From 0b520cb71804b355cf141ea5c5596aabed711824 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Wed, 6 Nov 2019 19:28:29 +0100
Subject: mptests: Avoid build system defined defines

Update #3818.
---
 testsuites/mptests/mp05/init.c     | 65 --------------------------------------
 testsuites/mptests/mp05/init1.c    |  2 ++
 testsuites/mptests/mp05/init2.c    |  2 ++
 testsuites/mptests/mp05/initimpl.h | 65 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 69 insertions(+), 65 deletions(-)
 delete mode 100644 testsuites/mptests/mp05/init.c
 create mode 100644 testsuites/mptests/mp05/init1.c
 create mode 100644 testsuites/mptests/mp05/init2.c
 create mode 100644 testsuites/mptests/mp05/initimpl.h

(limited to 'testsuites/mptests/mp05')

diff --git a/testsuites/mptests/mp05/init.c b/testsuites/mptests/mp05/init.c
deleted file mode 100644
index a2d4002fde..0000000000
--- a/testsuites/mptests/mp05/init.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization task for this test program.
- *  It is a user initialization task and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1999.
- *  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
-
-#define CONFIGURE_INIT
-#include "system.h"
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  printf(
-    "\n\n*** TEST 5 -- NODE %" PRIu32 " ***\n",
-    Multiprocessing_configuration.node
-  );
-
-  Task_name[ 1 ] = rtems_build_name( '1', '1', '1', ' ' );
-  Task_name[ 2 ] = rtems_build_name( '2', '2', '2', ' ' );
-
-  puts( "Creating Test_task (Global)" );
-  status = rtems_task_create(
-    Task_name[Multiprocessing_configuration.node],
-    1,
-    RTEMS_MINIMUM_STACK_SIZE * 2,
-    RTEMS_TIMESLICE,
-    RTEMS_GLOBAL,
-    &Task_id[ 1 ]
-  );
-  directive_failed( status, "rtems_task_create" );
-
-  puts( "Starting Test_task (Global)" );
-  status = rtems_task_start( Task_id[ 1 ], Test_task, 0 );
-  directive_failed( status, "rtems_task_start" );
-
-  Timer_name[ 1 ] = rtems_build_name( 'T', 'M', '1', ' ' );
-
-  status = rtems_timer_create( Timer_name[ 1 ], &Timer_id[ 1 ] );
-  directive_failed( status, "rtems_timer_create" );
-
-  puts( "Deleting initialization task" );
-  rtems_task_exit();
-}
diff --git a/testsuites/mptests/mp05/init1.c b/testsuites/mptests/mp05/init1.c
new file mode 100644
index 0000000000..cfe033db60
--- /dev/null
+++ b/testsuites/mptests/mp05/init1.c
@@ -0,0 +1,2 @@
+#define CONFIGURE_MP_NODE_NUMBER 1
+#include "initimpl.h"
diff --git a/testsuites/mptests/mp05/init2.c b/testsuites/mptests/mp05/init2.c
new file mode 100644
index 0000000000..40c2c81592
--- /dev/null
+++ b/testsuites/mptests/mp05/init2.c
@@ -0,0 +1,2 @@
+#define CONFIGURE_MP_NODE_NUMBER 2
+#include "initimpl.h"
diff --git a/testsuites/mptests/mp05/initimpl.h b/testsuites/mptests/mp05/initimpl.h
new file mode 100644
index 0000000000..a2d4002fde
--- /dev/null
+++ b/testsuites/mptests/mp05/initimpl.h
@@ -0,0 +1,65 @@
+/*  Init
+ *
+ *  This routine is the initialization task for this test program.
+ *  It is a user initialization task and has the responsibility for creating
+ *  and starting the tasks that make up the test.  If the time of day
+ *  clock is required for the test, it should also be set to a known
+ *  value by this function.
+ *
+ *  Input parameters:
+ *    argument - task argument
+ *
+ *  Output parameters:  NONE
+ *
+ *  COPYRIGHT (c) 1989-1999.
+ *  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
+
+#define CONFIGURE_INIT
+#include "system.h"
+
+rtems_task Init(
+  rtems_task_argument argument
+)
+{
+  rtems_status_code status;
+
+  printf(
+    "\n\n*** TEST 5 -- NODE %" PRIu32 " ***\n",
+    Multiprocessing_configuration.node
+  );
+
+  Task_name[ 1 ] = rtems_build_name( '1', '1', '1', ' ' );
+  Task_name[ 2 ] = rtems_build_name( '2', '2', '2', ' ' );
+
+  puts( "Creating Test_task (Global)" );
+  status = rtems_task_create(
+    Task_name[Multiprocessing_configuration.node],
+    1,
+    RTEMS_MINIMUM_STACK_SIZE * 2,
+    RTEMS_TIMESLICE,
+    RTEMS_GLOBAL,
+    &Task_id[ 1 ]
+  );
+  directive_failed( status, "rtems_task_create" );
+
+  puts( "Starting Test_task (Global)" );
+  status = rtems_task_start( Task_id[ 1 ], Test_task, 0 );
+  directive_failed( status, "rtems_task_start" );
+
+  Timer_name[ 1 ] = rtems_build_name( 'T', 'M', '1', ' ' );
+
+  status = rtems_timer_create( Timer_name[ 1 ], &Timer_id[ 1 ] );
+  directive_failed( status, "rtems_timer_create" );
+
+  puts( "Deleting initialization task" );
+  rtems_task_exit();
+}
-- 
cgit v1.2.3