From dc9f1a932ba762e7dabe62d48b93e019ed092efd Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Mon, 5 Sep 2011 09:49:52 +0000 Subject: 2011-09-05 Sebastian Huber * psxfatal01/psxfatal01.scn, psxfatal01/testcase.h, psxfatal02/psxfatal02.scn, psxfatal02/testcase.h, psxfatal_support/init.c: Print proper begin and end message. --- testsuites/psxtests/ChangeLog | 6 ++++++ testsuites/psxtests/psxfatal01/psxfatal01.scn | 3 ++- testsuites/psxtests/psxfatal01/testcase.h | 1 + testsuites/psxtests/psxfatal02/psxfatal02.scn | 3 ++- testsuites/psxtests/psxfatal02/testcase.h | 1 + testsuites/psxtests/psxfatal_support/init.c | 14 +++++++++++++- 6 files changed, 25 insertions(+), 3 deletions(-) (limited to 'testsuites') diff --git a/testsuites/psxtests/ChangeLog b/testsuites/psxtests/ChangeLog index 5f34a7d06c..2dbf483f42 100644 --- a/testsuites/psxtests/ChangeLog +++ b/testsuites/psxtests/ChangeLog @@ -1,3 +1,9 @@ +2011-09-05 Sebastian Huber + + * psxfatal01/psxfatal01.scn, psxfatal01/testcase.h, + psxfatal02/psxfatal02.scn, psxfatal02/testcase.h, + psxfatal_support/init.c: Print proper begin and end message. + 2011-08-21 Joel Sherrill PR 1890/cpukit diff --git a/testsuites/psxtests/psxfatal01/psxfatal01.scn b/testsuites/psxtests/psxfatal01/psxfatal01.scn index 4044b90e50..2a41713788 100644 --- a/testsuites/psxtests/psxfatal01/psxfatal01.scn +++ b/testsuites/psxtests/psxfatal01/psxfatal01.scn @@ -1,2 +1,3 @@ +*** TEST POSIX FATAL 1 *** Fatal error (POSIX API Init thread create failure - NULL entry) hit -*** END OF TEST *** +*** END OF TEST POSIX FATAL 1 *** diff --git a/testsuites/psxtests/psxfatal01/testcase.h b/testsuites/psxtests/psxfatal01/testcase.h index c8c4ba8194..5a6742433f 100644 --- a/testsuites/psxtests/psxfatal01/testcase.h +++ b/testsuites/psxtests/psxfatal01/testcase.h @@ -24,6 +24,7 @@ posix_initialization_threads_table POSIX_Initialization_threads[] = { sizeof(CONFIGURE_POSIX_INIT_THREAD_TABLE_NAME) / \ sizeof(posix_initialization_threads_table) +#define FATAL_ERROR_TEST_NAME "1" #define FATAL_ERROR_DESCRIPTION \ "POSIX API Init thread create failure - NULL entry" #define FATAL_ERROR_EXPECTED_SOURCE INTERNAL_ERROR_POSIX_API diff --git a/testsuites/psxtests/psxfatal02/psxfatal02.scn b/testsuites/psxtests/psxfatal02/psxfatal02.scn index ce52daa790..d78ed02c71 100644 --- a/testsuites/psxtests/psxfatal02/psxfatal02.scn +++ b/testsuites/psxtests/psxfatal02/psxfatal02.scn @@ -1,2 +1,3 @@ +*** TEST POSIX FATAL 2 *** Fatal error (POSIX API Init thread create failure -- no memory for stack) hit -*** END OF TEST *** +*** END OF TEST POSIX FATAL 2 *** diff --git a/testsuites/psxtests/psxfatal02/testcase.h b/testsuites/psxtests/psxfatal02/testcase.h index 28acdc7769..46230bb512 100644 --- a/testsuites/psxtests/psxfatal02/testcase.h +++ b/testsuites/psxtests/psxfatal02/testcase.h @@ -28,6 +28,7 @@ posix_initialization_threads_table POSIX_Initialization_threads[] = { sizeof(CONFIGURE_POSIX_INIT_THREAD_TABLE_NAME) / \ sizeof(posix_initialization_threads_table) +#define FATAL_ERROR_TEST_NAME "2" #define FATAL_ERROR_DESCRIPTION \ "POSIX API Init thread create failure -- no memory for stack" #define FATAL_ERROR_EXPECTED_SOURCE INTERNAL_ERROR_POSIX_API diff --git a/testsuites/psxtests/psxfatal_support/init.c b/testsuites/psxtests/psxfatal_support/init.c index d759d99189..274a982e5d 100644 --- a/testsuites/psxtests/psxfatal_support/init.c +++ b/testsuites/psxtests/psxfatal_support/init.c @@ -16,10 +16,21 @@ #define CONFIGURE_INIT #include "system.h" +static void print_test_begin_message(void) +{ + static bool done = false; + + if (!done) { + done = true; + printk( "\n\n\n*** TEST POSIX FATAL " FATAL_ERROR_TEST_NAME " ***\n" ); + } +} + void *POSIX_Init( void *argument ) { + print_test_begin_message(); force_error(); printk( "Fatal error (%s) NOT hit\n", FATAL_ERROR_DESCRIPTION ); rtems_test_exit(0); @@ -115,6 +126,7 @@ void Fatal_extension( uint32_t error ) { + print_test_begin_message(); printk( "Fatal error (%s) hit\n", FATAL_ERROR_DESCRIPTION ); if ( source != FATAL_ERROR_EXPECTED_SOURCE ){ @@ -146,7 +158,7 @@ void Fatal_extension( && is_internal == FATAL_ERROR_EXPECTED_IS_INTERNAL && error == FATAL_ERROR_EXPECTED_ERROR ) { - printk( "*** END OF TEST ***\n" ); + printk( "*** END OF TEST POSIX FATAL " FATAL_ERROR_TEST_NAME " ***\n" ); } if ( _System_state_Is_up( _System_state_Get() ) ) -- cgit v1.2.3