sptests: Avoid build system defined defines

Update #3818.

2 files changed, 149 insertions, 147 deletions

diff --git a/testsuites/sptests/spintrcritical06/init.c b/testsuites/sptests/spintrcritical06/init.c
index 161f0502de..d8fedae772 100644
--- a/testsuites/sptests/spintrcritical06/init.c
+++ b/testsuites/sptests/spintrcritical06/init.c
@@ -1,147 +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_task Secondary_task(rtems_task_argument arg);
-
-/* common parameters */
-#define SEMAPHORE_ATTRIBUTES     RTEMS_PRIORITY
-
-#if defined(PRIORITY_NO_TIMEOUT_FORWARD)
-  #define TEST_NAME          "6"
-  #define TEST_STRING        "Priority/Restart Search Task (Forward)"
-
-  #define INIT_PRIORITY      2
-  #define BLOCKER_PRIORITY   1
-  #define SEMAPHORE_OBTAIN_TIMEOUT 2
-
-#elif defined(PRIORITY_NO_TIMEOUT_REVERSE)
-  #define TEST_NAME          "7"
-  #define TEST_STRING        "Priority/Restart Search Task (Backward)"
-  #define INIT_PRIORITY      126
-  #define BLOCKER_PRIORITY   127
-  #define SEMAPHORE_OBTAIN_TIMEOUT 0
-
-#else
-
-  #error "Test Mode not defined"
-#endif
-
-const char rtems_test_name[] = "SPINTRCRITICAL " TEST_NAME;
-
-rtems_id Secondary_task_id;
-rtems_id Semaphore;
-
-rtems_timer_service_routine test_release_from_isr(
-  rtems_id  timer,
-  void     *arg
-)
-{
-  (void) rtems_task_restart( Secondary_task_id, 1 );
-}
-
-rtems_task Secondary_task(
-  rtems_task_argument arg
-)
-{
-  if ( arg )
-    (void) rtems_semaphore_flush( Semaphore );
-
-  (void) rtems_semaphore_obtain(
-    Semaphore,
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT
-  );
-
-  rtems_test_assert(0);
-}
-
-static bool test_body( void *arg )
-{
-  (void) arg;
-
-  rtems_semaphore_obtain(
-    Semaphore,
-    RTEMS_DEFAULT_OPTIONS,
-    SEMAPHORE_OBTAIN_TIMEOUT
-  );
-
-  return false;
-}
-
-rtems_task Init(
-  rtems_task_argument ignored
-)
-{
-  rtems_status_code     status;
-
-  TEST_BEGIN();
-
-  puts( "Init - Trying to generate semaphore release from ISR while blocking" );
-  puts( "Init - There is no way for the test to know if it hits the case" );
-  puts( "Init - Variation is: " TEST_STRING );
-  status = rtems_semaphore_create(
-    rtems_build_name( 'S', 'M', '1', ' ' ),
-    0,
-    SEMAPHORE_ATTRIBUTES,
-    RTEMS_NO_PRIORITY,
-    &Semaphore
-  );
-  directive_failed( status, "rtems_semaphore_create of SM1" );
-
-  status = rtems_task_create(
-    rtems_build_name( 'B', 'L', 'C', 'K' ),
-    BLOCKER_PRIORITY,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_NO_PREEMPT,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Secondary_task_id
-  );
-  directive_failed( status, "rtems_task_create" );
-
-  status = rtems_task_start( Secondary_task_id, Secondary_task, 0 );
-  directive_failed( status, "rtems_task_start" );
-
-  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_INIT_TASK_PRIORITY  INIT_PRIORITY
-#define CONFIGURE_INIT_TASK_INITIAL_MODES RTEMS_PREEMPT
-#define CONFIGURE_MICROSECONDS_PER_TICK  2000
-#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#define CONFIGURE_DISABLE_SMP_CONFIGURATION
-
-#define CONFIGURE_INIT
-#include <rtems/confdefs.h>
-
-/* global variables */
+#define PRIORITY_NO_TIMEOUT_FORWARD
+#include "spintrcritical06impl.h"
diff --git a/testsuites/sptests/spintrcritical06/spintrcritical06impl.h b/testsuites/sptests/spintrcritical06/spintrcritical06impl.h
new file mode 100644
index 0000000000..161f0502de
--- /dev/null
+++ b/testsuites/sptests/spintrcritical06/spintrcritical06impl.h
@@ -0,0 +1,147 @@
+/*
+ *  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_task Secondary_task(rtems_task_argument arg);
+
+/* common parameters */
+#define SEMAPHORE_ATTRIBUTES     RTEMS_PRIORITY
+
+#if defined(PRIORITY_NO_TIMEOUT_FORWARD)
+  #define TEST_NAME          "6"
+  #define TEST_STRING        "Priority/Restart Search Task (Forward)"
+
+  #define INIT_PRIORITY      2
+  #define BLOCKER_PRIORITY   1
+  #define SEMAPHORE_OBTAIN_TIMEOUT 2
+
+#elif defined(PRIORITY_NO_TIMEOUT_REVERSE)
+  #define TEST_NAME          "7"
+  #define TEST_STRING        "Priority/Restart Search Task (Backward)"
+  #define INIT_PRIORITY      126
+  #define BLOCKER_PRIORITY   127
+  #define SEMAPHORE_OBTAIN_TIMEOUT 0
+
+#else
+
+  #error "Test Mode not defined"
+#endif
+
+const char rtems_test_name[] = "SPINTRCRITICAL " TEST_NAME;
+
+rtems_id Secondary_task_id;
+rtems_id Semaphore;
+
+rtems_timer_service_routine test_release_from_isr(
+  rtems_id  timer,
+  void     *arg
+)
+{
+  (void) rtems_task_restart( Secondary_task_id, 1 );
+}
+
+rtems_task Secondary_task(
+  rtems_task_argument arg
+)
+{
+  if ( arg )
+    (void) rtems_semaphore_flush( Semaphore );
+
+  (void) rtems_semaphore_obtain(
+    Semaphore,
+    RTEMS_DEFAULT_OPTIONS,
+    RTEMS_NO_TIMEOUT
+  );
+
+  rtems_test_assert(0);
+}
+
+static bool test_body( void *arg )
+{
+  (void) arg;
+
+  rtems_semaphore_obtain(
+    Semaphore,
+    RTEMS_DEFAULT_OPTIONS,
+    SEMAPHORE_OBTAIN_TIMEOUT
+  );
+
+  return false;
+}
+
+rtems_task Init(
+  rtems_task_argument ignored
+)
+{
+  rtems_status_code     status;
+
+  TEST_BEGIN();
+
+  puts( "Init - Trying to generate semaphore release from ISR while blocking" );
+  puts( "Init - There is no way for the test to know if it hits the case" );
+  puts( "Init - Variation is: " TEST_STRING );
+  status = rtems_semaphore_create(
+    rtems_build_name( 'S', 'M', '1', ' ' ),
+    0,
+    SEMAPHORE_ATTRIBUTES,
+    RTEMS_NO_PRIORITY,
+    &Semaphore
+  );
+  directive_failed( status, "rtems_semaphore_create of SM1" );
+
+  status = rtems_task_create(
+    rtems_build_name( 'B', 'L', 'C', 'K' ),
+    BLOCKER_PRIORITY,
+    RTEMS_MINIMUM_STACK_SIZE,
+    RTEMS_NO_PREEMPT,
+    RTEMS_DEFAULT_ATTRIBUTES,
+    &Secondary_task_id
+  );
+  directive_failed( status, "rtems_task_create" );
+
+  status = rtems_task_start( Secondary_task_id, Secondary_task, 0 );
+  directive_failed( status, "rtems_task_start" );
+
+  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_INIT_TASK_PRIORITY  INIT_PRIORITY
+#define CONFIGURE_INIT_TASK_INITIAL_MODES RTEMS_PREEMPT
+#define CONFIGURE_MICROSECONDS_PER_TICK  2000
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
+
+#define CONFIGURE_DISABLE_SMP_CONFIGURATION
+
+#define CONFIGURE_INIT
+#include <rtems/confdefs.h>
+
+/* global variables */