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/mp10/mp10-node1.doc | 42 ++++++++++++++++++++++++++++ testsuites/mptests/mp10/mp10-node1.scn | 4 +++ testsuites/mptests/mp10/mp10-node2.doc | 9 ++++++ testsuites/mptests/mp10/mp10-node2.scn | 19 +++++++++++++ testsuites/mptests/mp10/node1/Makefile.am | 22 --------------- testsuites/mptests/mp10/node1/mp10-node1.doc | 42 ---------------------------- testsuites/mptests/mp10/node1/mp10-node1.scn | 4 --- testsuites/mptests/mp10/node2/Makefile.am | 22 --------------- testsuites/mptests/mp10/node2/mp10-node2.doc | 9 ------ testsuites/mptests/mp10/node2/mp10-node2.scn | 19 ------------- 10 files changed, 74 insertions(+), 118 deletions(-) create mode 100644 testsuites/mptests/mp10/mp10-node1.doc create mode 100644 testsuites/mptests/mp10/mp10-node1.scn create mode 100644 testsuites/mptests/mp10/mp10-node2.doc create mode 100644 testsuites/mptests/mp10/mp10-node2.scn delete mode 100644 testsuites/mptests/mp10/node1/Makefile.am delete mode 100644 testsuites/mptests/mp10/node1/mp10-node1.doc delete mode 100644 testsuites/mptests/mp10/node1/mp10-node1.scn delete mode 100644 testsuites/mptests/mp10/node2/Makefile.am delete mode 100644 testsuites/mptests/mp10/node2/mp10-node2.doc delete mode 100644 testsuites/mptests/mp10/node2/mp10-node2.scn (limited to 'testsuites/mptests/mp10') diff --git a/testsuites/mptests/mp10/mp10-node1.doc b/testsuites/mptests/mp10/mp10-node1.doc new file mode 100644 index 0000000000..fc926b0519 --- /dev/null +++ b/testsuites/mptests/mp10/mp10-node1.doc @@ -0,0 +1,42 @@ +# 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: test59 + +GLOBAL SEMAPHORE TEST + +directives: + ex_init, ex_start, t_create, t_start, tm_tick, i_return, t_ident, + tm_set, tm_get, tm_wkafter + +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 task can delete itself or another task. diff --git a/testsuites/mptests/mp10/mp10-node1.scn b/testsuites/mptests/mp10/mp10-node1.scn new file mode 100644 index 0000000000..deeafc0a9a --- /dev/null +++ b/testsuites/mptests/mp10/mp10-node1.scn @@ -0,0 +1,4 @@ +*** TEST 10 -- NODE 1 *** +Creating Message Queue (Global) +Creating Semaphore (Global) +*** END OF TEST 10 *** diff --git a/testsuites/mptests/mp10/mp10-node2.doc b/testsuites/mptests/mp10/mp10-node2.doc new file mode 100644 index 0000000000..981286480f --- /dev/null +++ b/testsuites/mptests/mp10/mp10-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/mp10/mp10-node2.scn b/testsuites/mptests/mp10/mp10-node2.scn new file mode 100644 index 0000000000..25c07e6202 --- /dev/null +++ b/testsuites/mptests/mp10/mp10-node2.scn @@ -0,0 +1,19 @@ +*** TEST 10 -- NODE 2 *** +Creating Test_task 1 (local) +Starting Test_task 1 (local) +Creating Test_task 2 (local) +Starting Test_task 2 (local) +Creating Test_task 3 (local) +Starting Test_task 3 (local) +Sleeping for 1 seconds ... +Getting QID of message queue +Attempting to receive message ... +Getting SMID of semaphore +Attempting to acquire semaphore ... +Getting SMID of semaphore +Attempting to acquire semaphore ... +Deleting Test_task2 +Deleting Test_task1 +Restarting Test_task3 +*** END OF TEST 10 *** + 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/node1/mp10-node1.doc b/testsuites/mptests/mp10/node1/mp10-node1.doc deleted file mode 100644 index fc926b0519..0000000000 --- a/testsuites/mptests/mp10/node1/mp10-node1.doc +++ /dev/null @@ -1,42 +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: test59 - -GLOBAL SEMAPHORE TEST - -directives: - ex_init, ex_start, t_create, t_start, tm_tick, i_return, t_ident, - tm_set, tm_get, tm_wkafter - -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 task can delete itself or another task. diff --git a/testsuites/mptests/mp10/node1/mp10-node1.scn b/testsuites/mptests/mp10/node1/mp10-node1.scn deleted file mode 100644 index deeafc0a9a..0000000000 --- a/testsuites/mptests/mp10/node1/mp10-node1.scn +++ /dev/null @@ -1,4 +0,0 @@ -*** TEST 10 -- NODE 1 *** -Creating Message Queue (Global) -Creating Semaphore (Global) -*** END OF TEST 10 *** 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/mp10/node2/mp10-node2.doc b/testsuites/mptests/mp10/node2/mp10-node2.doc deleted file mode 100644 index 981286480f..0000000000 --- a/testsuites/mptests/mp10/node2/mp10-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/mp10/node2/mp10-node2.scn b/testsuites/mptests/mp10/node2/mp10-node2.scn deleted file mode 100644 index 25c07e6202..0000000000 --- a/testsuites/mptests/mp10/node2/mp10-node2.scn +++ /dev/null @@ -1,19 +0,0 @@ -*** TEST 10 -- NODE 2 *** -Creating Test_task 1 (local) -Starting Test_task 1 (local) -Creating Test_task 2 (local) -Starting Test_task 2 (local) -Creating Test_task 3 (local) -Starting Test_task 3 (local) -Sleeping for 1 seconds ... -Getting QID of message queue -Attempting to receive message ... -Getting SMID of semaphore -Attempting to acquire semaphore ... -Getting SMID of semaphore -Attempting to acquire semaphore ... -Deleting Test_task2 -Deleting Test_task1 -Restarting Test_task3 -*** END OF TEST 10 *** - -- cgit v1.2.3