diff options
| author | Chris Johns <chrisj@rtems.org> | 2017-11-08 08:25:36 +1100 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2017-11-11 16:14:59 +1100 |
| commit | bcd0c06c9be41f68d41c2fc1ed9408410b9084a3 (patch) | |
| tree | a1e3900176bfc6110ca284e2d8bc0c1da563ad29 /testsuites | |
| parent | mvme162: Fix errors tripped by transition to using polled IO for tests (diff) | |
| download | rtems-bcd0c06c9be41f68d41c2fc1ed9408410b9084a3.tar.bz2 | |
tests: Use rtems_test_begin and rtems_test_end.
Add a tests enum and move all test banner test to the library in libmisc.
Update #3199.
Diffstat (limited to 'testsuites')
| -rw-r--r-- | testsuites/samples/cdtest/main.cc | 4 | ||||
| -rw-r--r-- | testsuites/sptests/sp20/init.c | 4 | ||||
| -rw-r--r-- | testsuites/support/include/buffer_test_io.h | 45 |
3 files changed, 6 insertions, 47 deletions
diff --git a/testsuites/samples/cdtest/main.cc b/testsuites/samples/cdtest/main.cc index 33e6fd2edd..7aeb884354 100644 --- a/testsuites/samples/cdtest/main.cc +++ b/testsuites/samples/cdtest/main.cc @@ -47,14 +47,14 @@ static int num_inst = 0; static void check_begin_of_test(void) { if ( num_inst == 0 ) { - printf(TEST_BEGIN_STRING); + TEST_BEGIN(); } } static void check_end_of_test(void) { if ( num_inst == 0 ) { - printk(TEST_END_STRING); + TEST_END(); } } diff --git a/testsuites/sptests/sp20/init.c b/testsuites/sptests/sp20/init.c index bf8afc7684..6b63b6a380 100644 --- a/testsuites/sptests/sp20/init.c +++ b/testsuites/sptests/sp20/init.c @@ -38,7 +38,7 @@ static long buffers[ BUFFER_COUNT ][ BUFFER_SIZE / sizeof(long) ]; void end_of_test( void ) { - rtems_test_printf( TEST_END_STRING ); + TEST_END(); rtems_printer_task_drain( &printer_task ); rtems_test_exit( 0 ); } @@ -59,7 +59,7 @@ rtems_task Init( error = rtems_print_printer_task( &rtems_test_printer, &printer_task ); rtems_test_assert( error == 0 ); - rtems_test_printf( TEST_BEGIN_STRING ); + TEST_BEGIN(); Task_name[ 1 ] = rtems_build_name( 'T', 'A', '1', ' ' ); Task_name[ 2 ] = rtems_build_name( 'T', 'A', '2', ' ' ); diff --git a/testsuites/support/include/buffer_test_io.h b/testsuites/support/include/buffer_test_io.h index 1ff15f6ca8..8fbcd68b3e 100644 --- a/testsuites/support/include/buffer_test_io.h +++ b/testsuites/support/include/buffer_test_io.h @@ -11,28 +11,6 @@ extern "C" { #endif -/* - * Test states. No state string is an expected pass. - */ -#if (TEST_STATE_EXPECTED_FAIL && TEST_STATE_USER_INPUT) || \ - (TEST_STATE_EXPECTED_FAIL && TEST_STATE_INDETERMINATE) || \ - (TEST_STATE_EXPECTED_FAIL && TEST_STATE_BENCHMARK) || \ - (TEST_STATE_USER_INPUT && TEST_STATE_INDETERMINATE) || \ - (TEST_STATE_USER_INPUT && TEST_STATE_BENCHMARK) || \ - (TEST_STATE_INDETERMINATE && TEST_STATE_BENCHMARK) - #error Test states must be unique -#endif - -#if TEST_STATE_EXPECTED_FAIL - #define TEST_STATE_STRING "*** TEST STATE: EXPECTED-FAIL\n" -#elif TEST_STATE_USER_INPUT - #define TEST_STATE_STRING "*** TEST STATE: USER_INPUT\n" -#elif TEST_STATE_INDETERMINATE - #define TEST_STATE_STRING "*** TEST STATE: INDETERMINATE\n" -#elif TEST_STATE_BENCHMARK - #define TEST_STATE_STRING "*** TEST STATE: BENCHMARK\n" -#endif - #undef printf #define printf(...) \ do { \ @@ -61,27 +39,8 @@ extern "C" { do { \ } while (0) -#if defined(TEST_STATE_STRING) - #define TEST_BEGIN() \ - do { \ - rtems_printf( &rtems_test_printer, "\n"); \ - rtems_printf( &rtems_test_printer, TEST_BEGIN_STRING ); \ - rtems_printf( &rtems_test_printer, TEST_STATE_STRING ); \ - } while (0) -#else - #define TEST_BEGIN() \ - do { \ - rtems_printf( &rtems_test_printer, "\n" ); \ - rtems_printf( &rtems_test_printer, TEST_BEGIN_STRING ); \ - } while (0) -#endif - -#define TEST_END() \ - do { \ - rtems_printf( &rtems_test_printer, "\n" ); \ - rtems_printf( &rtems_test_printer, TEST_END_STRING ); \ - rtems_printf( &rtems_test_printer, "\n" ); \ - } while (0) +#define TEST_BEGIN() rtems_test_begin(rtems_test_name, TEST_STATE) +#define TEST_END() rtems_test_end(rtems_test_name) #ifdef __cplusplus }; |