sptests: Avoid build system defined defines

Update #3818.

2 files changed, 157 insertions, 155 deletions

diff --git a/testsuites/sptests/spintrcritical01/init.c b/testsuites/sptests/spintrcritical01/init.c
index 5c480b4bb3..0df5160c8f 100644
--- a/testsuites/sptests/spintrcritical01/init.c
+++ b/testsuites/sptests/spintrcritical01/init.c
@@ -1,155 +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>
-
-#include <rtems/score/threadimpl.h>
-
-#if defined(FIFO_NO_TIMEOUT)
-  #define TEST_NAME                "1"
-  #define TEST_STRING              "FIFO/Without Timeout"
-  #define SEMAPHORE_OBTAIN_TIMEOUT 0
-  #define SEMAPHORE_ATTRIBUTES     RTEMS_DEFAULT_ATTRIBUTES
-
-#elif defined(FIFO_WITH_TIMEOUT)
-  #define TEST_NAME                "2"
-  #define TEST_STRING              "FIFO/With Timeout"
-  #define SEMAPHORE_OBTAIN_TIMEOUT 10
-  #define SEMAPHORE_ATTRIBUTES     RTEMS_DEFAULT_ATTRIBUTES
-
-#elif defined(PRIORITY_NO_TIMEOUT)
-  #define TEST_NAME                "3"
-  #define TEST_STRING              "Priority/Without Timeout"
-  #define SEMAPHORE_OBTAIN_TIMEOUT 0
-  #define SEMAPHORE_ATTRIBUTES     RTEMS_PRIORITY
-
-#elif defined(PRIORITY_WITH_TIMEOUT)
-  #define TEST_NAME                "4"
-  #define TEST_STRING              "Priority/With Timeout"
-  #define SEMAPHORE_OBTAIN_TIMEOUT 10
-  #define SEMAPHORE_ATTRIBUTES     RTEMS_PRIORITY
-
-#elif defined(PRIORITY_NO_TIMEOUT_REVERSE)
-  #define TEST_NAME                "5"
-  #define TEST_STRING              "Priority/Without Timeout (Reverse)"
-  #define SEMAPHORE_OBTAIN_TIMEOUT 0
-  #define SEMAPHORE_ATTRIBUTES     RTEMS_PRIORITY
-
-#else
-
-  #error "Test Mode not defined"
-#endif
-
-const char rtems_test_name[] = "SPINTRCRITICAL " TEST_NAME;
-
-static Thread_Control *thread;
-
-static rtems_id Semaphore;
-
-static bool case_hit;
-
-static bool interrupts_blocking_op(void)
-{
-  Thread_Wait_flags flags = _Thread_Wait_flags_get( thread );
-
-  return
-    flags == ( THREAD_WAIT_CLASS_OBJECT | THREAD_WAIT_STATE_INTEND_TO_BLOCK );
-}
-
-static rtems_timer_service_routine test_release_from_isr(
-  rtems_id  timer,
-  void     *arg
-)
-{
-  rtems_status_code     status;
-
-  if ( interrupts_blocking_op() ) {
-    case_hit = true;
-  }
-
-  status = rtems_semaphore_release( Semaphore );
-  directive_failed_with_level( status, "release", -1 );
-}
-
-
-static bool test_body( void *arg )
-{
-  rtems_status_code status;
-
-  (void) arg;
-
-  status = rtems_semaphore_obtain(
-    Semaphore,
-    RTEMS_DEFAULT_OPTIONS,
-    SEMAPHORE_OBTAIN_TIMEOUT
-  );
-  directive_failed( status, "rtems_semaphore_obtain" );
-
-  return case_hit;
-}
-
-static rtems_task Init(
-  rtems_task_argument ignored
-)
-{
-  rtems_status_code     status;
-
-  TEST_BEGIN();
-
-  thread = _Thread_Get_executing();
-
-  puts( "Init - Trying to generate semaphore release from ISR while blocking" );
-  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" );
-
-  interrupt_critical_section_test( test_body, NULL, test_release_from_isr );
-
-  if ( case_hit ) {
-    puts( "Init - Case hit" );
-    TEST_END();
-  } else
-    puts( "Init - Case not hit - ran too long" );
-
-  rtems_test_exit(0);
-}
-
-/* configuration information */
-
-#define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
-#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS       1
-#define CONFIGURE_MAXIMUM_TIMERS      1
-#define CONFIGURE_MAXIMUM_SEMAPHORES  1
-#define CONFIGURE_MAXIMUM_USER_EXTENSIONS 1
-#define CONFIGURE_MICROSECONDS_PER_TICK  1000
-#if defined(PRIORITY_NO_TIMEOUT_REVERSE)
-  #define CONFIGURE_INIT_TASK_PRIORITY   250
-#endif
-#define CONFIGURE_MICROSECONDS_PER_TICK  1000
-#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#define CONFIGURE_INIT
-#include <rtems/confdefs.h>
-
-/* global variables */
+#define FIFO_NO_TIMEOUT
+#include "spintrcritical01impl.h"
diff --git a/testsuites/sptests/spintrcritical01/spintrcritical01impl.h b/testsuites/sptests/spintrcritical01/spintrcritical01impl.h
new file mode 100644
index 0000000000..5c480b4bb3
--- /dev/null
+++ b/testsuites/sptests/spintrcritical01/spintrcritical01impl.h
@@ -0,0 +1,155 @@
+/*
+ *  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>
+
+#include <rtems/score/threadimpl.h>
+
+#if defined(FIFO_NO_TIMEOUT)
+  #define TEST_NAME                "1"
+  #define TEST_STRING              "FIFO/Without Timeout"
+  #define SEMAPHORE_OBTAIN_TIMEOUT 0
+  #define SEMAPHORE_ATTRIBUTES     RTEMS_DEFAULT_ATTRIBUTES
+
+#elif defined(FIFO_WITH_TIMEOUT)
+  #define TEST_NAME                "2"
+  #define TEST_STRING              "FIFO/With Timeout"
+  #define SEMAPHORE_OBTAIN_TIMEOUT 10
+  #define SEMAPHORE_ATTRIBUTES     RTEMS_DEFAULT_ATTRIBUTES
+
+#elif defined(PRIORITY_NO_TIMEOUT)
+  #define TEST_NAME                "3"
+  #define TEST_STRING              "Priority/Without Timeout"
+  #define SEMAPHORE_OBTAIN_TIMEOUT 0
+  #define SEMAPHORE_ATTRIBUTES     RTEMS_PRIORITY
+
+#elif defined(PRIORITY_WITH_TIMEOUT)
+  #define TEST_NAME                "4"
+  #define TEST_STRING              "Priority/With Timeout"
+  #define SEMAPHORE_OBTAIN_TIMEOUT 10
+  #define SEMAPHORE_ATTRIBUTES     RTEMS_PRIORITY
+
+#elif defined(PRIORITY_NO_TIMEOUT_REVERSE)
+  #define TEST_NAME                "5"
+  #define TEST_STRING              "Priority/Without Timeout (Reverse)"
+  #define SEMAPHORE_OBTAIN_TIMEOUT 0
+  #define SEMAPHORE_ATTRIBUTES     RTEMS_PRIORITY
+
+#else
+
+  #error "Test Mode not defined"
+#endif
+
+const char rtems_test_name[] = "SPINTRCRITICAL " TEST_NAME;
+
+static Thread_Control *thread;
+
+static rtems_id Semaphore;
+
+static bool case_hit;
+
+static bool interrupts_blocking_op(void)
+{
+  Thread_Wait_flags flags = _Thread_Wait_flags_get( thread );
+
+  return
+    flags == ( THREAD_WAIT_CLASS_OBJECT | THREAD_WAIT_STATE_INTEND_TO_BLOCK );
+}
+
+static rtems_timer_service_routine test_release_from_isr(
+  rtems_id  timer,
+  void     *arg
+)
+{
+  rtems_status_code     status;
+
+  if ( interrupts_blocking_op() ) {
+    case_hit = true;
+  }
+
+  status = rtems_semaphore_release( Semaphore );
+  directive_failed_with_level( status, "release", -1 );
+}
+
+
+static bool test_body( void *arg )
+{
+  rtems_status_code status;
+
+  (void) arg;
+
+  status = rtems_semaphore_obtain(
+    Semaphore,
+    RTEMS_DEFAULT_OPTIONS,
+    SEMAPHORE_OBTAIN_TIMEOUT
+  );
+  directive_failed( status, "rtems_semaphore_obtain" );
+
+  return case_hit;
+}
+
+static rtems_task Init(
+  rtems_task_argument ignored
+)
+{
+  rtems_status_code     status;
+
+  TEST_BEGIN();
+
+  thread = _Thread_Get_executing();
+
+  puts( "Init - Trying to generate semaphore release from ISR while blocking" );
+  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" );
+
+  interrupt_critical_section_test( test_body, NULL, test_release_from_isr );
+
+  if ( case_hit ) {
+    puts( "Init - Case hit" );
+    TEST_END();
+  } else
+    puts( "Init - Case not hit - ran too long" );
+
+  rtems_test_exit(0);
+}
+
+/* configuration information */
+
+#define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+
+#define CONFIGURE_MAXIMUM_TASKS       1
+#define CONFIGURE_MAXIMUM_TIMERS      1
+#define CONFIGURE_MAXIMUM_SEMAPHORES  1
+#define CONFIGURE_MAXIMUM_USER_EXTENSIONS 1
+#define CONFIGURE_MICROSECONDS_PER_TICK  1000
+#if defined(PRIORITY_NO_TIMEOUT_REVERSE)
+  #define CONFIGURE_INIT_TASK_PRIORITY   250
+#endif
+#define CONFIGURE_MICROSECONDS_PER_TICK  1000
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
+
+#define CONFIGURE_INIT
+#include <rtems/confdefs.h>
+
+/* global variables */