From c89a5dc821b48644a639c57bb3cca781185899be Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Wed, 6 Nov 2019 16:07:48 +0100 Subject: samples: Avoid build system defined defines Update #3818. --- testsuites/samples/Makefile.am | 10 +++---- testsuites/samples/base_mp/init.c | 48 ---------------------------------- testsuites/samples/base_mp/init1.c | 2 ++ testsuites/samples/base_mp/init2.c | 2 ++ testsuites/samples/base_mp/initimpl.h | 48 ++++++++++++++++++++++++++++++++++ testsuites/samples/paranoia/paranoia.c | 4 +++ 6 files changed, 61 insertions(+), 53 deletions(-) delete mode 100644 testsuites/samples/base_mp/init.c create mode 100644 testsuites/samples/base_mp/init1.c create mode 100644 testsuites/samples/base_mp/init2.c create mode 100644 testsuites/samples/base_mp/initimpl.h diff --git a/testsuites/samples/Makefile.am b/testsuites/samples/Makefile.am index f05c9a3689..1944d90ccc 100644 --- a/testsuites/samples/Makefile.am +++ b/testsuites/samples/Makefile.am @@ -19,14 +19,14 @@ if TEST_base_mp samples += base_mp_node1 sample_screens += base_mp/base_mp-node1.scn sample_docs += base_mp/base_mp-node1.doc -base_mp_node1_SOURCES = base_mp/init.c base_mp/apptask.c base_mp/system.h -base_mp_node1_CPPFLAGS = -DNODE_NUMBER=1 $(AM_CPPFLAGS) $(TEST_FLAGS_base_mp) \ +base_mp_node1_SOURCES = base_mp/init1.c base_mp/apptask.c base_mp/system.h +base_mp_node1_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_base_mp) \ $(support_includes) samples += base_mp_node2 sample_screens += base_mp/base_mp-node2.scn sample_docs += base_mp/base_mp-node2.doc -base_mp_node2_SOURCES = base_mp/init.c base_mp/apptask.c base_mp/system.h -base_mp_node2_CPPFLAGS = -DNODE_NUMBER=2 $(AM_CPPFLAGS) $(TEST_FLAGS_base_mp) \ +base_mp_node2_SOURCES = base_mp/init2.c base_mp/apptask.c base_mp/system.h +base_mp_node2_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_base_mp) \ $(support_includes) endif endif @@ -120,7 +120,7 @@ sample_docs += paranoia/paranoia.doc paranoia_SOURCES = paranoia/init.c paranoia/paranoia.c \ paranoia/system.h paranoia_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_paranoia) \ - $(support_includes) -DCYGNUS -DNOMAIN -DNOSIGNAL + $(support_includes) paranoia_LDADD = -lm $(LDADD) endif diff --git a/testsuites/samples/base_mp/init.c b/testsuites/samples/base_mp/init.c deleted file mode 100644 index 608b0dea51..0000000000 --- a/testsuites/samples/base_mp/init.c +++ /dev/null @@ -1,48 +0,0 @@ -/** - * 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 - -#define CONFIGURE_INIT -#include "system.h" -#include - -#include "tmacros.h" - -/* forward declarations to avoid warnings */ -rtems_task Init(rtems_task_argument argument); - -const char rtems_test_name[] = "SAMPLE MULTIPROCESSOR APPLICATION"; - -rtems_task Init( - rtems_task_argument argument -) -{ - rtems_name task_name; - rtems_id tid; - rtems_status_code status; - - TEST_BEGIN(); - printf( "Creating and starting an application task\n" ); - task_name = rtems_build_name( 'T', 'A', '1', ' ' ); - status = rtems_task_create( task_name, 1, RTEMS_MINIMUM_STACK_SIZE, - RTEMS_INTERRUPT_LEVEL(0), RTEMS_DEFAULT_ATTRIBUTES, &tid ); - rtems_test_assert(status == RTEMS_SUCCESSFUL); - - status = rtems_task_start( - tid, - Application_task, - Multiprocessing_configuration.node - ); - rtems_test_assert(status == RTEMS_SUCCESSFUL); - - rtems_task_exit(); -} diff --git a/testsuites/samples/base_mp/init1.c b/testsuites/samples/base_mp/init1.c new file mode 100644 index 0000000000..cfe033db60 --- /dev/null +++ b/testsuites/samples/base_mp/init1.c @@ -0,0 +1,2 @@ +#define CONFIGURE_MP_NODE_NUMBER 1 +#include "initimpl.h" diff --git a/testsuites/samples/base_mp/init2.c b/testsuites/samples/base_mp/init2.c new file mode 100644 index 0000000000..40c2c81592 --- /dev/null +++ b/testsuites/samples/base_mp/init2.c @@ -0,0 +1,2 @@ +#define CONFIGURE_MP_NODE_NUMBER 2 +#include "initimpl.h" diff --git a/testsuites/samples/base_mp/initimpl.h b/testsuites/samples/base_mp/initimpl.h new file mode 100644 index 0000000000..608b0dea51 --- /dev/null +++ b/testsuites/samples/base_mp/initimpl.h @@ -0,0 +1,48 @@ +/** + * 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 + +#define CONFIGURE_INIT +#include "system.h" +#include + +#include "tmacros.h" + +/* forward declarations to avoid warnings */ +rtems_task Init(rtems_task_argument argument); + +const char rtems_test_name[] = "SAMPLE MULTIPROCESSOR APPLICATION"; + +rtems_task Init( + rtems_task_argument argument +) +{ + rtems_name task_name; + rtems_id tid; + rtems_status_code status; + + TEST_BEGIN(); + printf( "Creating and starting an application task\n" ); + task_name = rtems_build_name( 'T', 'A', '1', ' ' ); + status = rtems_task_create( task_name, 1, RTEMS_MINIMUM_STACK_SIZE, + RTEMS_INTERRUPT_LEVEL(0), RTEMS_DEFAULT_ATTRIBUTES, &tid ); + rtems_test_assert(status == RTEMS_SUCCESSFUL); + + status = rtems_task_start( + tid, + Application_task, + Multiprocessing_configuration.node + ); + rtems_test_assert(status == RTEMS_SUCCESSFUL); + + rtems_task_exit(); +} diff --git a/testsuites/samples/paranoia/paranoia.c b/testsuites/samples/paranoia/paranoia.c index 0c207533f4..2f2d1943fe 100644 --- a/testsuites/samples/paranoia/paranoia.c +++ b/testsuites/samples/paranoia/paranoia.c @@ -3,6 +3,10 @@ #endif #include +#define CYGNUS +#define NOMAIN +#define NOSIGNAL + /* * A C version of Kahan's Floating Point Test "Paranoia" * -- cgit v1.2.3