summaryrefslogtreecommitdiffstats
path: root/testsuites/mptests/mp10
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2018-04-09 13:41:08 +1000
committerChris Johns <chrisj@rtems.org>2018-04-10 08:24:54 +1000
commit3206879f06e7e74abe0593d53a67e6cccab4bd18 (patch)
tree6a3f8e0022f1d4e4c09d0f42e215245b3547019b /testsuites/mptests/mp10
parenttestsuite/fstests: Merged nested Makefile.am files into one Makefile.am (diff)
downloadrtems-3206879f06e7e74abe0593d53a67e6cccab4bd18.tar.bz2
testsuite/mptests: Merged nested Makefile.am files into one Makefile.am
This change is part of the testsuite Makefile.am reorganization. Update #3382
Diffstat (limited to 'testsuites/mptests/mp10')
-rw-r--r--testsuites/mptests/mp10/mp10-node1.doc (renamed from testsuites/mptests/mp10/node1/mp10-node1.doc)0
-rw-r--r--testsuites/mptests/mp10/mp10-node1.scn (renamed from testsuites/mptests/mp10/node1/mp10-node1.scn)0
-rw-r--r--testsuites/mptests/mp10/mp10-node2.doc (renamed from testsuites/mptests/mp10/node2/mp10-node2.doc)0
-rw-r--r--testsuites/mptests/mp10/mp10-node2.scn (renamed from testsuites/mptests/mp10/node2/mp10-node2.scn)0
-rw-r--r--testsuites/mptests/mp10/node1/Makefile.am22
-rw-r--r--testsuites/mptests/mp10/node2/Makefile.am22
6 files changed, 0 insertions, 44 deletions
diff --git a/testsuites/mptests/mp10/node1/mp10-node1.doc b/testsuites/mptests/mp10/mp10-node1.doc
index fc926b0519..fc926b0519 100644
--- a/testsuites/mptests/mp10/node1/mp10-node1.doc
+++ b/testsuites/mptests/mp10/mp10-node1.doc
diff --git a/testsuites/mptests/mp10/node1/mp10-node1.scn b/testsuites/mptests/mp10/mp10-node1.scn
index deeafc0a9a..deeafc0a9a 100644
--- a/testsuites/mptests/mp10/node1/mp10-node1.scn
+++ b/testsuites/mptests/mp10/mp10-node1.scn
diff --git a/testsuites/mptests/mp10/node2/mp10-node2.doc b/testsuites/mptests/mp10/mp10-node2.doc
index 981286480f..981286480f 100644
--- a/testsuites/mptests/mp10/node2/mp10-node2.doc
+++ b/testsuites/mptests/mp10/mp10-node2.doc
diff --git a/testsuites/mptests/mp10/node2/mp10-node2.scn b/testsuites/mptests/mp10/mp10-node2.scn
index 25c07e6202..25c07e6202 100644
--- a/testsuites/mptests/mp10/node2/mp10-node2.scn
+++ b/testsuites/mptests/mp10/mp10-node2.scn
diff --git a/testsuites/mptests/mp10/node1/Makefile.am b/testsuites/mptests/mp10/node1/Makefile.am
deleted file mode 100644
index 54b190071e..0000000000
--- a/testsuites/mptests/mp10/node1/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-rtems_tests_PROGRAMS = mp10-node1
-mp10_node1_SOURCES = ../init.c ../task1.c ../task2.c ../task3.c ../system.h
-
-dist_rtems_tests_DATA = mp10-node1.scn
-dist_rtems_tests_DATA += mp10-node1.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/..
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(mp10_node1_OBJECTS)
-LINK_LIBS = $(mp10_node1_LDLIBS)
-
-mp10-node1$(EXEEXT): $(mp10_node1_OBJECTS) $(mp10_node1_DEPENDENCIES)
- @rm -f mp10-node1$(EXEEXT)
- $(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp10/node2/Makefile.am b/testsuites/mptests/mp10/node2/Makefile.am
deleted file mode 100644
index 86ccb574cd..0000000000
--- a/testsuites/mptests/mp10/node2/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-rtems_tests_PROGRAMS = mp10-node2
-mp10_node2_SOURCES = ../init.c ../task1.c ../task2.c ../task3.c ../system.h
-
-dist_rtems_tests_DATA = mp10-node2.scn
-dist_rtems_tests_DATA += mp10-node2.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/..
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(mp10_node2_OBJECTS)
-LINK_LIBS = $(mp10_node2_LDLIBS)
-
-mp10-node2$(EXEEXT): $(mp10_node2_OBJECTS) $(mp10_node2_DEPENDENCIES)
- @rm -f mp10-node2$(EXEEXT)
- $(make-exe)
-
-include $(top_srcdir)/../automake/local.am