diff options
Diffstat (limited to 'testsuites/psxtests')
| -rwxr-xr-x | testsuites/psxtests/Makefile.am | 4 | ||||
| -rw-r--r-- | testsuites/psxtests/psxfatal_support/init.c | 48 | ||||
| -rw-r--r-- | testsuites/psxtests/psxfatal_support/system.h | 79 |
3 files changed, 44 insertions, 87 deletions
diff --git a/testsuites/psxtests/Makefile.am b/testsuites/psxtests/Makefile.am index 42d67e2fd9..0d213a4437 100755 --- a/testsuites/psxtests/Makefile.am +++ b/testsuites/psxtests/Makefile.am @@ -391,7 +391,7 @@ endif if TEST_psxfatal01 psx_tests += psxfatal01 psx_screens += psxfatal01/psxfatal01.scn -psxfatal01_SOURCES = psxfatal_support/init.c psxfatal_support/system.h \ +psxfatal01_SOURCES = psxfatal_support/init.c \ psxfatal01/testcase.h psxfatal01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxfatal01) \ $(support_includes) -I$(top_srcdir)/psxfatal01 @@ -400,7 +400,7 @@ endif if TEST_psxfatal02 psx_tests += psxfatal02 psx_screens += psxfatal02/psxfatal02.scn -psxfatal02_SOURCES = psxfatal_support/init.c psxfatal_support/system.h \ +psxfatal02_SOURCES = psxfatal_support/init.c \ psxfatal02/testcase.h psxfatal02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxfatal02) \ $(support_includes) -I$(top_srcdir)/psxfatal02 diff --git a/testsuites/psxtests/psxfatal_support/init.c b/testsuites/psxtests/psxfatal_support/init.c index 38caa3f36a..2c305396d5 100644 --- a/testsuites/psxtests/psxfatal_support/init.c +++ b/testsuites/psxtests/psxfatal_support/init.c @@ -11,10 +11,15 @@ #include "config.h" #endif -#include "tmacros.h" +#include <rtems/bspIo.h> -#define CONFIGURE_INIT -#include "system.h" +#include <tmacros.h> + +void *POSIX_Init(void *argument); + +void force_error(void); + +#include "testcase.h" const char rtems_test_name[] = "PSXFATAL " FATAL_ERROR_TEST_NAME; @@ -38,7 +43,7 @@ void *POSIX_Init( rtems_test_exit(0); } -void Put_Error( rtems_fatal_source source, rtems_fatal_code error ) +static void Put_Error( rtems_fatal_source source, rtems_fatal_code error ) { if ( source == INTERNAL_ERROR_CORE ) { printk( rtems_internal_error_text( error ) ); @@ -56,12 +61,12 @@ void Put_Error( rtems_fatal_source source, rtems_fatal_code error ) } } -void Put_Source( rtems_fatal_source source ) +static void Put_Source( rtems_fatal_source source ) { printk( "%s", rtems_fatal_source_text( source ) ); } -void Fatal_extension( +static void Fatal_extension( rtems_fatal_source source, bool always_set_to_false, rtems_fatal_code error @@ -97,3 +102,34 @@ void Fatal_extension( TEST_END(); } } + +#define CONFIGURE_INIT + +#define CONFIGURE_INITIAL_EXTENSIONS \ + { \ + NULL, /* create */ \ + NULL, /* start */ \ + NULL, /* restart */ \ + NULL, /* delete */ \ + NULL, /* switch */ \ + NULL, /* begin */ \ + NULL, /* exitted */ \ + Fatal_extension /* fatal */ \ + }, \ + RTEMS_TEST_INITIAL_EXTENSION + +/* extra parameters may be in testcase.h */ +#define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER + +/* always need an Init task, some cases need more tasks */ +#ifndef SPFATAL_TEST_CASE_EXTRA_THREADS +#define SPFATAL_TEST_CASE_EXTRA_THREADS 0 +#endif + +#define CONFIGURE_MAXIMUM_POSIX_THREADS \ + (SPFATAL_TEST_CASE_EXTRA_THREADS + 1) + +#define CONFIGURE_POSIX_INIT_THREAD_TABLE + +#include <rtems/confdefs.h> diff --git a/testsuites/psxtests/psxfatal_support/system.h b/testsuites/psxtests/psxfatal_support/system.h deleted file mode 100644 index 21a60f6396..0000000000 --- a/testsuites/psxtests/psxfatal_support/system.h +++ /dev/null @@ -1,79 +0,0 @@ -/** - * - * This include file contains information that is included in every - * function in the test set. - */ - -/* - * COPYRIGHT (c) 1989-2012. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.org/license/LICENSE. - */ - -/* - * Some of the fatal error cases require the ability to peek inside RTEMS - */ - -#include <rtems.h> -#include <tmacros.h> - -/* functions */ -void force_error(void); - -void Put_Source( rtems_fatal_source source ); - -void Put_Error( rtems_fatal_source source, rtems_fatal_code error ); - -void *POSIX_Init( - void *argument -); - -void Fatal_extension( - rtems_fatal_source source, - bool always_set_to_false, - rtems_fatal_code error -); - -/* need prototypes */ - -#include "testcase.h" - -/* configuration information */ - -extern rtems_extensions_table initial_extensions; - -#define CONFIGURE_INITIAL_EXTENSIONS \ - { \ - NULL, /* create */ \ - NULL, /* start */ \ - NULL, /* restart */ \ - NULL, /* delete */ \ - NULL, /* switch */ \ - NULL, /* begin */ \ - NULL, /* exitted */ \ - Fatal_extension /* fatal */ \ - }, \ - RTEMS_TEST_INITIAL_EXTENSION - -/* extra parameters may be in testcase.h */ -#define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER -#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER - -/* always need an Init task, some cases need more tasks */ -#ifndef SPFATAL_TEST_CASE_EXTRA_THREADS -#define SPFATAL_TEST_CASE_EXTRA_THREADS 0 -#endif - -#define CONFIGURE_MAXIMUM_POSIX_THREADS \ - (SPFATAL_TEST_CASE_EXTRA_THREADS + 1) - -#define CONFIGURE_POSIX_INIT_THREAD_TABLE - -#include <rtems/confdefs.h> - -/* global variables */ - -/* end of include file */ |