This change is part of the testsuite Makefile.am reorganization. Update #3382 --- testsuites/mptests/Makefile.am | 262 +++++++++++++++++++-- testsuites/mptests/configure.ac | 58 ++--- testsuites/mptests/mp01/{node1 => }/mp01-node1.doc | 0 testsuites/mptests/mp01/{node1 => }/mp01-node1.scn | 0 testsuites/mptests/mp01/{node2 => }/mp01-node2.doc | 0 testsuites/mptests/mp01/{node2 => }/mp01-node2.scn | 0 testsuites/mptests/mp01/node1/Makefile.am | 21 -- testsuites/mptests/mp01/node2/Makefile.am | 22 -- testsuites/mptests/mp03/{node1 => }/mp03-node1.doc | 0 testsuites/mptests/mp03/{node1 => }/mp03-node1.scn | 0 testsuites/mptests/mp03/{node2 => }/mp03-node2.doc | 0 testsuites/mptests/mp03/{node2 => }/mp03-node2.scn | 0 testsuites/mptests/mp03/node1/Makefile.am | 22 -- testsuites/mptests/mp03/node2/Makefile.am | 22 -- testsuites/mptests/mp04/{node1 => }/mp04-node1.doc | 0 testsuites/mptests/mp04/{node1 => }/mp04-node1.scn | 0 testsuites/mptests/mp04/{node2 => }/mp04-node2.doc | 0 testsuites/mptests/mp04/{node2 => }/mp04-node2.scn | 0 testsuites/mptests/mp04/node1/Makefile.am | 22 -- testsuites/mptests/mp04/node2/Makefile.am | 22 -- testsuites/mptests/mp05/{node1 => }/mp05-node1.doc | 0 testsuites/mptests/mp05/{node1 => }/mp05-node1.scn | 0 testsuites/mptests/mp05/{node2 => }/mp05-node2.doc | 0 testsuites/mptests/mp05/{node2 => }/mp05-node2.scn | 0 testsuites/mptests/mp05/node1/Makefile.am | 22 -- testsuites/mptests/mp05/node2/Makefile.am | 22 -- testsuites/mptests/mp06/{node1 => }/mp06-node1.doc | 0 testsuites/mptests/mp06/{node1 => }/mp06-node1.scn | 0 testsuites/mptests/mp06/{node2 => }/mp06-node2.doc | 0 testsuites/mptests/mp06/{node2 => }/mp06-node2.scn | 0 testsuites/mptests/mp06/node1/Makefile.am | 22 -- testsuites/mptests/mp06/node2/Makefile.am | 22 -- testsuites/mptests/mp07/{node1 => }/mp07-node1.doc | 0 testsuites/mptests/mp07/{node1 => }/mp07-node1.scn | 0 testsuites/mptests/mp07/{node2 => }/mp07-node2.doc | 0 testsuites/mptests/mp07/{node2 => }/mp07-node2.scn | 0 testsuites/mptests/mp07/node1/Makefile.am | 22 -- testsuites/mptests/mp07/node2/Makefile.am | 22 -- testsuites/mptests/mp08/{node1 => }/mp08-node1.doc | 0 testsuites/mptests/mp08/{node1 => }/mp08-node1.scn | 0 testsuites/mptests/mp08/{node2 => }/mp08-node2.doc | 0 testsuites/mptests/mp08/{node2 => }/mp08-node2.scn | 0 testsuites/mptests/mp08/node1/Makefile.am | 22 -- testsuites/mptests/mp08/node2/Makefile.am | 22 -- testsuites/mptests/mp09/{node1 => }/mp09-node1.doc | 0 testsuites/mptests/mp09/{node1 => }/mp09-node1.scn | 0 testsuites/mptests/mp09/{node2 => }/mp09-node2.doc | 0 testsuites/mptests/mp09/{node2 => }/mp09-node2.scn | 0 testsuites/mptests/mp09/node1/Makefile.am | 22 -- testsuites/mptests/mp09/node2/Makefile.am | 22 -- testsuites/mptests/mp10/{node1 => }/mp10-node1.doc | 0 testsuites/mptests/mp10/{node1 => }/mp10-node1.scn | 0 testsuites/mptests/mp10/{node2 => }/mp10-node2.doc | 0 testsuites/mptests/mp10/{node2 => }/mp10-node2.scn | 0 testsuites/mptests/mp10/node1/Makefile.am | 22 -- testsuites/mptests/mp10/node2/Makefile.am | 22 -- testsuites/mptests/mp11/{node1 => }/mp11-node1.doc | 0 testsuites/mptests/mp11/{node1 => }/mp11-node1.scn | 0 testsuites/mptests/mp11/{node2 => }/mp11-node2.doc | 0 testsuites/mptests/mp11/{node2 => }/mp11-node2.scn | 0 testsuites/mptests/mp11/node1/Makefile.am | 22 -- testsuites/mptests/mp11/node2/Makefile.am | 22 -- testsuites/mptests/mp12/{node1 => }/mp12-node1.doc | 0 testsuites/mptests/mp12/{node1 => }/mp12-node1.scn | 0 testsuites/mptests/mp12/{node2 => }/mp12-node2.doc | 0 testsuites/mptests/mp12/{node2 => }/mp12-node2.scn | 0 testsuites/mptests/mp12/node1/Makefile.am | 22 -- testsuites/mptests/mp12/node2/Makefile.am | 22 -- testsuites/mptests/mp13/{node1 => }/mp13-node1.doc | 0 testsuites/mptests/mp13/{node1 => }/mp13-node1.scn | 0 testsuites/mptests/mp13/{node2 => }/mp13-node2.doc | 0 testsuites/mptests/mp13/{node2 => }/mp13-node2.scn | 0 testsuites/mptests/mp13/node1/Makefile.am | 22 -- testsuites/mptests/mp13/node2/Makefile.am | 22 -- testsuites/mptests/mp14/{node1 => }/mp14-node1.doc | 0 testsuites/mptests/mp14/{node1 => }/mp14-node1.scn | 0 testsuites/mptests/mp14/{node2 => }/mp14-node2.doc | 0 testsuites/mptests/mp14/{node2 => }/mp14-node2.scn | 0 testsuites/mptests/mp14/node1/Makefile.am | 24 -- testsuites/mptests/mp14/node2/Makefile.am | 24 -- 80 files changed, 262 insertions(+), 633 deletions(-) rename testsuites/mptests/mp01/{node1 => }/mp01-node1.doc (100%) rename testsuites/mptests/mp01/{node1 => }/mp01-node1.scn (100%) rename testsuites/mptests/mp01/{node2 => }/mp01-node2.doc (100%) rename testsuites/mptests/mp01/{node2 => }/mp01-node2.scn (100%) delete mode 100644 testsuites/mptests/mp01/node1/Makefile.am delete mode 100644 testsuites/mptests/mp01/node2/Makefile.am rename testsuites/mptests/mp03/{node1 => }/mp03-node1.doc (100%) rename testsuites/mptests/mp03/{node1 => }/mp03-node1.scn (100%) rename testsuites/mptests/mp03/{node2 => }/mp03-node2.doc (100%) rename testsuites/mptests/mp03/{node2 => }/mp03-node2.scn (100%) delete mode 100644 testsuites/mptests/mp03/node1/Makefile.am delete mode 100644 testsuites/mptests/mp03/node2/Makefile.am rename testsuites/mptests/mp04/{node1 => }/mp04-node1.doc (100%) rename testsuites/mptests/mp04/{node1 => }/mp04-node1.scn (100%) rename testsuites/mptests/mp04/{node2 => }/mp04-node2.doc (100%) rename testsuites/mptests/mp04/{node2 => }/mp04-node2.scn (100%) delete mode 100644 testsuites/mptests/mp04/node1/Makefile.am delete mode 100644 testsuites/mptests/mp04/node2/Makefile.am rename testsuites/mptests/mp05/{node1 => }/mp05-node1.doc (100%) rename testsuites/mptests/mp05/{node1 => }/mp05-node1.scn (100%) rename testsuites/mptests/mp05/{node2 => }/mp05-node2.doc (100%) rename testsuites/mptests/mp05/{node2 => }/mp05-node2.scn (100%) delete mode 100644 testsuites/mptests/mp05/node1/Makefile.am delete mode 100644 testsuites/mptests/mp05/node2/Makefile.am rename testsuites/mptests/mp06/{node1 => }/mp06-node1.doc (100%) rename testsuites/mptests/mp06/{node1 => }/mp06-node1.scn (100%) rename testsuites/mptests/mp06/{node2 => }/mp06-node2.doc (100%) rename testsuites/mptests/mp06/{node2 => }/mp06-node2.scn (100%) delete mode 100644 testsuites/mptests/mp06/node1/Makefile.am delete mode 100644 testsuites/mptests/mp06/node2/Makefile.am rename testsuites/mptests/mp07/{node1 => }/mp07-node1.doc (100%) rename testsuites/mptests/mp07/{node1 => }/mp07-node1.scn (100%) rename testsuites/mptests/mp07/{node2 => }/mp07-node2.doc (100%) rename testsuites/mptests/mp07/{node2 => }/mp07-node2.scn (100%) delete mode 100644 testsuites/mptests/mp07/node1/Makefile.am delete mode 100644 testsuites/mptests/mp07/node2/Makefile.am rename testsuites/mptests/mp08/{node1 => }/mp08-node1.doc (100%) rename testsuites/mptests/mp08/{node1 => }/mp08-node1.scn (100%) rename testsuites/mptests/mp08/{node2 => }/mp08-node2.doc (100%) rename testsuites/mptests/mp08/{node2 => }/mp08-node2.scn (100%) delete mode 100644 testsuites/mptests/mp08/node1/Makefile.am delete mode 100644 testsuites/mptests/mp08/node2/Makefile.am rename testsuites/mptests/mp09/{node1 => }/mp09-node1.doc (100%) rename testsuites/mptests/mp09/{node1 => }/mp09-node1.scn (100%) rename testsuites/mptests/mp09/{node2 => }/mp09-node2.doc (100%) rename testsuites/mptests/mp09/{node2 => }/mp09-node2.scn (100%) delete mode 100644 testsuites/mptests/mp09/node1/Makefile.am delete mode 100644 testsuites/mptests/mp09/node2/Makefile.am rename testsuites/mptests/mp10/{node1 => }/mp10-node1.doc (100%) rename testsuites/mptests/mp10/{node1 => }/mp10-node1.scn (100%) rename testsuites/mptests/mp10/{node2 => }/mp10-node2.doc (100%) rename testsuites/mptests/mp10/{node2 => }/mp10-node2.scn (100%) delete mode 100644 testsuites/mptests/mp10/node1/Makefile.am delete mode 100644 testsuites/mptests/mp10/node2/Makefile.am rename testsuites/mptests/mp11/{node1 => }/mp11-node1.doc (100%) rename testsuites/mptests/mp11/{node1 => }/mp11-node1.scn (100%) rename testsuites/mptests/mp11/{node2 => }/mp11-node2.doc (100%) rename testsuites/mptests/mp11/{node2 => }/mp11-node2.scn (100%) delete mode 100644 testsuites/mptests/mp11/node1/Makefile.am delete mode 100644 testsuites/mptests/mp11/node2/Makefile.am rename testsuites/mptests/mp12/{node1 => }/mp12-node1.doc (100%) rename testsuites/mptests/mp12/{node1 => }/mp12-node1.scn (100%) rename testsuites/mptests/mp12/{node2 => }/mp12-node2.doc (100%) rename testsuites/mptests/mp12/{node2 => }/mp12-node2.scn (100%) delete mode 100644 testsuites/mptests/mp12/node1/Makefile.am delete mode 100644 testsuites/mptests/mp12/node2/Makefile.am rename testsuites/mptests/mp13/{node1 => }/mp13-node1.doc (100%) rename testsuites/mptests/mp13/{node1 => }/mp13-node1.scn (100%) rename testsuites/mptests/mp13/{node2 => }/mp13-node2.doc (100%) rename testsuites/mptests/mp13/{node2 => }/mp13-node2.scn (100%) delete mode 100644 testsuites/mptests/mp13/node1/Makefile.am delete mode 100644 testsuites/mptests/mp13/node2/Makefile.am rename testsuites/mptests/mp14/{node1 => }/mp14-node1.doc (100%) rename testsuites/mptests/mp14/{node1 => }/mp14-node1.scn (100%) rename testsuites/mptests/mp14/{node2 => }/mp14-node2.doc (100%) rename testsuites/mptests/mp14/{node2 => }/mp14-node2.scn (100%) delete mode 100644 testsuites/mptests/mp14/node1/Makefile.am delete mode 100644 testsuites/mptests/mp14/node2/Makefile.am
diff --git a/testsuites/mptests/Makefile.am b/testsuites/mptests/Makefile.am index cfb80e5a23..18416169d5 100644 --- a/testsuites/mptests/Makefile.am +++ b/testsuites/mptests/Makefile.am @@ -1,19 +1,249 @@ +# +# Multiple Processor Teststuite +# + ACLOCAL_AMFLAGS = -I ../aclocal -_SUBDIRS = -_SUBDIRS += mp01 -_SUBDIRS += mp03 -_SUBDIRS += mp04 -_SUBDIRS += mp05 -_SUBDIRS += mp06 -_SUBDIRS += mp07 -_SUBDIRS += mp08 -_SUBDIRS += mp09 -_SUBDIRS += mp10 -_SUBDIRS += mp11 -_SUBDIRS += mp12 -_SUBDIRS += mp13 -_SUBDIRS += mp14 - -include $(top_srcdir)/../automake/subdirs.am +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../automake/compile.am + +mp_tests = +mp_screens = +mp_docs = +mp_lib = + +support_includes = -I$(top_srcdir)/../support/include + +if HAS_MP +if TEST_mp01 +mp_tests += mp01_node1 +mp_screens += mp01/mp01-node1.scn +mp_docs += mp01/mp01-node1.doc +mp01_node1_SOURCES = mp01/init.c mp01/task1.c mp01/system.h +mp01_node1_CPPFLAGS = -DNODE_NUMBER=1 $(AM_CPPFLAGS) $(TEST_FLAGS_mp01) \ + $(support_includes) +mp_tests += mp01_node2 +mp_screens += mp01/mp01-node2.scn +mp_docs += mp01/mp01-node2.doc +mp01_node2_SOURCES = mp01/init.c mp01/task1.c mp01/system.h +mp01_node2_CPPFLAGS = -DNODE_NUMBER=2 $(AM_CPPFLAGS) $(TEST_FLAGS_mp01) \ + $(support_includes) +endif +endif + +if HAS_MP +if TEST_mp03 +mp_tests += mp03_node1 +mp_screens += mp03/mp03-node1.scn +mp_docs += mp03/mp03-node1.doc +mp03_node1_SOURCES = mp03/init.c mp03/task1.c mp03/delay.c mp03/system.h +mp03_node1_CPPFLAGS = -DNODE_NUMBER=1 $(AM_CPPFLAGS) $(TEST_FLAGS_mp03) \ + $(support_includes) +mp_tests += mp03_node2 +mp_screens += mp03/mp03-node2.scn +mp_docs += mp03/mp03-node2.doc +mp03_node2_SOURCES = mp03/init.c mp03/task1.c mp03/delay.c mp03/system.h +mp03_node2_CPPFLAGS = -DNODE_NUMBER=2 $(AM_CPPFLAGS) $(TEST_FLAGS_mp03) \ + $(support_includes) +endif +endif + +if HAS_MP +if TEST_mp04 +mp_tests += mp04_node1 +mp_screens += mp04/mp04-node1.scn +mp_docs += mp04/mp04-node1.doc +mp04_node1_SOURCES = mp04/init.c mp04/task1.c mp04/system.h +mp04_node1_CPPFLAGS = -DNODE_NUMBER=1 $(AM_CPPFLAGS) $(TEST_FLAGS_mp04) \ + $(support_includes) +mp_tests += mp04_node2 +mp_screens += mp04/mp04-node2.scn +mp_docs += mp04/mp04-node2.doc +mp04_node2_SOURCES = mp04/init.c mp04/task1.c mp04/system.h +mp04_node2_CPPFLAGS = -DNODE_NUMBER=2 $(AM_CPPFLAGS) $(TEST_FLAGS_mp04) \ + $(support_includes) +endif +endif + +if HAS_MP +if TEST_mp05 +mp_tests += mp05_node1 +mp_screens += mp05/mp05-node1.scn +mp_docs += mp05/mp05-node1.doc +mp05_node1_SOURCES = mp05/init.c mp05/task1.c mp05/asr.c mp05/system.h +mp05_node1_CPPFLAGS = -DNODE_NUMBER=1 $(AM_CPPFLAGS) $(TEST_FLAGS_mp05) \ + $(support_includes) +mp_tests += mp05_node2 +mp_screens += mp05/mp05-node2.scn +mp_docs += mp05/mp05-node2.doc +mp05_node2_SOURCES = mp05/init.c mp05/task1.c mp05/asr.c mp05/system.h +mp05_node2_CPPFLAGS = -DNODE_NUMBER=2 $(AM_CPPFLAGS) $(TEST_FLAGS_mp05) \ + $(support_includes) +endif +endif + +if HAS_MP +if TEST_mp06 +mp_tests += mp06_node1 +mp_screens += mp06/mp06-node1.scn +mp_docs += mp06/mp06-node1.doc +mp06_node1_SOURCES = mp06/init.c mp06/task1.c mp06/system.h +mp06_node1_CPPFLAGS = -DNODE_NUMBER=1 $(AM_CPPFLAGS) $(TEST_FLAGS_mp06) \ + $(support_includes) +mp_tests += mp06_node2 +mp_screens += mp06/mp06-node2.scn +mp_docs += mp06/mp06-node2.doc +mp06_node2_SOURCES = mp06/init.c mp06/task1.c mp06/system.h +mp06_node2_CPPFLAGS = -DNODE_NUMBER=2 $(AM_CPPFLAGS) $(TEST_FLAGS_mp06) \ + $(support_includes) +endif +endif + +if HAS_MP +if TEST_mp07 +mp_tests += mp07_node1 +mp_screens += mp07/mp07-node1.scn +mp_docs += mp07/mp07-node1.doc +mp07_node1_SOURCES = mp07/init.c mp07/task1.c mp07/system.h +mp07_node1_CPPFLAGS = -DNODE_NUMBER=1 $(AM_CPPFLAGS) $(TEST_FLAGS_mp07) \ + $(support_includes) +mp_tests += mp07_node2 +mp_screens += mp07/mp07-node2.scn +mp_docs += mp07/mp07-node2.doc +mp07_node2_SOURCES = mp07/init.c mp07/task1.c mp07/system.h +mp07_node2_CPPFLAGS = -DNODE_NUMBER=2 $(AM_CPPFLAGS) $(TEST_FLAGS_mp07) \ + $(support_includes) +endif +endif + +if HAS_MP +if TEST_mp08 +mp_tests += mp08_node1 +mp_screens += mp08/mp08-node1.scn +mp_docs += mp08/mp08-node1.doc +mp08_node1_SOURCES = mp08/init.c mp08/task1.c mp08/system.h +mp08_node1_CPPFLAGS = -DNODE_NUMBER=1 $(AM_CPPFLAGS) $(TEST_FLAGS_mp08) \ + $(support_includes) +mp_tests += mp08_node2 +mp_screens += mp08/mp08-node2.scn +mp_docs += mp08/mp08-node2.doc +mp08_node2_SOURCES = mp08/init.c mp08/task1.c mp08/system.h +mp08_node2_CPPFLAGS = -DNODE_NUMBER=2 $(AM_CPPFLAGS) $(TEST_FLAGS_mp08) \ + $(support_includes) +endif +endif + +if HAS_MP +if TEST_mp09 +mp_tests += mp09_node1 +mp_screens += mp09/mp09-node1.scn +mp_docs += mp09/mp09-node1.doc +mp09_node1_SOURCES = mp09/init.c mp09/task1.c mp09/recvmsg.c \ + mp09/sendmsg.c mp09/system.h +mp09_node1_CPPFLAGS = -DNODE_NUMBER=1 $(AM_CPPFLAGS) $(TEST_FLAGS_mp09) \ + $(support_includes) +mp_tests += mp09_node2 +mp_screens += mp09/mp09-node2.scn +mp_docs += mp09/mp09-node2.doc +mp09_node2_SOURCES = mp09/init.c mp09/task1.c mp09/recvmsg.c \ + mp09/sendmsg.c mp09/system.h +mp09_node2_CPPFLAGS = -DNODE_NUMBER=2 $(AM_CPPFLAGS) $(TEST_FLAGS_mp09) \ + $(support_includes) +endif +endif + +if HAS_MP +if TEST_mp10 +mp_tests += mp10_node1 +mp_screens += mp10/mp10-node1.scn +mp_docs += mp10/mp10-node1.doc +mp10_node1_SOURCES = mp10/init.c mp10/task1.c mp10/task2.c mp10/task3.c \ + mp10/system.h +mp10_node1_CPPFLAGS = -DNODE_NUMBER=1 $(AM_CPPFLAGS) $(TEST_FLAGS_mp10) \ + $(support_includes) +mp_tests += mp10_node2 +mp_screens += mp10/mp10-node2.scn +mp_docs += mp10/mp10-node2.doc +mp10_node2_SOURCES = mp10/init.c mp10/task1.c mp10/task2.c mp10/task3.c \ + mp10/system.h +mp10_node2_CPPFLAGS = -DNODE_NUMBER=2 $(AM_CPPFLAGS) $(TEST_FLAGS_mp10) \ + $(support_includes) +endif +endif + +if HAS_MP +if TEST_mp11 +mp_tests += mp11_node1 +mp_screens += mp11/mp11-node1.scn +mp_docs += mp11/mp11-node1.doc +mp11_node1_SOURCES = mp11/init.c mp11/system.h +mp11_node1_CPPFLAGS = -DNODE_NUMBER=1 $(AM_CPPFLAGS) $(TEST_FLAGS_mp11) \ + $(support_includes) +mp_tests += mp11_node2 +mp_screens += mp11/mp11-node2.scn +mp_docs += mp11/mp11-node2.doc +mp11_node2_SOURCES = mp11/init.c mp11/system.h +mp11_node2_CPPFLAGS = -DNODE_NUMBER=2 $(AM_CPPFLAGS) $(TEST_FLAGS_mp11) \ + $(support_includes) +endif +endif + +if HAS_MP +if TEST_mp12 +mp_tests += mp12_node1 +mp_screens += mp12/mp12-node1.scn +mp_docs += mp12/mp12-node1.doc +mp12_node1_SOURCES = mp12/init.c mp12/system.h +mp12_node1_CPPFLAGS = -DNODE_NUMBER=1 $(AM_CPPFLAGS) $(TEST_FLAGS_mp12) \ + $(support_includes) +mp_tests += mp12_node2 +mp_screens += mp12/mp12-node2.scn +mp_docs += mp12/mp12-node2.doc +mp12_node2_SOURCES = mp12/init.c mp12/system.h +mp12_node2_CPPFLAGS = -DNODE_NUMBER=2 $(AM_CPPFLAGS) $(TEST_FLAGS_mp12) \ + $(support_includes) +endif +endif + +if HAS_MP +if TEST_mp13 +mp_tests += mp13_node1 +mp_screens += mp13/mp13-node1.scn +mp_docs += mp13/mp13-node1.doc +mp13_node1_SOURCES = mp13/init.c mp13/task1.c mp13/task2.c mp13/system.h +mp13_node1_CPPFLAGS = -DNODE_NUMBER=1 $(AM_CPPFLAGS) $(TEST_FLAGS_mp13) \ + $(support_includes) +mp_tests += mp13_node2 +mp_screens += mp13/mp13-node2.scn +mp_docs += mp13/mp13-node2.doc +mp13_node2_SOURCES = mp13/init.c mp13/task1.c mp13/task2.c mp13/system.h +mp13_node2_CPPFLAGS = -DNODE_NUMBER=2 $(AM_CPPFLAGS) $(TEST_FLAGS_mp13) \ + $(support_includes) +endif +endif + +if HAS_MP +if TEST_mp14 +mp_tests += mp14_node1 +mp_screens += mp14/mp14-node1.scn +mp_docs += mp14/mp14-node1.doc +mp14_node1_SOURCES = mp14/init.c mp14/exit.c mp14/delay.c \ + mp14/evtask1.c mp14/evtmtask.c mp14/pttask1.c mp14/smtask1.c \ + mp14/msgtask1.c mp14/system.h +mp14_node1_CPPFLAGS = -DNODE_NUMBER=1 $(AM_CPPFLAGS) $(TEST_FLAGS_mp14) \ + $(support_includes) -DMAX_LONG_TEST_DURATION=$(MAX_LONG_TEST_DURATION) +mp_tests += mp14_node2 +mp_screens += mp14/mp14-node2.scn +mp_docs += mp14/mp14-node2.doc +mp14_node2_SOURCES = mp14/init.c mp14/exit.c mp14/delay.c \ + mp14/evtask1.c mp14/evtmtask.c mp14/pttask1.c mp14/smtask1.c \ + mp14/msgtask1.c mp14/system.h +mp14_node2_CPPFLAGS = -DNODE_NUMBER=2 $(AM_CPPFLAGS) $(TEST_FLAGS_mp14) \ + $(support_includes) -DMAX_LONG_TEST_DURATION=$(MAX_LONG_TEST_DURATION) +endif +endif + +rtems_tests_PROGRAMS = $(mp_tests) +dist_rtems_tests_DATA = $(mp_screens) $(mp_docs) + include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/configure.ac b/testsuites/mptests/configure.ac index fca89117a1..f13759078d 100644 --- a/testsuites/mptests/configure.ac +++ b/testsuites/mptests/configure.ac @@ -32,46 +32,20 @@ MAX_LONG_TEST_DURATION=${MAX_LONG_TEST_DURATION-100} AC_ARG_VAR([MAX_LONG_TEST_DURATION], [The longest length of time a "long running" test should run]) -# Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile -mp01/Makefile -mp01/node1/Makefile -mp01/node2/Makefile -mp03/Makefile -mp03/node1/Makefile -mp03/node2/Makefile -mp04/Makefile -mp04/node1/Makefile -mp04/node2/Makefile -mp05/Makefile -mp05/node1/Makefile -mp05/node2/Makefile -mp06/Makefile -mp06/node1/Makefile -mp06/node2/Makefile -mp07/Makefile -mp07/node1/Makefile -mp07/node2/Makefile -mp08/Makefile -mp08/node1/Makefile -mp08/node2/Makefile -mp09/Makefile -mp09/node1/Makefile -mp09/node2/Makefile -mp10/Makefile -mp10/node1/Makefile -mp10/node2/Makefile -mp11/Makefile -mp11/node1/Makefile -mp11/node2/Makefile -mp12/Makefile -mp12/node1/Makefile -mp12/node2/Makefile -mp13/Makefile -mp13/node1/Makefile -mp13/node2/Makefile -mp14/Makefile -mp14/node1/Makefile -mp14/node2/Makefile -]) +# BSP Test configuration +RTEMS_TEST_CHECK([mp01]) +RTEMS_TEST_CHECK([mp03]) +RTEMS_TEST_CHECK([mp04]) +RTEMS_TEST_CHECK([mp05]) +RTEMS_TEST_CHECK([mp06]) +RTEMS_TEST_CHECK([mp07]) +RTEMS_TEST_CHECK([mp08]) +RTEMS_TEST_CHECK([mp09]) +RTEMS_TEST_CHECK([mp10]) +RTEMS_TEST_CHECK([mp11]) +RTEMS_TEST_CHECK([mp12]) +RTEMS_TEST_CHECK([mp13]) +RTEMS_TEST_CHECK([mp14]) + +AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/testsuites/mptests/mp01/node1/mp01-node1.doc b/testsuites/mptests/mp01/mp01-node1.doc similarity index 100% rename from testsuites/mptests/mp01/node1/mp01-node1.doc rename to testsuites/mptests/mp01/mp01-node1.doc diff --git a/testsuites/mptests/mp01/node1/mp01-node1.scn b/testsuites/mptests/mp01/mp01-node1.scn similarity index 100% rename from testsuites/mptests/mp01/node1/mp01-node1.scn rename to testsuites/mptests/mp01/mp01-node1.scn diff --git a/testsuites/mptests/mp01/node2/mp01-node2.doc b/testsuites/mptests/mp01/mp01-node2.doc similarity index 100% rename from testsuites/mptests/mp01/node2/mp01-node2.doc rename to testsuites/mptests/mp01/mp01-node2.doc diff --git a/testsuites/mptests/mp01/node2/mp01-node2.scn b/testsuites/mptests/mp01/mp01-node2.scn similarity index 100% rename from testsuites/mptests/mp01/node2/mp01-node2.scn rename to testsuites/mptests/mp01/mp01-node2.scn diff --git a/testsuites/mptests/mp01/node1/Makefile.am b/testsuites/mptests/mp01/node1/Makefile.am deleted file mode 100644 index ad2d12e538..0000000000 --- a/testsuites/mptests/mp01/node1/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -rtems_tests_PROGRAMS = mp01-node1 -mp01_node1_SOURCES = ../init.c ../task1.c ../system.h - -dist_rtems_tests_DATA = mp01-node1.scn -dist_rtems_tests_DATA += mp01-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 = $(mp01_node1_OBJECTS) -LINK_LIBS = $(mp01_node1_LDLIBS) - -mp01-node1$(EXEEXT): $(mp01_node1_OBJECTS) $(mp01_node1_DEPENDENCIES) - @rm -f mp01-node1$(EXEEXT) - $(make-exe) - -include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp01/node2/Makefile.am b/testsuites/mptests/mp01/node2/Makefile.am deleted file mode 100644 index 4d5a2aa944..0000000000 --- a/testsuites/mptests/mp01/node2/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -rtems_tests_PROGRAMS = mp01-node2 -mp01_node2_SOURCES = ../init.c ../task1.c ../system.h - -dist_rtems_tests_DATA = mp01-node2.scn -dist_rtems_tests_DATA += mp01-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 = $(mp01_node2_OBJECTS) -LINK_LIBS = $(mp01_node2_LDLIBS) - -mp01-node2$(EXEEXT): $(mp01_node2_OBJECTS) $(mp01_node2_DEPENDENCIES) - @rm -f mp01-node2$(EXEEXT) - $(make-exe) - -include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp03/node1/mp03-node1.doc b/testsuites/mptests/mp03/mp03-node1.doc similarity index 100% rename from testsuites/mptests/mp03/node1/mp03-node1.doc rename to testsuites/mptests/mp03/mp03-node1.doc diff --git a/testsuites/mptests/mp03/node1/mp03-node1.scn b/testsuites/mptests/mp03/mp03-node1.scn similarity index 100% rename from testsuites/mptests/mp03/node1/mp03-node1.scn rename to testsuites/mptests/mp03/mp03-node1.scn diff --git a/testsuites/mptests/mp03/node2/mp03-node2.doc b/testsuites/mptests/mp03/mp03-node2.doc similarity index 100% rename from testsuites/mptests/mp03/node2/mp03-node2.doc rename to testsuites/mptests/mp03/mp03-node2.doc diff --git a/testsuites/mptests/mp03/node2/mp03-node2.scn b/testsuites/mptests/mp03/mp03-node2.scn similarity index 100% rename from testsuites/mptests/mp03/node2/mp03-node2.scn rename to testsuites/mptests/mp03/mp03-node2.scn diff --git a/testsuites/mptests/mp03/node1/Makefile.am b/testsuites/mptests/mp03/node1/Makefile.am deleted file mode 100644 index 7710acdef5..0000000000 --- a/testsuites/mptests/mp03/node1/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -rtems_tests_PROGRAMS = mp03-node1 -mp03_node1_SOURCES = ../init.c ../task1.c ../delay.c ../system.h - -dist_rtems_tests_DATA = mp03-node1.scn -dist_rtems_tests_DATA += mp03-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 = $(mp03_node1_OBJECTS) -LINK_LIBS = $(mp03_node1_LDLIBS) - -mp03-node1$(EXEEXT): $(mp03_node1_OBJECTS) $(mp03_node1_DEPENDENCIES) - @rm -f mp03-node1$(EXEEXT) - $(make-exe) - -include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp03/node2/Makefile.am b/testsuites/mptests/mp03/node2/Makefile.am deleted file mode 100644 index 868dd6c4e7..0000000000 --- a/testsuites/mptests/mp03/node2/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -rtems_tests_PROGRAMS = mp03-node2 -mp03_node2_SOURCES = ../init.c ../delay.c ../task1.c ../system.h - -dist_rtems_tests_DATA = mp03-node2.scn -dist_rtems_tests_DATA += mp03-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 = $(mp03_node2_OBJECTS) -LINK_LIBS = $(mp03_node2_LDLIBS) - -mp03-node2$(EXEEXT): $(mp03_node2_OBJECTS) $(mp03_node2_DEPENDENCIES) - @rm -f mp03-node2$(EXEEXT) - $(make-exe) - -include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp04/node1/mp04-node1.doc b/testsuites/mptests/mp04/mp04-node1.doc similarity index 100% rename from testsuites/mptests/mp04/node1/mp04-node1.doc rename to testsuites/mptests/mp04/mp04-node1.doc diff --git a/testsuites/mptests/mp04/node1/mp04-node1.scn b/testsuites/mptests/mp04/mp04-node1.scn similarity index 100% rename from testsuites/mptests/mp04/node1/mp04-node1.scn rename to testsuites/mptests/mp04/mp04-node1.scn diff --git a/testsuites/mptests/mp04/node2/mp04-node2.doc b/testsuites/mptests/mp04/mp04-node2.doc similarity index 100% rename from testsuites/mptests/mp04/node2/mp04-node2.doc rename to testsuites/mptests/mp04/mp04-node2.doc diff --git a/testsuites/mptests/mp04/node2/mp04-node2.scn b/testsuites/mptests/mp04/mp04-node2.scn similarity index 100% rename from testsuites/mptests/mp04/node2/mp04-node2.scn rename to testsuites/mptests/mp04/mp04-node2.scn diff --git a/testsuites/mptests/mp04/node1/Makefile.am b/testsuites/mptests/mp04/node1/Makefile.am deleted file mode 100644 index ad619ae1ca..0000000000 --- a/testsuites/mptests/mp04/node1/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -rtems_tests_PROGRAMS = mp04-node1 -mp04_node1_SOURCES = ../init.c ../task1.c ../system.h - -dist_rtems_tests_DATA = mp04-node1.scn -dist_rtems_tests_DATA += mp04-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 = $(mp04_node1_OBJECTS) -LINK_LIBS = $(mp04_node1_LDLIBS) - -mp04-node1$(EXEEXT): $(mp04_node1_OBJECTS) $(mp04_node1_DEPENDENCIES) - @rm -f mp04-node1$(EXEEXT) - $(make-exe) - -include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp04/node2/Makefile.am b/testsuites/mptests/mp04/node2/Makefile.am deleted file mode 100644 index 4ac67a94f9..0000000000 --- a/testsuites/mptests/mp04/node2/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -rtems_tests_PROGRAMS = mp04-node2 -mp04_node2_SOURCES = ../init.c ../task1.c ../system.h - -dist_rtems_tests_DATA = mp04-node2.scn -dist_rtems_tests_DATA += mp04-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 = $(mp04_node2_OBJECTS) -LINK_LIBS = $(mp04_node2_LDLIBS) - -mp04-node2$(EXEEXT): $(mp04_node2_OBJECTS) $(mp04_node2_DEPENDENCIES) - @rm -f mp04-node2$(EXEEXT) - $(make-exe) - -include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp05/node1/mp05-node1.doc b/testsuites/mptests/mp05/mp05-node1.doc similarity index 100% rename from testsuites/mptests/mp05/node1/mp05-node1.doc rename to testsuites/mptests/mp05/mp05-node1.doc diff --git a/testsuites/mptests/mp05/node1/mp05-node1.scn b/testsuites/mptests/mp05/mp05-node1.scn similarity index 100% rename from testsuites/mptests/mp05/node1/mp05-node1.scn rename to testsuites/mptests/mp05/mp05-node1.scn diff --git a/testsuites/mptests/mp05/node2/mp05-node2.doc b/testsuites/mptests/mp05/mp05-node2.doc similarity index 100% rename from testsuites/mptests/mp05/node2/mp05-node2.doc rename to testsuites/mptests/mp05/mp05-node2.doc diff --git a/testsuites/mptests/mp05/node2/mp05-node2.scn b/testsuites/mptests/mp05/mp05-node2.scn similarity index 100% rename from testsuites/mptests/mp05/node2/mp05-node2.scn rename to testsuites/mptests/mp05/mp05-node2.scn diff --git a/testsuites/mptests/mp05/node1/Makefile.am b/testsuites/mptests/mp05/node1/Makefile.am deleted file mode 100644 index 99d0f9f086..0000000000 --- a/testsuites/mptests/mp05/node1/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -rtems_tests_PROGRAMS = mp05-node1 -mp05_node1_SOURCES = ../init.c ../asr.c ../task1.c ../system.h - -dist_rtems_tests_DATA = mp05-node1.scn -dist_rtems_tests_DATA += mp05-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 = $(mp05_node1_OBJECTS) -LINK_LIBS = $(mp05_node1_LDLIBS) - -mp05-node1$(EXEEXT): $(mp05_node1_OBJECTS) $(mp05_node1_DEPENDENCIES) - @rm -f mp05-node1$(EXEEXT) - $(make-exe) - -include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp05/node2/Makefile.am b/testsuites/mptests/mp05/node2/Makefile.am deleted file mode 100644 index 2114fc59c7..0000000000 --- a/testsuites/mptests/mp05/node2/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -rtems_tests_PROGRAMS = mp05-node2 -mp05_node2_SOURCES = ../init.c ../asr.c ../task1.c ../system.h - -dist_rtems_tests_DATA = mp05-node2.scn -dist_rtems_tests_DATA += mp05-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 = $(mp05_node2_OBJECTS) -LINK_LIBS = $(mp05_node2_LDLIBS) - -mp05-node2$(EXEEXT): $(mp05_node2_OBJECTS) $(mp05_node2_DEPENDENCIES) - @rm -f mp05-node2$(EXEEXT) - $(make-exe) - -include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp06/node1/mp06-node1.doc b/testsuites/mptests/mp06/mp06-node1.doc similarity index 100% rename from testsuites/mptests/mp06/node1/mp06-node1.doc rename to testsuites/mptests/mp06/mp06-node1.doc diff --git a/testsuites/mptests/mp06/node1/mp06-node1.scn b/testsuites/mptests/mp06/mp06-node1.scn similarity index 100% rename from testsuites/mptests/mp06/node1/mp06-node1.scn rename to testsuites/mptests/mp06/mp06-node1.scn diff --git a/testsuites/mptests/mp06/node2/mp06-node2.doc b/testsuites/mptests/mp06/mp06-node2.doc similarity index 100% rename from testsuites/mptests/mp06/node2/mp06-node2.doc rename to testsuites/mptests/mp06/mp06-node2.doc diff --git a/testsuites/mptests/mp06/node2/mp06-node2.scn b/testsuites/mptests/mp06/mp06-node2.scn similarity index 100% rename from testsuites/mptests/mp06/node2/mp06-node2.scn rename to testsuites/mptests/mp06/mp06-node2.scn diff --git a/testsuites/mptests/mp06/node1/Makefile.am b/testsuites/mptests/mp06/node1/Makefile.am deleted file mode 100644 index 73575a1a16..0000000000 --- a/testsuites/mptests/mp06/node1/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -rtems_tests_PROGRAMS = mp06-node1 -mp06_node1_SOURCES = ../init.c ../task1.c ../system.h - -dist_rtems_tests_DATA = mp06-node1.scn -dist_rtems_tests_DATA += mp06-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 = $(mp06_node1_OBJECTS) -LINK_LIBS = $(mp06_node1_LDLIBS) - -mp06-node1$(EXEEXT): $(mp06_node1_OBJECTS) $(mp06_node1_DEPENDENCIES) - @rm -f mp06-node1$(EXEEXT) - $(make-exe) - -include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp06/node2/Makefile.am b/testsuites/mptests/mp06/node2/Makefile.am deleted file mode 100644 index 66afc48aaf..0000000000 --- a/testsuites/mptests/mp06/node2/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -rtems_tests_PROGRAMS = mp06-node2 -mp06_node2_SOURCES = ../init.c ../task1.c ../system.h - -dist_rtems_tests_DATA = mp06-node2.scn -dist_rtems_tests_DATA += mp06-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 = $(mp06_node2_OBJECTS) -LINK_LIBS = $(mp06_node2_LDLIBS) - -mp06-node2$(EXEEXT): $(mp06_node2_OBJECTS) $(mp06_node2_DEPENDENCIES) - @rm -f mp06-node2$(EXEEXT) - $(make-exe) - -include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp07/node1/mp07-node1.doc b/testsuites/mptests/mp07/mp07-node1.doc similarity index 100% rename from testsuites/mptests/mp07/node1/mp07-node1.doc rename to testsuites/mptests/mp07/mp07-node1.doc diff --git a/testsuites/mptests/mp07/node1/mp07-node1.scn b/testsuites/mptests/mp07/mp07-node1.scn similarity index 100% rename from testsuites/mptests/mp07/node1/mp07-node1.scn rename to testsuites/mptests/mp07/mp07-node1.scn diff --git a/testsuites/mptests/mp07/node2/mp07-node2.doc b/testsuites/mptests/mp07/mp07-node2.doc similarity index 100% rename from testsuites/mptests/mp07/node2/mp07-node2.doc rename to testsuites/mptests/mp07/mp07-node2.doc diff --git a/testsuites/mptests/mp07/node2/mp07-node2.scn b/testsuites/mptests/mp07/mp07-node2.scn similarity index 100% rename from testsuites/mptests/mp07/node2/mp07-node2.scn rename to testsuites/mptests/mp07/mp07-node2.scn diff --git a/testsuites/mptests/mp07/node1/Makefile.am b/testsuites/mptests/mp07/node1/Makefile.am deleted file mode 100644 index 8a44eb5e2e..0000000000 --- a/testsuites/mptests/mp07/node1/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -rtems_tests_PROGRAMS = mp07-node1 -mp07_node1_SOURCES = ../init.c ../task1.c ../system.h - -dist_rtems_tests_DATA = mp07-node1.scn -dist_rtems_tests_DATA += mp07-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 = $(mp07_node1_OBJECTS) -LINK_LIBS = $(mp07_node1_LDLIBS) - -mp07-node1$(EXEEXT): $(mp07_node1_OBJECTS) $(mp07_node1_DEPENDENCIES) - @rm -f mp07-node1$(EXEEXT) - $(make-exe) - -include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp07/node2/Makefile.am b/testsuites/mptests/mp07/node2/Makefile.am deleted file mode 100644 index 636ef982aa..0000000000 --- a/testsuites/mptests/mp07/node2/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -rtems_tests_PROGRAMS = mp07-node2 -mp07_node2_SOURCES = ../init.c ../task1.c ../system.h - -dist_rtems_tests_DATA = mp07-node2.scn -dist_rtems_tests_DATA += mp07-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 = $(mp07_node2_OBJECTS) -LINK_LIBS = $(mp07_node2_LDLIBS) - -mp07-node2$(EXEEXT): $(mp07_node2_OBJECTS) $(mp07_node2_DEPENDENCIES) - @rm -f mp07-node2$(EXEEXT) - $(make-exe) - -include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp08/node1/mp08-node1.doc b/testsuites/mptests/mp08/mp08-node1.doc similarity index 100% rename from testsuites/mptests/mp08/node1/mp08-node1.doc rename to testsuites/mptests/mp08/mp08-node1.doc diff --git a/testsuites/mptests/mp08/node1/mp08-node1.scn b/testsuites/mptests/mp08/mp08-node1.scn similarity index 100% rename from testsuites/mptests/mp08/node1/mp08-node1.scn rename to testsuites/mptests/mp08/mp08-node1.scn diff --git a/testsuites/mptests/mp08/node2/mp08-node2.doc b/testsuites/mptests/mp08/mp08-node2.doc similarity index 100% rename from testsuites/mptests/mp08/node2/mp08-node2.doc rename to testsuites/mptests/mp08/mp08-node2.doc diff --git a/testsuites/mptests/mp08/node2/mp08-node2.scn b/testsuites/mptests/mp08/mp08-node2.scn similarity index 100% rename from testsuites/mptests/mp08/node2/mp08-node2.scn rename to testsuites/mptests/mp08/mp08-node2.scn diff --git a/testsuites/mptests/mp08/node1/Makefile.am b/testsuites/mptests/mp08/node1/Makefile.am deleted file mode 100644 index c2857cba3a..0000000000 --- a/testsuites/mptests/mp08/node1/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -rtems_tests_PROGRAMS = mp08-node1 -mp08_node1_SOURCES = ../init.c ../task1.c ../system.h - -dist_rtems_tests_DATA = mp08-node1.scn -dist_rtems_tests_DATA += mp08-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 = $(mp08_node1_OBJECTS) -LINK_LIBS = $(mp08_node1_LDLIBS) - -mp08-node1$(EXEEXT): $(mp08_node1_OBJECTS) $(mp08_node1_DEPENDENCIES) - @rm -f mp08-node1$(EXEEXT) - $(make-exe) - -include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp08/node2/Makefile.am b/testsuites/mptests/mp08/node2/Makefile.am deleted file mode 100644 index 445bf03398..0000000000 --- a/testsuites/mptests/mp08/node2/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -rtems_tests_PROGRAMS = mp08-node2 -mp08_node2_SOURCES = ../init.c ../task1.c ../system.h - -dist_rtems_tests_DATA = mp08-node2.scn -dist_rtems_tests_DATA += mp08-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 = $(mp08_node2_OBJECTS) -LINK_LIBS = $(mp08_node2_LDLIBS) - -mp08-node2$(EXEEXT): $(mp08_node2_OBJECTS) $(mp08_node2_DEPENDENCIES) - @rm -f mp08-node2$(EXEEXT) - $(make-exe) - -include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp09/node1/mp09-node1.doc b/testsuites/mptests/mp09/mp09-node1.doc similarity index 100% rename from testsuites/mptests/mp09/node1/mp09-node1.doc rename to testsuites/mptests/mp09/mp09-node1.doc diff --git a/testsuites/mptests/mp09/node1/mp09-node1.scn b/testsuites/mptests/mp09/mp09-node1.scn similarity index 100% rename from testsuites/mptests/mp09/node1/mp09-node1.scn rename to testsuites/mptests/mp09/mp09-node1.scn diff --git a/testsuites/mptests/mp09/node2/mp09-node2.doc b/testsuites/mptests/mp09/mp09-node2.doc similarity index 100% rename from testsuites/mptests/mp09/node2/mp09-node2.doc rename to testsuites/mptests/mp09/mp09-node2.doc diff --git a/testsuites/mptests/mp09/node2/mp09-node2.scn b/testsuites/mptests/mp09/mp09-node2.scn similarity index 100% rename from testsuites/mptests/mp09/node2/mp09-node2.scn rename to testsuites/mptests/mp09/mp09-node2.scn diff --git a/testsuites/mptests/mp09/node1/Makefile.am b/testsuites/mptests/mp09/node1/Makefile.am deleted file mode 100644 index f3b3d114de..0000000000 --- a/testsuites/mptests/mp09/node1/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -rtems_tests_PROGRAMS = mp09-node1 -mp09_node1_SOURCES = ../init.c ../task1.c ../recvmsg.c ../sendmsg.c ../system.h - -dist_rtems_tests_DATA = mp09-node1.scn -dist_rtems_tests_DATA += mp09-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 = $(mp09_node1_OBJECTS) -LINK_LIBS = $(mp09_node1_LDLIBS) - -mp09-node1$(EXEEXT): $(mp09_node1_OBJECTS) $(mp09_node1_DEPENDENCIES) - @rm -f mp09-node1$(EXEEXT) - $(make-exe) - -include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp09/node2/Makefile.am b/testsuites/mptests/mp09/node2/Makefile.am deleted file mode 100644 index 7c7eeb6b74..0000000000 --- a/testsuites/mptests/mp09/node2/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -rtems_tests_PROGRAMS = mp09-node2 -mp09_node2_SOURCES = ../init.c ../task1.c ../recvmsg.c ../sendmsg.c ../system.h - -dist_rtems_tests_DATA = mp09-node2.scn -dist_rtems_tests_DATA += mp09-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 = $(mp09_node2_OBJECTS) -LINK_LIBS = $(mp09_node2_LDLIBS) - -mp09-node2$(EXEEXT): $(mp09_node2_OBJECTS) $(mp09_node2_DEPENDENCIES) - @rm -f mp09-node2$(EXEEXT) - $(make-exe) - -include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp10/node1/mp10-node1.doc b/testsuites/mptests/mp10/mp10-node1.doc similarity index 100% rename from testsuites/mptests/mp10/node1/mp10-node1.doc rename to testsuites/mptests/mp10/mp10-node1.doc diff --git a/testsuites/mptests/mp10/node1/mp10-node1.scn b/testsuites/mptests/mp10/mp10-node1.scn similarity index 100% rename from testsuites/mptests/mp10/node1/mp10-node1.scn rename to testsuites/mptests/mp10/mp10-node1.scn diff --git a/testsuites/mptests/mp10/node2/mp10-node2.doc b/testsuites/mptests/mp10/mp10-node2.doc similarity index 100% rename from testsuites/mptests/mp10/node2/mp10-node2.doc rename to testsuites/mptests/mp10/mp10-node2.doc diff --git a/testsuites/mptests/mp10/node2/mp10-node2.scn b/testsuites/mptests/mp10/mp10-node2.scn similarity index 100% rename from testsuites/mptests/mp10/node2/mp10-node2.scn rename to 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 diff --git a/testsuites/mptests/mp11/node1/mp11-node1.doc b/testsuites/mptests/mp11/mp11-node1.doc similarity index 100% rename from testsuites/mptests/mp11/node1/mp11-node1.doc rename to testsuites/mptests/mp11/mp11-node1.doc diff --git a/testsuites/mptests/mp11/node1/mp11-node1.scn b/testsuites/mptests/mp11/mp11-node1.scn similarity index 100% rename from testsuites/mptests/mp11/node1/mp11-node1.scn rename to testsuites/mptests/mp11/mp11-node1.scn diff --git a/testsuites/mptests/mp11/node2/mp11-node2.doc b/testsuites/mptests/mp11/mp11-node2.doc similarity index 100% rename from testsuites/mptests/mp11/node2/mp11-node2.doc rename to testsuites/mptests/mp11/mp11-node2.doc diff --git a/testsuites/mptests/mp11/node2/mp11-node2.scn b/testsuites/mptests/mp11/mp11-node2.scn similarity index 100% rename from testsuites/mptests/mp11/node2/mp11-node2.scn rename to testsuites/mptests/mp11/mp11-node2.scn diff --git a/testsuites/mptests/mp11/node1/Makefile.am b/testsuites/mptests/mp11/node1/Makefile.am deleted file mode 100644 index 3a4d70ffb8..0000000000 --- a/testsuites/mptests/mp11/node1/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -rtems_tests_PROGRAMS = mp11-node1 -mp11_node1_SOURCES = ../init.c ../system.h - -dist_rtems_tests_DATA = mp11-node1.scn -dist_rtems_tests_DATA += mp11-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 = $(mp11_node1_OBJECTS) -LINK_LIBS = $(mp11_node1_LDLIBS) - -mp11-node1$(EXEEXT): $(mp11_node1_OBJECTS) $(mp11_node1_DEPENDENCIES) - @rm -f mp11-node1$(EXEEXT) - $(make-exe) - -include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp11/node2/Makefile.am b/testsuites/mptests/mp11/node2/Makefile.am deleted file mode 100644 index 852b730068..0000000000 --- a/testsuites/mptests/mp11/node2/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -rtems_tests_PROGRAMS = mp11-node2 -mp11_node2_SOURCES = ../init.c ../system.h - -dist_rtems_tests_DATA = mp11-node2.scn -dist_rtems_tests_DATA += mp11-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 = $(mp11_node2_OBJECTS) -LINK_LIBS = $(mp11_node2_LDLIBS) - -mp11-node2$(EXEEXT): $(mp11_node2_OBJECTS) $(mp11_node2_DEPENDENCIES) - @rm -f mp11-node2$(EXEEXT) - $(make-exe) - -include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp12/node1/mp12-node1.doc b/testsuites/mptests/mp12/mp12-node1.doc similarity index 100% rename from testsuites/mptests/mp12/node1/mp12-node1.doc rename to testsuites/mptests/mp12/mp12-node1.doc diff --git a/testsuites/mptests/mp12/node1/mp12-node1.scn b/testsuites/mptests/mp12/mp12-node1.scn similarity index 100% rename from testsuites/mptests/mp12/node1/mp12-node1.scn rename to testsuites/mptests/mp12/mp12-node1.scn diff --git a/testsuites/mptests/mp12/node2/mp12-node2.doc b/testsuites/mptests/mp12/mp12-node2.doc similarity index 100% rename from testsuites/mptests/mp12/node2/mp12-node2.doc rename to testsuites/mptests/mp12/mp12-node2.doc diff --git a/testsuites/mptests/mp12/node2/mp12-node2.scn b/testsuites/mptests/mp12/mp12-node2.scn similarity index 100% rename from testsuites/mptests/mp12/node2/mp12-node2.scn rename to testsuites/mptests/mp12/mp12-node2.scn diff --git a/testsuites/mptests/mp12/node1/Makefile.am b/testsuites/mptests/mp12/node1/Makefile.am deleted file mode 100644 index b72e938793..0000000000 --- a/testsuites/mptests/mp12/node1/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -rtems_tests_PROGRAMS = mp12-node1 -mp12_node1_SOURCES = ../init.c ../system.h - -dist_rtems_tests_DATA = mp12-node1.scn -dist_rtems_tests_DATA += mp12-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 = $(mp12_node1_OBJECTS) -LINK_LIBS = $(mp12_node1_LDLIBS) - -mp12-node1$(EXEEXT): $(mp12_node1_OBJECTS) $(mp12_node1_DEPENDENCIES) - @rm -f mp12-node1$(EXEEXT) - $(make-exe) - -include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp12/node2/Makefile.am b/testsuites/mptests/mp12/node2/Makefile.am deleted file mode 100644 index a2f6036bae..0000000000 --- a/testsuites/mptests/mp12/node2/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -rtems_tests_PROGRAMS = mp12-node2 -mp12_node2_SOURCES = ../init.c ../system.h - -dist_rtems_tests_DATA = mp12-node2.scn -dist_rtems_tests_DATA += mp12-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 = $(mp12_node2_OBJECTS) -LINK_LIBS = $(mp12_node2_LDLIBS) - -mp12-node2$(EXEEXT): $(mp12_node2_OBJECTS) $(mp12_node2_DEPENDENCIES) - @rm -f mp12-node2$(EXEEXT) - $(make-exe) - -include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp13/node1/mp13-node1.doc b/testsuites/mptests/mp13/mp13-node1.doc similarity index 100% rename from testsuites/mptests/mp13/node1/mp13-node1.doc rename to testsuites/mptests/mp13/mp13-node1.doc diff --git a/testsuites/mptests/mp13/node1/mp13-node1.scn b/testsuites/mptests/mp13/mp13-node1.scn similarity index 100% rename from testsuites/mptests/mp13/node1/mp13-node1.scn rename to testsuites/mptests/mp13/mp13-node1.scn diff --git a/testsuites/mptests/mp13/node2/mp13-node2.doc b/testsuites/mptests/mp13/mp13-node2.doc similarity index 100% rename from testsuites/mptests/mp13/node2/mp13-node2.doc rename to testsuites/mptests/mp13/mp13-node2.doc diff --git a/testsuites/mptests/mp13/node2/mp13-node2.scn b/testsuites/mptests/mp13/mp13-node2.scn similarity index 100% rename from testsuites/mptests/mp13/node2/mp13-node2.scn rename to testsuites/mptests/mp13/mp13-node2.scn diff --git a/testsuites/mptests/mp13/node1/Makefile.am b/testsuites/mptests/mp13/node1/Makefile.am deleted file mode 100644 index ea5c2283d8..0000000000 --- a/testsuites/mptests/mp13/node1/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -rtems_tests_PROGRAMS = mp13-node1 -mp13_node1_SOURCES = ../init.c ../task1.c ../task2.c ../system.h - -dist_rtems_tests_DATA = mp13-node1.scn -dist_rtems_tests_DATA += mp13-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 = $(mp13_node1_OBJECTS) -LINK_LIBS = $(mp13_node1_LDLIBS) - -mp13-node1$(EXEEXT): $(mp13_node1_OBJECTS) $(mp13_node1_DEPENDENCIES) - @rm -f mp13-node1$(EXEEXT) - $(make-exe) - -include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp13/node2/Makefile.am b/testsuites/mptests/mp13/node2/Makefile.am deleted file mode 100644 index f237c5cf0e..0000000000 --- a/testsuites/mptests/mp13/node2/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -rtems_tests_PROGRAMS = mp13-node2 -mp13_node2_SOURCES = ../init.c ../task1.c ../task2.c ../system.h - -dist_rtems_tests_DATA = mp13-node2.scn -dist_rtems_tests_DATA += mp13-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 = $(mp13_node2_OBJECTS) -LINK_LIBS = $(mp13_node2_LDLIBS) - -mp13-node2$(EXEEXT): $(mp13_node2_OBJECTS) $(mp13_node2_DEPENDENCIES) - @rm -f mp13-node2$(EXEEXT) - $(make-exe) - -include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp14/node1/mp14-node1.doc b/testsuites/mptests/mp14/mp14-node1.doc similarity index 100% rename from testsuites/mptests/mp14/node1/mp14-node1.doc rename to testsuites/mptests/mp14/mp14-node1.doc diff --git a/testsuites/mptests/mp14/node1/mp14-node1.scn b/testsuites/mptests/mp14/mp14-node1.scn similarity index 100% rename from testsuites/mptests/mp14/node1/mp14-node1.scn rename to testsuites/mptests/mp14/mp14-node1.scn diff --git a/testsuites/mptests/mp14/node2/mp14-node2.doc b/testsuites/mptests/mp14/mp14-node2.doc similarity index 100% rename from testsuites/mptests/mp14/node2/mp14-node2.doc rename to testsuites/mptests/mp14/mp14-node2.doc diff --git a/testsuites/mptests/mp14/node2/mp14-node2.scn b/testsuites/mptests/mp14/mp14-node2.scn similarity index 100% rename from testsuites/mptests/mp14/node2/mp14-node2.scn rename to testsuites/mptests/mp14/mp14-node2.scn diff --git a/testsuites/mptests/mp14/node1/Makefile.am b/testsuites/mptests/mp14/node1/Makefile.am deleted file mode 100644 index e233978eb2..0000000000 --- a/testsuites/mptests/mp14/node1/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -rtems_tests_PROGRAMS = mp14-node1 -mp14_node1_SOURCES = ../exit.c ../init.c ../delay.c ../evtask1.c ../evtmtask.c \ - ../pttask1.c ../smtask1.c ../msgtask1.c ../system.h - -dist_rtems_tests_DATA = mp14-node1.scn -dist_rtems_tests_DATA += mp14-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 += -DMAX_LONG_TEST_DURATION=$(MAX_LONG_TEST_DURATION) - -AM_CPPFLAGS += -I$(top_srcdir)/../support/include - -LINK_OBJS = $(mp14_node1_OBJECTS) -LINK_LIBS = $(mp14_node1_LDLIBS) - -mp14-node1$(EXEEXT): $(mp14_node1_OBJECTS) $(mp14_node1_DEPENDENCIES) - @rm -f mp14-node1$(EXEEXT) - $(make-exe) - -include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp14/node2/Makefile.am b/testsuites/mptests/mp14/node2/Makefile.am deleted file mode 100644 index 832462b86a..0000000000 --- a/testsuites/mptests/mp14/node2/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -rtems_tests_PROGRAMS = mp14-node2 -mp14_node2_SOURCES = ../exit.c ../init.c ../delay.c ../evtask1.c ../evtmtask.c \ - ../pttask1.c ../smtask1.c ../msgtask1.c ../system.h - -dist_rtems_tests_DATA = mp14-node2.scn -dist_rtems_tests_DATA += mp14-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 += -DMAX_LONG_TEST_DURATION=$(MAX_LONG_TEST_DURATION) - -AM_CPPFLAGS += -I$(top_srcdir)/../support/include - -LINK_OBJS = $(mp14_node2_OBJECTS) -LINK_LIBS = $(mp14_node2_LDLIBS) - -mp14-node2$(EXEEXT): $(mp14_node2_OBJECTS) $(mp14_node2_DEPENDENCIES) - @rm -f mp14-node2$(EXEEXT) - $(make-exe) - -include $(top_srcdir)/../automake/local.am -- 2.15.1 _______________________________________________ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel