diff options
| author | Chris Johns <chrisj@rtems.org> | 2017-10-19 16:39:16 +1100 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2017-10-23 16:25:45 +1100 |
| commit | 98c6d501452f02264ff148a1b8479e420c81562d (patch) | |
| tree | 8c6cd90ccd1df98f782396d94d6acdbfe5d042cb | |
| parent | posix: Fix POSIX disabled build (diff) | |
| download | rtems-98c6d501452f02264ff148a1b8479e420c81562d.tar.bz2 | |
testsuite: Use printk for all test output where possible.
- Remove the printf support leaving the direct printk support configured
with TESTS_USE_PRINTK and all other output goes via a buffered vsniprintf
call to printk.
- Control the test's single init for functions and global data with
TEST_INIT and not CONFIGURE_INIT. They are now separate.
Updates #3170.
555 files changed, 1349 insertions, 342 deletions
diff --git a/testsuites/benchmarks/dhrystone/init.c b/testsuites/benchmarks/dhrystone/init.c index 3e6245c743..a109f4e5a4 100644 --- a/testsuites/benchmarks/dhrystone/init.c +++ b/testsuites/benchmarks/dhrystone/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" const char rtems_test_name[] = "DHRYSTONE"; diff --git a/testsuites/benchmarks/linpack/init.c b/testsuites/benchmarks/linpack/init.c index c94314b41d..38bfbaf642 100644 --- a/testsuites/benchmarks/linpack/init.c +++ b/testsuites/benchmarks/linpack/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" const char rtems_test_name[] = "LINPACK"; diff --git a/testsuites/benchmarks/whetstone/init.c b/testsuites/benchmarks/whetstone/init.c index b1661186b1..572b6ccccf 100644 --- a/testsuites/benchmarks/whetstone/init.c +++ b/testsuites/benchmarks/whetstone/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" const char rtems_test_name[] = "WHETSTONE"; diff --git a/testsuites/fstests/fsbdpart01/init.c b/testsuites/fstests/fsbdpart01/init.c index f339255469..ec0b3f6c7d 100644 --- a/testsuites/fstests/fsbdpart01/init.c +++ b/testsuites/fstests/fsbdpart01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include <sys/stat.h> diff --git a/testsuites/fstests/fsclose01/init.c b/testsuites/fstests/fsclose01/init.c index 77df082036..9e8a51e43c 100644 --- a/testsuites/fstests/fsclose01/init.c +++ b/testsuites/fstests/fsclose01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <sys/stat.h> #include <sys/ioctl.h> #include <sys/uio.h> diff --git a/testsuites/fstests/fsdosfsformat01/init.c b/testsuites/fstests/fsdosfsformat01/init.c index b7df74883a..d84a80b195 100644 --- a/testsuites/fstests/fsdosfsformat01/init.c +++ b/testsuites/fstests/fsdosfsformat01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include <fcntl.h> diff --git a/testsuites/fstests/fsdosfsname01/init.c b/testsuites/fstests/fsdosfsname01/init.c index f272945d89..ab01296291 100644 --- a/testsuites/fstests/fsdosfsname01/init.c +++ b/testsuites/fstests/fsdosfsname01/init.c @@ -17,6 +17,8 @@ #endif +#define TEST_INIT + #include "tmacros.h" #include <errno.h> diff --git a/testsuites/fstests/fsdosfsname02/init.c b/testsuites/fstests/fsdosfsname02/init.c index 0496ca00a4..bfb3bd315a 100644 --- a/testsuites/fstests/fsdosfsname02/init.c +++ b/testsuites/fstests/fsdosfsname02/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <sys/stat.h> #include <fcntl.h> #include <stdlib.h> diff --git a/testsuites/fstests/fsdosfssync01/init.c b/testsuites/fstests/fsdosfssync01/init.c index c53d2ccc7b..2b27408438 100644 --- a/testsuites/fstests/fsdosfssync01/init.c +++ b/testsuites/fstests/fsdosfssync01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include <sys/stat.h> diff --git a/testsuites/fstests/fsdosfswrite01/init.c b/testsuites/fstests/fsdosfswrite01/init.c index 525a882d48..b787e3c37f 100644 --- a/testsuites/fstests/fsdosfswrite01/init.c +++ b/testsuites/fstests/fsdosfswrite01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include <fcntl.h> #include <rtems/dosfs.h> diff --git a/testsuites/fstests/fsfseeko01/init.c b/testsuites/fstests/fsfseeko01/init.c index dd073ce86a..ca6ce47381 100644 --- a/testsuites/fstests/fsfseeko01/init.c +++ b/testsuites/fstests/fsfseeko01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include <sys/types.h> diff --git a/testsuites/fstests/fsimfsconfig01/init.c b/testsuites/fstests/fsimfsconfig01/init.c index 0a1cea59b7..57fd63c526 100644 --- a/testsuites/fstests/fsimfsconfig01/init.c +++ b/testsuites/fstests/fsimfsconfig01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #define TESTS_USE_PRINTK #include "tmacros.h" diff --git a/testsuites/fstests/fsimfsconfig02/init.c b/testsuites/fstests/fsimfsconfig02/init.c index 35f9c83b58..07df21668f 100644 --- a/testsuites/fstests/fsimfsconfig02/init.c +++ b/testsuites/fstests/fsimfsconfig02/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include <sys/stat.h> diff --git a/testsuites/fstests/fsimfsconfig03/init.c b/testsuites/fstests/fsimfsconfig03/init.c index 352fb50577..311c5bb6b2 100644 --- a/testsuites/fstests/fsimfsconfig03/init.c +++ b/testsuites/fstests/fsimfsconfig03/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #define TESTS_USE_PRINTK #include "tmacros.h" diff --git a/testsuites/fstests/fsimfsgeneric01/init.c b/testsuites/fstests/fsimfsgeneric01/init.c index 45d6d1cc2d..fff59e4ebf 100644 --- a/testsuites/fstests/fsimfsgeneric01/init.c +++ b/testsuites/fstests/fsimfsgeneric01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include <sys/stat.h> diff --git a/testsuites/fstests/fsnofs01/init.c b/testsuites/fstests/fsnofs01/init.c index 37ebac1771..603a906fdf 100644 --- a/testsuites/fstests/fsnofs01/init.c +++ b/testsuites/fstests/fsnofs01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #define TESTS_USE_PRINTK #include "tmacros.h" diff --git a/testsuites/fstests/fsrofs01/init.c b/testsuites/fstests/fsrofs01/init.c index 45aae88df9..323e275cb5 100644 --- a/testsuites/fstests/fsrofs01/init.c +++ b/testsuites/fstests/fsrofs01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include <sys/stat.h> diff --git a/testsuites/fstests/imfs_support/fs_support.c b/testsuites/fstests/imfs_support/fs_support.c index 966b01f121..53271fe94f 100644 --- a/testsuites/fstests/imfs_support/fs_support.c +++ b/testsuites/fstests/imfs_support/fs_support.c @@ -1,3 +1,5 @@ +#define TEST_INIT + /* * COPYRIGHT (c) 1989-2011. * On-Line Applications Research Corporation (OAR). diff --git a/testsuites/fstests/jffs2_support/fs_support.c b/testsuites/fstests/jffs2_support/fs_support.c index da80de6304..18dbe20360 100644 --- a/testsuites/fstests/jffs2_support/fs_support.c +++ b/testsuites/fstests/jffs2_support/fs_support.c @@ -12,6 +12,8 @@ * http://www.rtems.org/license/LICENSE. */ +#define TEST_INIT + #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/testsuites/fstests/mdosfs_support/fs_support.c b/testsuites/fstests/mdosfs_support/fs_support.c index 1a07edf46f..b233a3374a 100644 --- a/testsuites/fstests/mdosfs_support/fs_support.c +++ b/testsuites/fstests/mdosfs_support/fs_support.c @@ -1,3 +1,5 @@ +#define TEST_INIT + /* * COPYRIGHT (c) 1989-2011. * On-Line Applications Research Corporation (OAR). diff --git a/testsuites/fstests/mimfs_support/fs_support.c b/testsuites/fstests/mimfs_support/fs_support.c index 7760ff7426..efcd5c4dcd 100644 --- a/testsuites/fstests/mimfs_support/fs_support.c +++ b/testsuites/fstests/mimfs_support/fs_support.c @@ -7,6 +7,8 @@ * http://www.rtems.org/license/LICENSE. */ +#define TEST_INIT + #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/testsuites/fstests/mrfs_support/fs_support.c b/testsuites/fstests/mrfs_support/fs_support.c index 11053505e5..85e1217044 100644 --- a/testsuites/fstests/mrfs_support/fs_support.c +++ b/testsuites/fstests/mrfs_support/fs_support.c @@ -7,6 +7,8 @@ * http://www.rtems.org/license/LICENSE. */ +#define TEST_INIT + #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/testsuites/libtests/block01/init.c b/testsuites/libtests/block01/init.c index b7eaa2b91f..c1a20693bd 100644 --- a/testsuites/libtests/block01/init.c +++ b/testsuites/libtests/block01/init.c @@ -24,6 +24,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <sys/stat.h> #include <stdio.h> #include <fcntl.h> diff --git a/testsuites/libtests/block02/init.c b/testsuites/libtests/block02/init.c index 863064109b..f7dc3efd0d 100644 --- a/testsuites/libtests/block02/init.c +++ b/testsuites/libtests/block02/init.c @@ -24,6 +24,8 @@ #include "config.h" #endif +#define TEST_INIT + #define TESTS_USE_PRINTK #include "tmacros.h" diff --git a/testsuites/libtests/block03/init.c b/testsuites/libtests/block03/init.c index f2a18b9a7c..f2f6bd9ee4 100644 --- a/testsuites/libtests/block03/init.c +++ b/testsuites/libtests/block03/init.c @@ -24,6 +24,8 @@ #include "config.h" #endif +#define TEST_INIT + #define TESTS_USE_PRINTK #include "tmacros.h" diff --git a/testsuites/libtests/block04/init.c b/testsuites/libtests/block04/init.c index 3f448c7605..3d674c1107 100644 --- a/testsuites/libtests/block04/init.c +++ b/testsuites/libtests/block04/init.c @@ -24,6 +24,8 @@ #include "config.h" #endif +#define TEST_INIT + #define TESTS_USE_PRINTK #include "tmacros.h" diff --git a/testsuites/libtests/block05/init.c b/testsuites/libtests/block05/init.c index 7cce2acfd0..7a40b50b3c 100644 --- a/testsuites/libtests/block05/init.c +++ b/testsuites/libtests/block05/init.c @@ -24,6 +24,8 @@ #include "config.h" #endif +#define TEST_INIT + #define TESTS_USE_PRINTK #include "tmacros.h" #include <stdarg.h> diff --git a/testsuites/libtests/block06/init.c b/testsuites/libtests/block06/init.c index 1b91ad7ab2..e1544118f5 100644 --- a/testsuites/libtests/block06/init.c +++ b/testsuites/libtests/block06/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <errno.h> #include <setjmp.h> #include <stdio.h> @@ -128,24 +130,6 @@ typedef struct bdbuf_task_control #define BDBUF_SECONDS(msec) ((msec) * 1000UL) /** - * Print a message to output and flush it. - * - * @param format The format string. See printf for details. - * @param ... The arguments for the format text. - * @return int The number of bytes written to the output. - */ -static int -bdbuf_test_printf (const char *format, ...) -{ - int ret = 0; - va_list args; - va_start (args, format); - ret = vfprintf (stdout, format, args); - fflush (stdout); - return ret; -} - -/** * Print the status code description and return true if true. * * @param sc The RTEMS status code. @@ -172,7 +156,7 @@ bdbuf_disk_lock (bdbuf_disk* bdd) sc = rtems_semaphore_obtain (bdd->lock, RTEMS_WAIT, 0); if (sc != RTEMS_SUCCESSFUL) { - bdbuf_test_printf ("disk ioctl: lock failed: "); + printf ("disk ioctl: lock failed: "); bdbuf_test_print_sc (sc, true); return false; } @@ -189,7 +173,7 @@ bdbuf_disk_unlock (bdbuf_disk* bdd) sc = rtems_semaphore_release (bdd->lock); if (sc != RTEMS_SUCCESSFUL) { - bdbuf_test_printf ("disk ioctl: unlock failed: "); + printf ("disk ioctl: unlock failed: "); bdbuf_test_print_sc (sc, true); return false; } @@ -210,12 +194,12 @@ bdbuf_wait (const char* who, unsigned long timeout) &out); if (sc != RTEMS_SUCCESSFUL) { - bdbuf_test_printf ("%s: wait: receive failed: ", who); + printf ("%s: wait: receive failed: ", who); bdbuf_test_print_sc (sc, true); } else if ((out & RTEMS_EVENT_0) == 0) { - bdbuf_test_printf ("%s: wait: received wrong event: %08x", who, out); + printf ("%s: wait: received wrong event: %08x", who, out); } return sc; } @@ -226,7 +210,7 @@ bdbuf_wait (const char* who, unsigned long timeout) static bool bdbuf_send_wait_event (const char* task, const char* msg, rtems_id id) { - bdbuf_test_printf ("%s: %s: %08x: ", task, msg, id); + printf ("%s: %s: %08x: ", task, msg, id); return bdbuf_test_print_sc (rtems_event_send (id, RTEMS_EVENT_0), true); } @@ -244,12 +228,12 @@ bdbuf_watch (unsigned long timeout) &out); if (sc != RTEMS_SUCCESSFUL) { - bdbuf_test_printf ("watch: receive failed: "); + printf ("watch: receive failed: "); bdbuf_test_print_sc (sc, true); } else if ((out & RTEMS_EVENT_1) == 0) { - bdbuf_test_printf ("watch: received wrong event: %08x", out); + printf ("watch: received wrong event: %08x", out); } return sc; } @@ -260,7 +244,7 @@ bdbuf_watch (unsigned long timeout) static bool bdbuf_send_watch_event (const char* task, const char* msg, rtems_id id) { - bdbuf_test_printf ("%s: %s: %08x: ", task, msg, id); + printf ("%s: %s: %08x: ", task, msg, id); return bdbuf_test_print_sc (rtems_event_send (id, RTEMS_EVENT_1), true); } @@ -306,7 +290,7 @@ bdbuf_disk_driver_watch_wait (bdbuf_task_control* tc, unsigned long msecs) rtems_status_code sc = bdbuf_watch (msecs); if (sc != RTEMS_SUCCESSFUL) { - bdbuf_test_printf ("%s: driver watch: driver wait: ", tc->name); + printf ("%s: driver watch: driver wait: ", tc->name); passed = bdbuf_test_print_sc (sc, true); } bdbuf_clear_disk_driver_watch (tc); @@ -337,7 +321,7 @@ bdbuf_sleep (unsigned long msecs) sc = rtems_task_wake_after (RTEMS_MICROSECONDS_TO_TICKS (msecs * 1000)); if (sc != RTEMS_SUCCESSFUL) { - bdbuf_test_printf ("sleep wake after failed: "); + printf ("sleep wake after failed: "); bdbuf_test_print_sc (sc, true); return false; } @@ -413,7 +397,7 @@ bdbuf_disk_ioctl_process (bdbuf_disk* bdd, rtems_blkdev_request* req) case BDBUF_DISK_WAIT: if (bdd->waiting) - bdbuf_test_printf ("disk ioctl: bad waiter: %s:%08x\n", + printf ("disk ioctl: bad waiter: %s:%08x\n", bdd->waiting_name, bdd->waiting); bdd->waiting_name = "bdd"; @@ -431,22 +415,22 @@ bdbuf_disk_ioctl_process (bdbuf_disk* bdd, rtems_blkdev_request* req) break; case BDBUF_DISK_SLEEP: - bdbuf_test_printf ("disk ioctl: sleeping: %d msecs\n", + printf ("disk ioctl: sleeping: %d msecs\n", bdd->driver_sleep); result = bdbuf_sleep (bdd->driver_sleep); break; case BDBUF_DISK_BLOCKS_INORDER: - bdbuf_test_printf ("disk ioctl: multi-block order check: count = %d\n", + printf ("disk ioctl: multi-block order check: count = %d\n", req->bufnum); for (b = 0; b < (req->bufnum - 1); b++) if (req->bufs[b].block >= req->bufs[b + 1].block) - bdbuf_test_printf ("disk ioctl: out of order: index:%d (%d >= %d\n", + printf ("disk ioctl: out of order: index:%d (%d >= %d\n", b, req->bufs[b].block, req->bufs[b + 1].block); break; default: - bdbuf_test_printf ("disk ioctl: invalid action: %d\n", + printf ("disk ioctl: invalid action: %d\n", bdd->driver_action); result = false; break; @@ -563,7 +547,7 @@ bdbuf_disk_initialize (rtems_device_major_number major, { rtems_status_code sc; - bdbuf_test_printf ("disk io init: "); + printf ("disk io init: "); sc = rtems_disk_io_initialize (); if (!bdbuf_test_print_sc (sc, true)) return sc; @@ -579,8 +563,8 @@ bdbuf_disk_initialize (rtems_device_major_number major, bdd->name = strdup (name); - bdbuf_test_printf ("disk init: %s\n", bdd->name); - bdbuf_test_printf ("disk lock: "); + printf ("disk init: %s\n", bdd->name); + printf ("disk lock: "); sc = rtems_semaphore_create (rtems_build_name ('B', 'D', 'D', 'K'), 1, RTEMS_PRIORITY | RTEMS_BINARY_SEMAPHORE | @@ -596,7 +580,7 @@ bdbuf_disk_initialize (rtems_device_major_number major, bdbuf_disk_ioctl, bdd, name); if (sc != RTEMS_SUCCESSFUL) { - bdbuf_test_printf ("disk init: create phys failed: "); + printf ("disk init: create phys failed: "); bdbuf_test_print_sc (sc, true); return sc; } @@ -631,7 +615,7 @@ bdbuf_tests_setup_disk (rtems_device_major_number *major, /* * Register the disk driver. */ - bdbuf_test_printf ("register disk driver\n"); + printf ("register disk driver\n"); sc = rtems_io_register_driver (RTEMS_DRIVER_AUTO_MAJOR, &bdbuf_disk_io_ops, @@ -653,7 +637,7 @@ bdbuf_tests_create_task (bdbuf_task_control* tc, { rtems_status_code sc; - bdbuf_test_printf ("creating task: %s: priority: %d: ", + printf ("creating task: %s: priority: %d: ", tc->name, priority); sc = rtems_task_create (rtems_build_name (tc->name[0], tc->name[1], @@ -666,7 +650,7 @@ bdbuf_tests_create_task (bdbuf_task_control* tc, if (!bdbuf_test_print_sc (sc, true)) return false; - bdbuf_test_printf ("starting task: %s: ", tc->name); + printf ("starting task: %s: ", tc->name); sc = rtems_task_start (tc->task, entry_point, (rtems_task_argument) tc); @@ -694,7 +678,7 @@ bdbuf_tests_task_0_test_1 (bdbuf_task_control* tc) for (i = 0; (i < 2) && passed; i++) { - bdbuf_test_printf ("%s: rtems_bdbuf_get[0]: ", tc->name); + printf ("%s: rtems_bdbuf_get[0]: ", tc->name); sc = rtems_bdbuf_get (tc->dd, 0, &bd); if (!bdbuf_test_print_sc (sc, true)) { @@ -702,7 +686,7 @@ bdbuf_tests_task_0_test_1 (bdbuf_task_control* tc) break; } - bdbuf_test_printf ("%s: rtems_bdbuf_release[0]: ", tc->name); + printf ("%s: rtems_bdbuf_release[0]: ", tc->name); sc = rtems_bdbuf_release (bd); if (!bdbuf_test_print_sc (sc, true)) { @@ -742,7 +726,7 @@ bdbuf_tests_task_0_test_2 (bdbuf_task_control* tc) for (i = 0; (i < 5) && passed; i++) { - bdbuf_test_printf ("%s: rtems_bdbuf_get[%d]: ", tc->name, i); + printf ("%s: rtems_bdbuf_get[%d]: ", tc->name, i); sc = rtems_bdbuf_get (tc->dd, i, &bd); if (!bdbuf_test_print_sc (sc, true)) passed = false; @@ -767,18 +751,18 @@ bdbuf_tests_task_0_test_2 (bdbuf_task_control* tc) sc = bdbuf_wait (tc->name, BDBUF_SECONDS (5)); if (sc != RTEMS_SUCCESSFUL) { - bdbuf_test_printf ("%s: wait failed: ", tc->name); + printf ("%s: wait failed: ", tc->name); bdbuf_test_print_sc (sc, true); passed = false; break; } else { - bdbuf_test_printf ("%s: rtems_bdbuf_release[%d]: unblocks task 1\n", + printf ("%s: rtems_bdbuf_release[%d]: unblocks task 1\n", tc->name, i); bd = (rtems_bdbuf_buffer*) rtems_chain_get (&buffers); sc = rtems_bdbuf_release (bd); - bdbuf_test_printf ("%s: rtems_bdbuf_release[%d]: ", tc->name, i); + printf ("%s: rtems_bdbuf_release[%d]: ", tc->name, i); if (!bdbuf_test_print_sc (sc, true)) { passed = false; @@ -815,11 +799,11 @@ bdbuf_tests_task_0_test_3 (bdbuf_task_control* tc) /* * Read the buffer and then release it. */ - bdbuf_test_printf ("%s: rtems_bdbuf_read[5]: ", tc->name); + printf ("%s: rtems_bdbuf_read[5]: ", tc->name); sc = rtems_bdbuf_read (tc->dd, 5, &bd); if ((passed = bdbuf_test_print_sc (sc, true))) { - bdbuf_test_printf ("%s: rtems_bdbuf_release_modified[5]: ", tc->name); + printf ("%s: rtems_bdbuf_release_modified[5]: ", tc->name); sc = rtems_bdbuf_release_modified (bd); passed = bdbuf_test_print_sc (sc, true); } @@ -828,11 +812,11 @@ bdbuf_tests_task_0_test_3 (bdbuf_task_control* tc) * Read the buffer again and then just release. The buffer should * be maintained as modified. */ - bdbuf_test_printf ("%s: rtems_bdbuf_read[5]: ", tc->name); + printf ("%s: rtems_bdbuf_read[5]: ", tc->name); sc = rtems_bdbuf_read (tc->dd, 5, &bd); if ((passed = bdbuf_test_print_sc (sc, true))) { - bdbuf_test_printf ("%s: rtems_bdbuf_release[5]: ", tc->name); + printf ("%s: rtems_bdbuf_release[5]: ", tc->name); sc = rtems_bdbuf_release (bd); passed = bdbuf_test_print_sc (sc, true); } @@ -886,7 +870,7 @@ bdbuf_tests_task_0_test_4 (bdbuf_task_control* tc) for (i = 0; (i < num) && passed; i++) { - bdbuf_test_printf ("%s: rtems_bdbuf_read[%d]: ", tc->name, i); + printf ("%s: rtems_bdbuf_read[%d]: ", tc->name, i); sc = rtems_bdbuf_read (tc->dd, i, &bd); if (!bdbuf_test_print_sc (sc, true)) passed = false; @@ -909,21 +893,21 @@ bdbuf_tests_task_0_test_4 (bdbuf_task_control* tc) * Release half the buffers, wait 500msecs then release the * remainder. This tests the swap out timer on each buffer. */ - bdbuf_test_printf ("%s: rtems_bdbuf_release_modified[0]: unblocks task 1\n", + printf ("%s: rtems_bdbuf_release_modified[0]: unblocks task 1\n", tc->name); bd = (rtems_bdbuf_buffer*) rtems_chain_get (&buffers); sc = rtems_bdbuf_release_modified (bd); - bdbuf_test_printf ("%s: rtems_bdbuf_release_modified[0]: ", tc->name); + printf ("%s: rtems_bdbuf_release_modified[0]: ", tc->name); passed = bdbuf_test_print_sc (sc, true); if (passed) { for (i = 1; (i < (num / 2)) && passed; i++) { - bdbuf_test_printf ("%s: rtems_bdbuf_release_modified[%d]: " \ + printf ("%s: rtems_bdbuf_release_modified[%d]: " \ "unblocks task 1\n", tc->name, i); bd = (rtems_bdbuf_buffer*) rtems_chain_get (&buffers); sc = rtems_bdbuf_release_modified (bd); - bdbuf_test_printf ("%s: rtems_bdbuf_release_modified[%d]: ", + printf ("%s: rtems_bdbuf_release_modified[%d]: ", tc->name, i); passed = bdbuf_test_print_sc (sc, true); if (!passed) @@ -942,7 +926,7 @@ bdbuf_tests_task_0_test_4 (bdbuf_task_control* tc) for (i = 0; (i < (num / 2)) && passed; i++) { - bdbuf_test_printf ("%s: rtems_bdbuf_release_modified[%d]: ", + printf ("%s: rtems_bdbuf_release_modified[%d]: ", tc->name, i + (num / 2)); bd = (rtems_bdbuf_buffer*) rtems_chain_get (&buffers); passed = bdbuf_test_print_sc (rtems_bdbuf_release_modified (bd), @@ -958,7 +942,7 @@ bdbuf_tests_task_0_test_4 (bdbuf_task_control* tc) if (!rtems_chain_is_empty (&buffers)) { passed = false; - bdbuf_test_printf ("%s: buffer chain not empty\n", tc->name); + printf ("%s: buffer chain not empty\n", tc->name); } } } @@ -1004,7 +988,7 @@ bdbuf_tests_task_0_test_6 (bdbuf_task_control* tc) for (i = 0; (i < 5) && passed; i++) { - bdbuf_test_printf ("%s: rtems_bdbuf_read[%d]: ", tc->name, i); + printf ("%s: rtems_bdbuf_read[%d]: ", tc->name, i); sc = rtems_bdbuf_get (tc->dd, i, &bd); if (!bdbuf_test_print_sc (sc, true)) passed = false; @@ -1014,7 +998,7 @@ bdbuf_tests_task_0_test_6 (bdbuf_task_control* tc) for (i = 0; (i < 4) && passed; i++) { - bdbuf_test_printf ("%s: rtems_bdbuf_release_modified[%d]: ", + printf ("%s: rtems_bdbuf_release_modified[%d]: ", tc->name, i); bd = (rtems_bdbuf_buffer*) rtems_chain_get (&buffers); passed = bdbuf_test_print_sc (rtems_bdbuf_release_modified (bd), @@ -1023,7 +1007,7 @@ bdbuf_tests_task_0_test_6 (bdbuf_task_control* tc) if (passed) { - bdbuf_test_printf ("%s: rtems_bdbuf_sync[%d]: ", tc->name, i); + printf ("%s: rtems_bdbuf_sync[%d]: ", tc->name, i); bd = (rtems_bdbuf_buffer*) rtems_chain_get (&buffers); passed = bdbuf_test_print_sc (rtems_bdbuf_sync (bd), true); @@ -1061,7 +1045,7 @@ bdbuf_tests_task_0_test_7 (bdbuf_task_control* tc) for (i = 0; (i < 5) && passed; i++) { - bdbuf_test_printf ("%s: rtems_bdbuf_read[%d]: ", tc->name, i); + printf ("%s: rtems_bdbuf_read[%d]: ", tc->name, i); sc = rtems_bdbuf_get (tc->dd, i, &bd); if (!bdbuf_test_print_sc (sc, true)) passed = false; @@ -1071,7 +1055,7 @@ bdbuf_tests_task_0_test_7 (bdbuf_task_control* tc) for (i = 0; (i < 5) && passed; i++) { - bdbuf_test_printf ("%s: rtems_bdbuf_release_modified[%d]: ", + printf ("%s: rtems_bdbuf_release_modified[%d]: ", tc->name, i); bd = (rtems_bdbuf_buffer*) rtems_chain_get (&buffers); passed = bdbuf_test_print_sc (rtems_bdbuf_release_modified (bd), @@ -1080,7 +1064,7 @@ bdbuf_tests_task_0_test_7 (bdbuf_task_control* tc) if (passed) { - bdbuf_test_printf ("%s: rtems_bdbuf_syncdev[%d:%d]: ", + printf ("%s: rtems_bdbuf_syncdev[%d:%d]: ", tc->name, i, tc->major, tc->minor); @@ -1121,7 +1105,7 @@ bdbuf_tests_task_0_test_8 (bdbuf_task_control* tc) for (i = 0; (i < 5) && passed; i++) { - bdbuf_test_printf ("%s: rtems_bdbuf_read[%d]: ", tc->name, i); + printf ("%s: rtems_bdbuf_read[%d]: ", tc->name, i); sc = rtems_bdbuf_get (tc->dd, i, &bd); if (!bdbuf_test_print_sc (sc, true)) passed = false; @@ -1136,19 +1120,19 @@ bdbuf_tests_task_0_test_8 (bdbuf_task_control* tc) pnode = node->previous; rtems_chain_extract (node); node = pnode; - bdbuf_test_printf ("%s: rtems_bdbuf_release_modified[4]: ", tc->name); + printf ("%s: rtems_bdbuf_release_modified[4]: ", tc->name); passed = bdbuf_test_print_sc (rtems_bdbuf_release_modified (bd), true); bd = (rtems_bdbuf_buffer*) node; pnode = node->previous; rtems_chain_extract (node); node = pnode; - bdbuf_test_printf ("%s: rtems_bdbuf_release_modified[3]: ", tc->name); + printf ("%s: rtems_bdbuf_release_modified[3]: ", tc->name); passed = bdbuf_test_print_sc (rtems_bdbuf_release_modified (bd), true); for (i = 0; (i < 3) && passed; i++) { - bdbuf_test_printf ("%s: rtems_bdbuf_release_modified[%d]: ", + printf ("%s: rtems_bdbuf_release_modified[%d]: ", tc->name, i); bd = (rtems_bdbuf_buffer*) rtems_chain_get (&buffers); passed = bdbuf_test_print_sc (rtems_bdbuf_release_modified (bd), @@ -1162,12 +1146,12 @@ bdbuf_tests_task_0_test_8 (bdbuf_task_control* tc) */ bdbuf_set_disk_driver_action (tc, BDBUF_DISK_BLOCKS_INORDER); - bdbuf_test_printf ("%s: rtems_bdbuf_syncdev[%d:%d]: checking order\n", + printf ("%s: rtems_bdbuf_syncdev[%d:%d]: checking order\n", tc->name, i, tc->major, tc->minor); sc = rtems_bdbuf_syncdev (tc->dd); - bdbuf_test_printf ("%s: rtems_bdbuf_syncdev[%d:%d]: ", + printf ("%s: rtems_bdbuf_syncdev[%d:%d]: ", tc->name, i, tc->major, tc->minor); @@ -1230,14 +1214,14 @@ bdbuf_tests_task_0 (rtems_task_argument arg) /* * Invalid test for this task. An error. */ - bdbuf_test_printf ("%s: invalid test: %d\n", tc->name, tc->test); + printf ("%s: invalid test: %d\n", tc->name, tc->test); tc->passed = false; tc->test = 0; break; } } - bdbuf_test_printf ("%s: delete task\n", tc->name); + printf ("%s: delete task\n", tc->name); rtems_task_delete (RTEMS_SELF); } @@ -1264,16 +1248,16 @@ bdbuf_tests_ranged_get_release (bdbuf_task_control* tc, for (i = lower; (i < upper) && passed; i++) { - bdbuf_test_printf ("%s: rtems_bdbuf_get[%d]: blocking ...\n", tc->name, i); + printf ("%s: rtems_bdbuf_get[%d]: blocking ...\n", tc->name, i); sc = rtems_bdbuf_get (tc->dd, i, &bd); - bdbuf_test_printf ("%s: rtems_bdbuf_get[%d]: ", tc->name, i); + printf ("%s: rtems_bdbuf_get[%d]: ", tc->name, i); if (!bdbuf_test_print_sc (sc, true)) { passed = false; break; } - bdbuf_test_printf ("%s: rtems_bdbuf_release[%d]: ", tc->name, i); + printf ("%s: rtems_bdbuf_release[%d]: ", tc->name, i); sc = rtems_bdbuf_release (bd); if (!bdbuf_test_print_sc (sc, true)) { @@ -1324,14 +1308,14 @@ bdbuf_tests_task_1 (rtems_task_argument arg) /* * Invalid test for this task. An error. */ - bdbuf_test_printf ("%s: invalid test: %d\n", tc->name, tc->test); + printf ("%s: invalid test: %d\n", tc->name, tc->test); tc->passed = false; tc->test = 0; break; } } - bdbuf_test_printf ("%s: delete task\n", tc->name); + printf ("%s: delete task\n", tc->name); rtems_task_delete (RTEMS_SELF); } @@ -1372,14 +1356,14 @@ bdbuf_tests_task_2 (rtems_task_argument arg) /* * Invalid test for this task. An error. */ - bdbuf_test_printf ("%s: invalid test: %d\n", tc->name, tc->test); + printf ("%s: invalid test: %d\n", tc->name, tc->test); tc->passed = false; tc->test = 0; break; } } - bdbuf_test_printf ("%s: delete task\n", tc->name); + printf ("%s: delete task\n", tc->name); rtems_task_delete (RTEMS_SELF); } @@ -1426,7 +1410,7 @@ bdbuf_tests_finished (bdbuf_task_control* tasks) } if (!finished) - bdbuf_test_printf ("master: test timed out\n"); + printf ("master: test timed out\n"); else { int t; @@ -1778,7 +1762,7 @@ bdbuf_tester (void) /* * Change priority to a lower one. */ - bdbuf_test_printf ("lower priority to %d: ", BDBUF_TESTS_PRI_HIGH + 1); + printf ("lower priority to %d: ", BDBUF_TESTS_PRI_HIGH + 1); bdbuf_test_print_sc (rtems_task_set_priority (RTEMS_SELF, BDBUF_TESTS_PRI_HIGH + 1, &old_priority), @@ -1789,7 +1773,7 @@ bdbuf_tester (void) */ if (!bdbuf_tests_setup_disk (&major, &dd)) { - bdbuf_test_printf ("disk set up failed\n"); + printf ("disk set up failed\n"); return; } @@ -1827,9 +1811,9 @@ bdbuf_tester (void) */ for (t = 0; (t < BDBUF_TEST_NUM) && passed; t++) { - bdbuf_test_printf ("test %d: %s\n", t + 1, bdbuf_tests[t].label); + printf ("test %d: %s\n", t + 1, bdbuf_tests[t].label); passed = bdbuf_tests[t].test (tasks); - bdbuf_test_printf ("test %d: %s\n", t + 1, passed ? "passed" : "failed"); + printf ("test %d: %s\n", t + 1, passed ? "passed" : "failed"); } } diff --git a/testsuites/libtests/block07/init.c b/testsuites/libtests/block07/init.c index cd1b64abae..727bb6f89d 100644 --- a/testsuites/libtests/block07/init.c +++ b/testsuites/libtests/block07/init.c @@ -23,12 +23,14 @@ #include "config.h" #endif +#define TEST_INIT + #include <sys/ioctl.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#define TESTS_USE_PRINTK +#define TESTS_USE_PRINTF #include "tmacros.h" #include <rtems.h> @@ -88,21 +90,21 @@ static void task_low(rtems_task_argument arg) rtems_status_code sc = RTEMS_SUCCESSFUL; rtems_bdbuf_buffer *bd = NULL; - printk("L: try access: 0\n"); + printf("L: try access: 0\n"); sc = rtems_bdbuf_get(dd, 0, &bd); ASSERT_SC(sc); - printk("L: access: 0\n"); + printf("L: access: 0\n"); rtems_test_assert(bd->group->bds_per_group == 2); - printk("L: release: 0\n"); + printf("L: release: 0\n"); sc = rtems_bdbuf_release(bd); ASSERT_SC(sc); - printk("L: release done: 0\n"); + printf("L: release done: 0\n"); TEST_END(); @@ -114,21 +116,21 @@ static void task_mid(rtems_task_argument arg) rtems_status_code sc = RTEMS_SUCCESSFUL; rtems_bdbuf_buffer *bd = NULL; - printk("M: try access: 0\n"); + printf("M: try access: 0\n"); sc = rtems_bdbuf_get(dd, 0, &bd); ASSERT_SC(sc); - printk("M: access: 0\n"); + printf("M: access: 0\n"); rtems_test_assert(bd->group->bds_per_group == 1); - printk("M: release: 0\n"); + printf("M: release: 0\n"); sc = rtems_bdbuf_release(bd); ASSERT_SC(sc); - printk("M: release done: 0\n"); + printf("M: release done: 0\n"); rtems_task_delete(RTEMS_SELF); } @@ -140,21 +142,21 @@ static void task_high(rtems_task_argument arg) change_block_size(); - printk("H: try access: 0\n"); + printf("H: try access: 0\n"); sc = rtems_bdbuf_get(dd, 0, &bd); ASSERT_SC(sc); - printk("H: access: 0\n"); + printf("H: access: 0\n"); rtems_test_assert(bd->group->bds_per_group == 1); - printk("H: release: 0\n"); + printf("H: release: 0\n"); sc = rtems_bdbuf_release(bd); ASSERT_SC(sc); - printk("H: release done: 0\n"); + printf("H: release done: 0\n"); rtems_task_delete(RTEMS_SELF); } @@ -228,12 +230,12 @@ static rtems_task Init(rtems_task_argument argument) sc = rtems_bdbuf_release(bd); ASSERT_SC(sc); - printk("I: try access: 0\n"); + printf("I: try access: 0\n"); sc = rtems_bdbuf_get(dd, 0, &bd); ASSERT_SC(sc); - printk("I: access: 0\n"); + printf("I: access: 0\n"); sc = rtems_task_set_priority(RTEMS_SELF, PRIORITY_IDLE, &cur_prio); ASSERT_SC(sc); @@ -247,12 +249,12 @@ static rtems_task Init(rtems_task_argument argument) sc = rtems_task_set_priority(RTEMS_SELF, PRIORITY_INIT, &cur_prio); ASSERT_SC(sc); - printk("I: release: 0\n"); + printf("I: release: 0\n"); sc = rtems_bdbuf_release(bd); ASSERT_SC(sc); - printk("I: release done: 0\n"); + printf("I: release done: 0\n"); rtems_task_delete(RTEMS_SELF); } diff --git a/testsuites/libtests/block08/bdbuf_test3_2.c b/testsuites/libtests/block08/bdbuf_test3_2.c index e9cfc9e1a2..aba2bea095 100644 --- a/testsuites/libtests/block08/bdbuf_test3_2.c +++ b/testsuites/libtests/block08/bdbuf_test3_2.c @@ -154,7 +154,7 @@ bdbuf_test3_2_thread2(rtems_task_argument arg) TEST_FAILED(); } - printk("Thread #2 DEBLOCK\n"); + printf("Thread #2 DEBLOCK\n"); CONTINUE_MAIN(2); rc = rtems_bdbuf_release_modified(bd); @@ -184,7 +184,7 @@ bdbuf_test3_2_thread3(rtems_task_argument arg) TEST_FAILED(); } - printk("Thread #3 DEBLOCK\n"); + printf("Thread #3 DEBLOCK\n"); CONTINUE_MAIN(3); diff --git a/testsuites/libtests/block08/bdbuf_test3_3.c b/testsuites/libtests/block08/bdbuf_test3_3.c index 9b3080b13e..562bb78ddb 100644 --- a/testsuites/libtests/block08/bdbuf_test3_3.c +++ b/testsuites/libtests/block08/bdbuf_test3_3.c @@ -165,7 +165,7 @@ bdbuf_test3_3_thread2(rtems_task_argument arg) TEST_FAILED(); } - printk("Thread #2 DEBLOCK\n"); + printf("Thread #2 DEBLOCK\n"); CONTINUE_MAIN(2); rc = rtems_bdbuf_release(bd); @@ -195,7 +195,7 @@ bdbuf_test3_3_thread3(rtems_task_argument arg) TEST_FAILED(); } - printk("Thread #3 DEBLOCK\n"); + printf("Thread #3 DEBLOCK\n"); CONTINUE_MAIN(3); diff --git a/testsuites/libtests/block08/bdbuf_tests.c b/testsuites/libtests/block08/bdbuf_tests.c index c918d937ba..66e69d4fbd 100644 --- a/testsuites/libtests/block08/bdbuf_tests.c +++ b/testsuites/libtests/block08/bdbuf_tests.c @@ -33,14 +33,14 @@ struct bdbuf_test_descr { { bdbuf_test1_3_main }, { bdbuf_test1_4_main }, { bdbuf_test1_5_main }, - + { bdbuf_test2_1_main }, { bdbuf_test2_2_main }, - + { bdbuf_test3_1_main }, { bdbuf_test3_2_main }, { bdbuf_test3_3_main }, - + { bdbuf_test4_1_main }, { bdbuf_test4_2_main }, { bdbuf_test4_3_main }, @@ -88,7 +88,7 @@ bdbuf_test_start_aux_task(rtems_name name, printf("Failed to create task\n"); return rc; } - + rc = rtems_task_start(task_id, entry_point, arg); if (rc != RTEMS_SUCCESSFUL) { @@ -126,7 +126,7 @@ run_bdbuf_tests() if (sc != RTEMS_SUCCESSFUL) { - printk("Failed to create message queue for test task: %u\n", sc); + printf("Failed to create message queue for test task: %u\n", sc); return; } @@ -134,14 +134,14 @@ run_bdbuf_tests() sc = rtems_io_register_driver(0, &testdisk, &major); if (sc != RTEMS_SUCCESSFUL) { - printk("Failed to register TEST DEVICE: %d\n", sc); + printf("Failed to register TEST DEVICE: %d\n", sc); return; } test_dev = -1; while ((disk = rtems_disk_next(dev)) != NULL) { - printk( + printf( "DEV: %s [%" PRIdrtems_blkdev_bnum "]\n", disk->name, disk->size @@ -185,7 +185,7 @@ run_bdbuf_tests() &g_test_ctx.test_sync_main[i]); if (sc != RTEMS_SUCCESSFUL) { - printk("Failed to create sync sem for test task: %u\n", sc); + printf("Failed to create sync sem for test task: %u\n", sc); return; } } @@ -197,17 +197,17 @@ run_bdbuf_tests() &g_test_ctx.test_sync[i]); if (sc != RTEMS_SUCCESSFUL) { - printk("Failed to create sync sem for test task #%d: %u\n", i + 1, sc); + printf("Failed to create sync sem for test task #%d: %u\n", i + 1, sc); return; } } - + sc = rtems_semaphore_create(rtems_build_name('T', 'S', 'M', 'E'), 0, TEST_SEM_ATTRIBS, 0, &g_test_ctx.test_end_main); if (sc != RTEMS_SUCCESSFUL) { - printk("Failed to create end sync sem for test task: %u\n", sc); + printf("Failed to create end sync sem for test task: %u\n", sc); return; } @@ -249,7 +249,7 @@ bdbuf_test_start_thread(unsigned int idx, rtems_task_entry func) sc = rtems_task_delete(g_test_ctx.test_task[idx]); if (sc != RTEMS_SUCCESSFUL) { - printk("Failed to delete test thread %u in test %s\n", + printf("Failed to delete test thread %u in test %s\n", idx + 1, g_test_ctx.test_name); return sc; } @@ -275,11 +275,10 @@ bdbuf_test_end() RTEMS_WAIT, RTEMS_NO_TIMEOUT); if (sc != RTEMS_SUCCESSFUL) { - printk("Failed to get a thread stopped\n"); + printf("Failed to get a thread stopped\n"); } g_test_ctx.test_task[i] = OBJECTS_ID_NONE; } } return RTEMS_SUCCESSFUL; } - diff --git a/testsuites/libtests/block08/init.c b/testsuites/libtests/block08/init.c index 83eaf6d534..e712b07f42 100644 --- a/testsuites/libtests/block08/init.c +++ b/testsuites/libtests/block08/init.c @@ -19,6 +19,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #define CONFIGURE_INIT diff --git a/testsuites/libtests/block08/test_disk.c b/testsuites/libtests/block08/test_disk.c index 9a4c5bf2b1..aa33803b23 100644 --- a/testsuites/libtests/block08/test_disk.c +++ b/testsuites/libtests/block08/test_disk.c @@ -46,19 +46,19 @@ test_disk_ioctl(rtems_disk_device *dd, uint32_t req, void *argp) r = argp; - printk("DISK_DRV: %s ", + printf("DISK_DRV: %s ", r->req == RTEMS_BLKDEV_REQ_READ ? "R" : r->req == RTEMS_BLKDEV_REQ_WRITE ? "W" : "?"); for (i = 0, sg = r->bufs; i < r->bufnum; i++, sg++) { - printk("[%" PRIu32 "] ", sg->block); + printf("[%" PRIu32 "] ", sg->block); } - printk("\n"); + printf("\n"); break; } default: - printk("%s() Unexpected request comes %" PRIu32 "\n", + printf("%s() Unexpected request comes %" PRIu32 "\n", __FUNCTION__, req); return -1; } @@ -135,7 +135,7 @@ test_disk_initialize( rc = bdbuf_test_create_drv_rx_queue(&drvq_id); if (rc != RTEMS_SUCCESSFUL) { - printk("%s() Failed to create Msg Queue for RX: %u\n", + printf("%s() Failed to create Msg Queue for RX: %u\n", __FUNCTION__, rc); return rc; } @@ -148,6 +148,6 @@ test_disk_initialize( return rc; } - printk("TEST DISK - OK\n"); + printf("TEST DISK - OK\n"); return RTEMS_SUCCESSFUL; } diff --git a/testsuites/libtests/block09/init.c b/testsuites/libtests/block09/init.c index 45e3b7ad39..3ad283ec59 100644 --- a/testsuites/libtests/block09/init.c +++ b/testsuites/libtests/block09/init.c @@ -24,6 +24,8 @@ #include "config.h" #endif +#define TEST_INIT + #define TESTS_USE_PRINTK #include "tmacros.h" diff --git a/testsuites/libtests/block10/init.c b/testsuites/libtests/block10/init.c index 1cdc91ebb1..98277444e2 100644 --- a/testsuites/libtests/block10/init.c +++ b/testsuites/libtests/block10/init.c @@ -23,7 +23,9 @@ #include "config.h" #endif -#define TESTS_USE_PRINTK +#define TEST_INIT + +#define TESTS_USE_PRINTF #include "tmacros.h" #include <assert.h> @@ -157,12 +159,12 @@ static rtems_bdbuf_buffer *do_get(char task) rtems_status_code sc = RTEMS_SUCCESSFUL; rtems_bdbuf_buffer *bd = NULL; - printk("%c: try get\n", task); + printf("%c: try get\n", task); sc = rtems_bdbuf_get(dd, 0, &bd); ASSERT_SC(sc); - printk("%c: get\n", task); + printf("%c: get\n", task); return bd; } @@ -172,7 +174,7 @@ static rtems_bdbuf_buffer *do_get_mod(char task) rtems_status_code sc = RTEMS_SUCCESSFUL; rtems_bdbuf_buffer *bd = NULL; - printk("%c: try get modified\n", task); + printf("%c: try get modified\n", task); sc = rtems_bdbuf_get(dd, 0, &bd); ASSERT_SC(sc); @@ -183,7 +185,7 @@ static rtems_bdbuf_buffer *do_get_mod(char task) sc = rtems_bdbuf_get(dd, 0, &bd); ASSERT_SC(sc); - printk("%c: get modified\n", task); + printf("%c: get modified\n", task); return bd; } @@ -193,12 +195,12 @@ static rtems_bdbuf_buffer *do_read(char task) rtems_status_code sc = RTEMS_SUCCESSFUL; rtems_bdbuf_buffer *bd = NULL; - printk("%c: try read\n", task); + printf("%c: try read\n", task); sc = rtems_bdbuf_read(dd, 0, &bd); ASSERT_SC(sc); - printk("%c: read\n", task); + printf("%c: read\n", task); return bd; } @@ -207,41 +209,41 @@ static void do_rel(char task, rtems_bdbuf_buffer *bd) { rtems_status_code sc = RTEMS_SUCCESSFUL; - printk("%c: release\n", task); + printf("%c: release\n", task); sc = rtems_bdbuf_release(bd); ASSERT_SC(sc); - printk("%c: release done\n", task); + printf("%c: release done\n", task); } static void do_rel_mod(char task, rtems_bdbuf_buffer *bd) { rtems_status_code sc = RTEMS_SUCCESSFUL; - printk("%c: release modified\n", task); + printf("%c: release modified\n", task); sc = rtems_bdbuf_release_modified(bd); ASSERT_SC(sc); - printk("%c: release modified done\n", task); + printf("%c: release modified done\n", task); } static void do_sync(char task, rtems_bdbuf_buffer *bd) { rtems_status_code sc = RTEMS_SUCCESSFUL; - printk("%c: sync\n", task); + printf("%c: sync\n", task); sc = rtems_bdbuf_sync(bd); ASSERT_SC(sc); - printk("%c: sync done\n", task); + printf("%c: sync done\n", task); } static void purge(char task) { - printk("%c: purge\n", task); + printf("%c: purge\n", task); rtems_bdbuf_purge_dev(dd); } @@ -449,7 +451,7 @@ static rtems_task Init(rtems_task_argument argument) for (i_ac = 0; i_ac < ACCESS_COUNT; ++i_ac) { for (i_rel = 0; i_rel < RELEASE_COUNT; ++i_rel) { for (i_w = 0; i_w < WAITER_COUNT; ++i_w) { - printk("test case [access]: %s and %s %s\n", access_assoc_table [i_ac], release_assoc_table [i_rel], waiter_assoc_table [i_w]); + printf("test case [access]: %s and %s %s\n", access_assoc_table [i_ac], release_assoc_table [i_rel], waiter_assoc_table [i_w]); check_access(access_table [i_ac], release_table [i_rel], waiter_table [i_w]); } } @@ -457,14 +459,14 @@ static rtems_task Init(rtems_task_argument argument) for (i_rel = 0; i_rel < RELEASE_COUNT; ++i_rel) { for (i_w = 0; i_w < WAITER_COUNT; ++i_w) { - printk("test case [intermediate]: %s %s\n", release_assoc_table [i_rel], waiter_assoc_table [i_w]); + printf("test case [intermediate]: %s %s\n", release_assoc_table [i_rel], waiter_assoc_table [i_w]); check_intermediate(release_table [i_rel], waiter_table [i_w]); } } for (i_p = 0; i_p < PURGER_COUNT; ++i_p) { for (i_w = 0; i_w < WAITER_COUNT; ++i_w) { - printk("test case [transfer]: %s %s\n", purger_assoc_table [i_p], waiter_assoc_table [i_w]); + printf("test case [transfer]: %s %s\n", purger_assoc_table [i_p], waiter_assoc_table [i_w]); check_transfer(purger_table [i_p], waiter_table [i_w]); } } diff --git a/testsuites/libtests/block11/init.c b/testsuites/libtests/block11/init.c index 4d19d1917b..68f962f5e7 100644 --- a/testsuites/libtests/block11/init.c +++ b/testsuites/libtests/block11/init.c @@ -24,6 +24,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include <sys/stat.h> diff --git a/testsuites/libtests/block12/init.c b/testsuites/libtests/block12/init.c index 5b749773dc..c7a409d6a6 100644 --- a/testsuites/libtests/block12/init.c +++ b/testsuites/libtests/block12/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include <errno.h> diff --git a/testsuites/libtests/block13/init.c b/testsuites/libtests/block13/init.c index 82c9b3a4a9..c936e0c26b 100644 --- a/testsuites/libtests/block13/init.c +++ b/testsuites/libtests/block13/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include <errno.h> diff --git a/testsuites/libtests/block14/init.c b/testsuites/libtests/block14/init.c index 0c2bed7bee..fcbb1b5f66 100644 --- a/testsuites/libtests/block14/init.c +++ b/testsuites/libtests/block14/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include <errno.h> diff --git a/testsuites/libtests/block15/init.c b/testsuites/libtests/block15/init.c index 19d30d17bf..fa2f1dd83f 100644 --- a/testsuites/libtests/block15/init.c +++ b/testsuites/libtests/block15/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include <errno.h> diff --git a/testsuites/libtests/block16/init.c b/testsuites/libtests/block16/init.c index c7d41480a9..0c83f05b28 100644 --- a/testsuites/libtests/block16/init.c +++ b/testsuites/libtests/block16/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include <sys/ioctl.h> diff --git a/testsuites/libtests/block17/init.c b/testsuites/libtests/block17/init.c index 384cb95a48..43dcde066e 100644 --- a/testsuites/libtests/block17/init.c +++ b/testsuites/libtests/block17/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <rtems/bdbuf.h> #include "tmacros.h" diff --git a/testsuites/libtests/bspcmdline01/init.c b/testsuites/libtests/bspcmdline01/init.c index bea50211e2..64d70bce07 100644 --- a/testsuites/libtests/bspcmdline01/init.c +++ b/testsuites/libtests/bspcmdline01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include <rtems/bspcmdline.h> diff --git a/testsuites/libtests/capture01/init.c b/testsuites/libtests/capture01/init.c index 7a2491594b..8062cbbd75 100644 --- a/testsuites/libtests/capture01/init.c +++ b/testsuites/libtests/capture01/init.c @@ -13,6 +13,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "system.h" #include <ctype.h> #include <stdlib.h> diff --git a/testsuites/libtests/cpuuse/init.c b/testsuites/libtests/cpuuse/init.c index 11fb273733..899b7db262 100644 --- a/testsuites/libtests/cpuuse/init.c +++ b/testsuites/libtests/cpuuse/init.c @@ -19,6 +19,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/libtests/crypt01/init.c b/testsuites/libtests/crypt01/init.c index 545c533feb..7c9dca0f8d 100644 --- a/testsuites/libtests/crypt01/init.c +++ b/testsuites/libtests/crypt01/init.c @@ -39,6 +39,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <crypt.h> #include <string.h> diff --git a/testsuites/libtests/debugger01/init.c b/testsuites/libtests/debugger01/init.c index e243d424a5..e7db8fe15d 100644 --- a/testsuites/libtests/debugger01/init.c +++ b/testsuites/libtests/debugger01/init.c @@ -12,6 +12,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/libtests/defaultconfig01/init.c b/testsuites/libtests/defaultconfig01/init.c index 21c326dcbd..66bb9d39a1 100644 --- a/testsuites/libtests/defaultconfig01/init.c +++ b/testsuites/libtests/defaultconfig01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <stdio.h> #include <bsp.h> diff --git a/testsuites/libtests/devfs01/init.c b/testsuites/libtests/devfs01/init.c index 1bfae95e97..66e702f61a 100644 --- a/testsuites/libtests/devfs01/init.c +++ b/testsuites/libtests/devfs01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define TESTS_USE_PRINTK #include <tmacros.h> #include "test_support.h" diff --git a/testsuites/libtests/devfs02/init.c b/testsuites/libtests/devfs02/init.c index 95ea10ddd6..740407202c 100644 --- a/testsuites/libtests/devfs02/init.c +++ b/testsuites/libtests/devfs02/init.c @@ -14,6 +14,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "test_support.h" #define TESTS_USE_PRINTK diff --git a/testsuites/libtests/devfs03/init.c b/testsuites/libtests/devfs03/init.c index 147deeb424..34d488b892 100644 --- a/testsuites/libtests/devfs03/init.c +++ b/testsuites/libtests/devfs03/init.c @@ -14,6 +14,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include "test_support.h" #include <rtems/devfs.h> diff --git a/testsuites/libtests/devfs04/init.c b/testsuites/libtests/devfs04/init.c index 707deeccbe..96b68df0f8 100644 --- a/testsuites/libtests/devfs04/init.c +++ b/testsuites/libtests/devfs04/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define TESTS_USE_PRINTK #include <tmacros.h> #include "test_support.h" diff --git a/testsuites/libtests/deviceio01/init.c b/testsuites/libtests/deviceio01/init.c index 519719d546..6271463407 100644 --- a/testsuites/libtests/deviceio01/init.c +++ b/testsuites/libtests/deviceio01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include "test_support.h" #include <rtems/devfs.h> diff --git a/testsuites/libtests/dl01/init.c b/testsuites/libtests/dl01/init.c index ec7ae1a413..d511c198d1 100644 --- a/testsuites/libtests/dl01/init.c +++ b/testsuites/libtests/dl01/init.c @@ -10,6 +10,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include <errno.h> diff --git a/testsuites/libtests/dl02/init.c b/testsuites/libtests/dl02/init.c index bf2d1a9717..b796b9ed95 100644 --- a/testsuites/libtests/dl02/init.c +++ b/testsuites/libtests/dl02/init.c @@ -10,6 +10,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include <errno.h> diff --git a/testsuites/libtests/dl03/init.c b/testsuites/libtests/dl03/init.c index ae8272294c..ddfda7a767 100644 --- a/testsuites/libtests/dl03/init.c +++ b/testsuites/libtests/dl03/init.c @@ -10,6 +10,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include <errno.h> diff --git a/testsuites/libtests/dl04/init.c b/testsuites/libtests/dl04/init.c index eb3018e393..d8655a6607 100644 --- a/testsuites/libtests/dl04/init.c +++ b/testsuites/libtests/dl04/init.c @@ -10,6 +10,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include <errno.h> diff --git a/testsuites/libtests/dl05/init.c b/testsuites/libtests/dl05/init.c index 0c58204139..a224f9a216 100644 --- a/testsuites/libtests/dl05/init.c +++ b/testsuites/libtests/dl05/init.c @@ -10,6 +10,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include <errno.h> diff --git a/testsuites/libtests/dumpbuf01/init.c b/testsuites/libtests/dumpbuf01/init.c index e9671cd144..4d03ffcf78 100644 --- a/testsuites/libtests/dumpbuf01/init.c +++ b/testsuites/libtests/dumpbuf01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include "test_support.h" #include <rtems/dumpbuf.h> diff --git a/testsuites/libtests/exit01/init.c b/testsuites/libtests/exit01/init.c index 0fd8d356f0..3592644319 100644 --- a/testsuites/libtests/exit01/init.c +++ b/testsuites/libtests/exit01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #define TESTS_USE_PRINTK #include "tmacros.h" diff --git a/testsuites/libtests/exit02/init.c b/testsuites/libtests/exit02/init.c index 48248a569a..2aa3f33f30 100644 --- a/testsuites/libtests/exit02/init.c +++ b/testsuites/libtests/exit02/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #define TESTS_USE_PRINTK #include "tmacros.h" diff --git a/testsuites/libtests/flashdisk01/init.c b/testsuites/libtests/flashdisk01/init.c index ea1b583895..276ba5d728 100644 --- a/testsuites/libtests/flashdisk01/init.c +++ b/testsuites/libtests/flashdisk01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include <sys/stat.h> diff --git a/testsuites/libtests/ftp01/init.c b/testsuites/libtests/ftp01/init.c index ad166c3f77..af8dd0773a 100644 --- a/testsuites/libtests/ftp01/init.c +++ b/testsuites/libtests/ftp01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <sys/stat.h> #include <fcntl.h> #include <string.h> diff --git a/testsuites/libtests/gxx01/init.c b/testsuites/libtests/gxx01/init.c index a0debcdc91..c73e2b236e 100644 --- a/testsuites/libtests/gxx01/init.c +++ b/testsuites/libtests/gxx01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <errno.h> #include <tmacros.h> #include "test_support.h" diff --git a/testsuites/libtests/heapwalk/init.c b/testsuites/libtests/heapwalk/init.c index 3bd6c91ce4..7d221aa811 100644 --- a/testsuites/libtests/heapwalk/init.c +++ b/testsuites/libtests/heapwalk/init.c @@ -15,6 +15,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/libtests/i2c01/init.c b/testsuites/libtests/i2c01/init.c index 0d6fc839f3..9994a9cf70 100644 --- a/testsuites/libtests/i2c01/init.c +++ b/testsuites/libtests/i2c01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <dev/i2c/i2c.h> #include <dev/i2c/eeprom.h> #include <dev/i2c/gpio-nxp-pca9535.h> diff --git a/testsuites/libtests/libfdt01/init.c b/testsuites/libtests/libfdt01/init.c index a13fc82021..9324aa9d58 100644 --- a/testsuites/libtests/libfdt01/init.c +++ b/testsuites/libtests/libfdt01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include <libfdt.h> diff --git a/testsuites/libtests/malloc02/init.c b/testsuites/libtests/malloc02/init.c index c333b22862..d3937ca721 100644 --- a/testsuites/libtests/malloc02/init.c +++ b/testsuites/libtests/malloc02/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> const char rtems_test_name[] = "MALLOC 2"; diff --git a/testsuites/libtests/malloc03/init.c b/testsuites/libtests/malloc03/init.c index 3b23a07c79..51d1c132aa 100644 --- a/testsuites/libtests/malloc03/init.c +++ b/testsuites/libtests/malloc03/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include "test_support.h" diff --git a/testsuites/libtests/malloc04/init.c b/testsuites/libtests/malloc04/init.c index dabbf98e61..3fc690651b 100644 --- a/testsuites/libtests/malloc04/init.c +++ b/testsuites/libtests/malloc04/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include "test_support.h" #include <rtems/libcsupport.h> diff --git a/testsuites/libtests/malloctest/init.c b/testsuites/libtests/malloctest/init.c index 6be6c1c25d..59aa1a105b 100644 --- a/testsuites/libtests/malloctest/init.c +++ b/testsuites/libtests/malloctest/init.c @@ -13,6 +13,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/libtests/md501/init.c b/testsuites/libtests/md501/init.c index 124c2d7b9b..f743454fdf 100644 --- a/testsuites/libtests/md501/init.c +++ b/testsuites/libtests/md501/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include <md5.h> diff --git a/testsuites/libtests/mghttpd01/init.c b/testsuites/libtests/mghttpd01/init.c index 39071a8dfb..31f0972ff5 100644 --- a/testsuites/libtests/mghttpd01/init.c +++ b/testsuites/libtests/mghttpd01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <rtems.h> #include <tmacros.h> diff --git a/testsuites/libtests/monitor/init.c b/testsuites/libtests/monitor/init.c index 15112285d9..e579d3c01d 100644 --- a/testsuites/libtests/monitor/init.c +++ b/testsuites/libtests/monitor/init.c @@ -15,6 +15,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/libtests/monitor02/init.c b/testsuites/libtests/monitor02/init.c index 22818cc441..105f1fd7c8 100644 --- a/testsuites/libtests/monitor02/init.c +++ b/testsuites/libtests/monitor02/init.c @@ -15,6 +15,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "bsp.h" #include "system.h" diff --git a/testsuites/libtests/mouse01/init.c b/testsuites/libtests/mouse01/init.c index 944551901c..145887a15a 100644 --- a/testsuites/libtests/mouse01/init.c +++ b/testsuites/libtests/mouse01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <bsp.h> #include <stdlib.h> diff --git a/testsuites/libtests/networking01/init.c b/testsuites/libtests/networking01/init.c index f22b3328b1..00f0bd4351 100644 --- a/testsuites/libtests/networking01/init.c +++ b/testsuites/libtests/networking01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <sys/socket.h> #include <netdb.h> #include <string.h> diff --git a/testsuites/libtests/newlib01/init.c b/testsuites/libtests/newlib01/init.c index 24dad1c4c5..bbe260e117 100644 --- a/testsuites/libtests/newlib01/init.c +++ b/testsuites/libtests/newlib01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <stdio.h> #include <rtems.h> diff --git a/testsuites/libtests/putenvtest/init.c b/testsuites/libtests/putenvtest/init.c index 0c2ca664e5..a71ed42144 100644 --- a/testsuites/libtests/putenvtest/init.c +++ b/testsuites/libtests/putenvtest/init.c @@ -23,6 +23,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include <tmacros.h> #include <stdio.h> diff --git a/testsuites/libtests/pwdgrp01/init.c b/testsuites/libtests/pwdgrp01/init.c index bc373672e5..af04cc8085 100644 --- a/testsuites/libtests/pwdgrp01/init.c +++ b/testsuites/libtests/pwdgrp01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <sys/stat.h> #include <sys/types.h> #include <errno.h> diff --git a/testsuites/libtests/pwdgrp02/init.c b/testsuites/libtests/pwdgrp02/init.c index ebc8d0b3fc..15939cdf8c 100644 --- a/testsuites/libtests/pwdgrp02/init.c +++ b/testsuites/libtests/pwdgrp02/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <sys/stat.h> #include <sys/types.h> #include <errno.h> diff --git a/testsuites/libtests/rbheap01/init.c b/testsuites/libtests/rbheap01/init.c index a85d107510..c97f6771fd 100644 --- a/testsuites/libtests/rbheap01/init.c +++ b/testsuites/libtests/rbheap01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include <rtems.h> diff --git a/testsuites/libtests/rtmonuse/init.c b/testsuites/libtests/rtmonuse/init.c index a3f2ee10ca..f6cb347b3e 100644 --- a/testsuites/libtests/rtmonuse/init.c +++ b/testsuites/libtests/rtmonuse/init.c @@ -23,6 +23,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/libtests/sha/init.c b/testsuites/libtests/sha/init.c index 797eec7794..c53f2f8f24 100644 --- a/testsuites/libtests/sha/init.c +++ b/testsuites/libtests/sha/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <sha256.h> #include <sha512.h> #include <stdio.h> diff --git a/testsuites/libtests/shell01/init.c b/testsuites/libtests/shell01/init.c index b7ec2d1601..bf3b50dfae 100644 --- a/testsuites/libtests/shell01/init.c +++ b/testsuites/libtests/shell01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <sys/stat.h> #include <sys/types.h> #include <errno.h> diff --git a/testsuites/libtests/sparsedisk01/init.c b/testsuites/libtests/sparsedisk01/init.c index 7c556cd4cf..6d3a648029 100644 --- a/testsuites/libtests/sparsedisk01/init.c +++ b/testsuites/libtests/sparsedisk01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <fcntl.h> #include <rtems/blkdev.h> #include "rtems/sparse-disk.h" diff --git a/testsuites/libtests/spi01/init.c b/testsuites/libtests/spi01/init.c index 990d3ec2b4..e478d7b249 100644 --- a/testsuites/libtests/spi01/init.c +++ b/testsuites/libtests/spi01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <dev/spi/spi.h> #include <sys/ioctl.h> diff --git a/testsuites/libtests/stackchk/init.c b/testsuites/libtests/stackchk/init.c index 72e3c23731..a88d01a418 100644 --- a/testsuites/libtests/stackchk/init.c +++ b/testsuites/libtests/stackchk/init.c @@ -23,6 +23,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/libtests/stackchk01/init.c b/testsuites/libtests/stackchk01/init.c index be0d494e08..cb72c9483e 100644 --- a/testsuites/libtests/stackchk01/init.c +++ b/testsuites/libtests/stackchk01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include <rtems/stackchk.h> diff --git a/testsuites/libtests/stringto01/init.c b/testsuites/libtests/stringto01/init.c index d36a4e543f..fd1c262fd6 100644 --- a/testsuites/libtests/stringto01/init.c +++ b/testsuites/libtests/stringto01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include <rtems/stringto.h> #include <limits.h> diff --git a/testsuites/libtests/syscall01/init.c b/testsuites/libtests/syscall01/init.c index 253b91fd47..b58f73c748 100644 --- a/testsuites/libtests/syscall01/init.c +++ b/testsuites/libtests/syscall01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include <sys/select.h> diff --git a/testsuites/libtests/tar01/init.c b/testsuites/libtests/tar01/init.c index 3316982315..ffc49b68c1 100644 --- a/testsuites/libtests/tar01/init.c +++ b/testsuites/libtests/tar01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <bsp.h> /* for device driver prototypes */ #include "tmacros.h" #include <rtems/untar.h> diff --git a/testsuites/libtests/tar02/init.c b/testsuites/libtests/tar02/init.c index 23c1187034..6d0c9a7fbe 100644 --- a/testsuites/libtests/tar02/init.c +++ b/testsuites/libtests/tar02/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <bsp.h> /* for device driver prototypes */ #include "tmacros.h" #include <rtems/imfs.h> diff --git a/testsuites/libtests/tar03/init.c b/testsuites/libtests/tar03/init.c index 72e95ecd2f..9a79222e4a 100644 --- a/testsuites/libtests/tar03/init.c +++ b/testsuites/libtests/tar03/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include "test_support.h" diff --git a/testsuites/libtests/termios/init.c b/testsuites/libtests/termios/init.c index 558f095449..deb6a88d47 100644 --- a/testsuites/libtests/termios/init.c +++ b/testsuites/libtests/termios/init.c @@ -24,6 +24,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <bsp.h> #include <rtems/shell.h> diff --git a/testsuites/libtests/termios01/init.c b/testsuites/libtests/termios01/init.c index a892762b03..865b55c6ce 100644 --- a/testsuites/libtests/termios01/init.c +++ b/testsuites/libtests/termios01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #define TTYDEFCHARS #include <termios.h> diff --git a/testsuites/libtests/termios02/init.c b/testsuites/libtests/termios02/init.c index fe16150513..eead771b5d 100644 --- a/testsuites/libtests/termios02/init.c +++ b/testsuites/libtests/termios02/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include <termios.h> #include <errno.h> diff --git a/testsuites/libtests/termios03/init.c b/testsuites/libtests/termios03/init.c index ab33ac82fd..d18c1c3f28 100644 --- a/testsuites/libtests/termios03/init.c +++ b/testsuites/libtests/termios03/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include "test_support.h" #include "termios_testdriver_polled.h" diff --git a/testsuites/libtests/termios04/init.c b/testsuites/libtests/termios04/init.c index dd9f653a7b..ed76962dad 100644 --- a/testsuites/libtests/termios04/init.c +++ b/testsuites/libtests/termios04/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include "test_support.h" #include "termios_testdriver_intr.h" diff --git a/testsuites/libtests/termios05/init.c b/testsuites/libtests/termios05/init.c index 72c9e81a37..d359165ee6 100644 --- a/testsuites/libtests/termios05/init.c +++ b/testsuites/libtests/termios05/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include "test_support.h" #include "termios_testdriver_intr.h" diff --git a/testsuites/libtests/termios06/init.c b/testsuites/libtests/termios06/init.c index 9b59ad2fb9..5c39dabacf 100644 --- a/testsuites/libtests/termios06/init.c +++ b/testsuites/libtests/termios06/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include "test_support.h" #include "termios_testdriver_polled.h" diff --git a/testsuites/libtests/termios07/init.c b/testsuites/libtests/termios07/init.c index bda570d706..d6a91ef8db 100644 --- a/testsuites/libtests/termios07/init.c +++ b/testsuites/libtests/termios07/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include "test_support.h" #include "termios_testdriver_intr.h" diff --git a/testsuites/libtests/termios08/init.c b/testsuites/libtests/termios08/init.c index 317ce7203d..7c290981da 100644 --- a/testsuites/libtests/termios08/init.c +++ b/testsuites/libtests/termios08/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include "test_support.h" #include "termios_testdriver_polled.h" diff --git a/testsuites/libtests/termios09/init.c b/testsuites/libtests/termios09/init.c index 6feb521244..46b4c76181 100644 --- a/testsuites/libtests/termios09/init.c +++ b/testsuites/libtests/termios09/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <sys/stat.h> #include <fcntl.h> #include <string.h> diff --git a/testsuites/libtests/top/init.c b/testsuites/libtests/top/init.c index 8a824ae194..ed33d8288a 100644 --- a/testsuites/libtests/top/init.c +++ b/testsuites/libtests/top/init.c @@ -21,6 +21,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/libtests/tztest/init.c b/testsuites/libtests/tztest/init.c index 88799f5849..263bd8e25b 100644 --- a/testsuites/libtests/tztest/init.c +++ b/testsuites/libtests/tztest/init.c @@ -20,6 +20,8 @@ #define CONFIGURE_INIT +#define TEST_INIT + #include <tmacros.h> #include <time.h> #include <stdlib.h> diff --git a/testsuites/libtests/uid01/init.c b/testsuites/libtests/uid01/init.c index 2e6fd635ed..56eba61a94 100644 --- a/testsuites/libtests/uid01/init.c +++ b/testsuites/libtests/uid01/init.c @@ -10,6 +10,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <bsp.h> #include <stdlib.h> diff --git a/testsuites/libtests/utf8proc01/init.c b/testsuites/libtests/utf8proc01/init.c index fda1444a37..142af2b748 100644 --- a/testsuites/libtests/utf8proc01/init.c +++ b/testsuites/libtests/utf8proc01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include <string.h> diff --git a/testsuites/mptests/mp01/init.c b/testsuites/mptests/mp01/init.c index 9e1a1a7375..33e81103ce 100644 --- a/testsuites/mptests/mp01/init.c +++ b/testsuites/mptests/mp01/init.c @@ -23,6 +23,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/mptests/mp03/init.c b/testsuites/mptests/mp03/init.c index 9607a447f4..6197f40b3a 100644 --- a/testsuites/mptests/mp03/init.c +++ b/testsuites/mptests/mp03/init.c @@ -23,6 +23,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/mptests/mp04/init.c b/testsuites/mptests/mp04/init.c index 5fbcaf81a0..9d5bfc78a9 100644 --- a/testsuites/mptests/mp04/init.c +++ b/testsuites/mptests/mp04/init.c @@ -23,6 +23,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/mptests/mp05/init.c b/testsuites/mptests/mp05/init.c index 9ecac0eac8..b93c81a8c1 100644 --- a/testsuites/mptests/mp05/init.c +++ b/testsuites/mptests/mp05/init.c @@ -23,6 +23,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/mptests/mp06/init.c b/testsuites/mptests/mp06/init.c index 3907517655..12e57a1fef 100644 --- a/testsuites/mptests/mp06/init.c +++ b/testsuites/mptests/mp06/init.c @@ -23,6 +23,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/mptests/mp07/init.c b/testsuites/mptests/mp07/init.c index 4bf3d57718..7cdf38632b 100644 --- a/testsuites/mptests/mp07/init.c +++ b/testsuites/mptests/mp07/init.c @@ -23,6 +23,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/mptests/mp08/init.c b/testsuites/mptests/mp08/init.c index a4e1ad4753..8ce0c9a7e7 100644 --- a/testsuites/mptests/mp08/init.c +++ b/testsuites/mptests/mp08/init.c @@ -23,6 +23,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/mptests/mp09/init.c b/testsuites/mptests/mp09/init.c index 8f64a3a323..7cc24a631a 100644 --- a/testsuites/mptests/mp09/init.c +++ b/testsuites/mptests/mp09/init.c @@ -23,6 +23,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/mptests/mp10/init.c b/testsuites/mptests/mp10/init.c index b5c5a200f4..b235600993 100644 --- a/testsuites/mptests/mp10/init.c +++ b/testsuites/mptests/mp10/init.c @@ -29,6 +29,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/mptests/mp11/init.c b/testsuites/mptests/mp11/init.c index e44b151597..527f187052 100644 --- a/testsuites/mptests/mp11/init.c +++ b/testsuites/mptests/mp11/init.c @@ -26,6 +26,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/mptests/mp12/init.c b/testsuites/mptests/mp12/init.c index 7486e664c6..7d1e23df0f 100644 --- a/testsuites/mptests/mp12/init.c +++ b/testsuites/mptests/mp12/init.c @@ -28,6 +28,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/mptests/mp13/init.c b/testsuites/mptests/mp13/init.c index e82a1d12e1..3889796e3f 100644 --- a/testsuites/mptests/mp13/init.c +++ b/testsuites/mptests/mp13/init.c @@ -23,6 +23,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/mptests/mp14/init.c b/testsuites/mptests/mp14/init.c index 68359bcd3a..47ad3121db 100644 --- a/testsuites/mptests/mp14/init.c +++ b/testsuites/mptests/mp14/init.c @@ -23,6 +23,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/psxtests/include/pmacros.h b/testsuites/psxtests/include/pmacros.h index be1b8b7567..76e30f5392 100644 --- a/testsuites/psxtests/include/pmacros.h +++ b/testsuites/psxtests/include/pmacros.h @@ -86,7 +86,6 @@ (void) ctime_r( &_tv.tv_sec, _time_buffer ); \ _time_buffer[ strlen( _time_buffer ) - 1 ] = 0; \ printf( "%s%s%s\n", s1, _time_buffer, s2 ); \ - fflush(stdout); \ } while ( 0 ) #define empty_line() puts( "" ) diff --git a/testsuites/psxtests/psx01/init.c b/testsuites/psxtests/psx01/init.c index 2b2fafd0cd..7b7a4ef87c 100644 --- a/testsuites/psxtests/psx01/init.c +++ b/testsuites/psxtests/psx01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <sched.h> #include <sys/utsname.h> diff --git a/testsuites/psxtests/psx02/init.c b/testsuites/psxtests/psx02/init.c index 0d2ab06c7e..7ea8b9870d 100644 --- a/testsuites/psxtests/psx02/init.c +++ b/testsuites/psxtests/psx02/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" #include <signal.h> diff --git a/testsuites/psxtests/psx03/init.c b/testsuites/psxtests/psx03/init.c index 5c5383ccfc..a78c72d0d2 100644 --- a/testsuites/psxtests/psx03/init.c +++ b/testsuites/psxtests/psx03/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" #include <signal.h> diff --git a/testsuites/psxtests/psx04/init.c b/testsuites/psxtests/psx04/init.c index 76c76af55b..b35fb68cc8 100644 --- a/testsuites/psxtests/psx04/init.c +++ b/testsuites/psxtests/psx04/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" #include <signal.h> diff --git a/testsuites/psxtests/psx05/init.c b/testsuites/psxtests/psx05/init.c index 70e8d4a67d..17249ee6b3 100644 --- a/testsuites/psxtests/psx05/init.c +++ b/testsuites/psxtests/psx05/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <sched.h> #define CONFIGURE_INIT diff --git a/testsuites/psxtests/psx06/init.c b/testsuites/psxtests/psx06/init.c index e077a28597..e10a7f5096 100644 --- a/testsuites/psxtests/psx06/init.c +++ b/testsuites/psxtests/psx06/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" #include <errno.h> diff --git a/testsuites/psxtests/psx07/init.c b/testsuites/psxtests/psx07/init.c index be5208b32f..b41e77e8b0 100644 --- a/testsuites/psxtests/psx07/init.c +++ b/testsuites/psxtests/psx07/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <pthread.h> #include <sched.h> diff --git a/testsuites/psxtests/psx08/init.c b/testsuites/psxtests/psx08/init.c index 781ac1ed30..b5839eae81 100644 --- a/testsuites/psxtests/psx08/init.c +++ b/testsuites/psxtests/psx08/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" #include <errno.h> diff --git a/testsuites/psxtests/psx09/init.c b/testsuites/psxtests/psx09/init.c index d9226c9abb..db10206f34 100644 --- a/testsuites/psxtests/psx09/init.c +++ b/testsuites/psxtests/psx09/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <sched.h> #define CONFIGURE_INIT diff --git a/testsuites/psxtests/psx10/init.c b/testsuites/psxtests/psx10/init.c index ad4e60e385..d58024a382 100644 --- a/testsuites/psxtests/psx10/init.c +++ b/testsuites/psxtests/psx10/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" #include <sched.h> diff --git a/testsuites/psxtests/psx11/init.c b/testsuites/psxtests/psx11/init.c index 9adde6e25b..8a4c0c45c5 100644 --- a/testsuites/psxtests/psx11/init.c +++ b/testsuites/psxtests/psx11/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <sched.h> #define CONFIGURE_INIT diff --git a/testsuites/psxtests/psx12/init.c b/testsuites/psxtests/psx12/init.c index 46fb0161b7..fc96aa03c4 100644 --- a/testsuites/psxtests/psx12/init.c +++ b/testsuites/psxtests/psx12/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <sys/time.h> #include <errno.h> #include <inttypes.h> diff --git a/testsuites/psxtests/psx13/main.c b/testsuites/psxtests/psx13/main.c index 62541bb51c..2d9111191d 100644 --- a/testsuites/psxtests/psx13/main.c +++ b/testsuites/psxtests/psx13/main.c @@ -9,12 +9,13 @@ * http://www.rtems.org/license/LICENSE. */ -#define CONFIGURE_INIT #ifdef HAVE_CONFIG_H #include "config.h" #endif +#define TEST_INIT + #include <bsp.h> #include <pmacros.h> diff --git a/testsuites/psxtests/psx14/init.c b/testsuites/psxtests/psx14/init.c index 070501f065..94a43fdb6c 100644 --- a/testsuites/psxtests/psx14/init.c +++ b/testsuites/psxtests/psx14/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" #include <rtems.h> diff --git a/testsuites/psxtests/psx15/init.c b/testsuites/psxtests/psx15/init.c index 654f0c87fb..36eadf4b77 100644 --- a/testsuites/psxtests/psx15/init.c +++ b/testsuites/psxtests/psx15/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <stdio.h> #include <inttypes.h> diff --git a/testsuites/psxtests/psx16/init.c b/testsuites/psxtests/psx16/init.c index 55f652679f..c9ddfeb88b 100644 --- a/testsuites/psxtests/psx16/init.c +++ b/testsuites/psxtests/psx16/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include "test_support.h" #include <pthread.h> diff --git a/testsuites/psxtests/psxaio01/init.c b/testsuites/psxtests/psxaio01/init.c index 283507f9cd..32479d41f6 100644 --- a/testsuites/psxtests/psxaio01/init.c +++ b/testsuites/psxtests/psxaio01/init.c @@ -10,6 +10,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" #include <rtems.h> diff --git a/testsuites/psxtests/psxaio02/init.c b/testsuites/psxtests/psxaio02/init.c index 3c75a365b5..781f01b916 100644 --- a/testsuites/psxtests/psxaio02/init.c +++ b/testsuites/psxtests/psxaio02/init.c @@ -10,6 +10,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" #include <rtems.h> diff --git a/testsuites/psxtests/psxaio03/init.c b/testsuites/psxtests/psxaio03/init.c index d8a13fa8e4..e0da0ee16e 100644 --- a/testsuites/psxtests/psxaio03/init.c +++ b/testsuites/psxtests/psxaio03/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" #include <rtems.h> diff --git a/testsuites/psxtests/psxalarm01/init.c b/testsuites/psxtests/psxalarm01/init.c index e4ab9b4f4a..d8ef47568b 100644 --- a/testsuites/psxtests/psxalarm01/init.c +++ b/testsuites/psxtests/psxalarm01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <pmacros.h> #include <sys/time.h> diff --git a/testsuites/psxtests/psxautoinit01/init.c b/testsuites/psxtests/psxautoinit01/init.c index 9001de2306..630fa1d17d 100644 --- a/testsuites/psxtests/psxautoinit01/init.c +++ b/testsuites/psxtests/psxautoinit01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include <pthread.h> #include <errno.h> diff --git a/testsuites/psxtests/psxautoinit02/init.c b/testsuites/psxtests/psxautoinit02/init.c index 5d652f7467..e281746eef 100644 --- a/testsuites/psxtests/psxautoinit02/init.c +++ b/testsuites/psxtests/psxautoinit02/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include <pthread.h> #include <errno.h> diff --git a/testsuites/psxtests/psxbarrier01/main.c b/testsuites/psxtests/psxbarrier01/main.c index f031c05b3c..a9c98cae11 100644 --- a/testsuites/psxtests/psxbarrier01/main.c +++ b/testsuites/psxtests/psxbarrier01/main.c @@ -7,12 +7,13 @@ * http://www.rtems.org/license/LICENSE. */ -#define CONFIGURE_INIT #ifdef HAVE_CONFIG_H #include "config.h" #endif +#define TEST_INIT + #include <rtems/test.h> #include <bsp.h> #include <pmacros.h> diff --git a/testsuites/psxtests/psxcancel/init.c b/testsuites/psxtests/psxcancel/init.c index c4c442b668..0e92db6dd4 100644 --- a/testsuites/psxtests/psxcancel/init.c +++ b/testsuites/psxtests/psxcancel/init.c @@ -8,6 +8,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <stdio.h> #include <stdlib.h> #include <pthread.h> diff --git a/testsuites/psxtests/psxcancel01/init.c b/testsuites/psxtests/psxcancel01/init.c index fce188ed39..5f4b1f84e7 100644 --- a/testsuites/psxtests/psxcancel01/init.c +++ b/testsuites/psxtests/psxcancel01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <pmacros.h> #include <errno.h> diff --git a/testsuites/psxtests/psxchroot01/main.c b/testsuites/psxtests/psxchroot01/main.c index 6dcb307df0..0c1e6a690d 100644 --- a/testsuites/psxtests/psxchroot01/main.c +++ b/testsuites/psxtests/psxchroot01/main.c @@ -2,12 +2,13 @@ * Simple test program -- simplified version of sample test hello. */ -#define CONFIGURE_INIT #ifdef HAVE_CONFIG_H #include "config.h" #endif +#define TEST_INIT + #include <bsp.h> #include <pmacros.h> diff --git a/testsuites/psxtests/psxclassic01/init.c b/testsuites/psxtests/psxclassic01/init.c index 1acc14142a..e9bca2a227 100644 --- a/testsuites/psxtests/psxclassic01/init.c +++ b/testsuites/psxtests/psxclassic01/init.c @@ -17,6 +17,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include <stdio.h> diff --git a/testsuites/psxtests/psxcleanup/psxcleanup.c b/testsuites/psxtests/psxcleanup/psxcleanup.c index 2af4aaf78d..f3f5de2fc6 100644 --- a/testsuites/psxtests/psxcleanup/psxcleanup.c +++ b/testsuites/psxtests/psxcleanup/psxcleanup.c @@ -13,6 +13,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" #include <pthread.h> /* thread facilities */ diff --git a/testsuites/psxtests/psxcleanup01/init.c b/testsuites/psxtests/psxcleanup01/init.c index f38b48ee93..15f18e25f0 100644 --- a/testsuites/psxtests/psxcleanup01/init.c +++ b/testsuites/psxtests/psxcleanup01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <rtems.h> #include "pmacros.h" #include <pthread.h> /* thread facilities */ diff --git a/testsuites/psxtests/psxcleanup02/init.c b/testsuites/psxtests/psxcleanup02/init.c index 88ecfee47e..7891e620d9 100644 --- a/testsuites/psxtests/psxcleanup02/init.c +++ b/testsuites/psxtests/psxcleanup02/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" int main(int argc, char **argv); diff --git a/testsuites/psxtests/psxclock/init.c b/testsuites/psxtests/psxclock/init.c index 669f4bb0c4..4aedd3e141 100644 --- a/testsuites/psxtests/psxclock/init.c +++ b/testsuites/psxtests/psxclock/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <time.h> #include <errno.h> diff --git a/testsuites/psxtests/psxclock01/init.c b/testsuites/psxtests/psxclock01/init.c index 6be85d2b70..9178e893c4 100644 --- a/testsuites/psxtests/psxclock01/init.c +++ b/testsuites/psxtests/psxclock01/init.c @@ -6,6 +6,8 @@ * http://www.rtems.org/license/LICENSE. */ +#define TEST_INIT + #include <tmacros.h> #include "test_support.h" diff --git a/testsuites/psxtests/psxconcurrency01/init.c b/testsuites/psxtests/psxconcurrency01/init.c index 60aef9230d..f93fda0e93 100644 --- a/testsuites/psxtests/psxconcurrency01/init.c +++ b/testsuites/psxtests/psxconcurrency01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <pmacros.h> #include <pthread.h> #include <errno.h> diff --git a/testsuites/psxtests/psxcond01/init.c b/testsuites/psxtests/psxcond01/init.c index 574769659a..2e4da67573 100644 --- a/testsuites/psxtests/psxcond01/init.c +++ b/testsuites/psxtests/psxcond01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include <pthread.h> #include <errno.h> diff --git a/testsuites/psxtests/psxcond02/init.c b/testsuites/psxtests/psxcond02/init.c index 6314762285..c458cfc672 100644 --- a/testsuites/psxtests/psxcond02/init.c +++ b/testsuites/psxtests/psxcond02/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include <pthread.h> #include <time.h> diff --git a/testsuites/psxtests/psxconfig01/init.c b/testsuites/psxtests/psxconfig01/init.c index a1dc4c618f..45bc168f72 100644 --- a/testsuites/psxtests/psxconfig01/init.c +++ b/testsuites/psxtests/psxconfig01/init.c @@ -25,6 +25,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <rtems/test.h> #include <tmacros.h> diff --git a/testsuites/psxtests/psxdevctl01/main.c b/testsuites/psxtests/psxdevctl01/main.c index 2228551f1d..664f82cc16 100644 --- a/testsuites/psxtests/psxdevctl01/main.c +++ b/testsuites/psxtests/psxdevctl01/main.c @@ -13,12 +13,13 @@ * http://www.rtems.org/license/LICENSE. */ -#define CONFIGURE_INIT #ifdef HAVE_CONFIG_H #include "config.h" #endif +#define TEST_INIT + #include <bsp.h> #include <pmacros.h> diff --git a/testsuites/psxtests/psxeintr_join/init.c b/testsuites/psxtests/psxeintr_join/init.c index f0810b50a5..935047d367 100644 --- a/testsuites/psxtests/psxeintr_join/init.c +++ b/testsuites/psxtests/psxeintr_join/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <stdio.h> #include <signal.h> #include <semaphore.h> diff --git a/testsuites/psxtests/psxenosys/init.c b/testsuites/psxtests/psxenosys/init.c index e0927446f9..ef9a1baa0e 100644 --- a/testsuites/psxtests/psxenosys/init.c +++ b/testsuites/psxtests/psxenosys/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <sys/types.h> #include <sys/wait.h> #if HAVE_SYS_MMAN_H diff --git a/testsuites/psxtests/psxfatal_support/init.c b/testsuites/psxtests/psxfatal_support/init.c index 9b59efa175..50e3abbb2e 100644 --- a/testsuites/psxtests/psxfatal_support/init.c +++ b/testsuites/psxtests/psxfatal_support/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define TESTS_USE_PRINTK #include "tmacros.h" diff --git a/testsuites/psxtests/psxfchx01/init.c b/testsuites/psxtests/psxfchx01/init.c index 89a0d06033..dc6d537d43 100644 --- a/testsuites/psxtests/psxfchx01/init.c +++ b/testsuites/psxtests/psxfchx01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <bsp.h> #include <pmacros.h> #include <unistd.h> diff --git a/testsuites/psxtests/psxfile01/main.c b/testsuites/psxtests/psxfile01/main.c index 554f8e96f8..7b1ea9a827 100644 --- a/testsuites/psxtests/psxfile01/main.c +++ b/testsuites/psxtests/psxfile01/main.c @@ -7,12 +7,13 @@ * http://www.rtems.org/license/LICENSE. */ -#define CONFIGURE_INIT #ifdef HAVE_CONFIG_H #include "config.h" #endif +#define TEST_INIT + #include <bsp.h> #include <pmacros.h> diff --git a/testsuites/psxtests/psxfile01/test.c b/testsuites/psxtests/psxfile01/test.c index 8fcb281307..4f53c1de8a 100644 --- a/testsuites/psxtests/psxfile01/test.c +++ b/testsuites/psxtests/psxfile01/test.c @@ -118,7 +118,6 @@ void stat_a_file( rtems_test_assert( file ); printf( "stat( %s ) returned ", file ); - fflush( stdout ); status = stat( file, &statbuf ); @@ -335,7 +334,7 @@ int main( status = close( fd ); rtems_test_assert( status == 0 ); - /* + /* * Open a file in read-only mode and try to truncate */ @@ -362,7 +361,7 @@ int main( rtems_test_assert( status == -1 ); rtems_test_assert( errno == EINVAL ); - /* + /* * Read from filedes opened for write */ @@ -387,7 +386,7 @@ int main( puts( "open /tmp/bha in read only mode -- OK" ); fd = open( "/tmp/bha", O_CREAT | O_RDONLY, S_IRWXU|S_IRWXG|S_IRWXO ); rtems_test_assert( fd != -1 ); - + puts( "attempt to read from /tmp/bha - expect EBADF" ); status = write( fd, buffer, 10 ); rtems_test_assert( status == -1 ); @@ -398,7 +397,7 @@ int main( status |= unlink( "/tmp/bha" ); rtems_test_assert( status == 0 ); - /* + /* * Read/write from an unopened filedes */ puts( "attempt to read from an unopened filedes - expect EBADF" ); diff --git a/testsuites/psxtests/psxfile02/init.c b/testsuites/psxtests/psxfile02/init.c index d66815203a..80e5d86897 100644 --- a/testsuites/psxtests/psxfile02/init.c +++ b/testsuites/psxtests/psxfile02/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <stdio.h> #include <sys/uio.h> #include <sys/types.h> diff --git a/testsuites/psxtests/psxfilelock01/init.c b/testsuites/psxtests/psxfilelock01/init.c index d64d1a185f..74533174d8 100644 --- a/testsuites/psxtests/psxfilelock01/init.c +++ b/testsuites/psxtests/psxfilelock01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include "test_support.h" #include <errno.h> diff --git a/testsuites/psxtests/psxgetattrnp01/init.c b/testsuites/psxtests/psxgetattrnp01/init.c index 19981573d1..33735cc144 100644 --- a/testsuites/psxtests/psxgetattrnp01/init.c +++ b/testsuites/psxtests/psxgetattrnp01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define _GNU_SOURCE #include <tmacros.h> #include <errno.h> diff --git a/testsuites/psxtests/psxgetrusage01/init.c b/testsuites/psxtests/psxgetrusage01/init.c index 590bc20e77..8723386366 100644 --- a/testsuites/psxtests/psxgetrusage01/init.c +++ b/testsuites/psxtests/psxgetrusage01/init.c @@ -19,6 +19,8 @@ extern int getrusage(int who, struct rusage *usage); #endif +#define TEST_INIT + #include <tmacros.h> #include "test_support.h" diff --git a/testsuites/psxtests/psxglobalcon01/init.cc b/testsuites/psxtests/psxglobalcon01/init.cc index d4855261be..f531410424 100644 --- a/testsuites/psxtests/psxglobalcon01/init.cc +++ b/testsuites/psxtests/psxglobalcon01/init.cc @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" const char rtems_test_name[] = "PSXGLOBALCON 1"; diff --git a/testsuites/psxtests/psxglobalcon02/init.cc b/testsuites/psxtests/psxglobalcon02/init.cc index c5f09b0d52..44a3c1ab5a 100644 --- a/testsuites/psxtests/psxglobalcon02/init.cc +++ b/testsuites/psxtests/psxglobalcon02/init.cc @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" const char rtems_test_name[] = "PSXGLOBALCON 2"; diff --git a/testsuites/psxtests/psxid01/init.c b/testsuites/psxtests/psxid01/init.c index 5aa03999df..2ffb84eb10 100644 --- a/testsuites/psxtests/psxid01/init.c +++ b/testsuites/psxtests/psxid01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include "test_support.h" diff --git a/testsuites/psxtests/psximfs01/init.c b/testsuites/psxtests/psximfs01/init.c index 76bb156daf..380ece7b60 100644 --- a/testsuites/psxtests/psximfs01/init.c +++ b/testsuites/psxtests/psximfs01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include "test_support.h" @@ -70,8 +72,7 @@ void write_helper(void) printf( "Total written = %zd\n", TotalWritten ); return; } - fprintf( - stderr, + printf( "Unable to create largest IMFS file (error=%s)\n", strerror(errno) ); @@ -79,7 +80,7 @@ void write_helper(void) } TotalWritten += written; } while (1); - + } void read_helper(void) @@ -93,8 +94,7 @@ void read_helper(void) sc = read( TestFd, &ch, sizeof(ch) ); if ( sc == 1 ) { if ( ch != (i%256) ) { - fprintf( - stderr, + printf( "MISMATCH 0x%02x != 0x%02x at offset %d\n", ch, i % 256, @@ -104,8 +104,7 @@ void read_helper(void) } i++; } else if ( sc != 0 ) { - fprintf( - stderr, + printf( "ERROR - at offset %d - returned %zd and error=%s\n", i, sc, @@ -139,12 +138,11 @@ void truncate_helper(void) rc = ftruncate( TestFd, new ); if ( rc != 0 ) { - fprintf( - stderr, - "ERROR - at offset %d - returned %d and error=%s\n", - (int) new, - rc, - strerror( errno ) + printf( + "ERROR - at offset %d - returned %d and error=%s\n", + (int) new, + rc, + strerror( errno ) ); } rtems_test_assert( rc == 0 ); @@ -162,8 +160,8 @@ void extend_helper(int eno) position = lseek( TestFd, 0, SEEK_END ); printf( "Seek to end .. returned %d\n", (int) position ); - /* - * test case to ftruncate a file to a length > its size + /* + * test case to ftruncate a file to a length > its size */ rc = ftruncate( TestFd, 2 ); @@ -178,12 +176,11 @@ void extend_helper(int eno) rc = ftruncate( TestFd, new ); if ( rc != 0 ) { if( errno != eno ) { - fprintf( - stderr, - "ERROR - at offset %d - returned %d and error=%s\n", - (int) new, - rc, - strerror( errno ) + printf( + "ERROR - at offset %d - returned %d and error=%s\n", + (int) new, + rc, + strerror( errno ) ); break; } @@ -239,7 +236,7 @@ rtems_task Init( open_it(true, false); read_helper(); close_it(); - + open_it(false, false); truncate_helper(); @@ -250,7 +247,7 @@ rtems_task Init( extend_helper(ENOSPC); - /* + /* * free the allocated heap memory */ free(alloc_ptr); diff --git a/testsuites/psxtests/psximfs02/init.c b/testsuites/psxtests/psximfs02/init.c index 047a4fcff5..07e55c42d9 100644 --- a/testsuites/psxtests/psximfs02/init.c +++ b/testsuites/psxtests/psximfs02/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include "test_support.h" diff --git a/testsuites/psxtests/psxintrcritical01/init.c b/testsuites/psxtests/psxintrcritical01/init.c index a6a64bad60..72686cc9a2 100644 --- a/testsuites/psxtests/psxintrcritical01/init.c +++ b/testsuites/psxtests/psxintrcritical01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include <intrcritical.h> #include <time.h> diff --git a/testsuites/psxtests/psxitimer/init.c b/testsuites/psxtests/psxitimer/init.c index dc32f34825..915c445dc3 100644 --- a/testsuites/psxtests/psxitimer/init.c +++ b/testsuites/psxtests/psxitimer/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <pmacros.h> #include <sys/time.h> #include <errno.h> diff --git a/testsuites/psxtests/psxkey01/init.c b/testsuites/psxtests/psxkey01/init.c index 6b8f57eccc..c1ce6cb269 100644 --- a/testsuites/psxtests/psxkey01/init.c +++ b/testsuites/psxtests/psxkey01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" #include <errno.h> diff --git a/testsuites/psxtests/psxkey02/init.c b/testsuites/psxtests/psxkey02/init.c index 23a392b004..e36c586edb 100644 --- a/testsuites/psxtests/psxkey02/init.c +++ b/testsuites/psxtests/psxkey02/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <pthread.h> #include <errno.h> #include <rtems/libcsupport.h> diff --git a/testsuites/psxtests/psxkey03/init.c b/testsuites/psxtests/psxkey03/init.c index b133e50739..e0c2f7d8d2 100644 --- a/testsuites/psxtests/psxkey03/init.c +++ b/testsuites/psxtests/psxkey03/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <pthread.h> #include <errno.h> #include "tmacros.h" diff --git a/testsuites/psxtests/psxkey04/init.c b/testsuites/psxtests/psxkey04/init.c index 4dcc342451..2540dd9d7f 100644 --- a/testsuites/psxtests/psxkey04/init.c +++ b/testsuites/psxtests/psxkey04/init.c @@ -12,6 +12,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <pthread.h> #include <errno.h> #include "tmacros.h" diff --git a/testsuites/psxtests/psxkey05/init.c b/testsuites/psxtests/psxkey05/init.c index 6ebe49fe01..e848fa337c 100644 --- a/testsuites/psxtests/psxkey05/init.c +++ b/testsuites/psxtests/psxkey05/init.c @@ -12,6 +12,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <pthread.h> #include <errno.h> #include "tmacros.h" diff --git a/testsuites/psxtests/psxkey06/init.c b/testsuites/psxtests/psxkey06/init.c index 28236c2adc..fa3f2cfa60 100644 --- a/testsuites/psxtests/psxkey06/init.c +++ b/testsuites/psxtests/psxkey06/init.c @@ -12,6 +12,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <pthread.h> #include <errno.h> #include "tmacros.h" diff --git a/testsuites/psxtests/psxkey07/init.c b/testsuites/psxtests/psxkey07/init.c index 91cc7ea4ea..b7616c5101 100644 --- a/testsuites/psxtests/psxkey07/init.c +++ b/testsuites/psxtests/psxkey07/init.c @@ -12,6 +12,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <pthread.h> #include <sched.h> #include <errno.h> diff --git a/testsuites/psxtests/psxkey08/init.c b/testsuites/psxtests/psxkey08/init.c index 1e6d53a34e..95da493e3d 100644 --- a/testsuites/psxtests/psxkey08/init.c +++ b/testsuites/psxtests/psxkey08/init.c @@ -12,6 +12,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include <stdio.h> diff --git a/testsuites/psxtests/psxkey09/init.c b/testsuites/psxtests/psxkey09/init.c index 2f7e92a741..9e1b494202 100644 --- a/testsuites/psxtests/psxkey09/init.c +++ b/testsuites/psxtests/psxkey09/init.c @@ -12,6 +12,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <pthread.h> #include <errno.h> #include "tmacros.h" diff --git a/testsuites/psxtests/psxkey10/init.c b/testsuites/psxtests/psxkey10/init.c index 1c6ebd8c63..1e773e3731 100644 --- a/testsuites/psxtests/psxkey10/init.c +++ b/testsuites/psxtests/psxkey10/init.c @@ -12,6 +12,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <pthread.h> #include <errno.h> #include "tmacros.h" diff --git a/testsuites/psxtests/psxmmap01/init.c b/testsuites/psxtests/psxmmap01/init.c index e3e8b9ac60..7efb36ef5e 100644 --- a/testsuites/psxtests/psxmmap01/init.c +++ b/testsuites/psxtests/psxmmap01/init.c @@ -30,6 +30,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" #include "pritime.h" diff --git a/testsuites/psxtests/psxmount/main.c b/testsuites/psxtests/psxmount/main.c index a723b87d4a..140057e4dc 100644 --- a/testsuites/psxtests/psxmount/main.c +++ b/testsuites/psxtests/psxmount/main.c @@ -4,12 +4,13 @@ * Attempt to mount the IMFS file system on a mount point in the base IMFS */ -#define CONFIGURE_INIT #ifdef HAVE_CONFIG_H #include "config.h" #endif +#define TEST_INIT + #include <bsp.h> #include <pmacros.h> diff --git a/testsuites/psxtests/psxmsgq01/init.c b/testsuites/psxtests/psxmsgq01/init.c index 3f34d39cef..8cab81628b 100644 --- a/testsuites/psxtests/psxmsgq01/init.c +++ b/testsuites/psxtests/psxmsgq01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" #include <sched.h> diff --git a/testsuites/psxtests/psxmsgq02/init.c b/testsuites/psxtests/psxmsgq02/init.c index 290663d22d..e9f2e92b53 100644 --- a/testsuites/psxtests/psxmsgq02/init.c +++ b/testsuites/psxtests/psxmsgq02/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" #include <errno.h> diff --git a/testsuites/psxtests/psxmsgq03/init.c b/testsuites/psxtests/psxmsgq03/init.c index 14644420c8..127bb72c69 100644 --- a/testsuites/psxtests/psxmsgq03/init.c +++ b/testsuites/psxtests/psxmsgq03/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/psxtests/psxmsgq04/init.c b/testsuites/psxtests/psxmsgq04/init.c index f1e1c968c0..815cb02ff3 100644 --- a/testsuites/psxtests/psxmsgq04/init.c +++ b/testsuites/psxtests/psxmsgq04/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <pmacros.h> #include <unistd.h> #include <errno.h> diff --git a/testsuites/psxtests/psxmutexattr01/init.c b/testsuites/psxtests/psxmutexattr01/init.c index 1ea1ab58c0..8ee67745d4 100644 --- a/testsuites/psxtests/psxmutexattr01/init.c +++ b/testsuites/psxtests/psxmutexattr01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include <errno.h> #include <pthread.h> diff --git a/testsuites/psxtests/psxobj01/init.c b/testsuites/psxtests/psxobj01/init.c index c3b3f49aa0..3a983b57e9 100644 --- a/testsuites/psxtests/psxobj01/init.c +++ b/testsuites/psxtests/psxobj01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include <rtems/score/objectimpl.h> diff --git a/testsuites/psxtests/psxonce01/init.c b/testsuites/psxtests/psxonce01/init.c index 1c90769d38..9f7f76b95d 100644 --- a/testsuites/psxtests/psxonce01/init.c +++ b/testsuites/psxtests/psxonce01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/psxtests/psxpasswd01/init.c b/testsuites/psxtests/psxpasswd01/init.c index eb96e280c5..947478bbb1 100644 --- a/testsuites/psxtests/psxpasswd01/init.c +++ b/testsuites/psxtests/psxpasswd01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <bsp.h> #include <pmacros.h> #include <sys/types.h> diff --git a/testsuites/psxtests/psxpasswd02/init.c b/testsuites/psxtests/psxpasswd02/init.c index 7090c9430f..f299d1ee54 100644 --- a/testsuites/psxtests/psxpasswd02/init.c +++ b/testsuites/psxtests/psxpasswd02/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <bsp.h> #include <pmacros.h> #include <sys/types.h> diff --git a/testsuites/psxtests/psxpipe01/init.c b/testsuites/psxtests/psxpipe01/init.c index 7066f6cf52..50ebeef7bb 100644 --- a/testsuites/psxtests/psxpipe01/init.c +++ b/testsuites/psxtests/psxpipe01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <bsp.h> #include <pmacros.h> #include <sys/types.h> diff --git a/testsuites/psxtests/psxrdwrv/main.c b/testsuites/psxtests/psxrdwrv/main.c index 32a5fa9fd8..701f99ac37 100644 --- a/testsuites/psxtests/psxrdwrv/main.c +++ b/testsuites/psxtests/psxrdwrv/main.c @@ -7,12 +7,13 @@ * http://www.rtems.org/license/LICENSE. */ -#define CONFIGURE_INIT #ifdef HAVE_CONFIG_H #include "config.h" #endif +#define TEST_INIT + #include <bsp.h> #include <pmacros.h> diff --git a/testsuites/psxtests/psxreaddir/main.c b/testsuites/psxtests/psxreaddir/main.c index 176d264978..ac421c1065 100644 --- a/testsuites/psxtests/psxreaddir/main.c +++ b/testsuites/psxtests/psxreaddir/main.c @@ -2,12 +2,13 @@ * Simple test program -- simplified version of sample test hello. */ -#define CONFIGURE_INIT #ifdef HAVE_CONFIG_H #include "config.h" #endif +#define TEST_INIT + #include <bsp.h> #include <pmacros.h> diff --git a/testsuites/psxtests/psxrwlock01/main.c b/testsuites/psxtests/psxrwlock01/main.c index 88190ebb2a..1386ad43e9 100644 --- a/testsuites/psxtests/psxrwlock01/main.c +++ b/testsuites/psxtests/psxrwlock01/main.c @@ -7,12 +7,13 @@ * http://www.rtems.org/license/LICENSE. */ -#define CONFIGURE_INIT #ifdef HAVE_CONFIG_H #include "config.h" #endif +#define TEST_INIT + #include <rtems/test.h> #include <bsp.h> #include <pmacros.h> diff --git a/testsuites/psxtests/psxsem01/init.c b/testsuites/psxtests/psxsem01/init.c index ae0b390a7c..d4ea8cb374 100644 --- a/testsuites/psxtests/psxsem01/init.c +++ b/testsuites/psxtests/psxsem01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <sched.h> #include <semaphore.h> #include <errno.h> diff --git a/testsuites/psxtests/psxshm01/init.c b/testsuites/psxtests/psxshm01/init.c index 4636f9a0af..176933354d 100644 --- a/testsuites/psxtests/psxshm01/init.c +++ b/testsuites/psxtests/psxshm01/init.c @@ -14,6 +14,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" #include "pritime.h" diff --git a/testsuites/psxtests/psxshm02/init.c b/testsuites/psxtests/psxshm02/init.c index 071f4c4da8..ff356ce529 100644 --- a/testsuites/psxtests/psxshm02/init.c +++ b/testsuites/psxtests/psxshm02/init.c @@ -14,6 +14,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" #include "pritime.h" diff --git a/testsuites/psxtests/psxsignal01/init.c b/testsuites/psxtests/psxsignal01/init.c index 511dd2d637..7ce2a7207f 100644 --- a/testsuites/psxtests/psxsignal01/init.c +++ b/testsuites/psxtests/psxsignal01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" #include <signal.h> diff --git a/testsuites/psxtests/psxsignal02/init.c b/testsuites/psxtests/psxsignal02/init.c index 6ae68d6e5b..eda7ef743a 100644 --- a/testsuites/psxtests/psxsignal02/init.c +++ b/testsuites/psxtests/psxsignal02/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <pmacros.h> #include <signal.h> #include <errno.h> diff --git a/testsuites/psxtests/psxsignal03/init.c b/testsuites/psxtests/psxsignal03/init.c index f3fc26672b..07fd69a1bb 100644 --- a/testsuites/psxtests/psxsignal03/init.c +++ b/testsuites/psxtests/psxsignal03/init.c @@ -47,6 +47,8 @@ #error "Test Mode not defined" #endif +#define TEST_INIT + #include <pmacros.h> #include <signal.h> #include <errno.h> diff --git a/testsuites/psxtests/psxsignal05/init.c b/testsuites/psxtests/psxsignal05/init.c index 0bc8d7f01f..196082e90e 100644 --- a/testsuites/psxtests/psxsignal05/init.c +++ b/testsuites/psxtests/psxsignal05/init.c @@ -16,6 +16,8 @@ #define SIGNAL_ONE SIGUSR1 #define SIGNAL_TWO SIGUSR2 +#define TEST_INIT + #include <pmacros.h> #include <signal.h> #include <errno.h> diff --git a/testsuites/psxtests/psxsignal06/init.c b/testsuites/psxtests/psxsignal06/init.c index cb34bb6bc8..20277be204 100644 --- a/testsuites/psxtests/psxsignal06/init.c +++ b/testsuites/psxtests/psxsignal06/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include "test_support.h" #include <pthread.h> diff --git a/testsuites/psxtests/psxspin01/main.c b/testsuites/psxtests/psxspin01/main.c index 4c3bc27fc5..e6462101cd 100644 --- a/testsuites/psxtests/psxspin01/main.c +++ b/testsuites/psxtests/psxspin01/main.c @@ -13,12 +13,13 @@ * http://www.rtems.org/license/LICENSE. */ -#define CONFIGURE_INIT #ifdef HAVE_CONFIG_H #include "config.h" #endif +#define TEST_INIT + #include <bsp.h> #include <pmacros.h> diff --git a/testsuites/psxtests/psxstack01/init.c b/testsuites/psxtests/psxstack01/init.c index 7a010c8c6c..be3617a702 100644 --- a/testsuites/psxtests/psxstack01/init.c +++ b/testsuites/psxtests/psxstack01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <pmacros.h> #include <errno.h> #include <pthread.h> diff --git a/testsuites/psxtests/psxstack02/init.c b/testsuites/psxtests/psxstack02/init.c index df65ee3393..43fca98411 100644 --- a/testsuites/psxtests/psxstack02/init.c +++ b/testsuites/psxtests/psxstack02/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include "test_support.h" diff --git a/testsuites/psxtests/psxstat/main.c b/testsuites/psxtests/psxstat/main.c index 07fde7f9b5..14a4b423ae 100644 --- a/testsuites/psxtests/psxstat/main.c +++ b/testsuites/psxtests/psxstat/main.c @@ -7,12 +7,13 @@ * http://www.rtems.org/license/LICENSE. */ -#define CONFIGURE_INIT #ifdef HAVE_CONFIG_H #include "config.h" #endif +#define TEST_INIT + #include <bsp.h> #include <pmacros.h> diff --git a/testsuites/psxtests/psxstrsignal01/init.c b/testsuites/psxtests/psxstrsignal01/init.c index 9614fb99aa..8f3129f04d 100644 --- a/testsuites/psxtests/psxstrsignal01/init.c +++ b/testsuites/psxtests/psxstrsignal01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include <signal.h> #include <string.h> diff --git a/testsuites/psxtests/psxsysconf/init.c b/testsuites/psxtests/psxsysconf/init.c index 2dd9018722..d95fdd3710 100644 --- a/testsuites/psxtests/psxsysconf/init.c +++ b/testsuites/psxtests/psxsysconf/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" #include "tmacros.h" diff --git a/testsuites/psxtests/psxthreadname01/init.c b/testsuites/psxtests/psxthreadname01/init.c index 16fdec6958..2af3ba7e64 100644 --- a/testsuites/psxtests/psxthreadname01/init.c +++ b/testsuites/psxtests/psxthreadname01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #define _GNU_SOURCE #include <errno.h> #include <pthread.h> diff --git a/testsuites/psxtests/psxtime/main.c b/testsuites/psxtests/psxtime/main.c index 7280e8f0af..a1653ffa2c 100644 --- a/testsuites/psxtests/psxtime/main.c +++ b/testsuites/psxtests/psxtime/main.c @@ -13,7 +13,8 @@ #include "config.h" #endif -#define CONFIGURE_INIT + +#define TEST_INIT #include <bsp.h> #include <tmacros.h> /* instantiate buffering code if needed */ diff --git a/testsuites/psxtests/psxtimer01/psxtimer.c b/testsuites/psxtests/psxtimer01/psxtimer.c index 032e9f8e6c..d869374d0c 100644 --- a/testsuites/psxtests/psxtimer01/psxtimer.c +++ b/testsuites/psxtests/psxtimer01/psxtimer.c @@ -24,6 +24,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" #include <pthread.h> /* thread facilities */ diff --git a/testsuites/psxtests/psxtimer02/psxtimer.c b/testsuites/psxtests/psxtimer02/psxtimer.c index e4d6d7d332..59f1697149 100644 --- a/testsuites/psxtests/psxtimer02/psxtimer.c +++ b/testsuites/psxtests/psxtimer02/psxtimer.c @@ -24,6 +24,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" #include "tmacros.h" diff --git a/testsuites/psxtests/psxtimes01/init.c b/testsuites/psxtests/psxtimes01/init.c index 30cecd427a..e6150b076e 100644 --- a/testsuites/psxtests/psxtimes01/init.c +++ b/testsuites/psxtests/psxtimes01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include "test_support.h" #include <sys/times.h> diff --git a/testsuites/psxtests/psxualarm/init.c b/testsuites/psxtests/psxualarm/init.c index 7a4fb21b99..a5ba5bf270 100644 --- a/testsuites/psxtests/psxualarm/init.c +++ b/testsuites/psxtests/psxualarm/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" #include <signal.h> diff --git a/testsuites/psxtests/psxusleep/init.c b/testsuites/psxtests/psxusleep/init.c index 383943e1fe..d9d0e71f4a 100644 --- a/testsuites/psxtests/psxusleep/init.c +++ b/testsuites/psxtests/psxusleep/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <pmacros.h> #include <time.h> #include <errno.h> diff --git a/testsuites/psxtmtests/psxtmbarrier01/init.c b/testsuites/psxtmtests/psxtmbarrier01/init.c index 7caa6727d0..0148e1c1bd 100644 --- a/testsuites/psxtmtests/psxtmbarrier01/init.c +++ b/testsuites/psxtmtests/psxtmbarrier01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <timesys.h> #include <rtems/btimer.h> #include "test_support.h" @@ -79,7 +81,7 @@ void *POSIX_Init( benchmark_pthread_barrier_init(); /* destroying barrier */ benchmark_pthread_barrier_destroy(); - + TEST_END(); rtems_test_exit(0); diff --git a/testsuites/psxtmtests/psxtmbarrier02/init.c b/testsuites/psxtmtests/psxtmbarrier02/init.c index 6705125ac6..d7e8f08026 100644 --- a/testsuites/psxtmtests/psxtmbarrier02/init.c +++ b/testsuites/psxtmtests/psxtmbarrier02/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <timesys.h> #include <tmacros.h> #include <rtems/btimer.h> diff --git a/testsuites/psxtmtests/psxtmbarrier03/init.c b/testsuites/psxtmtests/psxtmbarrier03/init.c index 27feac1fe8..05372f5fc5 100644 --- a/testsuites/psxtmtests/psxtmbarrier03/init.c +++ b/testsuites/psxtmtests/psxtmbarrier03/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <coverhd.h> #include <tmacros.h> #include <timesys.h> diff --git a/testsuites/psxtmtests/psxtmbarrier04/init.c b/testsuites/psxtmtests/psxtmbarrier04/init.c index baf1bf1032..61675b1975 100644 --- a/testsuites/psxtmtests/psxtmbarrier04/init.c +++ b/testsuites/psxtmtests/psxtmbarrier04/init.c @@ -7,6 +7,8 @@ * http://www.rtems.org/license/LICENSE. */ +#define TEST_INIT + #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/testsuites/psxtmtests/psxtmclocknanosleep01/init.c b/testsuites/psxtmtests/psxtmclocknanosleep01/init.c index 86c1f5f8b6..484ddbacee 100644 --- a/testsuites/psxtmtests/psxtmclocknanosleep01/init.c +++ b/testsuites/psxtmtests/psxtmclocknanosleep01/init.c @@ -13,6 +13,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <timesys.h> #include <rtems/btimer.h> #include "test_support.h" @@ -34,9 +36,9 @@ void *POSIX_Init( TEST_BEGIN(); - benchmark_timer_initialize(); + benchmark_timer_initialize(); clock_nanosleep( CLOCK_REALTIME, 0, &sleepTime, (struct timespec *) NULL ); - end_time = benchmark_timer_read(); + end_time = benchmark_timer_read(); put_time( "nanosleep: yield", end_time, 1, 0, 0 ); diff --git a/testsuites/psxtmtests/psxtmclocknanosleep02/init.c b/testsuites/psxtmtests/psxtmclocknanosleep02/init.c index b35a82b94f..89836f4959 100644 --- a/testsuites/psxtmtests/psxtmclocknanosleep02/init.c +++ b/testsuites/psxtmtests/psxtmclocknanosleep02/init.c @@ -13,6 +13,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <timesys.h> #include <rtems/btimer.h> #include "test_support.h" @@ -83,7 +85,7 @@ void *POSIX_Init( status = pthread_create( &threadId, NULL, Middle, NULL ); rtems_test_assert( !status ); } - + status = pthread_create( &threadId, NULL, Low, NULL ); rtems_test_assert( !status ); diff --git a/testsuites/psxtmtests/psxtmclocknanosleep03/init.c b/testsuites/psxtmtests/psxtmclocknanosleep03/init.c index ccceada787..8feef4e43d 100644 --- a/testsuites/psxtmtests/psxtmclocknanosleep03/init.c +++ b/testsuites/psxtmtests/psxtmclocknanosleep03/init.c @@ -13,6 +13,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <timesys.h> #include <rtems/btimer.h> #include "test_support.h" @@ -88,7 +90,7 @@ void *POSIX_Init( status = pthread_create( &threadId, NULL, Middle, NULL ); rtems_test_assert( !status ); } - + status = pthread_create( &threadId, NULL, Low, NULL ); rtems_test_assert( !status ); diff --git a/testsuites/psxtmtests/psxtmcond01/init.c b/testsuites/psxtmtests/psxtmcond01/init.c index 7ec876b9a0..ce7be62b21 100644 --- a/testsuites/psxtmtests/psxtmcond01/init.c +++ b/testsuites/psxtmtests/psxtmcond01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <coverhd.h> #include <tmacros.h> #include <timesys.h> diff --git a/testsuites/psxtmtests/psxtmcond02/init.c b/testsuites/psxtmtests/psxtmcond02/init.c index c8cf9c2685..8f8d16e0ab 100644 --- a/testsuites/psxtmtests/psxtmcond02/init.c +++ b/testsuites/psxtmtests/psxtmcond02/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <timesys.h> #include <pthread.h> #include <rtems/btimer.h> @@ -49,7 +51,7 @@ void benchmark_signal(void) void *POSIX_Init( void *argument ) -{ +{ TEST_BEGIN(); pthread_cond_init(&CondID, NULL); diff --git a/testsuites/psxtmtests/psxtmcond03/init.c b/testsuites/psxtmtests/psxtmcond03/init.c index 4a829bd55e..1a56a5b206 100644 --- a/testsuites/psxtmtests/psxtmcond03/init.c +++ b/testsuites/psxtmtests/psxtmcond03/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <coverhd.h> #include <tmacros.h> #include <timesys.h> diff --git a/testsuites/psxtmtests/psxtmcond04/init.c b/testsuites/psxtmtests/psxtmcond04/init.c index 1a40f23e53..529139bd5c 100644 --- a/testsuites/psxtmtests/psxtmcond04/init.c +++ b/testsuites/psxtmtests/psxtmcond04/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <coverhd.h> #include <tmacros.h> #include <timesys.h> diff --git a/testsuites/psxtmtests/psxtmcond05/init.c b/testsuites/psxtmtests/psxtmcond05/init.c index fcfad14b5f..fce8862c06 100644 --- a/testsuites/psxtmtests/psxtmcond05/init.c +++ b/testsuites/psxtmtests/psxtmcond05/init.c @@ -7,6 +7,8 @@ * http://www.rtems.org/license/LICENSE. */ +#define TEST_INIT + #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/testsuites/psxtmtests/psxtmcond06/init.c b/testsuites/psxtmtests/psxtmcond06/init.c index ec87ccd45c..75a00c4aab 100644 --- a/testsuites/psxtmtests/psxtmcond06/init.c +++ b/testsuites/psxtmtests/psxtmcond06/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <coverhd.h> #include <tmacros.h> #include <timesys.h> diff --git a/testsuites/psxtmtests/psxtmcond07/init.c b/testsuites/psxtmtests/psxtmcond07/init.c index 218fccccd4..611af66aa3 100644 --- a/testsuites/psxtmtests/psxtmcond07/init.c +++ b/testsuites/psxtmtests/psxtmcond07/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <coverhd.h> #include <tmacros.h> #include <timesys.h> diff --git a/testsuites/psxtmtests/psxtmcond08/init.c b/testsuites/psxtmtests/psxtmcond08/init.c index 377b09948d..636ecb6e8d 100644 --- a/testsuites/psxtmtests/psxtmcond08/init.c +++ b/testsuites/psxtmtests/psxtmcond08/init.c @@ -24,6 +24,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <stdio.h> #include <time.h> #include <errno.h> diff --git a/testsuites/psxtmtests/psxtmkey01/init.c b/testsuites/psxtmtests/psxtmkey01/init.c index 7430b15085..18122479b5 100644 --- a/testsuites/psxtmtests/psxtmkey01/init.c +++ b/testsuites/psxtmtests/psxtmkey01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <timesys.h> #include <rtems/btimer.h> #include <errno.h> @@ -71,10 +73,10 @@ void *POSIX_Init(void *argument) /*key creation, using NULL destructor*/ benchmark_pthread_key_create(); - + /* key deletion*/ benchmark_pthread_key_delete(); - + TEST_END(); rtems_test_exit(0); diff --git a/testsuites/psxtmtests/psxtmkey02/init.c b/testsuites/psxtmtests/psxtmkey02/init.c index fafb8f62bf..3381d41243 100644 --- a/testsuites/psxtmtests/psxtmkey02/init.c +++ b/testsuites/psxtmtests/psxtmkey02/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <timesys.h> #include <rtems/btimer.h> #include <errno.h> diff --git a/testsuites/psxtmtests/psxtmmq01/init.c b/testsuites/psxtmtests/psxtmmq01/init.c index a5ed4fcf39..e023be08bf 100644 --- a/testsuites/psxtmtests/psxtmmq01/init.c +++ b/testsuites/psxtmtests/psxtmmq01/init.c @@ -7,6 +7,8 @@ * http://www.rtems.org/license/LICENSE. */ +#define TEST_INIT + #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/testsuites/psxtmtests/psxtmmutex01/init.c b/testsuites/psxtmtests/psxtmmutex01/init.c index 7a020f917d..558d8e6c9f 100644 --- a/testsuites/psxtmtests/psxtmmutex01/init.c +++ b/testsuites/psxtmtests/psxtmmutex01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <timesys.h> #include <rtems/btimer.h> #include <errno.h> diff --git a/testsuites/psxtmtests/psxtmmutex02/init.c b/testsuites/psxtmtests/psxtmmutex02/init.c index b71e21f35f..44d74cace4 100644 --- a/testsuites/psxtmtests/psxtmmutex02/init.c +++ b/testsuites/psxtmtests/psxtmmutex02/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <coverhd.h> #include <tmacros.h> #include <timesys.h> diff --git a/testsuites/psxtmtests/psxtmmutex03/init.c b/testsuites/psxtmtests/psxtmmutex03/init.c index 6a29230520..9751b87e3f 100644 --- a/testsuites/psxtmtests/psxtmmutex03/init.c +++ b/testsuites/psxtmtests/psxtmmutex03/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <timesys.h> #include <rtems/btimer.h> #include <errno.h> @@ -93,10 +95,10 @@ void benchmark_mutex_trylock_not_available(void) benchmark_timer_initialize(); status = pthread_mutex_trylock( &MutexId ); - /* - * it has to return a negative value - * because it try to lock a not available mutex - * so the assert call is make with status instead !status + /* + * it has to return a negative value + * because it try to lock a not available mutex + * so the assert call is make with status instead !status */ end_time = benchmark_timer_read(); rtems_test_assert( status ); @@ -136,7 +138,7 @@ void *POSIX_Init( int status; TEST_BEGIN(); - + /* * Create the single Mutex used in all the test case */ @@ -144,7 +146,7 @@ void *POSIX_Init( rtems_test_assert( !status ); /* - * Now invoke subroutines to time each test case + * Now invoke subroutines to time each test case * get the goal depends of its order */ benchmark_mutex_lock_available(); @@ -154,7 +156,7 @@ void *POSIX_Init( benchmark_mutex_unlock_no_threads_waiting(); benchmark_mutex_timedlock_available(); benchmark_mutex_unlock_no_threads_waiting(); - + /* * Destroy the mutex used in the tests diff --git a/testsuites/psxtmtests/psxtmmutex04/init.c b/testsuites/psxtmtests/psxtmmutex04/init.c index 6513c59223..cb6d1f4a39 100644 --- a/testsuites/psxtmtests/psxtmmutex04/init.c +++ b/testsuites/psxtmtests/psxtmmutex04/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <timesys.h> #include <tmacros.h> #include <rtems/btimer.h> diff --git a/testsuites/psxtmtests/psxtmmutex05/init.c b/testsuites/psxtmtests/psxtmmutex05/init.c index d274fc5257..6ed38c2c8c 100644 --- a/testsuites/psxtmtests/psxtmmutex05/init.c +++ b/testsuites/psxtmtests/psxtmmutex05/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <coverhd.h> #include <tmacros.h> #include <timesys.h> diff --git a/testsuites/psxtmtests/psxtmmutex06/init.c b/testsuites/psxtmtests/psxtmmutex06/init.c index c2bd0011c7..01cea4686e 100644 --- a/testsuites/psxtmtests/psxtmmutex06/init.c +++ b/testsuites/psxtmtests/psxtmmutex06/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <coverhd.h> #include <tmacros.h> #include <timesys.h> diff --git a/testsuites/psxtmtests/psxtmmutex07/init.c b/testsuites/psxtmtests/psxtmmutex07/init.c index 9f087e5465..46ca01c47c 100644 --- a/testsuites/psxtmtests/psxtmmutex07/init.c +++ b/testsuites/psxtmtests/psxtmmutex07/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <timesys.h> #include <rtems/btimer.h> #include <errno.h> @@ -84,7 +86,7 @@ void *POSIX_Init( /* destroy mutex */ status = pthread_mutex_destroy( &MutexId ); rtems_test_assert( status == 0 ); - + TEST_END(); rtems_test_exit(0); diff --git a/testsuites/psxtmtests/psxtmnanosleep01/init.c b/testsuites/psxtmtests/psxtmnanosleep01/init.c index eeb67c1995..8dc2890a6b 100644 --- a/testsuites/psxtmtests/psxtmnanosleep01/init.c +++ b/testsuites/psxtmtests/psxtmnanosleep01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <timesys.h> #include <rtems/btimer.h> #include "test_support.h" @@ -32,9 +34,9 @@ void *POSIX_Init( TEST_BEGIN(); - benchmark_timer_initialize(); + benchmark_timer_initialize(); nanosleep( &sleepTime, (struct timespec *) NULL ); - end_time = benchmark_timer_read(); + end_time = benchmark_timer_read(); put_time( "nanosleep: yield", end_time, 1, 0, 0 ); diff --git a/testsuites/psxtmtests/psxtmnanosleep02/init.c b/testsuites/psxtmtests/psxtmnanosleep02/init.c index 12f6b75a6d..5c8139bc9e 100644 --- a/testsuites/psxtmtests/psxtmnanosleep02/init.c +++ b/testsuites/psxtmtests/psxtmnanosleep02/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <timesys.h> #include <rtems/btimer.h> #include "test_support.h" @@ -81,7 +83,7 @@ void *POSIX_Init( status = pthread_create( &threadId, NULL, Middle, NULL ); rtems_test_assert( !status ); } - + status = pthread_create( &threadId, NULL, Low, NULL ); rtems_test_assert( !status ); diff --git a/testsuites/psxtmtests/psxtmrwlock01/init.c b/testsuites/psxtmtests/psxtmrwlock01/init.c index 93d9c8b5b5..49f8e567e4 100644 --- a/testsuites/psxtmtests/psxtmrwlock01/init.c +++ b/testsuites/psxtmtests/psxtmrwlock01/init.c @@ -10,6 +10,9 @@ #ifdef HAVE_CONFIG_H #include "config.h" #endif + +#define TEST_INIT + #include <errno.h> #include <timesys.h> #include <rtems/btimer.h> diff --git a/testsuites/psxtmtests/psxtmrwlock02/init.c b/testsuites/psxtmtests/psxtmrwlock02/init.c index f2462b235b..0b37e0fd21 100644 --- a/testsuites/psxtmtests/psxtmrwlock02/init.c +++ b/testsuites/psxtmtests/psxtmrwlock02/init.c @@ -7,6 +7,8 @@ * http://www.rtems.org/license/LICENSE. */ +#define TEST_INIT + #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/testsuites/psxtmtests/psxtmrwlock03/init.c b/testsuites/psxtmtests/psxtmrwlock03/init.c index 10c7aee4cc..e4fc6c5f37 100644 --- a/testsuites/psxtmtests/psxtmrwlock03/init.c +++ b/testsuites/psxtmtests/psxtmrwlock03/init.c @@ -7,6 +7,8 @@ * http://www.rtems.org/license/LICENSE. */ +#define TEST_INIT + #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/testsuites/psxtmtests/psxtmrwlock04/init.c b/testsuites/psxtmtests/psxtmrwlock04/init.c index dd2d7357f1..53df5fa3a5 100644 --- a/testsuites/psxtmtests/psxtmrwlock04/init.c +++ b/testsuites/psxtmtests/psxtmrwlock04/init.c @@ -7,6 +7,8 @@ * http://www.rtems.org/license/LICENSE. */ +#define TEST_INIT + #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/testsuites/psxtmtests/psxtmrwlock05/init.c b/testsuites/psxtmtests/psxtmrwlock05/init.c index f6668c370d..cf7ed6ad96 100644 --- a/testsuites/psxtmtests/psxtmrwlock05/init.c +++ b/testsuites/psxtmtests/psxtmrwlock05/init.c @@ -7,6 +7,8 @@ * http://www.rtems.org/license/LICENSE. */ +#define TEST_INIT + #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/testsuites/psxtmtests/psxtmrwlock06/init.c b/testsuites/psxtmtests/psxtmrwlock06/init.c index 93a49be1f5..b68f716ad0 100644 --- a/testsuites/psxtmtests/psxtmrwlock06/init.c +++ b/testsuites/psxtmtests/psxtmrwlock06/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <coverhd.h> #include <pthread.h> #include <sched.h> diff --git a/testsuites/psxtmtests/psxtmrwlock07/init.c b/testsuites/psxtmtests/psxtmrwlock07/init.c index 303c3015c5..4c7128c238 100644 --- a/testsuites/psxtmtests/psxtmrwlock07/init.c +++ b/testsuites/psxtmtests/psxtmrwlock07/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <coverhd.h> #include <tmacros.h> #include <timesys.h> diff --git a/testsuites/psxtmtests/psxtmsem01/init.c b/testsuites/psxtmtests/psxtmsem01/init.c index 4223a02b3b..031124b441 100644 --- a/testsuites/psxtmtests/psxtmsem01/init.c +++ b/testsuites/psxtmtests/psxtmsem01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <errno.h> #include <fcntl.h> #include <semaphore.h> diff --git a/testsuites/psxtmtests/psxtmsem02/init.c b/testsuites/psxtmtests/psxtmsem02/init.c index 3c2f34a20b..79557ab2ce 100644 --- a/testsuites/psxtmtests/psxtmsem02/init.c +++ b/testsuites/psxtmtests/psxtmsem02/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <errno.h> #include <fcntl.h> #include <semaphore.h> diff --git a/testsuites/psxtmtests/psxtmsem03/init.c b/testsuites/psxtmtests/psxtmsem03/init.c index 687c8c6343..90378821ee 100644 --- a/testsuites/psxtmtests/psxtmsem03/init.c +++ b/testsuites/psxtmtests/psxtmsem03/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <errno.h> #include <fcntl.h> #include <semaphore.h> diff --git a/testsuites/psxtmtests/psxtmsem04/init.c b/testsuites/psxtmtests/psxtmsem04/init.c index 540f0a3b97..b8130a92ed 100644 --- a/testsuites/psxtmtests/psxtmsem04/init.c +++ b/testsuites/psxtmtests/psxtmsem04/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <errno.h> #include <fcntl.h> #include <semaphore.h> diff --git a/testsuites/psxtmtests/psxtmsem05/init.c b/testsuites/psxtmtests/psxtmsem05/init.c index 07b96b2024..fca2e0339e 100644 --- a/testsuites/psxtmtests/psxtmsem05/init.c +++ b/testsuites/psxtmtests/psxtmsem05/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <errno.h> #include <fcntl.h> #include <semaphore.h> diff --git a/testsuites/psxtmtests/psxtmsleep01/init.c b/testsuites/psxtmtests/psxtmsleep01/init.c index f2ee0af231..5f3b8deea8 100644 --- a/testsuites/psxtmtests/psxtmsleep01/init.c +++ b/testsuites/psxtmtests/psxtmsleep01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <timesys.h> #include <rtems/btimer.h> #include "test_support.h" diff --git a/testsuites/psxtmtests/psxtmsleep02/init.c b/testsuites/psxtmtests/psxtmsleep02/init.c index 95fc9d9831..8948c943d6 100644 --- a/testsuites/psxtmtests/psxtmsleep02/init.c +++ b/testsuites/psxtmtests/psxtmsleep02/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <timesys.h> #include <rtems/btimer.h> #include "test_support.h" @@ -68,7 +70,7 @@ void *POSIX_Init( status = pthread_create( &threadId, NULL, Middle, NULL ); rtems_test_assert( !status ); } - + status = pthread_create( &threadId, NULL, Low, NULL ); rtems_test_assert( !status ); diff --git a/testsuites/psxtmtests/psxtmthread01/init.c b/testsuites/psxtmtests/psxtmthread01/init.c index 60f94cfa56..35b9cbb89a 100644 --- a/testsuites/psxtmtests/psxtmthread01/init.c +++ b/testsuites/psxtmtests/psxtmthread01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <coverhd.h> #include <tmacros.h> #include <timesys.h> diff --git a/testsuites/psxtmtests/psxtmthread02/init.c b/testsuites/psxtmtests/psxtmthread02/init.c index c468f0335e..52e0ad3868 100644 --- a/testsuites/psxtmtests/psxtmthread02/init.c +++ b/testsuites/psxtmtests/psxtmthread02/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <timesys.h> #include <pthread.h> #include <sched.h> diff --git a/testsuites/psxtmtests/psxtmthread03/init.c b/testsuites/psxtmtests/psxtmthread03/init.c index 938a8c62e0..30e1b64c46 100644 --- a/testsuites/psxtmtests/psxtmthread03/init.c +++ b/testsuites/psxtmtests/psxtmthread03/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <coverhd.h> #include <tmacros.h> #include <timesys.h> diff --git a/testsuites/psxtmtests/psxtmthread04/init.c b/testsuites/psxtmtests/psxtmthread04/init.c index 5b260dd0c3..12f53370cb 100644 --- a/testsuites/psxtmtests/psxtmthread04/init.c +++ b/testsuites/psxtmtests/psxtmthread04/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <timesys.h> #include <pthread.h> #include <sched.h> @@ -55,7 +57,7 @@ void benchmark_pthread_setschedparam(void) status = pthread_getschedparam( pthread_self(), &policy, ¶m ); rtems_test_assert( status == 0 ); - + /* Arbitrary priority, no other threads to preempt us so it doesn't matter. */ param.sched_priority = 5; benchmark_timer_initialize(); @@ -69,7 +71,7 @@ void benchmark_pthread_setschedparam(void) 1, /* Only executed once */ 0, 0 - ); + ); } void *POSIX_Init( diff --git a/testsuites/psxtmtests/psxtmthread05/init.c b/testsuites/psxtmtests/psxtmthread05/init.c index 53a8b11a31..682afc0c84 100644 --- a/testsuites/psxtmtests/psxtmthread05/init.c +++ b/testsuites/psxtmtests/psxtmthread05/init.c @@ -12,6 +12,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <timesys.h> #include <pthread.h> #include <sched.h> @@ -38,7 +40,7 @@ void benchmark_pthread_setschedparam(void) /* make test_thread equal to POSIX_Init() */ pthread_getschedparam(pthread_self(), &policy, ¶m); - + pthread_setschedparam(thread_ID, policy, ¶m); /* At this point, we've switched to test_thread */ diff --git a/testsuites/psxtmtests/psxtmthread06/init.c b/testsuites/psxtmtests/psxtmthread06/init.c index 603190932d..d7c92fcce4 100644 --- a/testsuites/psxtmtests/psxtmthread06/init.c +++ b/testsuites/psxtmtests/psxtmthread06/init.c @@ -13,6 +13,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <timesys.h> #include <pthread.h> #include <sched.h> diff --git a/testsuites/rhealstone/rhdeadlockbrk/deadlockbrk.c b/testsuites/rhealstone/rhdeadlockbrk/deadlockbrk.c index a8977273c2..438bff1575 100644 --- a/testsuites/rhealstone/rhdeadlockbrk/deadlockbrk.c +++ b/testsuites/rhealstone/rhdeadlockbrk/deadlockbrk.c @@ -4,6 +4,8 @@ * This file's license is 2-clause BSD as in this distribution's LICENSE file. */ +#define TEST_INIT + #include <timesys.h> #include <rtems/btimer.h> diff --git a/testsuites/rhealstone/rhilatency/ilatency.c b/testsuites/rhealstone/rhilatency/ilatency.c index 0a7741bf28..87ca136e7a 100644 --- a/testsuites/rhealstone/rhilatency/ilatency.c +++ b/testsuites/rhealstone/rhilatency/ilatency.c @@ -13,6 +13,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include <timesys.h> #include <rtems/btimer.h> diff --git a/testsuites/rhealstone/rhmlatency/mlatency.c b/testsuites/rhealstone/rhmlatency/mlatency.c index 11a29c0e2c..3682dc89a1 100644 --- a/testsuites/rhealstone/rhmlatency/mlatency.c +++ b/testsuites/rhealstone/rhmlatency/mlatency.c @@ -8,6 +8,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <timesys.h> #include <rtems/btimer.h> diff --git a/testsuites/rhealstone/rhsemshuffle/semshuffle.c b/testsuites/rhealstone/rhsemshuffle/semshuffle.c index 6800926fec..6aaf38d80d 100644 --- a/testsuites/rhealstone/rhsemshuffle/semshuffle.c +++ b/testsuites/rhealstone/rhsemshuffle/semshuffle.c @@ -4,6 +4,8 @@ * This file's license is 2-clause BSD as in this distribution's LICENSE file. */ +#define TEST_INIT + #include <timesys.h> #include <rtems/btimer.h> diff --git a/testsuites/rhealstone/rhtaskpreempt/taskpreempt.c b/testsuites/rhealstone/rhtaskpreempt/taskpreempt.c index c396e742fe..0218c6d028 100644 --- a/testsuites/rhealstone/rhtaskpreempt/taskpreempt.c +++ b/testsuites/rhealstone/rhtaskpreempt/taskpreempt.c @@ -4,6 +4,8 @@ * This file's license is 2-clause BSD as in this distribution's LICENSE file. */ +#define TEST_INIT + #include <timesys.h> #include <rtems/btimer.h> diff --git a/testsuites/rhealstone/rhtaskswitch/taskswitch.c b/testsuites/rhealstone/rhtaskswitch/taskswitch.c index 520de3374a..972eed8914 100644 --- a/testsuites/rhealstone/rhtaskswitch/taskswitch.c +++ b/testsuites/rhealstone/rhtaskswitch/taskswitch.c @@ -4,6 +4,8 @@ * This file's license is 2-clause BSD as in this distribution's LICENSE file. */ +#define TEST_INIT + #include <timesys.h> #include <rtems/btimer.h> diff --git a/testsuites/samples/base_mp/init.c b/testsuites/samples/base_mp/init.c index 901dc83a9b..9986d3c57c 100644 --- a/testsuites/samples/base_mp/init.c +++ b/testsuites/samples/base_mp/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" #include <stdio.h> diff --git a/testsuites/samples/base_sp/init.c b/testsuites/samples/base_sp/init.c index b1cb4d90a6..48dbf79d1e 100644 --- a/testsuites/samples/base_sp/init.c +++ b/testsuites/samples/base_sp/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" #include "tmacros.h" diff --git a/testsuites/samples/capture/init.c b/testsuites/samples/capture/init.c index 557e8094c2..4893274254 100644 --- a/testsuites/samples/capture/init.c +++ b/testsuites/samples/capture/init.c @@ -13,6 +13,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "system.h" #include <stdio.h> #include <stdlib.h> diff --git a/testsuites/samples/cdtest/init.c b/testsuites/samples/cdtest/init.c index 1cf2b20f77..b5ea093a51 100644 --- a/testsuites/samples/cdtest/init.c +++ b/testsuites/samples/cdtest/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" #include <stdio.h> diff --git a/testsuites/samples/fileio/init.c b/testsuites/samples/fileio/init.c index 433266a99f..7158ab1f42 100644 --- a/testsuites/samples/fileio/init.c +++ b/testsuites/samples/fileio/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" #include <sys/param.h> diff --git a/testsuites/samples/nsecs/init.c b/testsuites/samples/nsecs/init.c index 59995f1da8..7e4e2090e1 100644 --- a/testsuites/samples/nsecs/init.c +++ b/testsuites/samples/nsecs/init.c @@ -17,6 +17,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <rtems.h> #include <inttypes.h> #include <stdio.h> diff --git a/testsuites/samples/paranoia/init.c b/testsuites/samples/paranoia/init.c index ac7c2148c0..60aaefc2bb 100644 --- a/testsuites/samples/paranoia/init.c +++ b/testsuites/samples/paranoia/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" #include <stdio.h> diff --git a/testsuites/samples/pppd/init.c b/testsuites/samples/pppd/init.c index a8daedc291..e8bd7c37ca 100644 --- a/testsuites/samples/pppd/init.c +++ b/testsuites/samples/pppd/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/testsuites/samples/ticker/init.c b/testsuites/samples/ticker/init.c index 3f3cbd8359..1b9ae9678d 100644 --- a/testsuites/samples/ticker/init.c +++ b/testsuites/samples/ticker/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/samples/unlimited/init.c b/testsuites/samples/unlimited/init.c index 002a9736e4..0466e3dd88 100644 --- a/testsuites/samples/unlimited/init.c +++ b/testsuites/samples/unlimited/init.c @@ -13,6 +13,8 @@ #define CONFIGURE_INIT +#define TEST_INIT + #include "system.h" #include "tmacros.h" #include <stdio.h> diff --git a/testsuites/smptests/smp01/init.c b/testsuites/smptests/smp01/init.c index c77a192071..ef9d6b8180 100644 --- a/testsuites/smptests/smp01/init.c +++ b/testsuites/smptests/smp01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/smptests/smp02/init.c b/testsuites/smptests/smp02/init.c index e70eca3182..48d614810c 100644 --- a/testsuites/smptests/smp02/init.c +++ b/testsuites/smptests/smp02/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/smptests/smp03/init.c b/testsuites/smptests/smp03/init.c index 03eddb0eaa..63383c4ff8 100644 --- a/testsuites/smptests/smp03/init.c +++ b/testsuites/smptests/smp03/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/smptests/smp05/init.c b/testsuites/smptests/smp05/init.c index 7211e8ca88..854c8febba 100644 --- a/testsuites/smptests/smp05/init.c +++ b/testsuites/smptests/smp05/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include "test_support.h" diff --git a/testsuites/smptests/smp07/init.c b/testsuites/smptests/smp07/init.c index 0dbf70b001..9bf0529fc2 100644 --- a/testsuites/smptests/smp07/init.c +++ b/testsuites/smptests/smp07/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include "test_support.h" diff --git a/testsuites/smptests/smp08/init.c b/testsuites/smptests/smp08/init.c index 85003929f5..fb58d70d12 100644 --- a/testsuites/smptests/smp08/init.c +++ b/testsuites/smptests/smp08/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/smptests/smp09/init.c b/testsuites/smptests/smp09/init.c index 66290641fd..4cb89de8ef 100644 --- a/testsuites/smptests/smp09/init.c +++ b/testsuites/smptests/smp09/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include "test_support.h" #include <rtems/cpuuse.h> diff --git a/testsuites/smptests/smpaffinity01/init.c b/testsuites/smptests/smpaffinity01/init.c index eae6d708db..c5a24c058b 100644 --- a/testsuites/smptests/smpaffinity01/init.c +++ b/testsuites/smptests/smpaffinity01/init.c @@ -13,6 +13,8 @@ #define NUM_CPUS 4 +#define TEST_INIT + #include "tmacros.h" const char rtems_test_name[] = "SMPAFFINITY 1"; diff --git a/testsuites/smptests/smpatomic01/init.c b/testsuites/smptests/smpatomic01/init.c index 394cc3f865..a780c69b34 100644 --- a/testsuites/smptests/smpatomic01/init.c +++ b/testsuites/smptests/smpatomic01/init.c @@ -18,6 +18,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <rtems/score/atomic.h> #include <rtems/score/smpbarrier.h> #include <rtems.h> diff --git a/testsuites/smptests/smpcache01/init.c b/testsuites/smptests/smpcache01/init.c index 73e30a13f2..ee752c78bd 100644 --- a/testsuites/smptests/smpcache01/init.c +++ b/testsuites/smptests/smpcache01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <rtems/score/atomic.h> #include <rtems/score/smpbarrier.h> #include <rtems/score/smpimpl.h> diff --git a/testsuites/smptests/smpcapture01/init.c b/testsuites/smptests/smpcapture01/init.c index 2818b91cf1..2650f24fa0 100644 --- a/testsuites/smptests/smpcapture01/init.c +++ b/testsuites/smptests/smpcapture01/init.c @@ -25,6 +25,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <rtems.h> #include <rtems/captureimpl.h> diff --git a/testsuites/smptests/smpcapture02/init.c b/testsuites/smptests/smpcapture02/init.c index 9926fbb493..efcb236522 100644 --- a/testsuites/smptests/smpcapture02/init.c +++ b/testsuites/smptests/smpcapture02/init.c @@ -21,6 +21,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <rtems.h> #include <bsp/irq.h> #include <rtems/captureimpl.h> diff --git a/testsuites/smptests/smpclock01/init.c b/testsuites/smptests/smpclock01/init.c index 5972959b66..a4128e436c 100644 --- a/testsuites/smptests/smpclock01/init.c +++ b/testsuites/smptests/smpclock01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include <rtems.h> diff --git a/testsuites/smptests/smpfatal01/init.c b/testsuites/smptests/smpfatal01/init.c index 2a000a5bf8..68ba68cbfa 100644 --- a/testsuites/smptests/smpfatal01/init.c +++ b/testsuites/smptests/smpfatal01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #define TESTS_USE_PRINTK #include "tmacros.h" diff --git a/testsuites/smptests/smpfatal02/init.c b/testsuites/smptests/smpfatal02/init.c index fc25808d56..0b2424571f 100644 --- a/testsuites/smptests/smpfatal02/init.c +++ b/testsuites/smptests/smpfatal02/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #define TESTS_USE_PRINTK #include "tmacros.h" diff --git a/testsuites/smptests/smpfatal03/init.c b/testsuites/smptests/smpfatal03/init.c index 47f8598387..8121fd29ae 100644 --- a/testsuites/smptests/smpfatal03/init.c +++ b/testsuites/smptests/smpfatal03/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #define TESTS_USE_PRINTK #include "tmacros.h" diff --git a/testsuites/smptests/smpfatal04/init.c b/testsuites/smptests/smpfatal04/init.c index 73ef701c70..93d6bf1240 100644 --- a/testsuites/smptests/smpfatal04/init.c +++ b/testsuites/smptests/smpfatal04/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #define TESTS_USE_PRINTK #include "tmacros.h" diff --git a/testsuites/smptests/smpfatal05/init.c b/testsuites/smptests/smpfatal05/init.c index 6b0954a7bb..b07c986af6 100644 --- a/testsuites/smptests/smpfatal05/init.c +++ b/testsuites/smptests/smpfatal05/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #define TESTS_USE_PRINTK #include "tmacros.h" diff --git a/testsuites/smptests/smpfatal06/init.c b/testsuites/smptests/smpfatal06/init.c index 37cd9afe5a..94e6cf7e32 100644 --- a/testsuites/smptests/smpfatal06/init.c +++ b/testsuites/smptests/smpfatal06/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #define TESTS_USE_PRINTK #include "tmacros.h" diff --git a/testsuites/smptests/smpfatal08/init.c b/testsuites/smptests/smpfatal08/init.c index 92f769a704..f4adc3279b 100644 --- a/testsuites/smptests/smpfatal08/init.c +++ b/testsuites/smptests/smpfatal08/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #define TESTS_USE_PRINTK #include "tmacros.h" diff --git a/testsuites/smptests/smpipi01/init.c b/testsuites/smptests/smpipi01/init.c index cc85388f7c..b2f232eb68 100644 --- a/testsuites/smptests/smpipi01/init.c +++ b/testsuites/smptests/smpipi01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <rtems/score/smpimpl.h> #include <rtems/score/smpbarrier.h> #include <rtems/counter.h> diff --git a/testsuites/smptests/smpload01/init.c b/testsuites/smptests/smpload01/init.c index 0e102354d4..778c3dc0f1 100644 --- a/testsuites/smptests/smpload01/init.c +++ b/testsuites/smptests/smpload01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include <stdlib.h> diff --git a/testsuites/smptests/smplock01/init.c b/testsuites/smptests/smplock01/init.c index 0a379154f5..38a3d0aebf 100644 --- a/testsuites/smptests/smplock01/init.c +++ b/testsuites/smptests/smplock01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <rtems/score/smplock.h> #include <rtems/score/smplockmcs.h> #include <rtems/score/smplockseq.h> diff --git a/testsuites/smptests/smpmigration01/init.c b/testsuites/smptests/smpmigration01/init.c index 6cde34b234..72033501e7 100644 --- a/testsuites/smptests/smpmigration01/init.c +++ b/testsuites/smptests/smpmigration01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #define TESTS_USE_PRINTF #include "tmacros.h" diff --git a/testsuites/smptests/smpmigration02/init.c b/testsuites/smptests/smpmigration02/init.c index 4180f5387f..15e5d6e6ab 100644 --- a/testsuites/smptests/smpmigration02/init.c +++ b/testsuites/smptests/smpmigration02/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <rtems.h> #include <rtems/libcsupport.h> #include <rtems/score/objectimpl.h> diff --git a/testsuites/smptests/smpmrsp01/init.c b/testsuites/smptests/smpmrsp01/init.c index cc955678b6..9da101e50a 100644 --- a/testsuites/smptests/smpmrsp01/init.c +++ b/testsuites/smptests/smpmrsp01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <sys/param.h> #include <stdio.h> diff --git a/testsuites/smptests/smpmutex01/init.c b/testsuites/smptests/smpmutex01/init.c index c7059e8e14..ead95cfe7d 100644 --- a/testsuites/smptests/smpmutex01/init.c +++ b/testsuites/smptests/smpmutex01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" const char rtems_test_name[] = "SMPMUTEX 1"; diff --git a/testsuites/smptests/smpmutex02/init.c b/testsuites/smptests/smpmutex02/init.c index 1604bb7cf8..f902d8843d 100644 --- a/testsuites/smptests/smpmutex02/init.c +++ b/testsuites/smptests/smpmutex02/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <inttypes.h> #include <string.h> #include <stdio.h> diff --git a/testsuites/smptests/smppsxaffinity01/init.c b/testsuites/smptests/smppsxaffinity01/init.c index 58e1db5435..0178071f77 100644 --- a/testsuites/smptests/smppsxaffinity01/init.c +++ b/testsuites/smptests/smppsxaffinity01/init.c @@ -13,6 +13,8 @@ #define _GNU_SOURCE +#define TEST_INIT + #include <tmacros.h> #include <errno.h> #include <pthread.h> diff --git a/testsuites/smptests/smppsxaffinity02/init.c b/testsuites/smptests/smppsxaffinity02/init.c index 21a723d41b..1b4bd59240 100644 --- a/testsuites/smptests/smppsxaffinity02/init.c +++ b/testsuites/smptests/smppsxaffinity02/init.c @@ -15,6 +15,8 @@ #define _GNU_SOURCE +#define TEST_INIT + #include <tmacros.h> #include <errno.h> #include <pthread.h> diff --git a/testsuites/smptests/smppsxmutex01/init.c b/testsuites/smptests/smppsxmutex01/init.c index aeed75c6d1..67ff99c45f 100644 --- a/testsuites/smptests/smppsxmutex01/init.c +++ b/testsuites/smptests/smppsxmutex01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <errno.h> #include <pthread.h> diff --git a/testsuites/smptests/smppsxsignal01/init.c b/testsuites/smptests/smppsxsignal01/init.c index 367615838c..2c4687dfbb 100644 --- a/testsuites/smptests/smppsxsignal01/init.c +++ b/testsuites/smptests/smppsxsignal01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include <pthread.h> diff --git a/testsuites/smptests/smpschedaffinity01/init.c b/testsuites/smptests/smpschedaffinity01/init.c index 778fda7ba0..d25d7e0c21 100644 --- a/testsuites/smptests/smpschedaffinity01/init.c +++ b/testsuites/smptests/smpschedaffinity01/init.c @@ -24,6 +24,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <rtems.h> #include "tmacros.h" diff --git a/testsuites/smptests/smpschedaffinity02/init.c b/testsuites/smptests/smpschedaffinity02/init.c index 9a8cfed7dd..6e40c8e29d 100644 --- a/testsuites/smptests/smpschedaffinity02/init.c +++ b/testsuites/smptests/smpschedaffinity02/init.c @@ -21,6 +21,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <rtems.h> #include "tmacros.h" diff --git a/testsuites/smptests/smpschedaffinity03/init.c b/testsuites/smptests/smpschedaffinity03/init.c index a53b30caa7..4036217fef 100644 --- a/testsuites/smptests/smpschedaffinity03/init.c +++ b/testsuites/smptests/smpschedaffinity03/init.c @@ -15,6 +15,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <rtems.h> #include "tmacros.h" diff --git a/testsuites/smptests/smpschedaffinity04/init.c b/testsuites/smptests/smpschedaffinity04/init.c index c7a071f054..2a504f92c0 100644 --- a/testsuites/smptests/smpschedaffinity04/init.c +++ b/testsuites/smptests/smpschedaffinity04/init.c @@ -15,6 +15,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <rtems.h> #include "tmacros.h" diff --git a/testsuites/smptests/smpschedaffinity05/init.c b/testsuites/smptests/smpschedaffinity05/init.c index 1d69592879..d2c897a442 100644 --- a/testsuites/smptests/smpschedaffinity05/init.c +++ b/testsuites/smptests/smpschedaffinity05/init.c @@ -24,6 +24,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <rtems.h> #include <inttypes.h> diff --git a/testsuites/smptests/smpschededf01/init.c b/testsuites/smptests/smpschededf01/init.c index d6e68b5465..2bfcadfef8 100644 --- a/testsuites/smptests/smpschededf01/init.c +++ b/testsuites/smptests/smpschededf01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <rtems.h> #include <rtems/cpuuse.h> #include <rtems/printer.h> diff --git a/testsuites/smptests/smpschededf02/init.c b/testsuites/smptests/smpschededf02/init.c index e0c5182f2e..17976fbb3f 100644 --- a/testsuites/smptests/smpschededf02/init.c +++ b/testsuites/smptests/smpschededf02/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include <rtems.h> diff --git a/testsuites/smptests/smpschededf03/init.c b/testsuites/smptests/smpschededf03/init.c index 33029532c6..3a1f2708e3 100644 --- a/testsuites/smptests/smpschededf03/init.c +++ b/testsuites/smptests/smpschededf03/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include <rtems.h> diff --git a/testsuites/smptests/smpschedsem01/init.c b/testsuites/smptests/smpschedsem01/init.c index cae5d6e84a..75173e3142 100644 --- a/testsuites/smptests/smpschedsem01/init.c +++ b/testsuites/smptests/smpschedsem01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <rtems.h> #include "tmacros.h" diff --git a/testsuites/smptests/smpscheduler01/init.c b/testsuites/smptests/smpscheduler01/init.c index 5df3281e25..9f0b5c1ed2 100644 --- a/testsuites/smptests/smpscheduler01/init.c +++ b/testsuites/smptests/smpscheduler01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <rtems.h> #include <rtems/score/threadimpl.h> diff --git a/testsuites/smptests/smpscheduler02/init.c b/testsuites/smptests/smpscheduler02/init.c index 5cd378315a..1107fad759 100644 --- a/testsuites/smptests/smpscheduler02/init.c +++ b/testsuites/smptests/smpscheduler02/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <sched.h> #include <limits.h> diff --git a/testsuites/smptests/smpscheduler04/init.c b/testsuites/smptests/smpscheduler04/init.c index a4e9da1289..2515e17a2f 100644 --- a/testsuites/smptests/smpscheduler04/init.c +++ b/testsuites/smptests/smpscheduler04/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <inttypes.h> #include <string.h> #include <stdio.h> diff --git a/testsuites/smptests/smpsignal01/init.c b/testsuites/smptests/smpsignal01/init.c index 52f2edbddd..af66c26fd7 100644 --- a/testsuites/smptests/smpsignal01/init.c +++ b/testsuites/smptests/smpsignal01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" const char rtems_test_name[] = "SMPSIGNAL 1"; diff --git a/testsuites/smptests/smpstrongapa01/init.c b/testsuites/smptests/smpstrongapa01/init.c index 75ac79bc54..d59714fda7 100644 --- a/testsuites/smptests/smpstrongapa01/init.c +++ b/testsuites/smptests/smpstrongapa01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include <rtems.h> diff --git a/testsuites/smptests/smpswitchextension01/init.c b/testsuites/smptests/smpswitchextension01/init.c index 3fad1d927c..c415863373 100644 --- a/testsuites/smptests/smpswitchextension01/init.c +++ b/testsuites/smptests/smpswitchextension01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include <stdio.h> diff --git a/testsuites/smptests/smpthreadlife01/init.c b/testsuites/smptests/smpthreadlife01/init.c index 5c2d106d0f..f224dd9223 100644 --- a/testsuites/smptests/smpthreadlife01/init.c +++ b/testsuites/smptests/smpthreadlife01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include <rtems.h> diff --git a/testsuites/smptests/smpunsupported01/init.c b/testsuites/smptests/smpunsupported01/init.c index a5ccaae271..56212a49d6 100644 --- a/testsuites/smptests/smpunsupported01/init.c +++ b/testsuites/smptests/smpunsupported01/init.c @@ -17,6 +17,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" const char rtems_test_name[] = "SMPUNSUPPORTED 1"; diff --git a/testsuites/smptests/smpwakeafter01/init.c b/testsuites/smptests/smpwakeafter01/init.c index 3d091f59c0..d6770590eb 100644 --- a/testsuites/smptests/smpwakeafter01/init.c +++ b/testsuites/smptests/smpwakeafter01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include <stdio.h> diff --git a/testsuites/sptests/Makefile.am b/testsuites/sptests/Makefile.am index cf95c4a9f6..f02d277142 100644 --- a/testsuites/sptests/Makefile.am +++ b/testsuites/sptests/Makefile.am @@ -61,7 +61,6 @@ _SUBDIRS += spmrsp01 _SUBDIRS += spscheduler01 _SUBDIRS += spfatal28 _SUBDIRS += spthreadlife01 -_SUBDIRS += spprofiling01 _SUBDIRS += spcache01 _SUBDIRS += sptls03 _SUBDIRS += spcpucounter01 diff --git a/testsuites/sptests/sp01/init.c b/testsuites/sptests/sp01/init.c index 4d73804dbb..a726a02461 100644 --- a/testsuites/sptests/sp01/init.c +++ b/testsuites/sptests/sp01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/sp02/init.c b/testsuites/sptests/sp02/init.c index d7ff317497..ffd330e77f 100644 --- a/testsuites/sptests/sp02/init.c +++ b/testsuites/sptests/sp02/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/sp03/init.c b/testsuites/sptests/sp03/init.c index 1f02eb666d..a5b6d8038a 100644 --- a/testsuites/sptests/sp03/init.c +++ b/testsuites/sptests/sp03/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/sp04/init.c b/testsuites/sptests/sp04/init.c index e7bc79393d..31925795e8 100644 --- a/testsuites/sptests/sp04/init.c +++ b/testsuites/sptests/sp04/init.c @@ -23,6 +23,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/sp05/init.c b/testsuites/sptests/sp05/init.c index 7d95ee9775..52db2eaa03 100644 --- a/testsuites/sptests/sp05/init.c +++ b/testsuites/sptests/sp05/init.c @@ -23,6 +23,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/sp06/init.c b/testsuites/sptests/sp06/init.c index e8379ae8f9..60e7a41137 100644 --- a/testsuites/sptests/sp06/init.c +++ b/testsuites/sptests/sp06/init.c @@ -23,6 +23,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/sp07/init.c b/testsuites/sptests/sp07/init.c index d5b606d12a..bfae5eb487 100644 --- a/testsuites/sptests/sp07/init.c +++ b/testsuites/sptests/sp07/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/sp08/init.c b/testsuites/sptests/sp08/init.c index 2364c70287..88c1445627 100644 --- a/testsuites/sptests/sp08/init.c +++ b/testsuites/sptests/sp08/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include <rtems/score/sysstate.h> diff --git a/testsuites/sptests/sp11/init.c b/testsuites/sptests/sp11/init.c index ee3f2e82e7..5b52ba9760 100644 --- a/testsuites/sptests/sp11/init.c +++ b/testsuites/sptests/sp11/init.c @@ -23,6 +23,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/sp12/init.c b/testsuites/sptests/sp12/init.c index 0b9200440b..fb7a5f8d07 100644 --- a/testsuites/sptests/sp12/init.c +++ b/testsuites/sptests/sp12/init.c @@ -23,6 +23,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/sp13/init.c b/testsuites/sptests/sp13/init.c index ffa2d1285d..ed244bcb1e 100644 --- a/testsuites/sptests/sp13/init.c +++ b/testsuites/sptests/sp13/init.c @@ -23,6 +23,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/sp14/init.c b/testsuites/sptests/sp14/init.c index b0cedc264e..5e3ef2360b 100644 --- a/testsuites/sptests/sp14/init.c +++ b/testsuites/sptests/sp14/init.c @@ -23,6 +23,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/sp15/init.c b/testsuites/sptests/sp15/init.c index dcf8f95ace..e867a913d1 100644 --- a/testsuites/sptests/sp15/init.c +++ b/testsuites/sptests/sp15/init.c @@ -23,6 +23,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/sp16/init.c b/testsuites/sptests/sp16/init.c index 3b8543b7c0..f9e5d0a97b 100644 --- a/testsuites/sptests/sp16/init.c +++ b/testsuites/sptests/sp16/init.c @@ -23,6 +23,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/sp17/init.c b/testsuites/sptests/sp17/init.c index 4f7cba8142..0ee99c105e 100644 --- a/testsuites/sptests/sp17/init.c +++ b/testsuites/sptests/sp17/init.c @@ -23,6 +23,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/sp18/init.c b/testsuites/sptests/sp18/init.c index 5f39794318..4c9448fcee 100644 --- a/testsuites/sptests/sp18/init.c +++ b/testsuites/sptests/sp18/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <rtems/libcsupport.h> #include <tmacros.h> diff --git a/testsuites/sptests/sp19/init.c b/testsuites/sptests/sp19/init.c index f1b75c406a..9d8fea373d 100644 --- a/testsuites/sptests/sp19/init.c +++ b/testsuites/sptests/sp19/init.c @@ -23,6 +23,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/sp20/init.c b/testsuites/sptests/sp20/init.c index 932352444f..0ffd75a32c 100644 --- a/testsuites/sptests/sp20/init.c +++ b/testsuites/sptests/sp20/init.c @@ -23,6 +23,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/sp2038/init.c b/testsuites/sptests/sp2038/init.c index da7c23ef5d..28c8cb1375 100644 --- a/testsuites/sptests/sp2038/init.c +++ b/testsuites/sptests/sp2038/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include <time.h> diff --git a/testsuites/sptests/sp21/init.c b/testsuites/sptests/sp21/init.c index 0eb453c974..9a2fec5b72 100644 --- a/testsuites/sptests/sp21/init.c +++ b/testsuites/sptests/sp21/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include <rtems/devnull.h> #include <rtems/devzero.h> diff --git a/testsuites/sptests/sp22/init.c b/testsuites/sptests/sp22/init.c index 23956e6c30..78e415d74e 100644 --- a/testsuites/sptests/sp22/init.c +++ b/testsuites/sptests/sp22/init.c @@ -23,6 +23,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/sp23/init.c b/testsuites/sptests/sp23/init.c index e0ee2f97a0..a6b52c6ec6 100644 --- a/testsuites/sptests/sp23/init.c +++ b/testsuites/sptests/sp23/init.c @@ -23,6 +23,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/sp24/init.c b/testsuites/sptests/sp24/init.c index b0e7f15628..8c50c3a9e7 100644 --- a/testsuites/sptests/sp24/init.c +++ b/testsuites/sptests/sp24/init.c @@ -23,6 +23,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/sp25/init.c b/testsuites/sptests/sp25/init.c index e744e5cfb6..ba4f65b932 100644 --- a/testsuites/sptests/sp25/init.c +++ b/testsuites/sptests/sp25/init.c @@ -23,6 +23,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/sp26/init.c b/testsuites/sptests/sp26/init.c index 0ac7157e7c..6df979c352 100644 --- a/testsuites/sptests/sp26/init.c +++ b/testsuites/sptests/sp26/init.c @@ -23,6 +23,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/sp27/init.c b/testsuites/sptests/sp27/init.c index bb4630d2de..a5459140f4 100644 --- a/testsuites/sptests/sp27/init.c +++ b/testsuites/sptests/sp27/init.c @@ -13,6 +13,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <bsp.h> #include <tmacros.h> diff --git a/testsuites/sptests/sp29/init.c b/testsuites/sptests/sp29/init.c index e65fbe3d45..6f68275626 100644 --- a/testsuites/sptests/sp29/init.c +++ b/testsuites/sptests/sp29/init.c @@ -8,6 +8,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include <bsp.h> diff --git a/testsuites/sptests/sp30/init.c b/testsuites/sptests/sp30/init.c index 616e4cd2a4..deb1873843 100644 --- a/testsuites/sptests/sp30/init.c +++ b/testsuites/sptests/sp30/init.c @@ -23,6 +23,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/sp31/init.c b/testsuites/sptests/sp31/init.c index 020ec255be..34a96519cc 100644 --- a/testsuites/sptests/sp31/init.c +++ b/testsuites/sptests/sp31/init.c @@ -23,6 +23,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/sp32/init.c b/testsuites/sptests/sp32/init.c index 71cd46c001..86068a35c9 100644 --- a/testsuites/sptests/sp32/init.c +++ b/testsuites/sptests/sp32/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> /* includes bsp.h, stdio, etc... */ const char rtems_test_name[] = "SP 32"; diff --git a/testsuites/sptests/sp33/init.c b/testsuites/sptests/sp33/init.c index 579cd65e11..d45d860899 100644 --- a/testsuites/sptests/sp33/init.c +++ b/testsuites/sptests/sp33/init.c @@ -11,7 +11,8 @@ #include "config.h" #endif -#define CONFIGURE_INIT +#define TEST_INIT + #include <tmacros.h> /* includes bsp.h, stdio, etc... */ const char rtems_test_name[] = "SP 33"; diff --git a/testsuites/sptests/sp34/changepri.c b/testsuites/sptests/sp34/changepri.c index 5000f693d3..d2bdd65ace 100644 --- a/testsuites/sptests/sp34/changepri.c +++ b/testsuites/sptests/sp34/changepri.c @@ -25,6 +25,8 @@ #define CONFIGURE_INIT +#define TEST_INIT + #include <bsp.h> #include <stdio.h> #include "tmacros.h" diff --git a/testsuites/sptests/sp35/priinv.c b/testsuites/sptests/sp35/priinv.c index 8848348758..69f3ca399b 100644 --- a/testsuites/sptests/sp35/priinv.c +++ b/testsuites/sptests/sp35/priinv.c @@ -51,6 +51,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <bsp.h> #include <stdio.h> #include "tmacros.h" @@ -232,7 +234,7 @@ rtems_isr LocalHwIsr(/*in*/ rtems_vector_number Vector) /* Signal synchroniztion semaphore to invoke waiting task */ status = rtems_semaphore_release(LocalHwSync_S); if (status != RTEMS_SUCCESSFUL) { - fprintf( stderr, "LocalHwISR release %d\n", status ); + printf( "LocalHwISR release %d\n", status ); while(1); /* Error */ } diff --git a/testsuites/sptests/sp36/strict_order_mut.c b/testsuites/sptests/sp36/strict_order_mut.c index db270caf41..d49ee74248 100644 --- a/testsuites/sptests/sp36/strict_order_mut.c +++ b/testsuites/sptests/sp36/strict_order_mut.c @@ -10,6 +10,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <bsp.h> #include <stdio.h> #include "tmacros.h" diff --git a/testsuites/sptests/sp37/init.c b/testsuites/sptests/sp37/init.c index 08d6285d3d..13e9a33cd3 100644 --- a/testsuites/sptests/sp37/init.c +++ b/testsuites/sptests/sp37/init.c @@ -18,6 +18,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/sp38/init.c b/testsuites/sptests/sp38/init.c index d77d5d2a1c..49c74c2e6d 100644 --- a/testsuites/sptests/sp38/init.c +++ b/testsuites/sptests/sp38/init.c @@ -13,6 +13,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/sp40/init.c b/testsuites/sptests/sp40/init.c index 44e8d45a03..b923d9f194 100644 --- a/testsuites/sptests/sp40/init.c +++ b/testsuites/sptests/sp40/init.c @@ -15,6 +15,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include <rtems/ioimpl.h> diff --git a/testsuites/sptests/sp41/init.c b/testsuites/sptests/sp41/init.c index 04b855b352..e08019aea2 100644 --- a/testsuites/sptests/sp41/init.c +++ b/testsuites/sptests/sp41/init.c @@ -13,6 +13,8 @@ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#define TEST_INIT + #include <tmacros.h> #include <rtems/score/objectimpl.h> diff --git a/testsuites/sptests/sp42/init.c b/testsuites/sptests/sp42/init.c index f4be2a5ca2..9260b7af39 100644 --- a/testsuites/sptests/sp42/init.c +++ b/testsuites/sptests/sp42/init.c @@ -13,6 +13,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <stdio.h> #include <stdlib.h> diff --git a/testsuites/sptests/sp43/init.c b/testsuites/sptests/sp43/init.c index a0025353ec..56c3985995 100644 --- a/testsuites/sptests/sp43/init.c +++ b/testsuites/sptests/sp43/init.c @@ -13,6 +13,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/sp44/init.c b/testsuites/sptests/sp44/init.c index 5b11eadda5..39b2f50392 100644 --- a/testsuites/sptests/sp44/init.c +++ b/testsuites/sptests/sp44/init.c @@ -9,6 +9,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include <rtems.h> #include <stdio.h> diff --git a/testsuites/sptests/sp45/init.c b/testsuites/sptests/sp45/init.c index b8b43b4df4..20b6119fc2 100644 --- a/testsuites/sptests/sp45/init.c +++ b/testsuites/sptests/sp45/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> const char rtems_test_name[] = "SP 45"; diff --git a/testsuites/sptests/sp46/init.c b/testsuites/sptests/sp46/init.c index 55653e0b3a..d66108aa2e 100644 --- a/testsuites/sptests/sp46/init.c +++ b/testsuites/sptests/sp46/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include <rtems/cpuuse.h> diff --git a/testsuites/sptests/sp47/init.c b/testsuites/sptests/sp47/init.c index 5d28303f19..2c2b637c38 100644 --- a/testsuites/sptests/sp47/init.c +++ b/testsuites/sptests/sp47/init.c @@ -6,6 +6,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> const char rtems_test_name[] = "SP 47"; diff --git a/testsuites/sptests/sp48/init.c b/testsuites/sptests/sp48/init.c index 53d8245c23..a6bfa9da19 100644 --- a/testsuites/sptests/sp48/init.c +++ b/testsuites/sptests/sp48/init.c @@ -13,6 +13,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include <rtems/libcsupport.h> diff --git a/testsuites/sptests/sp49/init.c b/testsuites/sptests/sp49/init.c index 64db98e11f..0edbc4a558 100644 --- a/testsuites/sptests/sp49/init.c +++ b/testsuites/sptests/sp49/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> const char rtems_test_name[] = "SP 49"; diff --git a/testsuites/sptests/sp50/init.c b/testsuites/sptests/sp50/init.c index 58a7be7501..abc5a75745 100644 --- a/testsuites/sptests/sp50/init.c +++ b/testsuites/sptests/sp50/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include "pritime.h" diff --git a/testsuites/sptests/sp51/init.c b/testsuites/sptests/sp51/init.c index 1e8f9e5ceb..51fa0064ab 100644 --- a/testsuites/sptests/sp51/init.c +++ b/testsuites/sptests/sp51/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> const char rtems_test_name[] = "SP 51"; diff --git a/testsuites/sptests/sp52/init.c b/testsuites/sptests/sp52/init.c index f7629a5d11..3069e24d4e 100644 --- a/testsuites/sptests/sp52/init.c +++ b/testsuites/sptests/sp52/init.c @@ -25,6 +25,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include <string.h> diff --git a/testsuites/sptests/sp54/init.c b/testsuites/sptests/sp54/init.c index 3b0d4589a9..e39999c6b6 100644 --- a/testsuites/sptests/sp54/init.c +++ b/testsuites/sptests/sp54/init.c @@ -18,6 +18,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> const char rtems_test_name[] = "SP 54"; diff --git a/testsuites/sptests/sp55/init.c b/testsuites/sptests/sp55/init.c index ee06e84d76..ebc1264d4d 100644 --- a/testsuites/sptests/sp55/init.c +++ b/testsuites/sptests/sp55/init.c @@ -17,6 +17,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> const char rtems_test_name[] = "SP 55"; diff --git a/testsuites/sptests/sp56/init.c b/testsuites/sptests/sp56/init.c index c0ce3c007c..c383420126 100644 --- a/testsuites/sptests/sp56/init.c +++ b/testsuites/sptests/sp56/init.c @@ -17,6 +17,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> const char rtems_test_name[] = "SP 56"; diff --git a/testsuites/sptests/sp57/init.c b/testsuites/sptests/sp57/init.c index 3003c2fa9c..8e0be12c52 100644 --- a/testsuites/sptests/sp57/init.c +++ b/testsuites/sptests/sp57/init.c @@ -17,6 +17,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> const char rtems_test_name[] = "SP 57"; diff --git a/testsuites/sptests/sp58/init.c b/testsuites/sptests/sp58/init.c index b61120320e..b5fd843586 100644 --- a/testsuites/sptests/sp58/init.c +++ b/testsuites/sptests/sp58/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include <sys/types.h> diff --git a/testsuites/sptests/sp59/init.c b/testsuites/sptests/sp59/init.c index 4120761acd..100b5408fb 100644 --- a/testsuites/sptests/sp59/init.c +++ b/testsuites/sptests/sp59/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> const char rtems_test_name[] = "SP 59"; diff --git a/testsuites/sptests/sp60/init.c b/testsuites/sptests/sp60/init.c index b015ac1244..baa8f2cc4b 100644 --- a/testsuites/sptests/sp60/init.c +++ b/testsuites/sptests/sp60/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> const char rtems_test_name[] = "SP 60"; diff --git a/testsuites/sptests/sp62/init.c b/testsuites/sptests/sp62/init.c index 7df64df0d6..cbe6c92bef 100644 --- a/testsuites/sptests/sp62/init.c +++ b/testsuites/sptests/sp62/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include <unistd.h> diff --git a/testsuites/sptests/sp63/init.c b/testsuites/sptests/sp63/init.c index 6f1c837d84..a4d66391a0 100644 --- a/testsuites/sptests/sp63/init.c +++ b/testsuites/sptests/sp63/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include <rtems/score/heapimpl.h> diff --git a/testsuites/sptests/sp64/init.c b/testsuites/sptests/sp64/init.c index 153a9f25f4..76961f71f9 100644 --- a/testsuites/sptests/sp64/init.c +++ b/testsuites/sptests/sp64/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <rtems/libcsupport.h> #include "tmacros.h" diff --git a/testsuites/sptests/sp65/init.c b/testsuites/sptests/sp65/init.c index 09c64b9d0b..f1fed6e4f0 100644 --- a/testsuites/sptests/sp65/init.c +++ b/testsuites/sptests/sp65/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include <unistd.h> diff --git a/testsuites/sptests/sp67/init.c b/testsuites/sptests/sp67/init.c index 154e836f41..fe05da224f 100644 --- a/testsuites/sptests/sp67/init.c +++ b/testsuites/sptests/sp67/init.c @@ -14,6 +14,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include <rtems/score/watchdogimpl.h> diff --git a/testsuites/sptests/sp68/init.c b/testsuites/sptests/sp68/init.c index 5642203b74..9aa8dd2091 100644 --- a/testsuites/sptests/sp68/init.c +++ b/testsuites/sptests/sp68/init.c @@ -24,6 +24,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> const char rtems_test_name[] = "SP 68"; diff --git a/testsuites/sptests/sp69/init.c b/testsuites/sptests/sp69/init.c index c604c2de06..83f93cde26 100644 --- a/testsuites/sptests/sp69/init.c +++ b/testsuites/sptests/sp69/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <rtems/cpuuse.h> #include <tmacros.h> #include "test_support.h" diff --git a/testsuites/sptests/sp70/init.c b/testsuites/sptests/sp70/init.c index 721e3b91a1..eafdde5c40 100644 --- a/testsuites/sptests/sp70/init.c +++ b/testsuites/sptests/sp70/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include "test_support.h" diff --git a/testsuites/sptests/sp71/init.c b/testsuites/sptests/sp71/init.c index eff6ba72d0..999a2e8626 100644 --- a/testsuites/sptests/sp71/init.c +++ b/testsuites/sptests/sp71/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include "test_support.h" diff --git a/testsuites/sptests/sp72/init.c b/testsuites/sptests/sp72/init.c index 5e2c8ab91d..b8561e0b22 100644 --- a/testsuites/sptests/sp72/init.c +++ b/testsuites/sptests/sp72/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include "test_support.h" diff --git a/testsuites/sptests/sp73/init.c b/testsuites/sptests/sp73/init.c index 8db5024fc5..261bf8bad2 100644 --- a/testsuites/sptests/sp73/init.c +++ b/testsuites/sptests/sp73/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <bsp.h> #include <inttypes.h> #include "tmacros.h" diff --git a/testsuites/sptests/sp74/init.c b/testsuites/sptests/sp74/init.c index 346c67662c..a1f9e5647c 100644 --- a/testsuites/sptests/sp74/init.c +++ b/testsuites/sptests/sp74/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> const char rtems_test_name[] = "SP 74"; diff --git a/testsuites/sptests/sp75/init.c b/testsuites/sptests/sp75/init.c index e699e766c6..667e4616f2 100644 --- a/testsuites/sptests/sp75/init.c +++ b/testsuites/sptests/sp75/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include "test_support.h" diff --git a/testsuites/sptests/sp76/init.c b/testsuites/sptests/sp76/init.c index daf55f1ede..f414080155 100644 --- a/testsuites/sptests/sp76/init.c +++ b/testsuites/sptests/sp76/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> const char rtems_test_name[] = "SP 76"; diff --git a/testsuites/sptests/sp77/init.c b/testsuites/sptests/sp77/init.c index c6ccacc3bc..f645209194 100644 --- a/testsuites/sptests/sp77/init.c +++ b/testsuites/sptests/sp77/init.c @@ -7,6 +7,8 @@ * http://www.rtems.org/license/LICENSE. */ +#define TEST_INIT + #include <tmacros.h> #include "test_support.h" diff --git a/testsuites/sptests/spassoc01/init.c b/testsuites/sptests/spassoc01/init.c index ba3873ac0e..959cd40e6c 100644 --- a/testsuites/sptests/spassoc01/init.c +++ b/testsuites/sptests/spassoc01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include "test_support.h" diff --git a/testsuites/sptests/spatomic01/init.c b/testsuites/sptests/spatomic01/init.c index b5fa6c4a7a..e034fcc423 100644 --- a/testsuites/sptests/spatomic01/init.c +++ b/testsuites/sptests/spatomic01/init.c @@ -18,6 +18,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <rtems/score/atomic.h> #include <stdio.h> #include <rtems.h> diff --git a/testsuites/sptests/spcache01/init.c b/testsuites/sptests/spcache01/init.c index 52fa860b93..28cf8c00c3 100644 --- a/testsuites/sptests/spcache01/init.c +++ b/testsuites/sptests/spcache01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <inttypes.h> #include <setjmp.h> #include <stdio.h> diff --git a/testsuites/sptests/spcbssched01/init.c b/testsuites/sptests/spcbssched01/init.c index be85bce85c..eb8a808d2a 100644 --- a/testsuites/sptests/spcbssched01/init.c +++ b/testsuites/sptests/spcbssched01/init.c @@ -23,6 +23,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/spcbssched02/init.c b/testsuites/sptests/spcbssched02/init.c index acaf7a723d..3d92de2d68 100644 --- a/testsuites/sptests/spcbssched02/init.c +++ b/testsuites/sptests/spcbssched02/init.c @@ -20,6 +20,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/spcbssched03/init.c b/testsuites/sptests/spcbssched03/init.c index 55549151b8..7b219054ca 100644 --- a/testsuites/sptests/spcbssched03/init.c +++ b/testsuites/sptests/spcbssched03/init.c @@ -20,6 +20,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/spchain/init.c b/testsuites/sptests/spchain/init.c index 8fa7ea087d..aa5f91d2d1 100644 --- a/testsuites/sptests/spchain/init.c +++ b/testsuites/sptests/spchain/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include <rtems/chain.h> diff --git a/testsuites/sptests/spclock_err01/init.c b/testsuites/sptests/spclock_err01/init.c index 087c8d4a05..7e02e5e277 100644 --- a/testsuites/sptests/spclock_err01/init.c +++ b/testsuites/sptests/spclock_err01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/spclock_err02/init.c b/testsuites/sptests/spclock_err02/init.c index 7912ab8b21..d87da5c2c3 100644 --- a/testsuites/sptests/spclock_err02/init.c +++ b/testsuites/sptests/spclock_err02/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include "test_support.h" diff --git a/testsuites/sptests/spcontext01/init.c b/testsuites/sptests/spcontext01/init.c index e093c50618..6d2adce685 100644 --- a/testsuites/sptests/spcontext01/init.c +++ b/testsuites/sptests/spcontext01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" const char rtems_test_name[] = "SPCONTEXT 1"; diff --git a/testsuites/sptests/spcoverage/init.c b/testsuites/sptests/spcoverage/init.c index a80acec7fe..31fdb4bd62 100644 --- a/testsuites/sptests/spcoverage/init.c +++ b/testsuites/sptests/spcoverage/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" const char rtems_test_name[] = "SPCOVERAGE"; diff --git a/testsuites/sptests/spcpucounter01/init.c b/testsuites/sptests/spcpucounter01/init.c index 92f2e15c72..1a582fa615 100644 --- a/testsuites/sptests/spcpucounter01/init.c +++ b/testsuites/sptests/spcpucounter01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <stdio.h> #include <inttypes.h> diff --git a/testsuites/sptests/spcpuset01/init.c b/testsuites/sptests/spcpuset01/init.c index b13be4913d..39518e279b 100644 --- a/testsuites/sptests/spcpuset01/init.c +++ b/testsuites/sptests/spcpuset01/init.c @@ -6,6 +6,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include <rtems.h> #include <stdlib.h> diff --git a/testsuites/sptests/spedfsched01/init.c b/testsuites/sptests/spedfsched01/init.c index 04fc5ca79c..303cdebc80 100644 --- a/testsuites/sptests/spedfsched01/init.c +++ b/testsuites/sptests/spedfsched01/init.c @@ -23,6 +23,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/spedfsched02/init.c b/testsuites/sptests/spedfsched02/init.c index aa2798c251..0e7f54dbf0 100644 --- a/testsuites/sptests/spedfsched02/init.c +++ b/testsuites/sptests/spedfsched02/init.c @@ -23,6 +23,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/spedfsched03/init.c b/testsuites/sptests/spedfsched03/init.c index 0c2425a37c..6163f9a43f 100644 --- a/testsuites/sptests/spedfsched03/init.c +++ b/testsuites/sptests/spedfsched03/init.c @@ -20,6 +20,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/spedfsched04/init.c b/testsuites/sptests/spedfsched04/init.c index bcaced994c..42b2b15cb6 100644 --- a/testsuites/sptests/spedfsched04/init.c +++ b/testsuites/sptests/spedfsched04/init.c @@ -30,6 +30,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <rtems/cpuuse.h> #include <tmacros.h> #include "test_support.h" diff --git a/testsuites/sptests/sperror01/init.c b/testsuites/sptests/sperror01/init.c index 1f64bc4649..4b0eb9f0a6 100644 --- a/testsuites/sptests/sperror01/init.c +++ b/testsuites/sptests/sperror01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define TESTS_USE_PRINTK #include <tmacros.h> diff --git a/testsuites/sptests/sperror02/init.c b/testsuites/sptests/sperror02/init.c index 717deabeab..bb82b1d069 100644 --- a/testsuites/sptests/sperror02/init.c +++ b/testsuites/sptests/sperror02/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define TESTS_USE_PRINTK #include <tmacros.h> diff --git a/testsuites/sptests/sperror03/init.c b/testsuites/sptests/sperror03/init.c index 9d80fe5f0e..4e5a311132 100644 --- a/testsuites/sptests/sperror03/init.c +++ b/testsuites/sptests/sperror03/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define TESTS_USE_PRINTK #include "tmacros.h" #include "test_support.h" diff --git a/testsuites/sptests/spevent_err03/init.c b/testsuites/sptests/spevent_err03/init.c index b13960e16d..1a1d33d0f4 100644 --- a/testsuites/sptests/spevent_err03/init.c +++ b/testsuites/sptests/spevent_err03/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/speventsystem01/init.c b/testsuites/sptests/speventsystem01/init.c index 7fb2429bc2..6a02b85384 100644 --- a/testsuites/sptests/speventsystem01/init.c +++ b/testsuites/sptests/speventsystem01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <rtems.h> #include "tmacros.h" diff --git a/testsuites/sptests/speventtransient01/init.c b/testsuites/sptests/speventtransient01/init.c index 91d6ecfc18..1473ea67c9 100644 --- a/testsuites/sptests/speventtransient01/init.c +++ b/testsuites/sptests/speventtransient01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <rtems.h> #include "tmacros.h" diff --git a/testsuites/sptests/spextensions01/init.c b/testsuites/sptests/spextensions01/init.c index cf02855f89..e94419f9e9 100644 --- a/testsuites/sptests/spextensions01/init.c +++ b/testsuites/sptests/spextensions01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #define TESTS_USE_PRINTK #include "tmacros.h" diff --git a/testsuites/sptests/spfatal26/init.c b/testsuites/sptests/spfatal26/init.c index 7d204389b8..ebfdb0bce9 100644 --- a/testsuites/sptests/spfatal26/init.c +++ b/testsuites/sptests/spfatal26/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #define TESTS_USE_PRINTK #include "tmacros.h" diff --git a/testsuites/sptests/spfatal30/init.c b/testsuites/sptests/spfatal30/init.c index 1c4e1cb1c8..d6b87da223 100644 --- a/testsuites/sptests/spfatal30/init.c +++ b/testsuites/sptests/spfatal30/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #define TESTS_USE_PRINTK #include "tmacros.h" diff --git a/testsuites/sptests/spfatal31/init.c b/testsuites/sptests/spfatal31/init.c index 0f147783df..e276205e20 100644 --- a/testsuites/sptests/spfatal31/init.c +++ b/testsuites/sptests/spfatal31/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #define TESTS_USE_PRINTK #include "tmacros.h" diff --git a/testsuites/sptests/spfatal_support/init.c b/testsuites/sptests/spfatal_support/init.c index f9b2ed37c1..b6de0d6401 100644 --- a/testsuites/sptests/spfatal_support/init.c +++ b/testsuites/sptests/spfatal_support/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/spfifo01/init.c b/testsuites/sptests/spfifo01/init.c index 0e0f67815b..3c8dc480ee 100644 --- a/testsuites/sptests/spfifo01/init.c +++ b/testsuites/sptests/spfifo01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <sys/stat.h> #include <stdio.h> #include <fcntl.h> diff --git a/testsuites/sptests/spfifo02/init.c b/testsuites/sptests/spfifo02/init.c index 64724016a3..671e6ff5fe 100644 --- a/testsuites/sptests/spfifo02/init.c +++ b/testsuites/sptests/spfifo02/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include "test_support.h" diff --git a/testsuites/sptests/spfifo03/init.c b/testsuites/sptests/spfifo03/init.c index 5aa48004ec..7d940951dd 100644 --- a/testsuites/sptests/spfifo03/init.c +++ b/testsuites/sptests/spfifo03/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <bsp.h> #include <tmacros.h> #include <stdio.h> diff --git a/testsuites/sptests/spfifo04/init.c b/testsuites/sptests/spfifo04/init.c index 157b45c786..b7966d12f1 100644 --- a/testsuites/sptests/spfifo04/init.c +++ b/testsuites/sptests/spfifo04/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <bsp.h> #include <tmacros.h> #include <stdio.h> diff --git a/testsuites/sptests/spfifo05/init.c b/testsuites/sptests/spfifo05/init.c index ab3ed66f96..522a45b428 100644 --- a/testsuites/sptests/spfifo05/init.c +++ b/testsuites/sptests/spfifo05/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <bsp.h> #include <tmacros.h> #include <stdio.h> diff --git a/testsuites/sptests/spfreechain01/init.c b/testsuites/sptests/spfreechain01/init.c index 6efcd93762..e741a9b058 100644 --- a/testsuites/sptests/spfreechain01/init.c +++ b/testsuites/sptests/spfreechain01/init.c @@ -10,6 +10,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include <rtems/score/chainimpl.h> #include <rtems/score/freechain.h> diff --git a/testsuites/sptests/spheapprot/init.c b/testsuites/sptests/spheapprot/init.c index 114abebc20..d17bb9a105 100644 --- a/testsuites/sptests/spheapprot/init.c +++ b/testsuites/sptests/spheapprot/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <stdio.h> #include <stdlib.h> #include <assert.h> diff --git a/testsuites/sptests/spinternalerror01/init.c b/testsuites/sptests/spinternalerror01/init.c index 21e42e358b..5dc587aaff 100644 --- a/testsuites/sptests/spinternalerror01/init.c +++ b/testsuites/sptests/spinternalerror01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #define TESTS_USE_PRINTK #include "tmacros.h" diff --git a/testsuites/sptests/spinternalerror02/init.c b/testsuites/sptests/spinternalerror02/init.c index 2ed4c955d8..b1a34680a4 100644 --- a/testsuites/sptests/spinternalerror02/init.c +++ b/testsuites/sptests/spinternalerror02/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include <rtems.h> diff --git a/testsuites/sptests/spintr_err01/init.c b/testsuites/sptests/spintr_err01/init.c index 9bc39bf4dc..afc195e7ed 100644 --- a/testsuites/sptests/spintr_err01/init.c +++ b/testsuites/sptests/spintr_err01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/spintrcritical01/init.c b/testsuites/sptests/spintrcritical01/init.c index b7cfee42f8..255f827484 100644 --- a/testsuites/sptests/spintrcritical01/init.c +++ b/testsuites/sptests/spintrcritical01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include <intrcritical.h> diff --git a/testsuites/sptests/spintrcritical06/init.c b/testsuites/sptests/spintrcritical06/init.c index 423e4b5fa7..9015810a35 100644 --- a/testsuites/sptests/spintrcritical06/init.c +++ b/testsuites/sptests/spintrcritical06/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include <intrcritical.h> diff --git a/testsuites/sptests/spintrcritical08/init.c b/testsuites/sptests/spintrcritical08/init.c index 1a7ed2d2e5..efe30c2c9e 100644 --- a/testsuites/sptests/spintrcritical08/init.c +++ b/testsuites/sptests/spintrcritical08/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include <intrcritical.h> #include <rtems/score/watchdogimpl.h> diff --git a/testsuites/sptests/spintrcritical09/init.c b/testsuites/sptests/spintrcritical09/init.c index 87c1c1aab3..bb495f6073 100644 --- a/testsuites/sptests/spintrcritical09/init.c +++ b/testsuites/sptests/spintrcritical09/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include <intrcritical.h> diff --git a/testsuites/sptests/spintrcritical10/init.c b/testsuites/sptests/spintrcritical10/init.c index f7e372a46b..b22b93849a 100644 --- a/testsuites/sptests/spintrcritical10/init.c +++ b/testsuites/sptests/spintrcritical10/init.c @@ -13,6 +13,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include <intrcritical.h> diff --git a/testsuites/sptests/spintrcritical11/init.c b/testsuites/sptests/spintrcritical11/init.c index 2a3f83a315..ee37bacfe7 100644 --- a/testsuites/sptests/spintrcritical11/init.c +++ b/testsuites/sptests/spintrcritical11/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include <intrcritical.h> diff --git a/testsuites/sptests/spintrcritical13/init.c b/testsuites/sptests/spintrcritical13/init.c index 7069938191..cd278542df 100644 --- a/testsuites/sptests/spintrcritical13/init.c +++ b/testsuites/sptests/spintrcritical13/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include <intrcritical.h> diff --git a/testsuites/sptests/spintrcritical15/init.c b/testsuites/sptests/spintrcritical15/init.c index 72e4832769..5c8e46ff0a 100644 --- a/testsuites/sptests/spintrcritical15/init.c +++ b/testsuites/sptests/spintrcritical15/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include <intrcritical.h> diff --git a/testsuites/sptests/spintrcritical16/init.c b/testsuites/sptests/spintrcritical16/init.c index 3657c0607f..c34828ac45 100644 --- a/testsuites/sptests/spintrcritical16/init.c +++ b/testsuites/sptests/spintrcritical16/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include <intrcritical.h> diff --git a/testsuites/sptests/spintrcritical18/init.c b/testsuites/sptests/spintrcritical18/init.c index f621d21280..fa2ee6c120 100644 --- a/testsuites/sptests/spintrcritical18/init.c +++ b/testsuites/sptests/spintrcritical18/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include <intrcritical.h> diff --git a/testsuites/sptests/spintrcritical20/init.c b/testsuites/sptests/spintrcritical20/init.c index 1697df426a..8c1f3760ac 100644 --- a/testsuites/sptests/spintrcritical20/init.c +++ b/testsuites/sptests/spintrcritical20/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include <intrcritical.h> #include <rtems/score/threadimpl.h> diff --git a/testsuites/sptests/spintrcritical21/init.c b/testsuites/sptests/spintrcritical21/init.c index faa48f717c..d5cf8e1aab 100644 --- a/testsuites/sptests/spintrcritical21/init.c +++ b/testsuites/sptests/spintrcritical21/init.c @@ -13,6 +13,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/spintrcritical22/init.c b/testsuites/sptests/spintrcritical22/init.c index 7412bdef7e..c95929e2e8 100644 --- a/testsuites/sptests/spintrcritical22/init.c +++ b/testsuites/sptests/spintrcritical22/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include <intrcritical.h> #include <rtems/rtems/semimpl.h> diff --git a/testsuites/sptests/spintrcritical23/init.c b/testsuites/sptests/spintrcritical23/init.c index f71de71099..019446d029 100644 --- a/testsuites/sptests/spintrcritical23/init.c +++ b/testsuites/sptests/spintrcritical23/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include <intrcritical.h> diff --git a/testsuites/sptests/spintrcritical24/init.c b/testsuites/sptests/spintrcritical24/init.c index 8f60c1ce70..6303f9e91c 100644 --- a/testsuites/sptests/spintrcritical24/init.c +++ b/testsuites/sptests/spintrcritical24/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <sys/stat.h> #include <fcntl.h> #include <unistd.h> diff --git a/testsuites/sptests/splinkersets01/init.c b/testsuites/sptests/splinkersets01/init.c index 4e19c6e846..90d44d6afb 100644 --- a/testsuites/sptests/splinkersets01/init.c +++ b/testsuites/sptests/splinkersets01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include "splinkersets01.h" diff --git a/testsuites/sptests/spmkdir/init.c b/testsuites/sptests/spmkdir/init.c index 6b016e3f1c..debe9881ef 100644 --- a/testsuites/sptests/spmkdir/init.c +++ b/testsuites/sptests/spmkdir/init.c @@ -23,6 +23,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <sys/stat.h> #include <errno.h> #include <fcntl.h> diff --git a/testsuites/sptests/spmountmgr01/init.c b/testsuites/sptests/spmountmgr01/init.c index 2330ca82ba..798838ecba 100644 --- a/testsuites/sptests/spmountmgr01/init.c +++ b/testsuites/sptests/spmountmgr01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include "test_support.h" #include <errno.h> diff --git a/testsuites/sptests/spmrsp01/init.c b/testsuites/sptests/spmrsp01/init.c index bf144a9775..2c01c2c91e 100644 --- a/testsuites/sptests/spmrsp01/init.c +++ b/testsuites/sptests/spmrsp01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <rtems.h> #include <rtems/libcsupport.h> diff --git a/testsuites/sptests/spmsgq_err01/init.c b/testsuites/sptests/spmsgq_err01/init.c index 24537725dc..80a0c54f7a 100644 --- a/testsuites/sptests/spmsgq_err01/init.c +++ b/testsuites/sptests/spmsgq_err01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" #define MESSAGE_SIZE (sizeof(long) * 4) diff --git a/testsuites/sptests/spmsgq_err02/init.c b/testsuites/sptests/spmsgq_err02/init.c index 2ed5057007..e64660ebe2 100644 --- a/testsuites/sptests/spmsgq_err02/init.c +++ b/testsuites/sptests/spmsgq_err02/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/spmutex01/init.c b/testsuites/sptests/spmutex01/init.c index b9d4a05f73..fd490e47b0 100644 --- a/testsuites/sptests/spmutex01/init.c +++ b/testsuites/sptests/spmutex01/init.c @@ -27,6 +27,8 @@ #include <pthread.h> #endif +#define TEST_INIT + #include "tmacros.h" const char rtems_test_name[] = "SPMUTEX 1"; diff --git a/testsuites/sptests/spnsext01/init.c b/testsuites/sptests/spnsext01/init.c index 1a10736611..4ff2067592 100644 --- a/testsuites/sptests/spnsext01/init.c +++ b/testsuites/sptests/spnsext01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> const char rtems_test_name[] = "SPNSEXT 1"; diff --git a/testsuites/sptests/spobjgetnext/init.c b/testsuites/sptests/spobjgetnext/init.c index 620185c1f3..25ea1145e6 100644 --- a/testsuites/sptests/spobjgetnext/init.c +++ b/testsuites/sptests/spobjgetnext/init.c @@ -13,6 +13,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/sppagesize/init.c b/testsuites/sptests/sppagesize/init.c index 04d735b84b..010c1c4a5d 100644 --- a/testsuites/sptests/sppagesize/init.c +++ b/testsuites/sptests/sppagesize/init.c @@ -10,6 +10,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include <rtems.h> #include <limits.h> diff --git a/testsuites/sptests/sppartition_err01/init.c b/testsuites/sptests/sppartition_err01/init.c index 39ee700daa..f53ebd2955 100644 --- a/testsuites/sptests/sppartition_err01/init.c +++ b/testsuites/sptests/sppartition_err01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/spport_err01/init.c b/testsuites/sptests/spport_err01/init.c index 20e66737b9..a6c95fca7d 100644 --- a/testsuites/sptests/spport_err01/init.c +++ b/testsuites/sptests/spport_err01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/spprintk/init.c b/testsuites/sptests/spprintk/init.c index 0f5c2a7e24..3d9b00149f 100644 --- a/testsuites/sptests/spprintk/init.c +++ b/testsuites/sptests/spprintk/init.c @@ -22,6 +22,8 @@ #undef RTEMS_PRINTFLIKE #define RTEMS_PRINTFLIKE(_a, _b) +#define TEST_INIT + #define TESTS_USE_PRINTK #include <tmacros.h> diff --git a/testsuites/sptests/spprivenv01/init.c b/testsuites/sptests/spprivenv01/init.c index 88cf5e07af..509d05ff19 100644 --- a/testsuites/sptests/spprivenv01/init.c +++ b/testsuites/sptests/spprivenv01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include "test_support.h" #include <rtems/libio_.h> diff --git a/testsuites/sptests/spprofiling01/init.c b/testsuites/sptests/spprofiling01/init.c index 60f6bd50ed..5e7e7411d3 100644 --- a/testsuites/sptests/spprofiling01/init.c +++ b/testsuites/sptests/spprofiling01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <rtems/profiling.h> #include <rtems/bspIo.h> #include <rtems.h> diff --git a/testsuites/sptests/spqreslib/init.c b/testsuites/sptests/spqreslib/init.c index d00b623043..2db540c9bc 100644 --- a/testsuites/sptests/spqreslib/init.c +++ b/testsuites/sptests/spqreslib/init.c @@ -16,6 +16,8 @@ * http://www.rtems.org/license/LICENSE. */ +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/spratemon_err01/init.c b/testsuites/sptests/spratemon_err01/init.c index ccc2361295..92bf1f70b9 100644 --- a/testsuites/sptests/spratemon_err01/init.c +++ b/testsuites/sptests/spratemon_err01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/sprbtree01/init.c b/testsuites/sptests/sprbtree01/init.c index 746b36ee3a..6cb6ea0fdf 100644 --- a/testsuites/sptests/sprbtree01/init.c +++ b/testsuites/sptests/sprbtree01/init.c @@ -10,6 +10,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include <rtems/rbtree.h> #include <rtems/score/rbtreeimpl.h> diff --git a/testsuites/sptests/spregion_err01/init.c b/testsuites/sptests/spregion_err01/init.c index 6dd8db63cf..27fc3266a9 100644 --- a/testsuites/sptests/spregion_err01/init.c +++ b/testsuites/sptests/spregion_err01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/sprmsched01/init.c b/testsuites/sptests/sprmsched01/init.c index f806605ec8..2bdc44db6c 100644 --- a/testsuites/sptests/sprmsched01/init.c +++ b/testsuites/sptests/sprmsched01/init.c @@ -31,6 +31,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <rtems/cpuuse.h> #include <tmacros.h> #include "test_support.h" diff --git a/testsuites/sptests/sprmsched02/init.c b/testsuites/sptests/sprmsched02/init.c index 4ee58ab5ec..235e91636b 100644 --- a/testsuites/sptests/sprmsched02/init.c +++ b/testsuites/sptests/sprmsched02/init.c @@ -10,6 +10,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <rtems/cpuuse.h> #include <tmacros.h> #include <rtems/rtems/ratemonimpl.h> diff --git a/testsuites/sptests/spscheduler01/init.c b/testsuites/sptests/spscheduler01/init.c index 9840a3ebc4..0fc1a891fe 100644 --- a/testsuites/sptests/spscheduler01/init.c +++ b/testsuites/sptests/spscheduler01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <rtems.h> #include <rtems/libcsupport.h> diff --git a/testsuites/sptests/spsem01/init.c b/testsuites/sptests/spsem01/init.c index 924f4c052d..e0a7b93db4 100644 --- a/testsuites/sptests/spsem01/init.c +++ b/testsuites/sptests/spsem01/init.c @@ -6,6 +6,8 @@ * http://www.rtems.org/license/LICENSE. */ +#define TEST_INIT + #include <rtems.h> #include <stdio.h> diff --git a/testsuites/sptests/spsem02/init.c b/testsuites/sptests/spsem02/init.c index d5fb47b255..f41f1ef74a 100644 --- a/testsuites/sptests/spsem02/init.c +++ b/testsuites/sptests/spsem02/init.c @@ -6,6 +6,8 @@ * http://www.rtems.org/license/LICENSE. */ +#define TEST_INIT + #include <rtems.h> #include <stdio.h> diff --git a/testsuites/sptests/spsem03/init.c b/testsuites/sptests/spsem03/init.c index 859f996629..90f116ee43 100644 --- a/testsuites/sptests/spsem03/init.c +++ b/testsuites/sptests/spsem03/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" const char rtems_test_name[] = "SPSEM 3"; diff --git a/testsuites/sptests/spsem_err01/init.c b/testsuites/sptests/spsem_err01/init.c index 39a366b41a..a1ed0e851f 100644 --- a/testsuites/sptests/spsem_err01/init.c +++ b/testsuites/sptests/spsem_err01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/spsem_err02/init.c b/testsuites/sptests/spsem_err02/init.c index 4c0acb9039..48894dd5d8 100644 --- a/testsuites/sptests/spsem_err02/init.c +++ b/testsuites/sptests/spsem_err02/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/spsignal_err01/init.c b/testsuites/sptests/spsignal_err01/init.c index 6f8cd3ef60..6a8e6d0692 100644 --- a/testsuites/sptests/spsignal_err01/init.c +++ b/testsuites/sptests/spsignal_err01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/spsimplesched01/init.c b/testsuites/sptests/spsimplesched01/init.c index 6bac9c367a..87d801097c 100644 --- a/testsuites/sptests/spsimplesched01/init.c +++ b/testsuites/sptests/spsimplesched01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> const char rtems_test_name[] = "SPSIMPLESCHED 1"; diff --git a/testsuites/sptests/spsimplesched02/init.c b/testsuites/sptests/spsimplesched02/init.c index 884a3abf6f..4e78ab5eb7 100644 --- a/testsuites/sptests/spsimplesched02/init.c +++ b/testsuites/sptests/spsimplesched02/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include <rtems/score/threadimpl.h> diff --git a/testsuites/sptests/spsimplesched03/init.c b/testsuites/sptests/spsimplesched03/init.c index 2f352af88b..e0773647dc 100644 --- a/testsuites/sptests/spsimplesched03/init.c +++ b/testsuites/sptests/spsimplesched03/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> const char rtems_test_name[] = "SPSIMPLESCHED 3"; diff --git a/testsuites/sptests/spsize/init.c b/testsuites/sptests/spsize/init.c index c26ba06c70..569594ce6d 100644 --- a/testsuites/sptests/spsize/init.c +++ b/testsuites/sptests/spsize/init.c @@ -23,6 +23,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/spstdthreads01/init.c b/testsuites/sptests/spstdthreads01/init.c index 4a9953cf8a..9f147daca6 100644 --- a/testsuites/sptests/spstdthreads01/init.c +++ b/testsuites/sptests/spstdthreads01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include <threads.h> diff --git a/testsuites/sptests/spstkalloc/init.c b/testsuites/sptests/spstkalloc/init.c index 4a26fdb9a6..9df45095f1 100644 --- a/testsuites/sptests/spstkalloc/init.c +++ b/testsuites/sptests/spstkalloc/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> const char rtems_test_name[] = "SPSTKALLOC"; diff --git a/testsuites/sptests/spstkalloc02/init.c b/testsuites/sptests/spstkalloc02/init.c index ae78b41480..cd818f2020 100644 --- a/testsuites/sptests/spstkalloc02/init.c +++ b/testsuites/sptests/spstkalloc02/init.c @@ -24,6 +24,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> const char rtems_test_name[] = "SPSTKALLOC 2"; diff --git a/testsuites/sptests/spsysinit01/init.c b/testsuites/sptests/spsysinit01/init.c index f3e0e3f6a5..80b5065c06 100644 --- a/testsuites/sptests/spsysinit01/init.c +++ b/testsuites/sptests/spsysinit01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #define TESTS_USE_PRINTK #include "tmacros.h" diff --git a/testsuites/sptests/spsyslock01/init.c b/testsuites/sptests/spsyslock01/init.c index 815579a0d9..63d18dca1e 100644 --- a/testsuites/sptests/spsyslock01/init.c +++ b/testsuites/sptests/spsyslock01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include <sys/lock.h> diff --git a/testsuites/sptests/sptask_err01/init.c b/testsuites/sptests/sptask_err01/init.c index b57e751aa6..52e601017a 100644 --- a/testsuites/sptests/sptask_err01/init.c +++ b/testsuites/sptests/sptask_err01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/sptask_err02/init.c b/testsuites/sptests/sptask_err02/init.c index dfdaf396d0..84687928ae 100644 --- a/testsuites/sptests/sptask_err02/init.c +++ b/testsuites/sptests/sptask_err02/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/sptask_err03/init.c b/testsuites/sptests/sptask_err03/init.c index d28a601418..203bb1da4c 100644 --- a/testsuites/sptests/sptask_err03/init.c +++ b/testsuites/sptests/sptask_err03/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/sptask_err04/init.c b/testsuites/sptests/sptask_err04/init.c index c9af611d27..a9e4ef766d 100644 --- a/testsuites/sptests/sptask_err04/init.c +++ b/testsuites/sptests/sptask_err04/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/sptasknopreempt01/init.c b/testsuites/sptests/sptasknopreempt01/init.c index 4bd49b1d82..159e21bc0e 100644 --- a/testsuites/sptests/sptasknopreempt01/init.c +++ b/testsuites/sptests/sptasknopreempt01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" const char rtems_test_name[] = "SPTASKNOPREEMPT 1"; diff --git a/testsuites/sptests/spthreadlife01/init.c b/testsuites/sptests/spthreadlife01/init.c index 8bf26b9b72..04712c9f45 100644 --- a/testsuites/sptests/spthreadlife01/init.c +++ b/testsuites/sptests/spthreadlife01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <rtems.h> #include <rtems/libcsupport.h> diff --git a/testsuites/sptests/spthreadq01/init.c b/testsuites/sptests/spthreadq01/init.c index 0b307542cf..13fb36c76f 100644 --- a/testsuites/sptests/spthreadq01/init.c +++ b/testsuites/sptests/spthreadq01/init.c @@ -13,6 +13,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include <rtems.h> diff --git a/testsuites/sptests/sptimecounter01/init.c b/testsuites/sptests/sptimecounter01/init.c index 179590d538..d5e7e7a73c 100644 --- a/testsuites/sptests/sptimecounter01/init.c +++ b/testsuites/sptests/sptimecounter01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #define TESTS_USE_PRINTK #include "tmacros.h" diff --git a/testsuites/sptests/sptimecounter02/init.c b/testsuites/sptests/sptimecounter02/init.c index 4f8de6a034..3d24ff4a2e 100644 --- a/testsuites/sptests/sptimecounter02/init.c +++ b/testsuites/sptests/sptimecounter02/init.c @@ -20,6 +20,8 @@ #define _KERNEL +#define TEST_INIT + #include <sys/time.h> #include <sys/timetc.h> diff --git a/testsuites/sptests/sptimecounter03/init.c b/testsuites/sptests/sptimecounter03/init.c index 3b57d95a12..d6303ba62f 100644 --- a/testsuites/sptests/sptimecounter03/init.c +++ b/testsuites/sptests/sptimecounter03/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <rtems/test.h> #include <rtems/bsd.h> diff --git a/testsuites/sptests/sptimecounter04/init.c b/testsuites/sptests/sptimecounter04/init.c index 72f2a138d5..481f556520 100644 --- a/testsuites/sptests/sptimecounter04/init.c +++ b/testsuites/sptests/sptimecounter04/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <time.h> #include <rtems.h> #include <rtems/test.h> diff --git a/testsuites/sptests/sptimer_err01/init.c b/testsuites/sptests/sptimer_err01/init.c index 35a6d7a1dd..1350bc9df3 100644 --- a/testsuites/sptests/sptimer_err01/init.c +++ b/testsuites/sptests/sptimer_err01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include "test_support.h" diff --git a/testsuites/sptests/sptimer_err02/init.c b/testsuites/sptests/sptimer_err02/init.c index ad25a16926..a385ab98fd 100644 --- a/testsuites/sptests/sptimer_err02/init.c +++ b/testsuites/sptests/sptimer_err02/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include "test_support.h" diff --git a/testsuites/sptests/sptimerserver01/init.c b/testsuites/sptests/sptimerserver01/init.c index 88f1fb3cf3..0690012f01 100644 --- a/testsuites/sptests/sptimerserver01/init.c +++ b/testsuites/sptests/sptimerserver01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" const char rtems_test_name[] = "SPTIMERSERVER 1"; diff --git a/testsuites/sptests/sptimespec01/init.c b/testsuites/sptests/sptimespec01/init.c index 945bd217ed..7115b8babb 100644 --- a/testsuites/sptests/sptimespec01/init.c +++ b/testsuites/sptests/sptimespec01/init.c @@ -10,6 +10,8 @@ * http://www.rtems.org/license/LICENSE. */ +#define TEST_INIT + #include <tmacros.h> #include "test_support.h" #include <rtems/timespec.h> diff --git a/testsuites/sptests/sptls01/init.c b/testsuites/sptests/sptls01/init.c index ba662aa832..9bbf97693d 100644 --- a/testsuites/sptests/sptls01/init.c +++ b/testsuites/sptests/sptls01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <stdio.h> #include "tmacros.h" diff --git a/testsuites/sptests/sptls02/init.cc b/testsuites/sptests/sptls02/init.cc index 86e3158dc9..fbdf53ec70 100644 --- a/testsuites/sptests/sptls02/init.cc +++ b/testsuites/sptests/sptls02/init.cc @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <stdio.h> #include <stdlib.h> diff --git a/testsuites/sptests/sptls03/init.c b/testsuites/sptests/sptls03/init.c index 1487595981..71f2bea799 100644 --- a/testsuites/sptests/sptls03/init.c +++ b/testsuites/sptests/sptls03/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <rtems/score/thread.h> #include "tmacros.h" diff --git a/testsuites/sptests/spwatchdog/init.c b/testsuites/sptests/spwatchdog/init.c index 3b08fb57e5..6e5e155a00 100644 --- a/testsuites/sptests/spwatchdog/init.c +++ b/testsuites/sptests/spwatchdog/init.c @@ -19,6 +19,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/sptests/spwkspace/init.c b/testsuites/sptests/spwkspace/init.c index 5131ebc189..8386daad2d 100644 --- a/testsuites/sptests/spwkspace/init.c +++ b/testsuites/sptests/spwkspace/init.c @@ -13,6 +13,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <tmacros.h> #include <string.h> diff --git a/testsuites/support/include/buffer_test_io.h b/testsuites/support/include/buffer_test_io.h index 464d578171..dff312d132 100644 --- a/testsuites/support/include/buffer_test_io.h +++ b/testsuites/support/include/buffer_test_io.h @@ -13,14 +13,6 @@ extern "C" { #endif /* - * Uncomment this to get buffered test output. When commented out, - * test output behaves as it always has and is printed using stdio. - */ - -/* #define TESTS_BUFFER_OUTPUT */ -/* #define TESTS_USE_PRINTK */ - -/* * Test states. No state string is an expected pass. */ #if (TEST_STATE_EXPECTED_FAIL && TEST_STATE_USER_INPUT) || \ @@ -78,46 +70,62 @@ extern "C" { } while (0) #if defined(TEST_STATE_STRING) - #define TEST_BEGIN() printk(TEST_BEGIN_STRING); printk(TEST_STATE_STRING); + #define TEST_BEGIN() \ + do { \ + printk("\n"); \ + printk(TEST_BEGIN_STRING); \ + printk(TEST_STATE_STRING); \ + } while (0) #else - #define TEST_BEGIN() printk(TEST_BEGIN_STRING) + #define TEST_BEGIN() \ + do { \ + printk("\n"); \ + printk(TEST_BEGIN_STRING); \ + } while (0) #endif - #define TEST_END() printk(TEST_END_STRING) + #define TEST_END() \ + do { \ + printk( "\n" ); \ + printk(TEST_END_STRING); \ + printk( "\n" ); \ + } while (0) /* * BUFFER TEST OUTPUT */ -#elif defined(TESTS_BUFFER_OUTPUT) +#else #include <stdio.h> #include <stdlib.h> + #define TEST_PRINT__FORMAT(_fmtpos, _appos) \ + __attribute__((__format__(__printf__, _fmtpos, _appos))) + #define _TEST_OUTPUT_BUFFER_SIZE 2048 + extern char _test_output_buffer[_TEST_OUTPUT_BUFFER_SIZE]; - void _test_output_append(char *); + + void _test_output_printf(const char *, ...) TEST_PRINT__FORMAT(1, 2); + void _test_output_append(const char *); void _test_output_flush(void); #define rtems_test_exit(_s) \ do { \ + fflush(stdout); \ + fflush(stderr); \ _test_output_flush(); \ exit(_s); \ } while (0) #undef printf - #define printf(...) \ - do { \ - char _buffer[128]; \ - sprintf( _buffer, __VA_ARGS__); \ - _test_output_append( _buffer ); \ - } while (0) + #define printf(...) _test_output_printf( __VA_ARGS__ ) #undef puts #define puts(_string) \ do { \ - char _buffer[128]; \ - sprintf( _buffer, "%s\n", _string ); \ - _test_output_append( _buffer ); \ + _test_output_append( _string ); \ + _test_output_append( "\n" ); \ } while (0) #undef putchar @@ -132,132 +140,78 @@ extern "C" { /* we write to stderr when there is a pause() */ #define FLUSH_OUTPUT() _test_output_flush() - #if defined(TEST_INIT) || defined(CONFIGURE_INIT) + #if defined(TEST_STATE_STRING) + #define TEST_BEGIN() \ + do { \ + _test_output_append( "\n" ); \ + _test_output_printf(TEST_BEGIN_STRING); \ + _test_output_append(TEST_STATE_STRING); \ + _test_output_append( "\n" ); \ + } while (0) + #else + #define TEST_BEGIN() \ + do { \ + _test_output_append( "\n" ); \ + _test_output_printf(TEST_BEGIN_STRING); \ + _test_output_append( "\n" ); \ + } while (0) + #endif + + #define TEST_END() \ + do { \ + _test_output_append( "\n" ); \ + _test_output_printf(TEST_END_STRING); \ + _test_output_append( "\n" ); \ + } while (0) + + /* + * Inline the tests this way because adding the code to the support directory + * requires all the makefile files to changed. + */ + #if defined(TEST_INIT) char _test_output_buffer[_TEST_OUTPUT_BUFFER_SIZE]; int _test_output_buffer_index = 0; - void _test_output_append(char *_buffer) + void _test_output_printf(const char* format, ...) { - char *p; - - for ( p=_buffer ; *p ; p++ ) { - _test_output_buffer[_test_output_buffer_index++] = *p; - _test_output_buffer[_test_output_buffer_index] = '\0'; - #if 0 - if ( *p == '\n' ) { - fprintf( stderr, "BUFFER -- %s", _test_output_buffer ); - _test_output_buffer_index = 0; - _test_output_buffer[0] = '\0'; - } - #endif - if ( _test_output_buffer_index >= (_TEST_OUTPUT_BUFFER_SIZE - 80) ) - _test_output_flush(); - } + va_list args; + char* in; + size_t size; + bool lf; + va_start(args, format); + in = _test_output_buffer + _test_output_buffer_index; + size = vsniprintf(in, + _TEST_OUTPUT_BUFFER_SIZE - _test_output_buffer_index, + format, args); + lf = memchr(in, '\n', size); + _test_output_buffer_index += size; + if ( lf || _test_output_buffer_index >= (_TEST_OUTPUT_BUFFER_SIZE - 80) ) + _test_output_flush(); + va_end(args); } - #include <termios.h> - #include <unistd.h> + void _test_output_append(const char *_buffer) + { + char* in; + size_t size; + bool lf; + in = _test_output_buffer + _test_output_buffer_index; + size = strlcpy(in, _buffer, _TEST_OUTPUT_BUFFER_SIZE - _test_output_buffer_index); + lf = memchr(in, '\n', size); + if ( lf || _test_output_buffer_index >= (_TEST_OUTPUT_BUFFER_SIZE - 80) ) + _test_output_flush(); + } void _test_output_flush(void) { - fprintf( stderr, "%s", _test_output_buffer ); + printk( _test_output_buffer ); _test_output_buffer_index = 0; - tcdrain( 2 ); + _test_output_buffer[0] = '\0'; } - #endif - -#elif defined(TESTS_USE_PRINTF) - - #include <stdio.h> - #include <stdlib.h> - - #define rtems_test_exit(_s) \ - do { \ - exit(_s); \ - } while (0) - - #define FLUSH_OUTPUT() \ - do { \ - fflush(stdout); \ - } while (0) - - #if defined(TEST_STATE_STRING) - #define TEST_BEGIN() printf(TEST_BEGIN_STRING); printf(TEST_STATE_STRING) - #else - #define TEST_BEGIN() printf(TEST_BEGIN_STRING) #endif - #define TEST_END() printf(TEST_END_STRING) - -/* - * USE IPRINT - */ -#else - - #include <stdio.h> - #include <stdlib.h> - - /* do not use iprintf if strict ansi mode */ - #if defined(_NEWLIB_VERSION) && !defined(__STRICT_ANSI__) - #define asprintf asiprintf - #define asnprintf asniprintf - #define dprintf diprintf - #define fprintf fiprintf - #define sprintf siprintf - #define snprintf sniprintf - #define vasprintf vasiprintf - #define vasnprintf vasniprintf - #define vdprintf vdiprintf - #define vfprintf vfiprintf - #define vprintf viprintf - #define vsprintf vsiprintf - #define vsnprintf vsniprintf - - #undef printf - #define printf(...) \ - do { \ - fiprintf( stderr, __VA_ARGS__ ); \ - } while (0) - #else - #undef printf - #define printf(...) \ - do { \ - fprintf( stderr, __VA_ARGS__ ); \ - } while (0) - #endif - - #undef puts - #define puts(_s) \ - do { \ - printf( "%s\n", _s ); \ - } while (0) - - #undef putchar - #define putchar(_c) \ - do { \ - printf( "%c", _c ); \ - } while (0) - - #define rtems_test_exit(_s) \ - do { \ - exit(_s); \ - } while (0) - - #define FLUSH_OUTPUT() \ - do { \ - fflush(stdout); \ - } while (0) - - #if defined(TEST_STATE_STRING) - #define TEST_BEGIN() fiprintf(stderr, TEST_BEGIN_STRING); fiprintf(stderr, TEST_STATE_STRING) - #else - #define TEST_BEGIN() fiprintf(stderr, TEST_BEGIN_STRING) - #endif - - #define TEST_END() fiprintf( stderr, TEST_END_STRING) - #endif #ifdef __cplusplus diff --git a/testsuites/support/include/tmacros.h b/testsuites/support/include/tmacros.h index 2b267ca519..e0418663b5 100644 --- a/testsuites/support/include/tmacros.h +++ b/testsuites/support/include/tmacros.h @@ -37,7 +37,7 @@ extern "C" { #define FOREVER 1 /* infinite loop */ -#ifdef CONFIGURE_INIT +#ifdef TEST_INIT #define TEST_EXTERN #else #define TEST_EXTERN extern diff --git a/testsuites/tmtests/tm01/task1.c b/testsuites/tmtests/tm01/task1.c index 98f9f053f2..84aa206a0d 100644 --- a/testsuites/tmtests/tm01/task1.c +++ b/testsuites/tmtests/tm01/task1.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/tmtests/tm02/task1.c b/testsuites/tmtests/tm02/task1.c index b3761502be..827baba99f 100644 --- a/testsuites/tmtests/tm02/task1.c +++ b/testsuites/tmtests/tm02/task1.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/tmtests/tm03/task1.c b/testsuites/tmtests/tm03/task1.c index 42126ac8a5..f364292e78 100644 --- a/testsuites/tmtests/tm03/task1.c +++ b/testsuites/tmtests/tm03/task1.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/tmtests/tm04/task1.c b/testsuites/tmtests/tm04/task1.c index 7be2afd7c1..8df101069e 100644 --- a/testsuites/tmtests/tm04/task1.c +++ b/testsuites/tmtests/tm04/task1.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/tmtests/tm05/task1.c b/testsuites/tmtests/tm05/task1.c index d1485e25bd..19b94e2742 100644 --- a/testsuites/tmtests/tm05/task1.c +++ b/testsuites/tmtests/tm05/task1.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/tmtests/tm06/task1.c b/testsuites/tmtests/tm06/task1.c index a784f9cfac..3f68d5f309 100644 --- a/testsuites/tmtests/tm06/task1.c +++ b/testsuites/tmtests/tm06/task1.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/tmtests/tm07/task1.c b/testsuites/tmtests/tm07/task1.c index a14f1a8f23..f79dfe55df 100644 --- a/testsuites/tmtests/tm07/task1.c +++ b/testsuites/tmtests/tm07/task1.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/tmtests/tm08/task1.c b/testsuites/tmtests/tm08/task1.c index a86322c61f..acf65d4cdb 100644 --- a/testsuites/tmtests/tm08/task1.c +++ b/testsuites/tmtests/tm08/task1.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/tmtests/tm09/task1.c b/testsuites/tmtests/tm09/task1.c index ff81571b5f..3d8ab1986d 100644 --- a/testsuites/tmtests/tm09/task1.c +++ b/testsuites/tmtests/tm09/task1.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/tmtests/tm10/task1.c b/testsuites/tmtests/tm10/task1.c index f7e4d27af4..42615ab6bb 100644 --- a/testsuites/tmtests/tm10/task1.c +++ b/testsuites/tmtests/tm10/task1.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/tmtests/tm11/task1.c b/testsuites/tmtests/tm11/task1.c index 01beb797e7..5ba13f7ae2 100644 --- a/testsuites/tmtests/tm11/task1.c +++ b/testsuites/tmtests/tm11/task1.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/tmtests/tm12/task1.c b/testsuites/tmtests/tm12/task1.c index dcd84c6216..ea499c56cd 100644 --- a/testsuites/tmtests/tm12/task1.c +++ b/testsuites/tmtests/tm12/task1.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/tmtests/tm13/task1.c b/testsuites/tmtests/tm13/task1.c index eac1b8bd7c..00a5a0eef7 100644 --- a/testsuites/tmtests/tm13/task1.c +++ b/testsuites/tmtests/tm13/task1.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/tmtests/tm14/task1.c b/testsuites/tmtests/tm14/task1.c index 8a7a5d7e59..69faff3248 100644 --- a/testsuites/tmtests/tm14/task1.c +++ b/testsuites/tmtests/tm14/task1.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/tmtests/tm15/task1.c b/testsuites/tmtests/tm15/task1.c index c3afd68e6c..d91f67d73b 100644 --- a/testsuites/tmtests/tm15/task1.c +++ b/testsuites/tmtests/tm15/task1.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/tmtests/tm16/task1.c b/testsuites/tmtests/tm16/task1.c index c4aa255564..0c63b26fc4 100644 --- a/testsuites/tmtests/tm16/task1.c +++ b/testsuites/tmtests/tm16/task1.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/tmtests/tm17/task1.c b/testsuites/tmtests/tm17/task1.c index 15c51a1f2b..123d165acf 100644 --- a/testsuites/tmtests/tm17/task1.c +++ b/testsuites/tmtests/tm17/task1.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/tmtests/tm18/task1.c b/testsuites/tmtests/tm18/task1.c index ca607f59f0..9267ff927e 100644 --- a/testsuites/tmtests/tm18/task1.c +++ b/testsuites/tmtests/tm18/task1.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/tmtests/tm19/task1.c b/testsuites/tmtests/tm19/task1.c index 8f07df17f5..cf909fb4ef 100644 --- a/testsuites/tmtests/tm19/task1.c +++ b/testsuites/tmtests/tm19/task1.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/tmtests/tm20/task1.c b/testsuites/tmtests/tm20/task1.c index ed9c204154..b30cb82fbf 100644 --- a/testsuites/tmtests/tm20/task1.c +++ b/testsuites/tmtests/tm20/task1.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/tmtests/tm21/task1.c b/testsuites/tmtests/tm21/task1.c index d7d6163d01..464ac4b45e 100644 --- a/testsuites/tmtests/tm21/task1.c +++ b/testsuites/tmtests/tm21/task1.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/tmtests/tm22/task1.c b/testsuites/tmtests/tm22/task1.c index eb4548648d..999963a343 100644 --- a/testsuites/tmtests/tm22/task1.c +++ b/testsuites/tmtests/tm22/task1.c @@ -12,6 +12,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/tmtests/tm23/task1.c b/testsuites/tmtests/tm23/task1.c index 249d62760a..5e9dc5c2e6 100644 --- a/testsuites/tmtests/tm23/task1.c +++ b/testsuites/tmtests/tm23/task1.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/tmtests/tm24/task1.c b/testsuites/tmtests/tm24/task1.c index 21de600e94..1360ba9acf 100644 --- a/testsuites/tmtests/tm24/task1.c +++ b/testsuites/tmtests/tm24/task1.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/tmtests/tm25/task1.c b/testsuites/tmtests/tm25/task1.c index 7777b51df9..c9f781bd22 100644 --- a/testsuites/tmtests/tm25/task1.c +++ b/testsuites/tmtests/tm25/task1.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/tmtests/tm26/task1.c b/testsuites/tmtests/tm26/task1.c index 9d157e9fcf..e0b09b81ac 100644 --- a/testsuites/tmtests/tm26/task1.c +++ b/testsuites/tmtests/tm26/task1.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include <rtems.h> #include "system.h" diff --git a/testsuites/tmtests/tm27/task1.c b/testsuites/tmtests/tm27/task1.c index c89c0956f1..7f50030853 100644 --- a/testsuites/tmtests/tm27/task1.c +++ b/testsuites/tmtests/tm27/task1.c @@ -17,6 +17,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/tmtests/tm28/task1.c b/testsuites/tmtests/tm28/task1.c index f157209eb5..ec09c0b488 100644 --- a/testsuites/tmtests/tm28/task1.c +++ b/testsuites/tmtests/tm28/task1.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/tmtests/tm29/task1.c b/testsuites/tmtests/tm29/task1.c index ef889cbf42..5176a068a2 100644 --- a/testsuites/tmtests/tm29/task1.c +++ b/testsuites/tmtests/tm29/task1.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/tmtests/tm30/init.c b/testsuites/tmtests/tm30/init.c index 022cdafb4f..d7ff99a4ca 100644 --- a/testsuites/tmtests/tm30/init.c +++ b/testsuites/tmtests/tm30/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <bsp.h> #include <coverhd.h> #include <tmacros.h> diff --git a/testsuites/tmtests/tmck/task1.c b/testsuites/tmtests/tmck/task1.c index e13181f912..6476de5cc0 100644 --- a/testsuites/tmtests/tmck/task1.c +++ b/testsuites/tmtests/tmck/task1.c @@ -12,6 +12,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/tmtests/tmcontext01/init.c b/testsuites/tmtests/tmcontext01/init.c index 2651847de4..9b76921bbf 100644 --- a/testsuites/tmtests/tmcontext01/init.c +++ b/testsuites/tmtests/tmcontext01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include <rtems/counter.h> #include <rtems.h> diff --git a/testsuites/tmtests/tmfine01/init.c b/testsuites/tmtests/tmfine01/init.c index 31843ce071..80000a70d6 100644 --- a/testsuites/tmtests/tmfine01/init.c +++ b/testsuites/tmtests/tmfine01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include <sys/lock.h> diff --git a/testsuites/tmtests/tmoverhd/testtask.c b/testsuites/tmtests/tmoverhd/testtask.c index bc73f8bc5d..0137beea63 100644 --- a/testsuites/tmtests/tmoverhd/testtask.c +++ b/testsuites/tmtests/tmoverhd/testtask.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/tmtests/tmtimer01/init.c b/testsuites/tmtests/tmtimer01/init.c index 6b9430481f..2189707d99 100644 --- a/testsuites/tmtests/tmtimer01/init.c +++ b/testsuites/tmtests/tmtimer01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include <stdio.h> |