From 3206879f06e7e74abe0593d53a67e6cccab4bd18 Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Mon, 9 Apr 2018 13:41:08 +1000 Subject: testsuite/mptests: Merged nested Makefile.am files into one Makefile.am This change is part of the testsuite Makefile.am reorganization. Update #3382 --- testsuites/mptests/mp05/mp05-node1.doc | 41 ++++++++++++++++++++++++++++ testsuites/mptests/mp05/mp05-node1.scn | 11 ++++++++ testsuites/mptests/mp05/mp05-node2.doc | 9 ++++++ testsuites/mptests/mp05/mp05-node2.scn | 10 +++++++ testsuites/mptests/mp05/node1/Makefile.am | 22 --------------- testsuites/mptests/mp05/node1/mp05-node1.doc | 41 ---------------------------- testsuites/mptests/mp05/node1/mp05-node1.scn | 11 -------- testsuites/mptests/mp05/node2/Makefile.am | 22 --------------- testsuites/mptests/mp05/node2/mp05-node2.doc | 9 ------ testsuites/mptests/mp05/node2/mp05-node2.scn | 10 ------- 10 files changed, 71 insertions(+), 115 deletions(-) create mode 100644 testsuites/mptests/mp05/mp05-node1.doc create mode 100644 testsuites/mptests/mp05/mp05-node1.scn create mode 100644 testsuites/mptests/mp05/mp05-node2.doc create mode 100644 testsuites/mptests/mp05/mp05-node2.scn delete mode 100644 testsuites/mptests/mp05/node1/Makefile.am delete mode 100644 testsuites/mptests/mp05/node1/mp05-node1.doc delete mode 100644 testsuites/mptests/mp05/node1/mp05-node1.scn delete mode 100644 testsuites/mptests/mp05/node2/Makefile.am delete mode 100644 testsuites/mptests/mp05/node2/mp05-node2.doc delete mode 100644 testsuites/mptests/mp05/node2/mp05-node2.scn (limited to 'testsuites/mptests/mp05') diff --git a/testsuites/mptests/mp05/mp05-node1.doc b/testsuites/mptests/mp05/mp05-node1.doc new file mode 100644 index 0000000000..a9042ada9c --- /dev/null +++ b/testsuites/mptests/mp05/mp05-node1.doc @@ -0,0 +1,41 @@ +# 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. +# + + +This file describes the directives and concepts tested by this test set. + +test set name: test54 + +directives: + ex_init, ex_start, t_create, t_start, tm_tick, i_return, t_ident, + tm_wkafter, as_catch, as_return + +concepts: + + a. Verifies system can create and start both the executive's system + initialization and idle task. + + b. Verifies executive can swap between three application tasks at the + same priority and the executive's internal idle task. + + c. Verifies can print strings to the CRT on port 2 of the mvme136 board + using Print and Println in the board support package. + + d. Verifies interrupt handler can handler a task switch from an interrupt + as specified with the i_return directive. + + e. Verifies executive initialization performed correctly. + + f. Verifies the executive trap handler except for the halt function. + + g. Verifies that a task can get the task identification number of itself. + + h. Verifies that a task can get the task identification number + of another task. + + i. Verifies that a signal can be sent to a remote task. diff --git a/testsuites/mptests/mp05/mp05-node1.scn b/testsuites/mptests/mp05/mp05-node1.scn new file mode 100644 index 0000000000..472740ba18 --- /dev/null +++ b/testsuites/mptests/mp05/mp05-node1.scn @@ -0,0 +1,11 @@ +*** TEST 5 -- NODE 1 *** +Creating Test_task (Global) +Starting Test_task (Global) +Deleting initialization task +rtems_signal_catch: initializing signal catcher +Remote task's name is : 222 +Getting TID of remote task +Sending signal to remote task +.................................................... +.................................................... +*** END OF TEST 5 *** diff --git a/testsuites/mptests/mp05/mp05-node2.doc b/testsuites/mptests/mp05/mp05-node2.doc new file mode 100644 index 0000000000..981286480f --- /dev/null +++ b/testsuites/mptests/mp05/mp05-node2.doc @@ -0,0 +1,9 @@ +# 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. +# + + diff --git a/testsuites/mptests/mp05/mp05-node2.scn b/testsuites/mptests/mp05/mp05-node2.scn new file mode 100644 index 0000000000..0c4b412f65 --- /dev/null +++ b/testsuites/mptests/mp05/mp05-node2.scn @@ -0,0 +1,10 @@ +*** TEST 5 -- NODE 2 *** +Creating Test_task (Global) +Starting Test_task (Global) +Deleting initialization task +rtems_signal_catch: initializing signal catcher +Remote task's name is : 111 +Getting TID of remote task +.................................................... +.................................................... +*** END OF TEST 5 *** 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/node1/mp05-node1.doc b/testsuites/mptests/mp05/node1/mp05-node1.doc deleted file mode 100644 index a9042ada9c..0000000000 --- a/testsuites/mptests/mp05/node1/mp05-node1.doc +++ /dev/null @@ -1,41 +0,0 @@ -# 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. -# - - -This file describes the directives and concepts tested by this test set. - -test set name: test54 - -directives: - ex_init, ex_start, t_create, t_start, tm_tick, i_return, t_ident, - tm_wkafter, as_catch, as_return - -concepts: - - a. Verifies system can create and start both the executive's system - initialization and idle task. - - b. Verifies executive can swap between three application tasks at the - same priority and the executive's internal idle task. - - c. Verifies can print strings to the CRT on port 2 of the mvme136 board - using Print and Println in the board support package. - - d. Verifies interrupt handler can handler a task switch from an interrupt - as specified with the i_return directive. - - e. Verifies executive initialization performed correctly. - - f. Verifies the executive trap handler except for the halt function. - - g. Verifies that a task can get the task identification number of itself. - - h. Verifies that a task can get the task identification number - of another task. - - i. Verifies that a signal can be sent to a remote task. diff --git a/testsuites/mptests/mp05/node1/mp05-node1.scn b/testsuites/mptests/mp05/node1/mp05-node1.scn deleted file mode 100644 index 472740ba18..0000000000 --- a/testsuites/mptests/mp05/node1/mp05-node1.scn +++ /dev/null @@ -1,11 +0,0 @@ -*** TEST 5 -- NODE 1 *** -Creating Test_task (Global) -Starting Test_task (Global) -Deleting initialization task -rtems_signal_catch: initializing signal catcher -Remote task's name is : 222 -Getting TID of remote task -Sending signal to remote task -.................................................... -.................................................... -*** END OF TEST 5 *** 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/mp05/node2/mp05-node2.doc b/testsuites/mptests/mp05/node2/mp05-node2.doc deleted file mode 100644 index 981286480f..0000000000 --- a/testsuites/mptests/mp05/node2/mp05-node2.doc +++ /dev/null @@ -1,9 +0,0 @@ -# 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. -# - - diff --git a/testsuites/mptests/mp05/node2/mp05-node2.scn b/testsuites/mptests/mp05/node2/mp05-node2.scn deleted file mode 100644 index 0c4b412f65..0000000000 --- a/testsuites/mptests/mp05/node2/mp05-node2.scn +++ /dev/null @@ -1,10 +0,0 @@ -*** TEST 5 -- NODE 2 *** -Creating Test_task (Global) -Starting Test_task (Global) -Deleting initialization task -rtems_signal_catch: initializing signal catcher -Remote task's name is : 111 -Getting TID of remote task -.................................................... -.................................................... -*** END OF TEST 5 *** -- cgit v1.2.3