summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2019-11-06 19:13:30 +0100
committerSebastian Huber <sebastian.huber@embedded-brains.de>2019-11-12 09:36:20 +0100
commit786ae3f7dfabb56add80bc0aeacbab5b98ca71aa (patch)
treeeeadb735575b75b45928cbec60a6a0d97aadb726
parentmptests/mp14: Make MAX_LONG_TEST_DURATION constant (diff)
downloadrtems-786ae3f7dfabb56add80bc0aeacbab5b98ca71aa.tar.bz2
ada/samples: Avoid build system defined defines
Update #3818.
-rw-r--r--testsuites/ada/samples/base_mp/node1/Makefile.am6
-rw-r--r--testsuites/ada/samples/base_mp/node1/init.c2
-rw-r--r--testsuites/ada/samples/base_mp/node2/Makefile.am6
-rw-r--r--testsuites/ada/samples/base_mp/node2/init.c2
4 files changed, 8 insertions, 8 deletions
diff --git a/testsuites/ada/samples/base_mp/node1/Makefile.am b/testsuites/ada/samples/base_mp/node1/Makefile.am
index 4916854597..26770f4e9a 100644
--- a/testsuites/ada/samples/base_mp/node1/Makefile.am
+++ b/testsuites/ada/samples/base_mp/node1/Makefile.am
@@ -4,18 +4,16 @@ include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/ada.am
AM_ADAFLAGS += -I$(srcdir)/..
+AM_CPPFLAGS += -I$(srcdir)/..
if EXPADA
noinst_PROGRAMS = ada_base_mp_node1
-ada_base_mp_node1_SOURCES = mptest-per_node_configuration.adb
+ada_base_mp_node1_SOURCES = init.c mptest-per_node_configuration.adb
endif
ada_base_mp_node1$(EXEEXT): ../mptest.adb init.o
$(GNATCOMPILE) -margs -a $< -o $@
-init.o: ../../../support/init.c
- $(COMPILE.c) $(AM_CPPFLAGS) -DNODE_NUMBER=1 -I$(srcdir)/.. -c $<
-
scndir = $(rtems_ada_testsdir)
dist_scn_DATA = ada_base_mp-node1.scn
diff --git a/testsuites/ada/samples/base_mp/node1/init.c b/testsuites/ada/samples/base_mp/node1/init.c
new file mode 100644
index 0000000000..073c033378
--- /dev/null
+++ b/testsuites/ada/samples/base_mp/node1/init.c
@@ -0,0 +1,2 @@
+#define CONFIGURE_MP_NODE_NUMBER 1
+#include "../../../support/init.c"
diff --git a/testsuites/ada/samples/base_mp/node2/Makefile.am b/testsuites/ada/samples/base_mp/node2/Makefile.am
index 277a3940a8..0129427f02 100644
--- a/testsuites/ada/samples/base_mp/node2/Makefile.am
+++ b/testsuites/ada/samples/base_mp/node2/Makefile.am
@@ -4,18 +4,16 @@ include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/ada.am
AM_ADAFLAGS += -I$(srcdir)/..
+AM_CPPFLAGS += -I$(srcdir)/..
if EXPADA
noinst_PROGRAMS = ada_base_mp_node2
-ada_base_mp_node2_SOURCES = mptest-per_node_configuration.adb
+ada_base_mp_node2_SOURCES = init.c mptest-per_node_configuration.adb
endif
ada_base_mp_node2$(EXEEXT): ../mptest.adb init.o
$(GNATCOMPILE) -margs -a $< -o $@
-init.o: ../../../support/init.c
- $(COMPILE.c) $(AM_CPPFLAGS) -DNODE_NUMBER=2 -I$(srcdir)/.. -c $<
-
scndir = $(rtems_ada_testsdir)
dist_scn_DATA = ada_base_mp-node2.scn
diff --git a/testsuites/ada/samples/base_mp/node2/init.c b/testsuites/ada/samples/base_mp/node2/init.c
new file mode 100644
index 0000000000..ea6db06eab
--- /dev/null
+++ b/testsuites/ada/samples/base_mp/node2/init.c
@@ -0,0 +1,2 @@
+#define CONFIGURE_MP_NODE_NUMBER 2
+#include "../../../support/init.c"