sptests: Avoid build system defined defines

Update #3818.

2 files changed, 98 insertions, 96 deletions

diff --git a/testsuites/sptests/spintrcritical11/init.c b/testsuites/sptests/spintrcritical11/init.c
index fb0d320dea..126a76d1a9 100644
--- a/testsuites/sptests/spintrcritical11/init.c
+++ b/testsuites/sptests/spintrcritical11/init.c
@@ -1,96 +1,2 @@
-/*
- *  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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <tmacros.h>
-#include <intrcritical.h>
-
-/* forward declarations to avoid warnings */
-rtems_task Init(rtems_task_argument argument);
-rtems_timer_service_routine test_release_from_isr(rtems_id  timer, void *arg);
-
-rtems_id Main_task;
-
-#if defined(EVENT_ANY)
-  #define TEST_NAME          "11"
-  #define TEST_STRING        "Event Any condition"
-  #define EVENTS_TO_SEND     0x1
-  #define EVENTS_TO_RECEIVE  0x3
-
-#elif defined(EVENT_ALL)
-  #define TEST_NAME          "12"
-  #define TEST_STRING        "Event All condition"
-  #define EVENTS_TO_SEND     0x3
-  #define EVENTS_TO_RECEIVE  0x3
-
-#else
-  #error "Test Mode not defined"
-
-#endif
-
-const char rtems_test_name[] = "SPINTRCRITICAL " TEST_NAME;
-
-rtems_timer_service_routine test_release_from_isr(
-  rtems_id  timer,
-  void     *arg
-)
-{
-  (void) rtems_event_send( Main_task, EVENTS_TO_SEND );
-}
-
-static bool test_body( void *arg )
-{
-  rtems_event_set out;
-
-  (void) arg;
-
-  rtems_event_receive( EVENTS_TO_RECEIVE, RTEMS_EVENT_ANY, 1, &out );
-
-  return false;
-}
-
-rtems_task Init(
-  rtems_task_argument ignored
-)
-{
-  TEST_BEGIN();
-
-  puts( "Init - Test may not be able to detect case is hit reliably" );
-  puts( "Init - Trying to generate event send from ISR while blocking" );
-  puts( "Init - Variation is: " TEST_STRING );
-
-  Main_task = rtems_task_self();
-
-  interrupt_critical_section_test( test_body, NULL, test_release_from_isr );
-
-  TEST_END();
-  rtems_test_exit(0);
-}
-
-/* configuration information */
-
-#define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
-#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS       2
-#define CONFIGURE_MAXIMUM_TIMERS      1
-#define CONFIGURE_MAXIMUM_SEMAPHORES  1
-#define CONFIGURE_MAXIMUM_USER_EXTENSIONS 1
-#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-#define CONFIGURE_MICROSECONDS_PER_TICK  1000
-
-#define CONFIGURE_INIT
-#include <rtems/confdefs.h>
-
-/* global variables */
+#define EVENT_ANY
+#include "spintrcritical11impl.h"
diff --git a/testsuites/sptests/spintrcritical11/spintrcritical11impl.h b/testsuites/sptests/spintrcritical11/spintrcritical11impl.h
new file mode 100644
index 0000000000..fb0d320dea
--- /dev/null
+++ b/testsuites/sptests/spintrcritical11/spintrcritical11impl.h
@@ -0,0 +1,96 @@
+/*
+ *  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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <tmacros.h>
+#include <intrcritical.h>
+
+/* forward declarations to avoid warnings */
+rtems_task Init(rtems_task_argument argument);
+rtems_timer_service_routine test_release_from_isr(rtems_id  timer, void *arg);
+
+rtems_id Main_task;
+
+#if defined(EVENT_ANY)
+  #define TEST_NAME          "11"
+  #define TEST_STRING        "Event Any condition"
+  #define EVENTS_TO_SEND     0x1
+  #define EVENTS_TO_RECEIVE  0x3
+
+#elif defined(EVENT_ALL)
+  #define TEST_NAME          "12"
+  #define TEST_STRING        "Event All condition"
+  #define EVENTS_TO_SEND     0x3
+  #define EVENTS_TO_RECEIVE  0x3
+
+#else
+  #error "Test Mode not defined"
+
+#endif
+
+const char rtems_test_name[] = "SPINTRCRITICAL " TEST_NAME;
+
+rtems_timer_service_routine test_release_from_isr(
+  rtems_id  timer,
+  void     *arg
+)
+{
+  (void) rtems_event_send( Main_task, EVENTS_TO_SEND );
+}
+
+static bool test_body( void *arg )
+{
+  rtems_event_set out;
+
+  (void) arg;
+
+  rtems_event_receive( EVENTS_TO_RECEIVE, RTEMS_EVENT_ANY, 1, &out );
+
+  return false;
+}
+
+rtems_task Init(
+  rtems_task_argument ignored
+)
+{
+  TEST_BEGIN();
+
+  puts( "Init - Test may not be able to detect case is hit reliably" );
+  puts( "Init - Trying to generate event send from ISR while blocking" );
+  puts( "Init - Variation is: " TEST_STRING );
+
+  Main_task = rtems_task_self();
+
+  interrupt_critical_section_test( test_body, NULL, test_release_from_isr );
+
+  TEST_END();
+  rtems_test_exit(0);
+}
+
+/* configuration information */
+
+#define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+
+#define CONFIGURE_MAXIMUM_TASKS       2
+#define CONFIGURE_MAXIMUM_TIMERS      1
+#define CONFIGURE_MAXIMUM_SEMAPHORES  1
+#define CONFIGURE_MAXIMUM_USER_EXTENSIONS 1
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
+#define CONFIGURE_MICROSECONDS_PER_TICK  1000
+
+#define CONFIGURE_INIT
+#include <rtems/confdefs.h>
+
+/* global variables */