tests: Simplify fatal error test support

Move system.h to shared init.c.

Update #3818.

2 files changed, 44 insertions, 84 deletions

diff --git a/testsuites/sptests/spfatal_support/init.c b/testsuites/sptests/spfatal_support/init.c
index f8d7225954..e5aae95027 100644
--- a/testsuites/sptests/spfatal_support/init.c
+++ b/testsuites/sptests/spfatal_support/init.c
@@ -11,8 +11,15 @@
 #include "config.h"
 #endif
 
-#define CONFIGURE_INIT
-#include "system.h"
+#include <rtems/bspIo.h>
+
+#include <tmacros.h>
+
+rtems_task Init( rtems_task_argument argument );
+
+void force_error( void );
+
+#include "testcase.h"
 
 const char rtems_test_name[] = "SPFATAL " FATAL_ERROR_TEST_NAME;
 
@@ -36,7 +43,8 @@ rtems_task Init(
   rtems_test_exit(0);
 }
 
-void Put_Error( uint32_t source, uint32_t error )
+#ifdef FATAL_ERROR_EXPECTED_ERROR
+static void Put_Error( uint32_t source, uint32_t error )
 {
   if ( source == INTERNAL_ERROR_CORE ) {
     printk( rtems_internal_error_text( error ) );
@@ -48,8 +56,9 @@ void Put_Error( uint32_t source, uint32_t error )
       printk( "%s", rtems_status_text( error ) );
   }
 }
+#endif
 
-void Put_Source( rtems_fatal_source source )
+static void Put_Source( rtems_fatal_source source )
 {
   printk( "%s", rtems_fatal_source_text( source ) );
 }
@@ -63,7 +72,7 @@ static bool is_expected_error( rtems_fatal_code error )
 #endif /* FATAL_ERROR_EXPECTED_ERROR */
 }
 
-void Fatal_extension(
+static void Fatal_extension(
   rtems_fatal_source source,
   bool               always_set_to_false,
   rtems_fatal_code   error
@@ -103,3 +112,33 @@ 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_TASKS
+#define SPFATAL_TEST_CASE_EXTRA_TASKS 0
+#endif
+#define CONFIGURE_MAXIMUM_TASKS \
+  (SPFATAL_TEST_CASE_EXTRA_TASKS + 1)
+
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
+
+#include <rtems/confdefs.h>
diff --git a/testsuites/sptests/spfatal_support/system.h b/testsuites/sptests/spfatal_support/system.h
deleted file mode 100644
index c03b303c2b..0000000000
--- a/testsuites/sptests/spfatal_support/system.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-2009.
- *  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 "tmacros.h"
-
-#include <rtems.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-void Fatal_extension(
-  rtems_fatal_source source,
-  bool               always_set_to_false,
-  rtems_fatal_code   error
-);
-
-void Put_Error(
-  uint32_t source,
-  uint32_t error
-);
-
-void Put_Source( rtems_fatal_source source );
-
-void force_error(void);
-
-#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_TASKS
-#define SPFATAL_TEST_CASE_EXTRA_TASKS 0
-#endif
-#define CONFIGURE_MAXIMUM_TASKS \
-  (SPFATAL_TEST_CASE_EXTRA_TASKS + 1)
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <rtems/confdefs.h>
-
-/* global variables */
-
-/* end of include file */