From 98c6d501452f02264ff148a1b8479e420c81562d Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Thu, 19 Oct 2017 16:39:16 +1100 Subject: 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. --- testsuites/psxtmtests/psxtmbarrier01/init.c | 4 +++- testsuites/psxtmtests/psxtmbarrier02/init.c | 2 ++ testsuites/psxtmtests/psxtmbarrier03/init.c | 2 ++ testsuites/psxtmtests/psxtmbarrier04/init.c | 2 ++ testsuites/psxtmtests/psxtmclocknanosleep01/init.c | 6 ++++-- testsuites/psxtmtests/psxtmclocknanosleep02/init.c | 4 +++- testsuites/psxtmtests/psxtmclocknanosleep03/init.c | 4 +++- testsuites/psxtmtests/psxtmcond01/init.c | 2 ++ testsuites/psxtmtests/psxtmcond02/init.c | 4 +++- testsuites/psxtmtests/psxtmcond03/init.c | 2 ++ testsuites/psxtmtests/psxtmcond04/init.c | 2 ++ testsuites/psxtmtests/psxtmcond05/init.c | 2 ++ testsuites/psxtmtests/psxtmcond06/init.c | 2 ++ testsuites/psxtmtests/psxtmcond07/init.c | 2 ++ testsuites/psxtmtests/psxtmcond08/init.c | 2 ++ testsuites/psxtmtests/psxtmkey01/init.c | 6 ++++-- testsuites/psxtmtests/psxtmkey02/init.c | 2 ++ testsuites/psxtmtests/psxtmmq01/init.c | 2 ++ testsuites/psxtmtests/psxtmmutex01/init.c | 2 ++ testsuites/psxtmtests/psxtmmutex02/init.c | 2 ++ testsuites/psxtmtests/psxtmmutex03/init.c | 16 +++++++++------- testsuites/psxtmtests/psxtmmutex04/init.c | 2 ++ testsuites/psxtmtests/psxtmmutex05/init.c | 2 ++ testsuites/psxtmtests/psxtmmutex06/init.c | 2 ++ testsuites/psxtmtests/psxtmmutex07/init.c | 4 +++- testsuites/psxtmtests/psxtmnanosleep01/init.c | 6 ++++-- testsuites/psxtmtests/psxtmnanosleep02/init.c | 4 +++- testsuites/psxtmtests/psxtmrwlock01/init.c | 3 +++ testsuites/psxtmtests/psxtmrwlock02/init.c | 2 ++ testsuites/psxtmtests/psxtmrwlock03/init.c | 2 ++ testsuites/psxtmtests/psxtmrwlock04/init.c | 2 ++ testsuites/psxtmtests/psxtmrwlock05/init.c | 2 ++ testsuites/psxtmtests/psxtmrwlock06/init.c | 2 ++ testsuites/psxtmtests/psxtmrwlock07/init.c | 2 ++ testsuites/psxtmtests/psxtmsem01/init.c | 2 ++ testsuites/psxtmtests/psxtmsem02/init.c | 2 ++ testsuites/psxtmtests/psxtmsem03/init.c | 2 ++ testsuites/psxtmtests/psxtmsem04/init.c | 2 ++ testsuites/psxtmtests/psxtmsem05/init.c | 2 ++ testsuites/psxtmtests/psxtmsleep01/init.c | 2 ++ testsuites/psxtmtests/psxtmsleep02/init.c | 4 +++- testsuites/psxtmtests/psxtmthread01/init.c | 2 ++ testsuites/psxtmtests/psxtmthread02/init.c | 2 ++ testsuites/psxtmtests/psxtmthread03/init.c | 2 ++ testsuites/psxtmtests/psxtmthread04/init.c | 6 ++++-- testsuites/psxtmtests/psxtmthread05/init.c | 4 +++- testsuites/psxtmtests/psxtmthread06/init.c | 2 ++ 47 files changed, 118 insertions(+), 23 deletions(-) (limited to 'testsuites/psxtmtests') 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 #include #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 #include #include 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 #include #include 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 #include #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 #include #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 #include #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 #include #include 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 #include #include @@ -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 #include #include 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 #include #include 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 #include #include 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 #include #include 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 #include #include 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 #include #include @@ -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 #include #include 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 #include #include 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 #include #include 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 #include #include @@ -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 #include #include 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 #include #include 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 #include #include 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 #include #include @@ -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 #include #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 #include #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 #include #include 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 #include #include 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 #include #include 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 #include #include 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 #include #include 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 #include #include 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 #include #include 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 #include #include 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 #include #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 #include #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 #include #include 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 #include #include 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 #include #include 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 #include #include @@ -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 #include #include @@ -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 #include #include -- cgit v1.2.3