From 6c4e9d077533bf18d04a90090535f1637b4c648e Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 1 Feb 2008 21:28:08 +0000 Subject: 2008-02-01 Joel Sherrill * mptests/mp01/node1/Makefile.am, mptests/mp01/node2/Makefile.am, mptests/mp02/node1/Makefile.am, mptests/mp02/node2/Makefile.am, mptests/mp03/node1/Makefile.am, mptests/mp03/node2/Makefile.am, mptests/mp04/node1/Makefile.am, mptests/mp04/node2/Makefile.am, mptests/mp05/node1/Makefile.am, mptests/mp05/node2/Makefile.am, mptests/mp06/node1/Makefile.am, mptests/mp06/node2/Makefile.am, mptests/mp07/node1/Makefile.am, mptests/mp07/node2/Makefile.am, mptests/mp08/node1/Makefile.am, mptests/mp08/node2/Makefile.am, mptests/mp09/node1/Makefile.am, mptests/mp09/node2/Makefile.am, mptests/mp10/node1/Makefile.am, mptests/mp10/node2/Makefile.am, mptests/mp11/node1/Makefile.am, mptests/mp11/node2/Makefile.am, mptests/mp12/node1/Makefile.am, mptests/mp12/node2/Makefile.am, mptests/mp13/node1/Makefile.am, mptests/mp13/node2/Makefile.am, mptests/mp14/node1/Makefile.am, mptests/mp14/node2/Makefile.am, samples/base_mp/node1/Makefile.am, samples/base_mp/node2/Makefile.am, samples/base_sp/Makefile.am, samples/hello/Makefile.am, samples/nsecs/Makefile.am, samples/ticker/Makefile.am, sptests/sp01/Makefile.am, sptests/sp02/Makefile.am, sptests/sp03/Makefile.am, sptests/sp04/Makefile.am, sptests/sp05/Makefile.am, sptests/sp06/Makefile.am, sptests/sp07/Makefile.am, sptests/sp08/Makefile.am, sptests/sp09/Makefile.am, sptests/sp11/Makefile.am, sptests/sp12/Makefile.am, sptests/sp13/Makefile.am, sptests/sp14/Makefile.am, sptests/sp15/Makefile.am, sptests/sp16/Makefile.am, sptests/sp17/Makefile.am, sptests/sp19/Makefile.am, sptests/sp20/Makefile.am, sptests/sp22/Makefile.am, sptests/sp23/Makefile.am, sptests/sp24/Makefile.am, sptests/sp25/Makefile.am, tmtests/tm01/Makefile.am, tmtests/tm02/Makefile.am, tmtests/tm03/Makefile.am, tmtests/tm04/Makefile.am, tmtests/tm05/Makefile.am, tmtests/tm06/Makefile.am, tmtests/tm07/Makefile.am, tmtests/tm08/Makefile.am, tmtests/tm09/Makefile.am, tmtests/tm10/Makefile.am, tmtests/tm11/Makefile.am, tmtests/tm12/Makefile.am, tmtests/tm13/Makefile.am, tmtests/tm14/Makefile.am, tmtests/tm15/Makefile.am, tmtests/tm16/Makefile.am, tmtests/tm17/Makefile.am, tmtests/tm18/Makefile.am, tmtests/tm19/Makefile.am, tmtests/tm20/Makefile.am, tmtests/tm21/Makefile.am, tmtests/tm22/Makefile.am, tmtests/tm23/Makefile.am, tmtests/tm24/Makefile.am, tmtests/tm25/Makefile.am, tmtests/tm28/Makefile.am, tmtests/tm29/Makefile.am, tmtests/tmck/Makefile.am, tmtests/tmoverhd/Makefile.am: Make all test names unique. All needed ada_ as prefix to distinguish them from the C tests. MP tests should produce an executable with test name and node number in it. Screens renamed to follow. * ada_mvscn, mptests/mp01/node1/ada_mp01-node1.scn, mptests/mp01/node2/ada_mp01-node2.scn, mptests/mp02/node1/ada_mp02-node1.scn, mptests/mp02/node2/ada_mp02-node2.scn, mptests/mp03/node1/ada_mp03-node1.scn, mptests/mp03/node2/ada_mp03-node2.scn, mptests/mp04/node1/ada_mp04-node1.scn, mptests/mp04/node2/ada_mp04-node2.scn, mptests/mp05/node1/ada_mp05-node1.scn, mptests/mp05/node2/ada_mp05-node2.scn, mptests/mp06/node1/ada_mp06-node1.scn, mptests/mp06/node2/ada_mp06-node2.scn, mptests/mp07/node1/ada_mp07-node1.scn, mptests/mp07/node2/ada_mp07-node2.scn, mptests/mp08/node1/ada_mp08-node1.scn, mptests/mp08/node2/ada_mp08-node2.scn, mptests/mp09/node1/ada_mp09-node1.scn, mptests/mp09/node2/ada_mp09-node2.scn, mptests/mp10/node1/ada_mp10-node1.scn, mptests/mp10/node2/ada_mp10-node2.scn, mptests/mp11/node1/ada_mp11-node1.scn, mptests/mp11/node2/ada_mp11-node2.scn, mptests/mp12/node1/ada_mp12-node1.scn, mptests/mp12/node2/ada_mp12-node2.scn, mptests/mp13/node1/ada_mp13-node1.scn, mptests/mp13/node2/ada_mp13-node2.scn, mptests/mp14/node1/ada_mp14-node1.scn, mptests/mp14/node2/ada_mp14-node2.scn, samples/base_mp/node1/ada_base_mp-node1.scn, samples/base_mp/node2/ada_base_mp-node2.scn, samples/base_sp/ada_base_sp.scn, samples/hello/ada_hello.scn, samples/nsecs/ada_nsecs.scn, samples/ticker/ada_ticker.scn, sptests/sp01/ada_sp01.scn, sptests/sp02/ada_sp02.scn, sptests/sp03/ada_sp03.scn, sptests/sp04/ada_sp04.scn, sptests/sp05/ada_sp05.scn, sptests/sp06/ada_sp06.scn, sptests/sp07/ada_sp07.scn, sptests/sp08/ada_sp08.scn, sptests/sp09/ada_sp09.scn, sptests/sp11/ada_sp11.scn, sptests/sp12/ada_sp12.scn, sptests/sp13/ada_sp13.scn, sptests/sp14/ada_sp14.scn, sptests/sp15/ada_sp15.scn, sptests/sp16/ada_sp16.scn, sptests/sp17/ada_sp17.scn, sptests/sp19/ada_sp19.scn, sptests/sp20/ada_sp20.scn, sptests/sp22/ada_sp22.scn, sptests/sp23/ada_sp23.scn, sptests/sp24/ada_sp24.scn, sptests/sp25/ada_sp25.scn: New files. * mptests/mp01/node1/mp01-node1.scn, mptests/mp01/node2/mp01-node2.scn, mptests/mp02/node1/mp02-node1.scn, mptests/mp02/node2/mp02-node2.scn, mptests/mp03/node1/mp03-node1.scn, mptests/mp03/node2/mp03-node2.scn, mptests/mp04/node1/mp04-node1.scn, mptests/mp04/node2/mp04-node2.scn, mptests/mp05/node1/mp05-node1.scn, mptests/mp05/node2/mp05-node2.scn, mptests/mp06/node1/mp06-node1.scn, mptests/mp06/node2/mp06-node2.scn, mptests/mp07/node1/mp07-node1.scn, mptests/mp07/node2/mp07-node2.scn, mptests/mp08/node1/mp08-node1.scn, mptests/mp08/node2/mp08-node2.scn, mptests/mp09/node1/mp09-node1.scn, mptests/mp09/node2/mp09-node2.scn, mptests/mp10/node1/mp10-node1.scn, mptests/mp10/node2/mp10-node2.scn, mptests/mp11/node1/mp11-node1.scn, mptests/mp11/node2/mp11-node2.scn, mptests/mp12/node1/mp12-node1.scn, mptests/mp12/node2/mp12-node2.scn, mptests/mp13/node1/mp13-node1.scn, mptests/mp13/node2/mp13-node2.scn, mptests/mp14/node1/mp14-node1.scn, mptests/mp14/node2/mp14-node2.scn, samples/base_mp/node1/base_mp-node1.scn, samples/base_mp/node2/base_mp-node2.scn, samples/base_sp/base_sp.scn, samples/hello/hello.scn, samples/nsecs/nsecs.scn, samples/ticker/ticker.scn, sptests/sp01/sp01.scn, sptests/sp02/sp02.scn, sptests/sp03/sp03.scn, sptests/sp04/sp04.scn, sptests/sp05/sp05.scn, sptests/sp06/sp06.scn, sptests/sp07/sp07.scn, sptests/sp08/sp08.scn, sptests/sp09/sp09.scn, sptests/sp11/sp11.scn, sptests/sp12/sp12.scn, sptests/sp13/sp13.scn, sptests/sp14/sp14.scn, sptests/sp15/sp15.scn, sptests/sp16/sp16.scn, sptests/sp17/sp17.scn, sptests/sp19/sp19.scn, sptests/sp20/sp20.scn, sptests/sp22/sp22.scn, sptests/sp23/sp23.scn, sptests/sp24/sp24.scn, sptests/sp25/sp25.scn: Removed. --- c/src/ada-tests/sptests/sp01/Makefile.am | 10 +- c/src/ada-tests/sptests/sp01/ada_sp01.scn | 16 ++ c/src/ada-tests/sptests/sp01/sp01.scn | 16 -- c/src/ada-tests/sptests/sp02/Makefile.am | 10 +- c/src/ada-tests/sptests/sp02/ada_sp02.scn | 15 ++ c/src/ada-tests/sptests/sp02/sp02.scn | 15 -- c/src/ada-tests/sptests/sp03/Makefile.am | 10 +- c/src/ada-tests/sptests/sp03/ada_sp03.scn | 26 ++++ c/src/ada-tests/sptests/sp03/sp03.scn | 26 ---- c/src/ada-tests/sptests/sp04/Makefile.am | 10 +- c/src/ada-tests/sptests/sp04/ada_sp04.scn | 25 +++ c/src/ada-tests/sptests/sp04/sp04.scn | 25 --- c/src/ada-tests/sptests/sp05/Makefile.am | 10 +- c/src/ada-tests/sptests/sp05/ada_sp05.scn | 47 ++++++ c/src/ada-tests/sptests/sp05/sp05.scn | 47 ------ c/src/ada-tests/sptests/sp06/Makefile.am | 10 +- c/src/ada-tests/sptests/sp06/ada_sp06.scn | 38 +++++ c/src/ada-tests/sptests/sp06/sp06.scn | 38 ----- c/src/ada-tests/sptests/sp07/Makefile.am | 10 +- c/src/ada-tests/sptests/sp07/ada_sp07.scn | 32 ++++ c/src/ada-tests/sptests/sp07/sp07.scn | 32 ---- c/src/ada-tests/sptests/sp08/Makefile.am | 10 +- c/src/ada-tests/sptests/sp08/ada_sp08.scn | 20 +++ c/src/ada-tests/sptests/sp08/sp08.scn | 20 --- c/src/ada-tests/sptests/sp09/Makefile.am | 10 +- c/src/ada-tests/sptests/sp09/ada_sp09.scn | 250 ++++++++++++++++++++++++++++++ c/src/ada-tests/sptests/sp09/sp09.scn | 250 ------------------------------ c/src/ada-tests/sptests/sp11/Makefile.am | 10 +- c/src/ada-tests/sptests/sp11/ada_sp11.scn | 74 +++++++++ c/src/ada-tests/sptests/sp11/sp11.scn | 74 --------- c/src/ada-tests/sptests/sp12/Makefile.am | 10 +- c/src/ada-tests/sptests/sp12/ada_sp12.scn | 78 ++++++++++ c/src/ada-tests/sptests/sp12/sp12.scn | 78 ---------- c/src/ada-tests/sptests/sp13/Makefile.am | 10 +- c/src/ada-tests/sptests/sp13/ada_sp13.scn | 78 ++++++++++ c/src/ada-tests/sptests/sp13/sp13.scn | 78 ---------- c/src/ada-tests/sptests/sp14/Makefile.am | 10 +- c/src/ada-tests/sptests/sp14/ada_sp14.scn | 33 ++++ c/src/ada-tests/sptests/sp14/sp14.scn | 33 ---- c/src/ada-tests/sptests/sp15/Makefile.am | 10 +- c/src/ada-tests/sptests/sp15/ada_sp15.scn | 16 ++ c/src/ada-tests/sptests/sp15/sp15.scn | 16 -- c/src/ada-tests/sptests/sp16/Makefile.am | 10 +- c/src/ada-tests/sptests/sp16/ada_sp16.scn | 58 +++++++ c/src/ada-tests/sptests/sp16/sp16.scn | 58 ------- c/src/ada-tests/sptests/sp17/Makefile.am | 10 +- c/src/ada-tests/sptests/sp17/ada_sp17.scn | 8 + c/src/ada-tests/sptests/sp17/sp17.scn | 8 - c/src/ada-tests/sptests/sp19/Makefile.am | 10 +- c/src/ada-tests/sptests/sp19/ada_sp19.scn | 55 +++++++ c/src/ada-tests/sptests/sp19/sp19.scn | 55 ------- c/src/ada-tests/sptests/sp20/Makefile.am | 10 +- c/src/ada-tests/sptests/sp20/ada_sp20.scn | 40 +++++ c/src/ada-tests/sptests/sp20/sp20.scn | 40 ----- c/src/ada-tests/sptests/sp22/Makefile.am | 10 +- c/src/ada-tests/sptests/sp22/ada_sp22.scn | 29 ++++ c/src/ada-tests/sptests/sp22/sp22.scn | 29 ---- c/src/ada-tests/sptests/sp23/Makefile.am | 10 +- c/src/ada-tests/sptests/sp23/ada_sp23.scn | 9 ++ c/src/ada-tests/sptests/sp23/sp23.scn | 9 -- c/src/ada-tests/sptests/sp24/Makefile.am | 10 +- c/src/ada-tests/sptests/sp24/ada_sp24.scn | 16 ++ c/src/ada-tests/sptests/sp24/sp24.scn | 16 -- c/src/ada-tests/sptests/sp25/Makefile.am | 10 +- c/src/ada-tests/sptests/sp25/ada_sp25.scn | 29 ++++ c/src/ada-tests/sptests/sp25/sp25.scn | 29 ---- 66 files changed, 1102 insertions(+), 1102 deletions(-) create mode 100644 c/src/ada-tests/sptests/sp01/ada_sp01.scn delete mode 100644 c/src/ada-tests/sptests/sp01/sp01.scn create mode 100644 c/src/ada-tests/sptests/sp02/ada_sp02.scn delete mode 100644 c/src/ada-tests/sptests/sp02/sp02.scn create mode 100644 c/src/ada-tests/sptests/sp03/ada_sp03.scn delete mode 100644 c/src/ada-tests/sptests/sp03/sp03.scn create mode 100644 c/src/ada-tests/sptests/sp04/ada_sp04.scn delete mode 100644 c/src/ada-tests/sptests/sp04/sp04.scn create mode 100644 c/src/ada-tests/sptests/sp05/ada_sp05.scn delete mode 100644 c/src/ada-tests/sptests/sp05/sp05.scn create mode 100644 c/src/ada-tests/sptests/sp06/ada_sp06.scn delete mode 100644 c/src/ada-tests/sptests/sp06/sp06.scn create mode 100644 c/src/ada-tests/sptests/sp07/ada_sp07.scn delete mode 100644 c/src/ada-tests/sptests/sp07/sp07.scn create mode 100644 c/src/ada-tests/sptests/sp08/ada_sp08.scn delete mode 100644 c/src/ada-tests/sptests/sp08/sp08.scn create mode 100644 c/src/ada-tests/sptests/sp09/ada_sp09.scn delete mode 100644 c/src/ada-tests/sptests/sp09/sp09.scn create mode 100644 c/src/ada-tests/sptests/sp11/ada_sp11.scn delete mode 100644 c/src/ada-tests/sptests/sp11/sp11.scn create mode 100644 c/src/ada-tests/sptests/sp12/ada_sp12.scn delete mode 100644 c/src/ada-tests/sptests/sp12/sp12.scn create mode 100644 c/src/ada-tests/sptests/sp13/ada_sp13.scn delete mode 100644 c/src/ada-tests/sptests/sp13/sp13.scn create mode 100644 c/src/ada-tests/sptests/sp14/ada_sp14.scn delete mode 100644 c/src/ada-tests/sptests/sp14/sp14.scn create mode 100644 c/src/ada-tests/sptests/sp15/ada_sp15.scn delete mode 100644 c/src/ada-tests/sptests/sp15/sp15.scn create mode 100644 c/src/ada-tests/sptests/sp16/ada_sp16.scn delete mode 100644 c/src/ada-tests/sptests/sp16/sp16.scn create mode 100644 c/src/ada-tests/sptests/sp17/ada_sp17.scn delete mode 100644 c/src/ada-tests/sptests/sp17/sp17.scn create mode 100644 c/src/ada-tests/sptests/sp19/ada_sp19.scn delete mode 100644 c/src/ada-tests/sptests/sp19/sp19.scn create mode 100644 c/src/ada-tests/sptests/sp20/ada_sp20.scn delete mode 100644 c/src/ada-tests/sptests/sp20/sp20.scn create mode 100644 c/src/ada-tests/sptests/sp22/ada_sp22.scn delete mode 100644 c/src/ada-tests/sptests/sp22/sp22.scn create mode 100644 c/src/ada-tests/sptests/sp23/ada_sp23.scn delete mode 100644 c/src/ada-tests/sptests/sp23/sp23.scn create mode 100644 c/src/ada-tests/sptests/sp24/ada_sp24.scn delete mode 100644 c/src/ada-tests/sptests/sp24/sp24.scn create mode 100644 c/src/ada-tests/sptests/sp25/ada_sp25.scn delete mode 100644 c/src/ada-tests/sptests/sp25/sp25.scn (limited to 'c/src/ada-tests/sptests') diff --git a/c/src/ada-tests/sptests/sp01/Makefile.am b/c/src/ada-tests/sptests/sp01/Makefile.am index eda526bbee..722d329d19 100644 --- a/c/src/ada-tests/sptests/sp01/Makefile.am +++ b/c/src/ada-tests/sptests/sp01/Makefile.am @@ -5,14 +5,14 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am include $(top_srcdir)/ada.am -noinst_PROGRAMS = sp01.exe -sp01_exe_SOURCES = sp01.adb config.h sptest.adb sptest.ads -sp01_exe_SOURCES += ../../support/init.c +noinst_PROGRAMS = ada_sp01.exe +ada_sp01_exe_SOURCES = sp01.adb config.h sptest.adb sptest.ads +ada_sp01_exe_SOURCES += ../../support/init.c -sp01.exe: sp01.adb init.$(OBJEXT) +ada_sp01.exe: sp01.adb init.$(OBJEXT) $(GNATCOMPILE) -margs -a $< -o $@ scndir = $(rtems_ada_testsdir) -dist_scn_DATA = sp01.scn +dist_scn_DATA = ada_sp01.scn include $(top_srcdir)/../../../testsuites/automake/local.am diff --git a/c/src/ada-tests/sptests/sp01/ada_sp01.scn b/c/src/ada-tests/sptests/sp01/ada_sp01.scn new file mode 100644 index 0000000000..7ba3bea626 --- /dev/null +++ b/c/src/ada-tests/sptests/sp01/ada_sp01.scn @@ -0,0 +1,16 @@ +*** TEST 1 *** +TA1 - clock_get - 9: 0: 0 12/31/1988 +TA2 - clock_get - 9: 0: 0 12/31/1988 +TA3 - clock_get - 9: 0: 0 12/31/1988 +TA1 - clock_get - 9: 0: 5 12/31/1988 +TA1 - clock_get - 9: 0:10 12/31/1988 +TA2 - clock_get - 9: 0:10 12/31/1988 +TA1 - clock_get - 9: 0:15 12/31/1988 +TA3 - clock_get - 9: 0:15 12/31/1988 +TA1 - clock_get - 9: 0:20 12/31/1988 +TA2 - clock_get - 9: 0:20 12/31/1988 +TA1 - clock_get - 9: 0:25 12/31/1988 +TA1 - clock_get - 9: 0:30 12/31/1988 +TA3 - clock_get - 9: 0:30 12/31/1988 +TA2 - clock_get - 9: 0:30 12/31/1988 +*** END OF TEST 1 *** diff --git a/c/src/ada-tests/sptests/sp01/sp01.scn b/c/src/ada-tests/sptests/sp01/sp01.scn deleted file mode 100644 index 7ba3bea626..0000000000 --- a/c/src/ada-tests/sptests/sp01/sp01.scn +++ /dev/null @@ -1,16 +0,0 @@ -*** TEST 1 *** -TA1 - clock_get - 9: 0: 0 12/31/1988 -TA2 - clock_get - 9: 0: 0 12/31/1988 -TA3 - clock_get - 9: 0: 0 12/31/1988 -TA1 - clock_get - 9: 0: 5 12/31/1988 -TA1 - clock_get - 9: 0:10 12/31/1988 -TA2 - clock_get - 9: 0:10 12/31/1988 -TA1 - clock_get - 9: 0:15 12/31/1988 -TA3 - clock_get - 9: 0:15 12/31/1988 -TA1 - clock_get - 9: 0:20 12/31/1988 -TA2 - clock_get - 9: 0:20 12/31/1988 -TA1 - clock_get - 9: 0:25 12/31/1988 -TA1 - clock_get - 9: 0:30 12/31/1988 -TA3 - clock_get - 9: 0:30 12/31/1988 -TA2 - clock_get - 9: 0:30 12/31/1988 -*** END OF TEST 1 *** diff --git a/c/src/ada-tests/sptests/sp02/Makefile.am b/c/src/ada-tests/sptests/sp02/Makefile.am index b2c33e819e..eb3dd486b8 100644 --- a/c/src/ada-tests/sptests/sp02/Makefile.am +++ b/c/src/ada-tests/sptests/sp02/Makefile.am @@ -5,14 +5,14 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am include $(top_srcdir)/ada.am -noinst_PROGRAMS = sp02.exe -sp02_exe_SOURCES = sp02.adb config.h sptest.adb sptest.ads -sp02_exe_SOURCES += ../../support/init.c +noinst_PROGRAMS = ada_sp02.exe +ada_sp02_exe_SOURCES = sp02.adb config.h sptest.adb sptest.ads +ada_sp02_exe_SOURCES += ../../support/init.c -sp02.exe: sp02.adb init.$(OBJEXT) +ada_sp02.exe: sp02.adb init.$(OBJEXT) $(GNATCOMPILE) -margs -a $< -o $@ scndir = $(rtems_ada_testsdir) -dist_scn_DATA = sp02.scn +dist_scn_DATA = ada_sp02.scn include $(top_srcdir)/../../../testsuites/automake/local.am diff --git a/c/src/ada-tests/sptests/sp02/ada_sp02.scn b/c/src/ada-tests/sptests/sp02/ada_sp02.scn new file mode 100644 index 0000000000..722dfff1de --- /dev/null +++ b/c/src/ada-tests/sptests/sp02/ada_sp02.scn @@ -0,0 +1,15 @@ +*** TEST 2 *** +INIT - task_wake_after - yielding processor +PREEMPT - task_delete - deleting self +INIT - suspending TA2 while middle task on a ready chain +TA1 - task_wake_after - sleep 1 second +TA2 - task_wake_after - sleep 1 minute +TA3 - task_wake_after - sleep 5 seconds +TA1 - task_ident - tid of TA2 (16#A010004#) +TA1 - task_ident - tid of TA3 (16#A010002#) +TA1 - task_set_priority - set TA3's priority to 2 +TA1 - task_suspend - suspend TA2 +TA1 - task_delete - delete TA2 +TA1 - task_wake_after - sleep for 5 seconds +TA3 - task_delete - delete self +*** END OF TEST 2 *** diff --git a/c/src/ada-tests/sptests/sp02/sp02.scn b/c/src/ada-tests/sptests/sp02/sp02.scn deleted file mode 100644 index 722dfff1de..0000000000 --- a/c/src/ada-tests/sptests/sp02/sp02.scn +++ /dev/null @@ -1,15 +0,0 @@ -*** TEST 2 *** -INIT - task_wake_after - yielding processor -PREEMPT - task_delete - deleting self -INIT - suspending TA2 while middle task on a ready chain -TA1 - task_wake_after - sleep 1 second -TA2 - task_wake_after - sleep 1 minute -TA3 - task_wake_after - sleep 5 seconds -TA1 - task_ident - tid of TA2 (16#A010004#) -TA1 - task_ident - tid of TA3 (16#A010002#) -TA1 - task_set_priority - set TA3's priority to 2 -TA1 - task_suspend - suspend TA2 -TA1 - task_delete - delete TA2 -TA1 - task_wake_after - sleep for 5 seconds -TA3 - task_delete - delete self -*** END OF TEST 2 *** diff --git a/c/src/ada-tests/sptests/sp03/Makefile.am b/c/src/ada-tests/sptests/sp03/Makefile.am index d6892fbdeb..b74c0cb130 100644 --- a/c/src/ada-tests/sptests/sp03/Makefile.am +++ b/c/src/ada-tests/sptests/sp03/Makefile.am @@ -5,14 +5,14 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am include $(top_srcdir)/ada.am -noinst_PROGRAMS = sp03.exe -sp03_exe_SOURCES = sp03.adb config.h sptest.adb sptest.ads -sp03_exe_SOURCES += ../../support/init.c +noinst_PROGRAMS = ada_sp03.exe +ada_sp03_exe_SOURCES = sp03.adb config.h sptest.adb sptest.ads +ada_sp03_exe_SOURCES += ../../support/init.c -sp03.exe: sp03.adb init.$(OBJEXT) +ada_sp03.exe: sp03.adb init.$(OBJEXT) $(GNATCOMPILE) -margs -a $< -o $@ scndir = $(rtems_ada_testsdir) -dist_scn_DATA = sp03.scn +dist_scn_DATA = ada_sp03.scn include $(top_srcdir)/../../../testsuites/automake/local.am diff --git a/c/src/ada-tests/sptests/sp03/ada_sp03.scn b/c/src/ada-tests/sptests/sp03/ada_sp03.scn new file mode 100644 index 0000000000..a2a04c6951 --- /dev/null +++ b/c/src/ada-tests/sptests/sp03/ada_sp03.scn @@ -0,0 +1,26 @@ +*** TEST 3 *** +TA1 sets clock: 9:15: 0 12/31/1988 +TA1 going to sleep: 9:15: 0 12/31/1988 +TA2 9:15: 1 12/31/1988 +TA2 9:15: 2 12/31/1988 +TA2 9:15: 3 12/31/1988 +TA2 9:15: 4 12/31/1988 +TA1 awakened: 9:15: 5 12/31/1988 +TA1 going to sleep: 9:15: 5 12/31/1988 +TA2 9:15: 5 12/31/1988 +TA2 9:15: 6 12/31/1988 +TA2 9:15: 7 12/31/1988 +TA2 9:15: 8 12/31/1988 +TA2 9:15: 9 12/31/1988 +TA1 awakened: 9:15:10 12/31/1988 +TA1 going to sleep: 9:15:10 12/31/1988 +TA2 9:15:10 12/31/1988 +TA2 9:15:11 12/31/1988 +TA2 9:15:12 12/31/1988 +TA2 9:15:13 12/31/1988 +TA2 9:15:14 12/31/1988 +TA1 awakened: 9:15:15 12/31/1988 +TA1 going to sleep: 9:15:15 12/31/1988 +TA2 9:15:15 12/31/1988 +TA2 9:15:16 12/31/1988 +*** END OF TEST 3 *** diff --git a/c/src/ada-tests/sptests/sp03/sp03.scn b/c/src/ada-tests/sptests/sp03/sp03.scn deleted file mode 100644 index a2a04c6951..0000000000 --- a/c/src/ada-tests/sptests/sp03/sp03.scn +++ /dev/null @@ -1,26 +0,0 @@ -*** TEST 3 *** -TA1 sets clock: 9:15: 0 12/31/1988 -TA1 going to sleep: 9:15: 0 12/31/1988 -TA2 9:15: 1 12/31/1988 -TA2 9:15: 2 12/31/1988 -TA2 9:15: 3 12/31/1988 -TA2 9:15: 4 12/31/1988 -TA1 awakened: 9:15: 5 12/31/1988 -TA1 going to sleep: 9:15: 5 12/31/1988 -TA2 9:15: 5 12/31/1988 -TA2 9:15: 6 12/31/1988 -TA2 9:15: 7 12/31/1988 -TA2 9:15: 8 12/31/1988 -TA2 9:15: 9 12/31/1988 -TA1 awakened: 9:15:10 12/31/1988 -TA1 going to sleep: 9:15:10 12/31/1988 -TA2 9:15:10 12/31/1988 -TA2 9:15:11 12/31/1988 -TA2 9:15:12 12/31/1988 -TA2 9:15:13 12/31/1988 -TA2 9:15:14 12/31/1988 -TA1 awakened: 9:15:15 12/31/1988 -TA1 going to sleep: 9:15:15 12/31/1988 -TA2 9:15:15 12/31/1988 -TA2 9:15:16 12/31/1988 -*** END OF TEST 3 *** diff --git a/c/src/ada-tests/sptests/sp04/Makefile.am b/c/src/ada-tests/sptests/sp04/Makefile.am index 5c991f34bc..4a0252cec2 100644 --- a/c/src/ada-tests/sptests/sp04/Makefile.am +++ b/c/src/ada-tests/sptests/sp04/Makefile.am @@ -5,14 +5,14 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am include $(top_srcdir)/ada.am -noinst_PROGRAMS = sp04.exe -sp04_exe_SOURCES = sp04.adb config.h sptest.adb sptest.ads -sp04_exe_SOURCES += ../../support/init.c +noinst_PROGRAMS = ada_sp04.exe +ada_sp04_exe_SOURCES = sp04.adb config.h sptest.adb sptest.ads +ada_sp04_exe_SOURCES += ../../support/init.c -sp04.exe: sp04.adb init.$(OBJEXT) +ada_sp04.exe: sp04.adb init.$(OBJEXT) $(GNATCOMPILE) -margs -a $< -o $@ scndir = $(rtems_ada_testsdir) -dist_scn_DATA = sp04.scn +dist_scn_DATA = ada_sp04.scn include $(top_srcdir)/../../../testsuites/automake/local.am diff --git a/c/src/ada-tests/sptests/sp04/ada_sp04.scn b/c/src/ada-tests/sptests/sp04/ada_sp04.scn new file mode 100644 index 0000000000..76d9f0c665 --- /dev/null +++ b/c/src/ada-tests/sptests/sp04/ada_sp04.scn @@ -0,0 +1,25 @@ +*** TEST 4 *** +TA1 - task_suspend - on Task 2 +TA1 - task_suspend - on Task 3 +TA1 - killing time +TA1 - task_resume - on Task 2 +TA1 - task_resume - on Task 3 +TA1 - task_mode - change mode to NO PREEMPT +TA1 - 9:15:10 12/31/1988 +TA1 - 9:15:11 12/31/1988 +TA1 - 9:15:12 12/31/1988 +TA1 - 9:15:13 12/31/1988 +TA1 - 9:15:14 12/31/1988 +TA1 - 9:15:15 12/31/1988 +TA1 - task_mode - change mode to PREEMPT +TA1 - 9:15: 0 12/31/1988 +TA2 - 9:15: 4 12/31/1988 +TA3 - 9:15: 5 12/31/1988 +TA1 - 9:15: 6 12/31/1988 +TA2 - 9:15: 7 12/31/1988 +TA3 - 9:15: 8 12/31/1988 +TA1 - 9:15: 9 12/31/1988 +TA2 - 9:15:16 12/31/1988 +TA3 - 9:15:17 12/31/1988 +TA1 - 9:15:18 12/31/1988 +*** END OF TEST 4 *** diff --git a/c/src/ada-tests/sptests/sp04/sp04.scn b/c/src/ada-tests/sptests/sp04/sp04.scn deleted file mode 100644 index 76d9f0c665..0000000000 --- a/c/src/ada-tests/sptests/sp04/sp04.scn +++ /dev/null @@ -1,25 +0,0 @@ -*** TEST 4 *** -TA1 - task_suspend - on Task 2 -TA1 - task_suspend - on Task 3 -TA1 - killing time -TA1 - task_resume - on Task 2 -TA1 - task_resume - on Task 3 -TA1 - task_mode - change mode to NO PREEMPT -TA1 - 9:15:10 12/31/1988 -TA1 - 9:15:11 12/31/1988 -TA1 - 9:15:12 12/31/1988 -TA1 - 9:15:13 12/31/1988 -TA1 - 9:15:14 12/31/1988 -TA1 - 9:15:15 12/31/1988 -TA1 - task_mode - change mode to PREEMPT -TA1 - 9:15: 0 12/31/1988 -TA2 - 9:15: 4 12/31/1988 -TA3 - 9:15: 5 12/31/1988 -TA1 - 9:15: 6 12/31/1988 -TA2 - 9:15: 7 12/31/1988 -TA3 - 9:15: 8 12/31/1988 -TA1 - 9:15: 9 12/31/1988 -TA2 - 9:15:16 12/31/1988 -TA3 - 9:15:17 12/31/1988 -TA1 - 9:15:18 12/31/1988 -*** END OF TEST 4 *** diff --git a/c/src/ada-tests/sptests/sp05/Makefile.am b/c/src/ada-tests/sptests/sp05/Makefile.am index 82fe91fcb3..be29c757ea 100644 --- a/c/src/ada-tests/sptests/sp05/Makefile.am +++ b/c/src/ada-tests/sptests/sp05/Makefile.am @@ -5,14 +5,14 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am include $(top_srcdir)/ada.am -noinst_PROGRAMS = sp05.exe -sp05_exe_SOURCES = sp05.adb config.h sptest.adb sptest.ads -sp05_exe_SOURCES += ../../support/init.c +noinst_PROGRAMS = ada_sp05.exe +ada_sp05_exe_SOURCES = sp05.adb config.h sptest.adb sptest.ads +ada_sp05_exe_SOURCES += ../../support/init.c -sp05.exe: sp05.adb init.$(OBJEXT) +ada_sp05.exe: sp05.adb init.$(OBJEXT) $(GNATCOMPILE) -margs -a $< -o $@ scndir = $(rtems_ada_testsdir) -dist_scn_DATA = sp05.scn +dist_scn_DATA = ada_sp05.scn include $(top_srcdir)/../../../testsuites/automake/local.am diff --git a/c/src/ada-tests/sptests/sp05/ada_sp05.scn b/c/src/ada-tests/sptests/sp05/ada_sp05.scn new file mode 100644 index 0000000000..591397f760 --- /dev/null +++ b/c/src/ada-tests/sptests/sp05/ada_sp05.scn @@ -0,0 +1,47 @@ +*** TEST 5 *** +TA1 - task_wake_after - sleep 5 seconds +TA2 - task_suspend - suspend self +TA3 - task_suspend - suspend self +TA1 - task_suspend - suspend TA3 +TA1 - task_resume - resume TA2 +TA1 - task_wake_after - sleep 5 seconds +TA2 - task_wake_after - sleep 1 second +TA2 - task_wake_after - sleep 1 second +TA2 - task_wake_after - sleep 1 second +TA2 - task_wake_after - sleep 1 second +TA2 - task_wake_after - sleep 1 second +TA1 - task_suspend - suspend TA2 +TA1 - task_resume - resume TA3 +TA1 - task_wake_after - sleep 5 seconds +TA3 - task_wake_after - sleep 1 second +TA3 - task_wake_after - sleep 1 second +TA3 - task_wake_after - sleep 1 second +TA3 - task_wake_after - sleep 1 second +TA3 - task_wake_after - sleep 1 second +TA1 - task_suspend - suspend TA3 +TA1 - task_resume - resume TA2 +TA1 - task_wake_after - sleep 5 seconds +TA2 - task_wake_after - sleep 1 second +TA2 - task_wake_after - sleep 1 second +TA2 - task_wake_after - sleep 1 second +TA2 - task_wake_after - sleep 1 second +TA2 - task_wake_after - sleep 1 second +TA1 - task_suspend - suspend TA2 +TA1 - task_resume - resume TA3 +TA1 - task_wake_after - sleep 5 seconds +TA3 - task_wake_after - sleep 1 second +TA3 - task_wake_after - sleep 1 second +TA3 - task_wake_after - sleep 1 second +TA3 - task_wake_after - sleep 1 second +TA3 - task_wake_after - sleep 1 second +TA1 - task_suspend - suspend TA3 +TA1 - task_resume - resume TA2 +TA1 - task_wake_after - sleep 5 seconds +TA2 - task_wake_after - sleep 1 second +TA2 - task_wake_after - sleep 1 second +TA2 - task_wake_after - sleep 1 second +TA2 - task_wake_after - sleep 1 second +TA2 - task_wake_after - sleep 1 second +TA1 - task_suspend - suspend TA2 +TA1 - task_resume - resume TA3 +*** END OF TEST 5 *** diff --git a/c/src/ada-tests/sptests/sp05/sp05.scn b/c/src/ada-tests/sptests/sp05/sp05.scn deleted file mode 100644 index 591397f760..0000000000 --- a/c/src/ada-tests/sptests/sp05/sp05.scn +++ /dev/null @@ -1,47 +0,0 @@ -*** TEST 5 *** -TA1 - task_wake_after - sleep 5 seconds -TA2 - task_suspend - suspend self -TA3 - task_suspend - suspend self -TA1 - task_suspend - suspend TA3 -TA1 - task_resume - resume TA2 -TA1 - task_wake_after - sleep 5 seconds -TA2 - task_wake_after - sleep 1 second -TA2 - task_wake_after - sleep 1 second -TA2 - task_wake_after - sleep 1 second -TA2 - task_wake_after - sleep 1 second -TA2 - task_wake_after - sleep 1 second -TA1 - task_suspend - suspend TA2 -TA1 - task_resume - resume TA3 -TA1 - task_wake_after - sleep 5 seconds -TA3 - task_wake_after - sleep 1 second -TA3 - task_wake_after - sleep 1 second -TA3 - task_wake_after - sleep 1 second -TA3 - task_wake_after - sleep 1 second -TA3 - task_wake_after - sleep 1 second -TA1 - task_suspend - suspend TA3 -TA1 - task_resume - resume TA2 -TA1 - task_wake_after - sleep 5 seconds -TA2 - task_wake_after - sleep 1 second -TA2 - task_wake_after - sleep 1 second -TA2 - task_wake_after - sleep 1 second -TA2 - task_wake_after - sleep 1 second -TA2 - task_wake_after - sleep 1 second -TA1 - task_suspend - suspend TA2 -TA1 - task_resume - resume TA3 -TA1 - task_wake_after - sleep 5 seconds -TA3 - task_wake_after - sleep 1 second -TA3 - task_wake_after - sleep 1 second -TA3 - task_wake_after - sleep 1 second -TA3 - task_wake_after - sleep 1 second -TA3 - task_wake_after - sleep 1 second -TA1 - task_suspend - suspend TA3 -TA1 - task_resume - resume TA2 -TA1 - task_wake_after - sleep 5 seconds -TA2 - task_wake_after - sleep 1 second -TA2 - task_wake_after - sleep 1 second -TA2 - task_wake_after - sleep 1 second -TA2 - task_wake_after - sleep 1 second -TA2 - task_wake_after - sleep 1 second -TA1 - task_suspend - suspend TA2 -TA1 - task_resume - resume TA3 -*** END OF TEST 5 *** diff --git a/c/src/ada-tests/sptests/sp06/Makefile.am b/c/src/ada-tests/sptests/sp06/Makefile.am index 7fa7a54ef6..9975118fe6 100644 --- a/c/src/ada-tests/sptests/sp06/Makefile.am +++ b/c/src/ada-tests/sptests/sp06/Makefile.am @@ -5,14 +5,14 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am include $(top_srcdir)/ada.am -noinst_PROGRAMS = sp06.exe -sp06_exe_SOURCES = sp06.adb config.h sptest.adb sptest.ads -sp06_exe_SOURCES += ../../support/init.c +noinst_PROGRAMS = ada_sp06.exe +ada_sp06_exe_SOURCES = sp06.adb config.h sptest.adb sptest.ads +ada_sp06_exe_SOURCES += ../../support/init.c -sp06.exe: sp06.adb init.$(OBJEXT) +ada_sp06.exe: sp06.adb init.$(OBJEXT) $(GNATCOMPILE) -margs -a $< -o $@ scndir = $(rtems_ada_testsdir) -dist_scn_DATA = sp06.scn +dist_scn_DATA = ada_sp06.scn include $(top_srcdir)/../../../testsuites/automake/local.am diff --git a/c/src/ada-tests/sptests/sp06/ada_sp06.scn b/c/src/ada-tests/sptests/sp06/ada_sp06.scn new file mode 100644 index 0000000000..8dc6c6afae --- /dev/null +++ b/c/src/ada-tests/sptests/sp06/ada_sp06.scn @@ -0,0 +1,38 @@ +*** TEST 6 *** +TA1 - is beginning to run +TA1 - restarting TA3 +TA2 - is beginning to run +TA2 - task_wake_after - sleep 1/2 second +TA2 - task_wake_after - sleep 1/2 second +TA1 - task_restart - restarting TA2 +TA2 - is beginning to run +TA2 - task_wake_after - sleep 1/2 second +TA2 - task_wake_after - sleep 1/2 second +TA1 - task_restart - restarting self +TA2 - task_wake_after - sleep 1/2 second +TA1 - is beginning to run +TA2 - task_wake_after - sleep 1/2 second +TA1 - task_restart - restarting TA2 +TA2 - is beginning to run +TA2 - task_wake_after - sleep 1/2 second +TA2 - task_wake_after - sleep 1/2 second +TA1 - task_restart - restarting self +TA2 - task_wake_after - sleep 1/2 second +TA1 - is beginning to run +TA2 - task_wake_after - sleep 1/2 second +TA1 - task_restart - restarting TA2 +TA2 - is beginning to run +TA2 - task_wake_after - sleep 1/2 second +TA2 - task_wake_after - sleep 1/2 second +TA1 - task_restart - restarting self +TA2 - task_wake_after - sleep 1/2 second +TA1 - is beginning to run +TA2 - task_wake_after - sleep 1/2 second +TA1 - task_restart - restarting TA2 +TA2 - is beginning to run +TA2 - task_wake_after - sleep 1/2 second +TA2 - task_wake_after - sleep 1/2 second +TA1 - task_restart - restarting self +TA2 - task_wake_after - sleep 1/2 second +TA1 - is beginning to run +*** END OF TEST 6 *** diff --git a/c/src/ada-tests/sptests/sp06/sp06.scn b/c/src/ada-tests/sptests/sp06/sp06.scn deleted file mode 100644 index 8dc6c6afae..0000000000 --- a/c/src/ada-tests/sptests/sp06/sp06.scn +++ /dev/null @@ -1,38 +0,0 @@ -*** TEST 6 *** -TA1 - is beginning to run -TA1 - restarting TA3 -TA2 - is beginning to run -TA2 - task_wake_after - sleep 1/2 second -TA2 - task_wake_after - sleep 1/2 second -TA1 - task_restart - restarting TA2 -TA2 - is beginning to run -TA2 - task_wake_after - sleep 1/2 second -TA2 - task_wake_after - sleep 1/2 second -TA1 - task_restart - restarting self -TA2 - task_wake_after - sleep 1/2 second -TA1 - is beginning to run -TA2 - task_wake_after - sleep 1/2 second -TA1 - task_restart - restarting TA2 -TA2 - is beginning to run -TA2 - task_wake_after - sleep 1/2 second -TA2 - task_wake_after - sleep 1/2 second -TA1 - task_restart - restarting self -TA2 - task_wake_after - sleep 1/2 second -TA1 - is beginning to run -TA2 - task_wake_after - sleep 1/2 second -TA1 - task_restart - restarting TA2 -TA2 - is beginning to run -TA2 - task_wake_after - sleep 1/2 second -TA2 - task_wake_after - sleep 1/2 second -TA1 - task_restart - restarting self -TA2 - task_wake_after - sleep 1/2 second -TA1 - is beginning to run -TA2 - task_wake_after - sleep 1/2 second -TA1 - task_restart - restarting TA2 -TA2 - is beginning to run -TA2 - task_wake_after - sleep 1/2 second -TA2 - task_wake_after - sleep 1/2 second -TA1 - task_restart - restarting self -TA2 - task_wake_after - sleep 1/2 second -TA1 - is beginning to run -*** END OF TEST 6 *** diff --git a/c/src/ada-tests/sptests/sp07/Makefile.am b/c/src/ada-tests/sptests/sp07/Makefile.am index 37167d4d97..97af3671a7 100644 --- a/c/src/ada-tests/sptests/sp07/Makefile.am +++ b/c/src/ada-tests/sptests/sp07/Makefile.am @@ -5,15 +5,15 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am include $(top_srcdir)/ada.am -noinst_PROGRAMS = sp07.exe +noinst_PROGRAMS = ada_sp07.exe -sp07_exe_SOURCES = sp07.adb config.h sptest.adb sptest.ads -sp07_exe_SOURCES += ../../support/init.c +ada_sp07_exe_SOURCES = sp07.adb config.h sptest.adb sptest.ads +ada_sp07_exe_SOURCES += ../../support/init.c -sp07.exe: sp07.adb init.$(OBJEXT) +ada_sp07.exe: sp07.adb init.$(OBJEXT) $(GNATCOMPILE) -margs -a $< -o $@ scndir = $(rtems_ada_testsdir) -dist_scn_DATA = sp07.scn +dist_scn_DATA = ada_sp07.scn include $(top_srcdir)/../../../testsuites/automake/local.am diff --git a/c/src/ada-tests/sptests/sp07/ada_sp07.scn b/c/src/ada-tests/sptests/sp07/ada_sp07.scn new file mode 100644 index 0000000000..b048411960 --- /dev/null +++ b/c/src/ada-tests/sptests/sp07/ada_sp07.scn @@ -0,0 +1,32 @@ +*** TEST 7 *** +TASKS_CREATE - TA1 - created. +TASKS_CREATE - TA2 - created. +TASKS_CREATE - TA3 - created. +TASKS_CREATE - TA4 - created. +TASKS_START - TA1 - started. +TASKS_START - TA2 - started. +TASKS_START - TA3 - started. +TASKS_START - TA4 - started. +TASKS_RESTART - TA3 - restarted. +INIT - task_set_note - set TA1's NOTEPAD_8 to TA1's initial priority: 4 +INIT - task_set_note - set TA2's NOTEPAD_8 to TA2's initial priority: 4 + +TA1 - task_set_priority - get initial priority of self: 4 +TA1 - task_get_note - get NOTEPAD_8 - current priority: 4 +TA1 - task_set_note - set TA2's NOTEPAD_8: 3 +TA1 - task_set_priority - set TA2's priority: 3 +TA2 - task_get_note - get NOTEPAD_8 - current priority: 3 +TA2 - task_set_note - set TA1's NOTEPAD_8: 2 +TA2 - task_set_priority - set TA1's priority: 2 +TA1 - task_get_note - get NOTEPAD_8 - current priority: 2 +TA1 - task_set_note - set TA2's NOTEPAD_8: 1 +TA1 - task_set_priority - set TA2's priority: 1 +TA2 - task_get_note - get NOTEPAD_8 - current priority: 1 +TA2 - task_suspend - suspend TA1 +TA2 - task_set_priority - set priority of TA1 ( blocked ) +TASKS_DELETE - TA2 deleting TA1 +TASKS_DELETE - TA2 deleting TA3 +TASKS_DELETE - TA2 deleting TA2 +TA4 - exitting task +TASK_EXITTED - user extension invoked correctly +*** END OF TEST 7 *** diff --git a/c/src/ada-tests/sptests/sp07/sp07.scn b/c/src/ada-tests/sptests/sp07/sp07.scn deleted file mode 100644 index b048411960..0000000000 --- a/c/src/ada-tests/sptests/sp07/sp07.scn +++ /dev/null @@ -1,32 +0,0 @@ -*** TEST 7 *** -TASKS_CREATE - TA1 - created. -TASKS_CREATE - TA2 - created. -TASKS_CREATE - TA3 - created. -TASKS_CREATE - TA4 - created. -TASKS_START - TA1 - started. -TASKS_START - TA2 - started. -TASKS_START - TA3 - started. -TASKS_START - TA4 - started. -TASKS_RESTART - TA3 - restarted. -INIT - task_set_note - set TA1's NOTEPAD_8 to TA1's initial priority: 4 -INIT - task_set_note - set TA2's NOTEPAD_8 to TA2's initial priority: 4 - -TA1 - task_set_priority - get initial priority of self: 4 -TA1 - task_get_note - get NOTEPAD_8 - current priority: 4 -TA1 - task_set_note - set TA2's NOTEPAD_8: 3 -TA1 - task_set_priority - set TA2's priority: 3 -TA2 - task_get_note - get NOTEPAD_8 - current priority: 3 -TA2 - task_set_note - set TA1's NOTEPAD_8: 2 -TA2 - task_set_priority - set TA1's priority: 2 -TA1 - task_get_note - get NOTEPAD_8 - current priority: 2 -TA1 - task_set_note - set TA2's NOTEPAD_8: 1 -TA1 - task_set_priority - set TA2's priority: 1 -TA2 - task_get_note - get NOTEPAD_8 - current priority: 1 -TA2 - task_suspend - suspend TA1 -TA2 - task_set_priority - set priority of TA1 ( blocked ) -TASKS_DELETE - TA2 deleting TA1 -TASKS_DELETE - TA2 deleting TA3 -TASKS_DELETE - TA2 deleting TA2 -TA4 - exitting task -TASK_EXITTED - user extension invoked correctly -*** END OF TEST 7 *** diff --git a/c/src/ada-tests/sptests/sp08/Makefile.am b/c/src/ada-tests/sptests/sp08/Makefile.am index 71f952279e..5c24a9ccb1 100644 --- a/c/src/ada-tests/sptests/sp08/Makefile.am +++ b/c/src/ada-tests/sptests/sp08/Makefile.am @@ -5,14 +5,14 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am include $(top_srcdir)/ada.am -noinst_PROGRAMS = sp08.exe -sp08_exe_SOURCES = sp08.adb config.h sptest.adb sptest.ads -sp08_exe_SOURCES += ../../support/init.c +noinst_PROGRAMS = ada_sp08.exe +ada_sp08_exe_SOURCES = sp08.adb config.h sptest.adb sptest.ads +ada_sp08_exe_SOURCES += ../../support/init.c -sp08.exe: sp08.adb init.$(OBJEXT) +ada_sp08.exe: sp08.adb init.$(OBJEXT) $(GNATCOMPILE) -margs -a $< -o $@ scndir = $(rtems_ada_testsdir) -dist_scn_DATA = sp08.scn +dist_scn_DATA = ada_sp08.scn include $(top_srcdir)/../../../testsuites/automake/local.am diff --git a/c/src/ada-tests/sptests/sp08/ada_sp08.scn b/c/src/ada-tests/sptests/sp08/ada_sp08.scn new file mode 100644 index 0000000000..d0081437fe --- /dev/null +++ b/c/src/ada-tests/sptests/sp08/ada_sp08.scn @@ -0,0 +1,20 @@ +*** TEST 8 *** +TA1 - task_mode - ASR - previous mode: 16#0# +TA1 - task_mode - NO_ASR - previous mode: 16#0# +TA1 - task_mode - NO_ASR - previous mode: 16#400# +TA1 - task_mode - ASR - previous mode: 16#400# +TA1 - task_mode - NO_TIMESLICE - previous mode: 16#0# +TA1 - task_mode - TIMESLICE - previous mode: 16#0# +TA1 - task_mode - TIMESLICE - previous mode: 16#200# +TA1 - task_mode - NO_TIMESLICE - previous mode: 16#200# +TA1 - task_mode - PREEMPT - previous mode: 16#0# +TA1 - task_mode - NO_PREEMPT - previous mode: 16#0# +TA1 - task_mode - NO_PREEMPT - previous mode: 16#100# +TA1 - task_mode - PREEMPT - previous mode: 16#100# +TA1 - task_mode - INTERRUPT_LEVEL( 3 ) - previous mode: 16#0# +TA1 - task_mode - INTERRUPT_LEVEL( 5 ) - previous mode: 16#1# +TA1 - task_mode - set all modes - previous mode: 16#1# +TA1 - task_mode - set all modes - previous mode: 16#701# +TA1 - task_mode - clear all modes - previous mode: 16#701# +TA1 - task_mode - get current mode - previous mode: 16#0# +*** END OF TEST 8 *** diff --git a/c/src/ada-tests/sptests/sp08/sp08.scn b/c/src/ada-tests/sptests/sp08/sp08.scn deleted file mode 100644 index d0081437fe..0000000000 --- a/c/src/ada-tests/sptests/sp08/sp08.scn +++ /dev/null @@ -1,20 +0,0 @@ -*** TEST 8 *** -TA1 - task_mode - ASR - previous mode: 16#0# -TA1 - task_mode - NO_ASR - previous mode: 16#0# -TA1 - task_mode - NO_ASR - previous mode: 16#400# -TA1 - task_mode - ASR - previous mode: 16#400# -TA1 - task_mode - NO_TIMESLICE - previous mode: 16#0# -TA1 - task_mode - TIMESLICE - previous mode: 16#0# -TA1 - task_mode - TIMESLICE - previous mode: 16#200# -TA1 - task_mode - NO_TIMESLICE - previous mode: 16#200# -TA1 - task_mode - PREEMPT - previous mode: 16#0# -TA1 - task_mode - NO_PREEMPT - previous mode: 16#0# -TA1 - task_mode - NO_PREEMPT - previous mode: 16#100# -TA1 - task_mode - PREEMPT - previous mode: 16#100# -TA1 - task_mode - INTERRUPT_LEVEL( 3 ) - previous mode: 16#0# -TA1 - task_mode - INTERRUPT_LEVEL( 5 ) - previous mode: 16#1# -TA1 - task_mode - set all modes - previous mode: 16#1# -TA1 - task_mode - set all modes - previous mode: 16#701# -TA1 - task_mode - clear all modes - previous mode: 16#701# -TA1 - task_mode - get current mode - previous mode: 16#0# -*** END OF TEST 8 *** diff --git a/c/src/ada-tests/sptests/sp09/Makefile.am b/c/src/ada-tests/sptests/sp09/Makefile.am index 9fcd9c1674..293cea54f4 100644 --- a/c/src/ada-tests/sptests/sp09/Makefile.am +++ b/c/src/ada-tests/sptests/sp09/Makefile.am @@ -9,15 +9,15 @@ include $(top_srcdir)/ada.am # handling can be verified in the binding. AM_ADAFLAGS += -gnatp -noinst_PROGRAMS = sp09.exe +noinst_PROGRAMS = ada_sp09.exe -sp09_exe_SOURCES = sp09.adb config.h sptest.adb sptest.ads -sp09_exe_SOURCES += ../../support/init.c +ada_sp09_exe_SOURCES = sp09.adb config.h sptest.adb sptest.ads +ada_sp09_exe_SOURCES += ../../support/init.c -sp09.exe: sp09.adb init.$(OBJEXT) +ada_sp09.exe: sp09.adb init.$(OBJEXT) $(GNATCOMPILE) -margs -a $< -o $@ scndir = $(rtems_ada_testsdir) -dist_scn_DATA = sp09.scn +dist_scn_DATA = ada_sp09.scn include $(top_srcdir)/../../../testsuites/automake/local.am diff --git a/c/src/ada-tests/sptests/sp09/ada_sp09.scn b/c/src/ada-tests/sptests/sp09/ada_sp09.scn new file mode 100644 index 0000000000..8fb09cd35a --- /dev/null +++ b/c/src/ada-tests/sptests/sp09/ada_sp09.scn @@ -0,0 +1,250 @@ +*** TEST 9 *** +INIT - task_create - INVALID_PRIORITY +INIT - task_restart - INCORRECT_STATE +TA1 - task_delete - INVALID_ID +TA1 - task_get_note - INVALID_NUMBER +TA1 - task_get_note - INVALID_ID +TA1 - task_ident - current task SUCCESSFUL +TA1 - task_ident - global INVALID_NAME +TA1 - task_ident - local INVALID_NAME +TA1 - task_ident - INVALID_NODE +TA1 - task_restart - INVALID_ID +TA1 - task_resume - INVALID_ID +TA1 - task_resume - INCORRECT_STATE +TA1 - task_set_priority - INVALID_PRIORITY +TA1 - task_set_priority - INVALID_ID +TA1 - task_set_note - INVALID_NUMBER +TA1 - task_set_note - INVALID_ID +TA1 - task_start - INVALID_ID +TA1 - task_start - INCORRECT_STATE +TA1 - task_suspend - INVALID_ID + +TA1 - clock_get - NOT_DEFINED +TA1 - task_wake_when - NOT_DEFINED +TA1 - timer_fire_when - NOT_DEFINED +TA1 - clock_set - 8:30:45 2/ 5/1987 - INVALID_CLOCK +TA1 - clock_set - 8:30:45 15/ 5/1988 - INVALID_CLOCK +TA1 - clock_set - 8:30:45 2/32/1988 - INVALID_CLOCK +TA1 - clock_set - 25:30:45 2/ 5/1988 - INVALID_CLOCK +TA1 - clock_set - 8:61:45 2/ 5/1988 - INVALID_CLOCK +TA1 - clock_set - 8:30:61 2/ 5/1988 - INVALID_CLOCK +TA1 - clock_set - 8:30:45 2/ 5/1988 - INVALID_CLOCK +TA1 - clock_set - 8:30:45 2/ 5/1988 - SUCCESSFUL +TA1 - task_wake_when - TICK INVALID - sleep about 3 seconds +TA1 - task_wake_when - TICK INVALID - woke up SUCCESSFUL +TA1 - task_wake_when - 8:30:48 2/ 5/1961 - INVALID_CLOCK +TA1 - task_wake_when - 25:30:48 2/ 5/1988 - INVALID_CLOCK +TA1 - current time - 8:30:48 2/ 5/1988 +TA1 - task_wake_when - 8:30:48 1/ 5/1988 - INVALID_CLOCK + +TA1 - task_create - INVALID_NAME +TA1 - task_create - stack size - UNSATISFIED +TA1 - task_create - TA2 created - SUCCESSFUL +TA1 - task_suspend - suspend TA2 - SUCCESSFUL +TA1 - task_suspend - suspend TA2 - ALREADY_SUSPENDED +TA1 - task_resume - TA2 resumed - SUCCESSFUL +TA1 - task_create - TA3 created - SUCCESSFUL +TA1 - task_create - 4 created - SUCCESSFUL +TA1 - task_create - 5 created - SUCCESSFUL +TA1 - task_create - 6 created - SUCCESSFUL +TA1 - task_create - 7 created - SUCCESSFUL +TA1 - task_create - 8 created - SUCCESSFUL +TA1 - task_create - 9 created - SUCCESSFUL +TA1 - task_create - 10 created - SUCCESSFUL +TA1 - task_create - 11 - TOO_MANY +TA1 - task_create - MP_NOT_CONFIGURED + +TA1 - event_receive - UNSATISFIED ( all conditions ) +TA1 - event_receive - UNSATISFIED ( any conditions ) +TA1 - event_receive - timeout in 3 seconds +TA1 - event_receive - woke with TIMEOUT +TA1 - event_send - INVALID_ID +TA1 - task_wake_after - sleep 1 second - SUCCESSFUL +TA1 - clock_set - 8:30:45 2/ 5/1988 - SUCCESSFUL + +TA1 - semaphore_create - INVALID_NAME +TA1 - semaphore_create - 1 - SUCCESSFUL +TA1 - semaphore_create - 2 - SUCCESSFUL +TA1 - semaphore_create - 3 - TOO_MANY +TA1 - semaphore_create - NOT_DEFINED +TA1 - semaphore_create - NOT_DEFINED +TA1 - semaphore_create - INVALID_NUMBER +TA1 - semaphore_create - MP_NOT_CONFIGURED +TA1 - semaphore_delete - unknown INVALID_ID +TA1 - semaphore_delete - local INVALID_ID +TA1 - semaphore_ident - global INVALID_NAME +TA1 - semaphore_ident - local INVALID_NAME + +TA1 - semaphore_obtain - INVALID_ID +TA1 - semaphore_obtain - got sem 1 - SUCCESSFUL +TA1 - semaphore_obtain - UNSATISFIED +TA1 - semaphore_obtain - timeout in 3 seconds +TA1 - semaphore_obtain - woke with TIMEOUT +TA1 - semaphore_release - NOT_OWNER_OF_RESOURCE +TA1 - semaphore_release - INVALID_ID +TA1 - task_start - start TA2 - SUCCESSFUL +TA1 - task_wake_after - yield processor - SUCCESSFUL +TA2 - semaphore_obtain - sem 1 - WAIT FOREVER +TA1 - semaphore_delete - delete sem 1 - SUCCESSFUL +TA1 - semaphore_obtain - binary semaphore +TA1 - semaphore_delete - delete sem 2 - RESOURCE_IN_USE +TA1 - task_wake_after - yield processor - SUCCESSFUL +TA2 - semaphore_obtain - woke up with OBJECT_WAS_DELETED +TA2 - task_delete - delete self - SUCCESSFUL +TA1 - task_delete TA2 - already deleted INVALID_ID + +TA1 - message_queue_broadcast - INVALID_ID +TA1 - message_queue_create - Q 1 - INVALID_NAME +TA1 - message_queue_create - Q 1 - MP_NOT_CONFIGURED +TA1 - message_queue_create - Q 1 - 2 DEEP - SUCCESSFUL +TA1 - message_queue_create - Q 2 - TOO_MANY +TA1 - message_queue_delete - unknown INVALID_ID +TA1 - message_queue_delete - local INVALID_ID +TA1 - message_queue_ident - INVALID_NAME +TA1 - message_queue_get_number_pending - INVALID_ID +TA1 - message_queue_flush - INVALID_ID +TA1 - message_queue_receive - INVALID_ID +TA1 - message_queue_receive - Q 1 - UNSATISFIED +TA1 - message_queue_receive - Q 1 - timeout in 3 seconds +TA1 - message_queue_receive - Q 1 - woke up with TIMEOUT +TA1 - message_queue_send - INVALID_ID +TA1 - message_queue_send - BUFFER 1 TO Q 1 - SUCCESSFUL +TA1 - message_queue_send - BUFFER 2 TO Q 1 - SUCCESSFUL +TA1 - message_queue_send - BUFFER 3 TO Q 1 - TOO_MANY + +TA1 - message_queue_delete - Q 1 - SUCCESSFUL +TA1 - message_queue_create - Q 1 - 2 DEEP - SUCCESSFUL +TA1 - message_queue_send - BUFFER 1 TO Q 1 - SUCCESSFUL +TA1 - message_queue_send - BUFFER 2 TO Q 1 - SUCCESSFUL +TA1 - message_queue_send - BUFFER 3 TO Q 1 - TOO_MANY +TA1 - message_queue_delete - Q 1 - SUCCESSFUL +TA1 - message_queue_create - Q 1 - 3 DEEP - SUCCESSFUL +TA1 - message_queue_send - BUFFER 1 TO Q 1 - SUCCESSFUL +TA1 - message_queue_send - BUFFER 2 TO Q 1 - SUCCESSFUL +TA1 - message_queue_send - BUFFER 3 TO Q 1 - SUCCESSFUL +TA1 - message_queue_send - BUFFER 4 TO Q 1 - TOO_MANY +TA1 - message_queue_delete - Q 1 - SUCCESSFUL +TA1 - message_queue_create - Q 1 - 3 DEEP - SUCCESSFUL +TA1 - task_start - start TA3 - SUCCESSFUL +TA1 - task_wake_after - yield processor - SUCCESSFUL +TA3 - message_queue_receive - Q 1 - WAIT FOREVER +TA1 - message_queue_delete - delete Q 1 - SUCCESSFUL +TA1 - task_wake_after - yield processor - SUCCESSFUL +TA3 - message_queue_receive - woke up with OBJECT_WAS_DELETED +TA3 - task_delete - delete self - SUCCESSFUL + +TA1 - port_create - INVALID_NAME +TA1 - port_create - INVALID_ADDRESS +TA1 - port_create - TOO_MANY +TA1 - port_delete - INVALID_ID +TA1 - port_ident - INVALID_NAME +TA1 - port_internal_to_external - INVALID_ID +TA1 - port_external_to_internal - INVALID_ID + +TA1 - rate_monotonic_create - INVALID_NAME +TA1 - rate_monotonic_create - SUCCESSFUL +TA1 - rate_monotonic_create - TOO_MANY +TA1 - rate_monotonic_ident - INVALID_NAME +TA1 - rate_monotonic_period - unknown INVALID_ID +TA1 - rate_monotonic_period - local INVALID_ID +TA1 - rate_monotonic_period( STATUS ) - NOT_DEFINED +TA1 - rate_monotonic_period - 100 ticks - SUCCESSFUL +TA1 - rate_monotonic_period( STATUS ) - SUCCESSFUL +TA1 - rate_monotonic_period( STATUS ) - TIMEOUT +TA1 - rate_monotonic_cancel - unknown INVALID_ID +TA1 - rate_monotonic_cancel - local INVALID_ID +TA1 - rate_monotonic_cancel - SUCCESSFUL +TA1 - rate_monotonic_period - 5 ticks - TIMEOUT +TA1 - task_wake_after - yielding to TA4 +TA4 - rate_monotonic_cancel - NOT_OWNER_OF_RESOURCE +TA4 - rate_monotonic_period - NOT_OWNER_OF_RESOURCE +TA4 - task_delete - delete self - SUCCESSFUL +TA1 - rate_monotonic_delete - unknown INVALID_ID +TA1 - rate_monotonic_delete - local INVALID_ID +TA1 - rate_monotonic_delete - SUCCESSFUL + +TA1 - partition_create - INVALID_NAME +TA1 - partition_create - length - INVALID_SIZE +TA1 - partition_create - buffer size - INVALID_SIZE +TA1 - partition_create - length < buffer size - INVALID_SIZE +TA1 - partition_create - MP_NOT_CONFIGURED +TA1 - partition_create - INVALID_ADDRESS +TA1 - partition_create - INVALID_SIZE +TA1 - partition_delete - unknown INVALID_ID +TA1 - partition_delete - local INVALID_ID +TA1 - partition_get_buffer - INVALID_ID +TA1 - partition_ident - INVALID_NAME +TA1 - partition_return_buffer - INVALID_ID +TA1 - partition_create - SUCCESSFUL +TA1 - partition_create - TOO_MANY +TA1 - partition_get_buffer - SUCCESSFUL +TA1 - partition_get_buffer - SUCCESSFUL +TA1 - partition_get_buffer - UNSATISFIED +TA1 - partition_delete - RESOURCE_IN_USE +TA1 - partition_return_buffer - INVALID_ADDRESS - out of range +TA1 - partition_return_buffer - INVALID_ADDRESS - not on boundary + +TA1 - region_create - INVALID_NAME +TA1 - region_create - INVALID_ADDRESS +TA1 - region_create - INVALID_SIZE +TA1 - region_create - SUCCESSFUL +TA1 - region_create - TOO_MANY +TA1 - region_delete - unknown INVALID_ID +TA1 - region_delete - local INVALID_ID +TA1 - region_ident - INVALID_NAME +TA1 - region_get_segment - INVALID_ID +TA1 - region_get_segment - INVALID_SIZE +TA1 - region_get_segment - SUCCESSFUL +TA1 - region_get_segment - UNSATISFIED +TA1 - region_get_segment - timeout in 3 seconds +TA1 - region_get_segment - woke up with TIMEOUT +TA1 - region_delete - RESOURCE_IN_USE +TA1 - region_return_segment - INVALID_ID +TA1 - region_return_segment - INVALID_ADDRESS +TA1 - debug_disable - DEBUG_REGION +TA1 - region_return_segment - INVALID_ADDRESS - SKIPPED +TA1 - region_return_segment - INVALID_ADDRESS - SKIPPED +TA1 - debug_enable - DEBUG_REGION +TA1 - region_extend - INVALID_ID +TA1 - region_extend - within heap - INVALID_ADDRESS +TA1 - region_extend - non-contiguous lower - NOT_IMPLEMENTED +TA1 - region_extend - contiguous lower - NOT_IMPLEMENTED +TA1 - region_extend - non-contiguous higher - NOT_IMPLEMENTED + +TA1 - clock_set - 23:59:59 12/31/2000 - SUCCESSFUL +TA1 - clock_get - 0: 0: 0 1/ 1/2001 - SUCCESSFUL +TA1 - clock_set - 23:59:59 12/31/1999 - SUCCESSFUL +TA1 - clock_get - 0: 0: 0 1/ 1/2000 - SUCCESSFUL +TA1 - clock_set - 23:59:59 12/31/2100 - SUCCESSFUL +TA1 - clock_get - 17:31:44 11/25/1964 - SUCCESSFUL +TA1 - clock_set - 23:59:59 12/31/2099 - SUCCESSFUL +TA1 - clock_get - 17:31:44 11/25/1963 - SUCCESSFUL +TA1 - clock_set - 23:59:59 12/31/1991 - SUCCESSFUL +TA1 - clock_get - 0: 0: 0 1/ 1/1992 - SUCCESSFUL + +TA1 - timer_create - INVALID_NAME +TA1 - timer_create - 1 - SUCCESSFUL +TA1 - timer_create - 2 - TOO_MANY +TA1 - timer_delete - local INVALID_ID +TA1 - timer_delete - global INVALID_ID +TA1 - timer_ident - INVALID_NAME +TA1 - timer_cancel - INVALID_ID +TA1 - timer_reset - INVALID_ID +TA1 - timer_reset - NOT_DEFINED +TA1 - timer_fire_after - INVALID_ID +TA1 - timer_fire_when - INVALID_ID +TA1 - timer_fire_after - INVALID_NUMBER +TA1 - timer_fire_when - 8:30:45 2/ 5/1987 - INVALID_CLOCK +TA1 - clock_get - 0: 0: 0 1/ 1/1992 +TA1 - timer_fire_when - 8:30:45 2/ 5/1990 - before INVALID_CLOCK +TA1 - timer_server_fire_after - INCORRECT_STATE +TA1 - timer_server_fire_when - INCORRECT_STATE +TA1 - timer_initiate_server - INVALID_PRIORITY +TA1 - timer_initiate_server +TA1 - timer_server_fire_after - INVALID_ID +TA1 - timer_server_fire_when - INVALID_ID +TA1 - timer_server_fire_after - INVALID_NUMBER +TA1 - timer_server_fire_when - 8:30:45 2/ 5/1987 - INVALID_CLOCK +TA1 - clock_get - 0: 0: 0 1/ 1/1992 +TA1 - timer_server_fire_when - 8:30:45 2/ 5/1990 - before INVALID_CLOCK +*** END OF TEST 9 *** diff --git a/c/src/ada-tests/sptests/sp09/sp09.scn b/c/src/ada-tests/sptests/sp09/sp09.scn deleted file mode 100644 index 8fb09cd35a..0000000000 --- a/c/src/ada-tests/sptests/sp09/sp09.scn +++ /dev/null @@ -1,250 +0,0 @@ -*** TEST 9 *** -INIT - task_create - INVALID_PRIORITY -INIT - task_restart - INCORRECT_STATE -TA1 - task_delete - INVALID_ID -TA1 - task_get_note - INVALID_NUMBER -TA1 - task_get_note - INVALID_ID -TA1 - task_ident - current task SUCCESSFUL -TA1 - task_ident - global INVALID_NAME -TA1 - task_ident - local INVALID_NAME -TA1 - task_ident - INVALID_NODE -TA1 - task_restart - INVALID_ID -TA1 - task_resume - INVALID_ID -TA1 - task_resume - INCORRECT_STATE -TA1 - task_set_priority - INVALID_PRIORITY -TA1 - task_set_priority - INVALID_ID -TA1 - task_set_note - INVALID_NUMBER -TA1 - task_set_note - INVALID_ID -TA1 - task_start - INVALID_ID -TA1 - task_start - INCORRECT_STATE -TA1 - task_suspend - INVALID_ID - -TA1 - clock_get - NOT_DEFINED -TA1 - task_wake_when - NOT_DEFINED -TA1 - timer_fire_when - NOT_DEFINED -TA1 - clock_set - 8:30:45 2/ 5/1987 - INVALID_CLOCK -TA1 - clock_set - 8:30:45 15/ 5/1988 - INVALID_CLOCK -TA1 - clock_set - 8:30:45 2/32/1988 - INVALID_CLOCK -TA1 - clock_set - 25:30:45 2/ 5/1988 - INVALID_CLOCK -TA1 - clock_set - 8:61:45 2/ 5/1988 - INVALID_CLOCK -TA1 - clock_set - 8:30:61 2/ 5/1988 - INVALID_CLOCK -TA1 - clock_set - 8:30:45 2/ 5/1988 - INVALID_CLOCK -TA1 - clock_set - 8:30:45 2/ 5/1988 - SUCCESSFUL -TA1 - task_wake_when - TICK INVALID - sleep about 3 seconds -TA1 - task_wake_when - TICK INVALID - woke up SUCCESSFUL -TA1 - task_wake_when - 8:30:48 2/ 5/1961 - INVALID_CLOCK -TA1 - task_wake_when - 25:30:48 2/ 5/1988 - INVALID_CLOCK -TA1 - current time - 8:30:48 2/ 5/1988 -TA1 - task_wake_when - 8:30:48 1/ 5/1988 - INVALID_CLOCK - -TA1 - task_create - INVALID_NAME -TA1 - task_create - stack size - UNSATISFIED -TA1 - task_create - TA2 created - SUCCESSFUL -TA1 - task_suspend - suspend TA2 - SUCCESSFUL -TA1 - task_suspend - suspend TA2 - ALREADY_SUSPENDED -TA1 - task_resume - TA2 resumed - SUCCESSFUL -TA1 - task_create - TA3 created - SUCCESSFUL -TA1 - task_create - 4 created - SUCCESSFUL -TA1 - task_create - 5 created - SUCCESSFUL -TA1 - task_create - 6 created - SUCCESSFUL -TA1 - task_create - 7 created - SUCCESSFUL -TA1 - task_create - 8 created - SUCCESSFUL -TA1 - task_create - 9 created - SUCCESSFUL -TA1 - task_create - 10 created - SUCCESSFUL -TA1 - task_create - 11 - TOO_MANY -TA1 - task_create - MP_NOT_CONFIGURED - -TA1 - event_receive - UNSATISFIED ( all conditions ) -TA1 - event_receive - UNSATISFIED ( any conditions ) -TA1 - event_receive - timeout in 3 seconds -TA1 - event_receive - woke with TIMEOUT -TA1 - event_send - INVALID_ID -TA1 - task_wake_after - sleep 1 second - SUCCESSFUL -TA1 - clock_set - 8:30:45 2/ 5/1988 - SUCCESSFUL - -TA1 - semaphore_create - INVALID_NAME -TA1 - semaphore_create - 1 - SUCCESSFUL -TA1 - semaphore_create - 2 - SUCCESSFUL -TA1 - semaphore_create - 3 - TOO_MANY -TA1 - semaphore_create - NOT_DEFINED -TA1 - semaphore_create - NOT_DEFINED -TA1 - semaphore_create - INVALID_NUMBER -TA1 - semaphore_create - MP_NOT_CONFIGURED -TA1 - semaphore_delete - unknown INVALID_ID -TA1 - semaphore_delete - local INVALID_ID -TA1 - semaphore_ident - global INVALID_NAME -TA1 - semaphore_ident - local INVALID_NAME - -TA1 - semaphore_obtain - INVALID_ID -TA1 - semaphore_obtain - got sem 1 - SUCCESSFUL -TA1 - semaphore_obtain - UNSATISFIED -TA1 - semaphore_obtain - timeout in 3 seconds -TA1 - semaphore_obtain - woke with TIMEOUT -TA1 - semaphore_release - NOT_OWNER_OF_RESOURCE -TA1 - semaphore_release - INVALID_ID -TA1 - task_start - start TA2 - SUCCESSFUL -TA1 - task_wake_after - yield processor - SUCCESSFUL -TA2 - semaphore_obtain - sem 1 - WAIT FOREVER -TA1 - semaphore_delete - delete sem 1 - SUCCESSFUL -TA1 - semaphore_obtain - binary semaphore -TA1 - semaphore_delete - delete sem 2 - RESOURCE_IN_USE -TA1 - task_wake_after - yield processor - SUCCESSFUL -TA2 - semaphore_obtain - woke up with OBJECT_WAS_DELETED -TA2 - task_delete - delete self - SUCCESSFUL -TA1 - task_delete TA2 - already deleted INVALID_ID - -TA1 - message_queue_broadcast - INVALID_ID -TA1 - message_queue_create - Q 1 - INVALID_NAME -TA1 - message_queue_create - Q 1 - MP_NOT_CONFIGURED -TA1 - message_queue_create - Q 1 - 2 DEEP - SUCCESSFUL -TA1 - message_queue_create - Q 2 - TOO_MANY -TA1 - message_queue_delete - unknown INVALID_ID -TA1 - message_queue_delete - local INVALID_ID -TA1 - message_queue_ident - INVALID_NAME -TA1 - message_queue_get_number_pending - INVALID_ID -TA1 - message_queue_flush - INVALID_ID -TA1 - message_queue_receive - INVALID_ID -TA1 - message_queue_receive - Q 1 - UNSATISFIED -TA1 - message_queue_receive - Q 1 - timeout in 3 seconds -TA1 - message_queue_receive - Q 1 - woke up with TIMEOUT -TA1 - message_queue_send - INVALID_ID -TA1 - message_queue_send - BUFFER 1 TO Q 1 - SUCCESSFUL -TA1 - message_queue_send - BUFFER 2 TO Q 1 - SUCCESSFUL -TA1 - message_queue_send - BUFFER 3 TO Q 1 - TOO_MANY - -TA1 - message_queue_delete - Q 1 - SUCCESSFUL -TA1 - message_queue_create - Q 1 - 2 DEEP - SUCCESSFUL -TA1 - message_queue_send - BUFFER 1 TO Q 1 - SUCCESSFUL -TA1 - message_queue_send - BUFFER 2 TO Q 1 - SUCCESSFUL -TA1 - message_queue_send - BUFFER 3 TO Q 1 - TOO_MANY -TA1 - message_queue_delete - Q 1 - SUCCESSFUL -TA1 - message_queue_create - Q 1 - 3 DEEP - SUCCESSFUL -TA1 - message_queue_send - BUFFER 1 TO Q 1 - SUCCESSFUL -TA1 - message_queue_send - BUFFER 2 TO Q 1 - SUCCESSFUL -TA1 - message_queue_send - BUFFER 3 TO Q 1 - SUCCESSFUL -TA1 - message_queue_send - BUFFER 4 TO Q 1 - TOO_MANY -TA1 - message_queue_delete - Q 1 - SUCCESSFUL -TA1 - message_queue_create - Q 1 - 3 DEEP - SUCCESSFUL -TA1 - task_start - start TA3 - SUCCESSFUL -TA1 - task_wake_after - yield processor - SUCCESSFUL -TA3 - message_queue_receive - Q 1 - WAIT FOREVER -TA1 - message_queue_delete - delete Q 1 - SUCCESSFUL -TA1 - task_wake_after - yield processor - SUCCESSFUL -TA3 - message_queue_receive - woke up with OBJECT_WAS_DELETED -TA3 - task_delete - delete self - SUCCESSFUL - -TA1 - port_create - INVALID_NAME -TA1 - port_create - INVALID_ADDRESS -TA1 - port_create - TOO_MANY -TA1 - port_delete - INVALID_ID -TA1 - port_ident - INVALID_NAME -TA1 - port_internal_to_external - INVALID_ID -TA1 - port_external_to_internal - INVALID_ID - -TA1 - rate_monotonic_create - INVALID_NAME -TA1 - rate_monotonic_create - SUCCESSFUL -TA1 - rate_monotonic_create - TOO_MANY -TA1 - rate_monotonic_ident - INVALID_NAME -TA1 - rate_monotonic_period - unknown INVALID_ID -TA1 - rate_monotonic_period - local INVALID_ID -TA1 - rate_monotonic_period( STATUS ) - NOT_DEFINED -TA1 - rate_monotonic_period - 100 ticks - SUCCESSFUL -TA1 - rate_monotonic_period( STATUS ) - SUCCESSFUL -TA1 - rate_monotonic_period( STATUS ) - TIMEOUT -TA1 - rate_monotonic_cancel - unknown INVALID_ID -TA1 - rate_monotonic_cancel - local INVALID_ID -TA1 - rate_monotonic_cancel - SUCCESSFUL -TA1 - rate_monotonic_period - 5 ticks - TIMEOUT -TA1 - task_wake_after - yielding to TA4 -TA4 - rate_monotonic_cancel - NOT_OWNER_OF_RESOURCE -TA4 - rate_monotonic_period - NOT_OWNER_OF_RESOURCE -TA4 - task_delete - delete self - SUCCESSFUL -TA1 - rate_monotonic_delete - unknown INVALID_ID -TA1 - rate_monotonic_delete - local INVALID_ID -TA1 - rate_monotonic_delete - SUCCESSFUL - -TA1 - partition_create - INVALID_NAME -TA1 - partition_create - length - INVALID_SIZE -TA1 - partition_create - buffer size - INVALID_SIZE -TA1 - partition_create - length < buffer size - INVALID_SIZE -TA1 - partition_create - MP_NOT_CONFIGURED -TA1 - partition_create - INVALID_ADDRESS -TA1 - partition_create - INVALID_SIZE -TA1 - partition_delete - unknown INVALID_ID -TA1 - partition_delete - local INVALID_ID -TA1 - partition_get_buffer - INVALID_ID -TA1 - partition_ident - INVALID_NAME -TA1 - partition_return_buffer - INVALID_ID -TA1 - partition_create - SUCCESSFUL -TA1 - partition_create - TOO_MANY -TA1 - partition_get_buffer - SUCCESSFUL -TA1 - partition_get_buffer - SUCCESSFUL -TA1 - partition_get_buffer - UNSATISFIED -TA1 - partition_delete - RESOURCE_IN_USE -TA1 - partition_return_buffer - INVALID_ADDRESS - out of range -TA1 - partition_return_buffer - INVALID_ADDRESS - not on boundary - -TA1 - region_create - INVALID_NAME -TA1 - region_create - INVALID_ADDRESS -TA1 - region_create - INVALID_SIZE -TA1 - region_create - SUCCESSFUL -TA1 - region_create - TOO_MANY -TA1 - region_delete - unknown INVALID_ID -TA1 - region_delete - local INVALID_ID -TA1 - region_ident - INVALID_NAME -TA1 - region_get_segment - INVALID_ID -TA1 - region_get_segment - INVALID_SIZE -TA1 - region_get_segment - SUCCESSFUL -TA1 - region_get_segment - UNSATISFIED -TA1 - region_get_segment - timeout in 3 seconds -TA1 - region_get_segment - woke up with TIMEOUT -TA1 - region_delete - RESOURCE_IN_USE -TA1 - region_return_segment - INVALID_ID -TA1 - region_return_segment - INVALID_ADDRESS -TA1 - debug_disable - DEBUG_REGION -TA1 - region_return_segment - INVALID_ADDRESS - SKIPPED -TA1 - region_return_segment - INVALID_ADDRESS - SKIPPED -TA1 - debug_enable - DEBUG_REGION -TA1 - region_extend - INVALID_ID -TA1 - region_extend - within heap - INVALID_ADDRESS -TA1 - region_extend - non-contiguous lower - NOT_IMPLEMENTED -TA1 - region_extend - contiguous lower - NOT_IMPLEMENTED -TA1 - region_extend - non-contiguous higher - NOT_IMPLEMENTED - -TA1 - clock_set - 23:59:59 12/31/2000 - SUCCESSFUL -TA1 - clock_get - 0: 0: 0 1/ 1/2001 - SUCCESSFUL -TA1 - clock_set - 23:59:59 12/31/1999 - SUCCESSFUL -TA1 - clock_get - 0: 0: 0 1/ 1/2000 - SUCCESSFUL -TA1 - clock_set - 23:59:59 12/31/2100 - SUCCESSFUL -TA1 - clock_get - 17:31:44 11/25/1964 - SUCCESSFUL -TA1 - clock_set - 23:59:59 12/31/2099 - SUCCESSFUL -TA1 - clock_get - 17:31:44 11/25/1963 - SUCCESSFUL -TA1 - clock_set - 23:59:59 12/31/1991 - SUCCESSFUL -TA1 - clock_get - 0: 0: 0 1/ 1/1992 - SUCCESSFUL - -TA1 - timer_create - INVALID_NAME -TA1 - timer_create - 1 - SUCCESSFUL -TA1 - timer_create - 2 - TOO_MANY -TA1 - timer_delete - local INVALID_ID -TA1 - timer_delete - global INVALID_ID -TA1 - timer_ident - INVALID_NAME -TA1 - timer_cancel - INVALID_ID -TA1 - timer_reset - INVALID_ID -TA1 - timer_reset - NOT_DEFINED -TA1 - timer_fire_after - INVALID_ID -TA1 - timer_fire_when - INVALID_ID -TA1 - timer_fire_after - INVALID_NUMBER -TA1 - timer_fire_when - 8:30:45 2/ 5/1987 - INVALID_CLOCK -TA1 - clock_get - 0: 0: 0 1/ 1/1992 -TA1 - timer_fire_when - 8:30:45 2/ 5/1990 - before INVALID_CLOCK -TA1 - timer_server_fire_after - INCORRECT_STATE -TA1 - timer_server_fire_when - INCORRECT_STATE -TA1 - timer_initiate_server - INVALID_PRIORITY -TA1 - timer_initiate_server -TA1 - timer_server_fire_after - INVALID_ID -TA1 - timer_server_fire_when - INVALID_ID -TA1 - timer_server_fire_after - INVALID_NUMBER -TA1 - timer_server_fire_when - 8:30:45 2/ 5/1987 - INVALID_CLOCK -TA1 - clock_get - 0: 0: 0 1/ 1/1992 -TA1 - timer_server_fire_when - 8:30:45 2/ 5/1990 - before INVALID_CLOCK -*** END OF TEST 9 *** diff --git a/c/src/ada-tests/sptests/sp11/Makefile.am b/c/src/ada-tests/sptests/sp11/Makefile.am index fa5776dc16..ddea6a06f3 100644 --- a/c/src/ada-tests/sptests/sp11/Makefile.am +++ b/c/src/ada-tests/sptests/sp11/Makefile.am @@ -5,14 +5,14 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am include $(top_srcdir)/ada.am -noinst_PROGRAMS = sp11.exe -sp11_exe_SOURCES = sp11.adb config.h sptest.adb sptest.ads -sp11_exe_SOURCES += ../../support/init.c +noinst_PROGRAMS = ada_sp11.exe +ada_sp11_exe_SOURCES = sp11.adb config.h sptest.adb sptest.ads +ada_sp11_exe_SOURCES += ../../support/init.c -sp11.exe: sp11.adb init.$(OBJEXT) +ada_sp11.exe: sp11.adb init.$(OBJEXT) $(GNATCOMPILE) -margs -a $< -o $@ scndir = $(rtems_ada_testsdir) -dist_scn_DATA = sp11.scn +dist_scn_DATA = ada_sp11.scn include $(top_srcdir)/../../../testsuites/automake/local.am diff --git a/c/src/ada-tests/sptests/sp11/ada_sp11.scn b/c/src/ada-tests/sptests/sp11/ada_sp11.scn new file mode 100644 index 0000000000..cbb6c4ab88 --- /dev/null +++ b/c/src/ada-tests/sptests/sp11/ada_sp11.scn @@ -0,0 +1,74 @@ +*** TEST 11 *** +TA1 - event_send - send EVENT_16 to TA2 +TA1 - event_receive - waiting forever on EVENT_14 and EVENT_15 +TA2 - event_receive - waiting forever on EVENT_16 +TA2 - EVENT_16 received - eventout => 16#10000# +TA2 - event_send - send EVENT_14 and EVENT_15 to TA1 +TA2 - event_receive - waiting forever on EVENT_17 or EVENT_18 - EVENT_ANY +TA1 - EVENT_14 and EVENT_15 received - eventout => 16#C000# +TA1 - event_send - send EVENT_18 to TA2 +TA1 - event_receive - waiting with 10 second timeout on EVENT_14 +TA2 - EVENT_17 or EVENT_18 received - eventout => 16#40000# +TA2 - event_send - send EVENT_14 to TA1 +TA2 - clock_set - 8:15: 0 2/12/1988 +TA2 - event_send - sending EVENT_10 to self after 5 seconds +TA2 - event_receive - waiting forever on EVENT_10 +TA1 - EVENT_14 received - eventout => 16#4000# +TA1 - event_send - send EVENT_19 to TA2 +TA1 - clock_get - 8:15: 0 2/12/1988 + +TA1 - event_send - send EVENT_18 to self after 5 seconds +TA1 - event_receive - waiting forever on EVENT_18 +TA2 - EVENT_10 received - eventout => 16#400# +TA1 - clock_get - 8:15: 5 2/12/1988 +TA2 - event_receive - PENDING_EVENTS +TA2 - eventout => 16#80000# +TA2 - event_receive - EVENT_19 - NO_WAIT +TA2 - EVENT_19 received - eventout => 16#80000# +TA2 - task_delete - deletes self +TA1 - EVENT_18 received - eventout => 16#40000# +TA1 - clock_get - 8:15: 5 2/12/1988 +TA1 - event_send - send EVENT_3 to self +TA1 - event_receive - EVENT_3 or EVENT_22 - NO_WAIT and EVENT_ANY +TA1 - EVENT_3 received - eventout => 16#8# +TA1 - event_send - send EVENT_4 to self +TA1 - event_receive - waiting forever on EVENT_4 or EVENT_5 - EVENT_ANY +TA1 - EVENT_4 received - eventout => 16#10# + +TA1 - event_send - send EVENT_18 to self after 5 seconds +TA1 - timer_cancel - cancelling timer for event EVENT_18 +TA1 - event_send - send EVENT_8 to self after 60 seconds +TA1 - event_send - send EVENT_9 to self after 60 seconds +TA1 - event_send - send EVENT_10 to self after 60 seconds +TA1 - timer_cancel - cancelling timer for event EVENT_8 +TA1 - clock_set - 8:15: 0 2/12/1988 +TA1 - event_send - send EVENT_1 every second +TA1 - EVENT_1 received - eventout => 16#2# - at 8:15: 1 2/12/1988 +TA1 - EVENT_1 received - eventout => 16#2# - at 8:15: 2 2/12/1988 +TA1 - EVENT_1 received - eventout => 16#2# - at 8:15: 3 2/12/1988 +TA1 - timer_cancel - cancelling timer for event EVENT_1 + +TA1 - event_send - send EVENT_11 to self in 1 day +TA1 - event_send - send EVENT_11 to self in 1 day +TA1 - event_send - send EVENT_11 to self in 2 days +TA1 - timer_cancel - cancelling EVENT_11 to self in 1 day +TA1 - timer_cancel - cancelling EVENT_11 to self in 2 days +TA1 - event_send - resending EVENT_11 to self in 2 days +TA1 - clock_set - 8:15: 3 2/15/1988 +TA1 - event_receive - waiting forever on EVENT_11 +TA1 - EVENT_11 received - eventout => 16#800# + +TA1 - event_send/event_receive combination +TA1 - clock_set - 8:15: 0 2/12/1988 +TA1 - event_receive all outstanding events +TA1 - event_send - send EVENT_10 to self in 1 day +TA1 - event_send - send EVENT_11 to self in 2 days +TA1 - clock_set - 7:15: 0 2/12/1988 +TA1 - set time backwards +TA1 - no events received +TA1 - clock_set - 7:15: 0 2/14/1988 +TA1 - set time forwards (leave a timer) +TA1 - EVENT_10 received +TA1 - event_send - send EVENT_11 to self in 100 ticks +TA1 - event_send - send EVENT_11 to self in 200 ticks +*** END OF TEST 11 *** diff --git a/c/src/ada-tests/sptests/sp11/sp11.scn b/c/src/ada-tests/sptests/sp11/sp11.scn deleted file mode 100644 index cbb6c4ab88..0000000000 --- a/c/src/ada-tests/sptests/sp11/sp11.scn +++ /dev/null @@ -1,74 +0,0 @@ -*** TEST 11 *** -TA1 - event_send - send EVENT_16 to TA2 -TA1 - event_receive - waiting forever on EVENT_14 and EVENT_15 -TA2 - event_receive - waiting forever on EVENT_16 -TA2 - EVENT_16 received - eventout => 16#10000# -TA2 - event_send - send EVENT_14 and EVENT_15 to TA1 -TA2 - event_receive - waiting forever on EVENT_17 or EVENT_18 - EVENT_ANY -TA1 - EVENT_14 and EVENT_15 received - eventout => 16#C000# -TA1 - event_send - send EVENT_18 to TA2 -TA1 - event_receive - waiting with 10 second timeout on EVENT_14 -TA2 - EVENT_17 or EVENT_18 received - eventout => 16#40000# -TA2 - event_send - send EVENT_14 to TA1 -TA2 - clock_set - 8:15: 0 2/12/1988 -TA2 - event_send - sending EVENT_10 to self after 5 seconds -TA2 - event_receive - waiting forever on EVENT_10 -TA1 - EVENT_14 received - eventout => 16#4000# -TA1 - event_send - send EVENT_19 to TA2 -TA1 - clock_get - 8:15: 0 2/12/1988 - -TA1 - event_send - send EVENT_18 to self after 5 seconds -TA1 - event_receive - waiting forever on EVENT_18 -TA2 - EVENT_10 received - eventout => 16#400# -TA1 - clock_get - 8:15: 5 2/12/1988 -TA2 - event_receive - PENDING_EVENTS -TA2 - eventout => 16#80000# -TA2 - event_receive - EVENT_19 - NO_WAIT -TA2 - EVENT_19 received - eventout => 16#80000# -TA2 - task_delete - deletes self -TA1 - EVENT_18 received - eventout => 16#40000# -TA1 - clock_get - 8:15: 5 2/12/1988 -TA1 - event_send - send EVENT_3 to self -TA1 - event_receive - EVENT_3 or EVENT_22 - NO_WAIT and EVENT_ANY -TA1 - EVENT_3 received - eventout => 16#8# -TA1 - event_send - send EVENT_4 to self -TA1 - event_receive - waiting forever on EVENT_4 or EVENT_5 - EVENT_ANY -TA1 - EVENT_4 received - eventout => 16#10# - -TA1 - event_send - send EVENT_18 to self after 5 seconds -TA1 - timer_cancel - cancelling timer for event EVENT_18 -TA1 - event_send - send EVENT_8 to self after 60 seconds -TA1 - event_send - send EVENT_9 to self after 60 seconds -TA1 - event_send - send EVENT_10 to self after 60 seconds -TA1 - timer_cancel - cancelling timer for event EVENT_8 -TA1 - clock_set - 8:15: 0 2/12/1988 -TA1 - event_send - send EVENT_1 every second -TA1 - EVENT_1 received - eventout => 16#2# - at 8:15: 1 2/12/1988 -TA1 - EVENT_1 received - eventout => 16#2# - at 8:15: 2 2/12/1988 -TA1 - EVENT_1 received - eventout => 16#2# - at 8:15: 3 2/12/1988 -TA1 - timer_cancel - cancelling timer for event EVENT_1 - -TA1 - event_send - send EVENT_11 to self in 1 day -TA1 - event_send - send EVENT_11 to self in 1 day -TA1 - event_send - send EVENT_11 to self in 2 days -TA1 - timer_cancel - cancelling EVENT_11 to self in 1 day -TA1 - timer_cancel - cancelling EVENT_11 to self in 2 days -TA1 - event_send - resending EVENT_11 to self in 2 days -TA1 - clock_set - 8:15: 3 2/15/1988 -TA1 - event_receive - waiting forever on EVENT_11 -TA1 - EVENT_11 received - eventout => 16#800# - -TA1 - event_send/event_receive combination -TA1 - clock_set - 8:15: 0 2/12/1988 -TA1 - event_receive all outstanding events -TA1 - event_send - send EVENT_10 to self in 1 day -TA1 - event_send - send EVENT_11 to self in 2 days -TA1 - clock_set - 7:15: 0 2/12/1988 -TA1 - set time backwards -TA1 - no events received -TA1 - clock_set - 7:15: 0 2/14/1988 -TA1 - set time forwards (leave a timer) -TA1 - EVENT_10 received -TA1 - event_send - send EVENT_11 to self in 100 ticks -TA1 - event_send - send EVENT_11 to self in 200 ticks -*** END OF TEST 11 *** diff --git a/c/src/ada-tests/sptests/sp12/Makefile.am b/c/src/ada-tests/sptests/sp12/Makefile.am index 35f9b45fd2..0e4799a382 100644 --- a/c/src/ada-tests/sptests/sp12/Makefile.am +++ b/c/src/ada-tests/sptests/sp12/Makefile.am @@ -5,14 +5,14 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am include $(top_srcdir)/ada.am -noinst_PROGRAMS = sp12.exe -sp12_exe_SOURCES = sp12.adb config.h sptest.adb sptest.ads -sp12_exe_SOURCES += ../../support/init.c +noinst_PROGRAMS = ada_sp12.exe +ada_sp12_exe_SOURCES = sp12.adb config.h sptest.adb sptest.ads +ada_sp12_exe_SOURCES += ../../support/init.c -sp12.exe: sp12.adb init.$(OBJEXT) +ada_sp12.exe: sp12.adb init.$(OBJEXT) $(GNATCOMPILE) -margs -a $< -o $@ scndir = $(rtems_ada_testsdir) -dist_scn_DATA = sp12.scn +dist_scn_DATA = ada_sp12.scn include $(top_srcdir)/../../../testsuites/automake/local.am diff --git a/c/src/ada-tests/sptests/sp12/ada_sp12.scn b/c/src/ada-tests/sptests/sp12/ada_sp12.scn new file mode 100644 index 0000000000..d1753e5ace --- /dev/null +++ b/c/src/ada-tests/sptests/sp12/ada_sp12.scn @@ -0,0 +1,78 @@ +*** TEST 12 *** +INIT - Forward priority queue test +PRI1 - semaphore_obtain - wait forever on SM2 +PRI2 - semaphore_obtain - wait forever on SM2 +PRI3 - semaphore_obtain - wait forever on SM2 +PRI4 - semaphore_obtain - wait forever on SM2 +PRI5 - semaphore_obtain - wait forever on SM2 +INIT - Backward priority queue test +PRI5 - semaphore_obtain - wait forever on SM2 +PRI4 - semaphore_obtain - wait forever on SM2 +PRI3 - semaphore_obtain - wait forever on SM2 +PRI2 - semaphore_obtain - wait forever on SM2 +PRI1 - semaphore_obtain - wait forever on SM2 + +INIT - Binary Semaphore and Priority Inheritance Test +INIT - semaphore_create - allocated binary semaphore +INIT - semaphore_release - allocated binary semaphore +INIT - semaphore_delete - allocated binary semaphore +PRI5 - semaphore_obtain - wait forever on SM2 +PRI5 - task_suspend - until all priority tasks blocked +PDRV - priority of PRI5 is 67 +PRI4 - semaphore_obtain - wait forever on SM2 +PDRV - change priority of PRI5 from 67 to 68 +PDRV - priority of PRI5 is 67 +PRI3 - semaphore_obtain - wait forever on SM2 +PDRV - priority of PRI5 is 67 +PRI2 - semaphore_obtain - wait forever on SM2 +PDRV - priority of PRI5 is 66 +PRI1 - semaphore_obtain - wait forever on SM2 +PDRV - priority of PRI5 is 65 +PDRV - task_resume - PRI5 +PRI5 - task_delete - all tasks waiting on SM2 +PRI5 - semaphore_obtain - nested +PRI5 - semaphore_release - nested +PRI5 - semaphore_release - restore priority +PRI5 - priority of PRI5 is 68 + +TA1 - semaphore_ident - smid => 16#1A010009# +TA1 - semaphore_obtain - wait forever on SM2 +TA1 - got SM2 +TA1 - semaphore_obtain - wait forever on SM3 +TA1 - got SM3 +TA1 - semaphore_obtain - get SM1 - NO_WAIT +TA1 - got SM1 +TA1 - task_wake_after - sleep 5 seconds +TA2 - semaphore_obtain - wait forever on SM1 +TA3 - semaphore_obtain - wait forever on SM2 + +TA1 - semaphore_release - release SM1 +TA1 - semaphore_obtain - waiting for SM1 with 10 second timeout +TA2 - got SM1 +TA2 - semaphore_release - release SM1 +TA2 - task_set_priority - make self highest priority task +TA2 - semaphore_obtain - wait forever on SM2 +TA1 - got SM1 +TA1 - semaphore_release - release SM2 +TA2 - got SM2 +TA2 - semaphore_release - release SM2 +TA2 - task_delete - delete self +TA1 - task_wake_after - sleep 5 seconds +TA3 - got SM2 +TA3 - semaphore_release - release SM2 +TA3 - semaphore_obtain - wait forever on SM3 + +TA1 - task_delete - delete TA3 +TA1 - task_wake_after - sleep 5 seconds +TA4 - semaphore_obtain - wait forever on SM1 +TA5 - semaphore_obtain - wait forever on SM1 +TA1 - task_delete - delete TA4 +TA1 - semaphore_release - release SM1 +TA1 - task_wake_after - sleep 5 seconds +TA5 - got SM1 +TA5 - semaphore_obtain - wait forever on SM1 +TA1 - semaphore_delete - delete SM1 +TA1 - semaphore_delete - delete SM3 +TA1 - task_delete - delete self +TA5 - SM1 deleted by TA1 +*** END OF TEST 12 *** diff --git a/c/src/ada-tests/sptests/sp12/sp12.scn b/c/src/ada-tests/sptests/sp12/sp12.scn deleted file mode 100644 index d1753e5ace..0000000000 --- a/c/src/ada-tests/sptests/sp12/sp12.scn +++ /dev/null @@ -1,78 +0,0 @@ -*** TEST 12 *** -INIT - Forward priority queue test -PRI1 - semaphore_obtain - wait forever on SM2 -PRI2 - semaphore_obtain - wait forever on SM2 -PRI3 - semaphore_obtain - wait forever on SM2 -PRI4 - semaphore_obtain - wait forever on SM2 -PRI5 - semaphore_obtain - wait forever on SM2 -INIT - Backward priority queue test -PRI5 - semaphore_obtain - wait forever on SM2 -PRI4 - semaphore_obtain - wait forever on SM2 -PRI3 - semaphore_obtain - wait forever on SM2 -PRI2 - semaphore_obtain - wait forever on SM2 -PRI1 - semaphore_obtain - wait forever on SM2 - -INIT - Binary Semaphore and Priority Inheritance Test -INIT - semaphore_create - allocated binary semaphore -INIT - semaphore_release - allocated binary semaphore -INIT - semaphore_delete - allocated binary semaphore -PRI5 - semaphore_obtain - wait forever on SM2 -PRI5 - task_suspend - until all priority tasks blocked -PDRV - priority of PRI5 is 67 -PRI4 - semaphore_obtain - wait forever on SM2 -PDRV - change priority of PRI5 from 67 to 68 -PDRV - priority of PRI5 is 67 -PRI3 - semaphore_obtain - wait forever on SM2 -PDRV - priority of PRI5 is 67 -PRI2 - semaphore_obtain - wait forever on SM2 -PDRV - priority of PRI5 is 66 -PRI1 - semaphore_obtain - wait forever on SM2 -PDRV - priority of PRI5 is 65 -PDRV - task_resume - PRI5 -PRI5 - task_delete - all tasks waiting on SM2 -PRI5 - semaphore_obtain - nested -PRI5 - semaphore_release - nested -PRI5 - semaphore_release - restore priority -PRI5 - priority of PRI5 is 68 - -TA1 - semaphore_ident - smid => 16#1A010009# -TA1 - semaphore_obtain - wait forever on SM2 -TA1 - got SM2 -TA1 - semaphore_obtain - wait forever on SM3 -TA1 - got SM3 -TA1 - semaphore_obtain - get SM1 - NO_WAIT -TA1 - got SM1 -TA1 - task_wake_after - sleep 5 seconds -TA2 - semaphore_obtain - wait forever on SM1 -TA3 - semaphore_obtain - wait forever on SM2 - -TA1 - semaphore_release - release SM1 -TA1 - semaphore_obtain - waiting for SM1 with 10 second timeout -TA2 - got SM1 -TA2 - semaphore_release - release SM1 -TA2 - task_set_priority - make self highest priority task -TA2 - semaphore_obtain - wait forever on SM2 -TA1 - got SM1 -TA1 - semaphore_release - release SM2 -TA2 - got SM2 -TA2 - semaphore_release - release SM2 -TA2 - task_delete - delete self -TA1 - task_wake_after - sleep 5 seconds -TA3 - got SM2 -TA3 - semaphore_release - release SM2 -TA3 - semaphore_obtain - wait forever on SM3 - -TA1 - task_delete - delete TA3 -TA1 - task_wake_after - sleep 5 seconds -TA4 - semaphore_obtain - wait forever on SM1 -TA5 - semaphore_obtain - wait forever on SM1 -TA1 - task_delete - delete TA4 -TA1 - semaphore_release - release SM1 -TA1 - task_wake_after - sleep 5 seconds -TA5 - got SM1 -TA5 - semaphore_obtain - wait forever on SM1 -TA1 - semaphore_delete - delete SM1 -TA1 - semaphore_delete - delete SM3 -TA1 - task_delete - delete self -TA5 - SM1 deleted by TA1 -*** END OF TEST 12 *** diff --git a/c/src/ada-tests/sptests/sp13/Makefile.am b/c/src/ada-tests/sptests/sp13/Makefile.am index 39f5fa9f0b..2661cbeba6 100644 --- a/c/src/ada-tests/sptests/sp13/Makefile.am +++ b/c/src/ada-tests/sptests/sp13/Makefile.am @@ -5,14 +5,14 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am include $(top_srcdir)/ada.am -noinst_PROGRAMS = sp13.exe -sp13_exe_SOURCES = sp13.adb config.h sptest.adb sptest.ads -sp13_exe_SOURCES += ../../support/init.c +noinst_PROGRAMS = ada_sp13.exe +ada_sp13_exe_SOURCES = sp13.adb config.h sptest.adb sptest.ads +ada_sp13_exe_SOURCES += ../../support/init.c -sp13.exe: sp13.adb init.$(OBJEXT) +ada_sp13.exe: sp13.adb init.$(OBJEXT) $(GNATCOMPILE) -margs -a $< -o $@ scndir = $(rtems_ada_testsdir) -dist_scn_DATA = sp13.scn +dist_scn_DATA = ada_sp13.scn include $(top_srcdir)/../../../testsuites/automake/local.am diff --git a/c/src/ada-tests/sptests/sp13/ada_sp13.scn b/c/src/ada-tests/sptests/sp13/ada_sp13.scn new file mode 100644 index 0000000000..f54a497a58 --- /dev/null +++ b/c/src/ada-tests/sptests/sp13/ada_sp13.scn @@ -0,0 +1,78 @@ +*** TEST 13 *** +TA1 - message_queue_ident - qid => 16#22010001# +TA1 - message_queue_send - BUFFER 1 TO Q 1 +TA1 - message_queue_send - BUFFER 2 TO Q 1 +TA1 - task_wake_after - sleep 5 seconds +TA2 - message_queue_receive - receive from queue 1 - NO_WAIT +TA2 - buffer received: BUFFER 1 TO Q 1 +TA2 - message_queue_receive - receive from queue 1 - WAIT FOREVER +TA2 - buffer received: BUFFER 2 TO Q 1 +TA2 - message_queue_receive - receive from queue 1 - WAIT FOREVER +TA3 - message_queue_receive - receive from queue 2 - WAIT FOREVER +TA1 - message_queue_send - BUFFER 3 TO Q 1 +TA1 - task_wake_after - sleep 5 seconds +TA2 - buffer received: BUFFER 3 TO Q 1 +TA2 - task_set_priority - make self highest priority task +TA2 - message_queue_receive - receive from queue 2 - WAIT FOREVER + +TA1 - message_queue_send - BUFFER 1 TO Q 2 +TA2 - buffer received: BUFFER 1 TO Q 2 +TA2 - message_queue_send - BUFFER 2 TO Q 2 +TA2 - message_queue_receive - receive from queue 1 - 10 second timeout +TA1 - message_queue_receive - receive from queue 1 - 10 second timeout +TA3 - buffer received: BUFFER 2 TO Q 2 +TA3 - message_queue_broadcast - BUFFER 3 TO Q 1 +TA2 - buffer received: BUFFER 3 TO Q 1 +TA2 - message_queue_receive - receive from queue 3 - WAIT FOREVER +TA3 - number of tasks awakened = 2 +TA3 - message_queue_receive - receive from queue 3 - WAIT FOREVER +TA1 - buffer received: BUFFER 3 TO Q 1 +TA1 - task_delete - delete TA2 +TA1 - message_queue_send - BUFFER 1 TO Q 3 +TA1 - task_wake_after - sleep 5 seconds +TA3 - buffer received: BUFFER 1 TO Q 3 +TA3 - task_delete - delete self + +TA1 - message_queue_send - BUFFER 2 TO Q 3 +TA1 - message_queue_send - BUFFER 3 TO Q 3 +TA1 - message_queue_send - BUFFER 4 TO Q 3 +TA1 - message_queue_urgent - BUFFER 5 TO Q 3 +TA1 - message_queue_receive - receive from queue 3 - WAIT FOREVER +TA1 - buffer received: BUFFER 5 TO Q 3 +TA1 - message_queue_receive - receive from queue 3 - WAIT FOREVER +TA1 - buffer received: BUFFER 2 TO Q 3 +TA1 - message_queue_receive - receive from queue 3 - WAIT FOREVER +TA1 - buffer received: BUFFER 3 TO Q 3 +TA1 - message_queue_receive - receive from queue 3 - WAIT FOREVER +TA1 - buffer received: BUFFER 4 TO Q 3 +TA1 - message_queue_urgent - BUFFER 3 TO Q 2 +TA1 - message_queue_receive - receive from queue 2 - WAIT FOREVER +TA1 - buffer received: BUFFER 3 TO Q 2 + +TA1 - message_queue_delete - delete queue 1 +TA1 - message_queue_urgent - BUFFER 3 TO Q 2 +TA1 - message_queue_delete - delete queue 2 +TA1 - message_queue_get_number_pending - check Q 3 +TA1 - 0 messages are pending on Q 3 +TA1 - message_queue_flush - empty Q 3 +TA1 - 0 messages were flushed from Q 3 +TA1 - message_queue_send - BUFFER 1 TO Q 3 +TA1 - message_queue_send - BUFFER 2 TO Q 3 +TA1 - message_queue_broadcast - NO BUFFER TO Q1 +TA1 - number of tasks awakened = 0 +TA1 - message_queue_get_number_pending - check Q 3 +TA1 - 2 messages are pending on Q 3 +TA1 - message_queue_send - BUFFER 3 TO Q 3 +TA1 - message_queue_flush - Q 3 +TA1 - 3 messages were flushed from Q 3 +TA1 - message_queue_send - until all message buffers consumed +TA1 - message_queue_send - all message buffers consumed +TA1 - message_queue_flush - Q 3 +TA1 - 100 messages were flushed from Q 3 + +TA1 - create message queue of 20 bytes on queue 1 +TA1 - message_queue_delete - delete queue 1 + +TA1 - message_queue_create - variable sizes +TA1 - message_queue_create and send - variable sizes +*** END OF TEST 13 *** diff --git a/c/src/ada-tests/sptests/sp13/sp13.scn b/c/src/ada-tests/sptests/sp13/sp13.scn deleted file mode 100644 index f54a497a58..0000000000 --- a/c/src/ada-tests/sptests/sp13/sp13.scn +++ /dev/null @@ -1,78 +0,0 @@ -*** TEST 13 *** -TA1 - message_queue_ident - qid => 16#22010001# -TA1 - message_queue_send - BUFFER 1 TO Q 1 -TA1 - message_queue_send - BUFFER 2 TO Q 1 -TA1 - task_wake_after - sleep 5 seconds -TA2 - message_queue_receive - receive from queue 1 - NO_WAIT -TA2 - buffer received: BUFFER 1 TO Q 1 -TA2 - message_queue_receive - receive from queue 1 - WAIT FOREVER -TA2 - buffer received: BUFFER 2 TO Q 1 -TA2 - message_queue_receive - receive from queue 1 - WAIT FOREVER -TA3 - message_queue_receive - receive from queue 2 - WAIT FOREVER -TA1 - message_queue_send - BUFFER 3 TO Q 1 -TA1 - task_wake_after - sleep 5 seconds -TA2 - buffer received: BUFFER 3 TO Q 1 -TA2 - task_set_priority - make self highest priority task -TA2 - message_queue_receive - receive from queue 2 - WAIT FOREVER - -TA1 - message_queue_send - BUFFER 1 TO Q 2 -TA2 - buffer received: BUFFER 1 TO Q 2 -TA2 - message_queue_send - BUFFER 2 TO Q 2 -TA2 - message_queue_receive - receive from queue 1 - 10 second timeout -TA1 - message_queue_receive - receive from queue 1 - 10 second timeout -TA3 - buffer received: BUFFER 2 TO Q 2 -TA3 - message_queue_broadcast - BUFFER 3 TO Q 1 -TA2 - buffer received: BUFFER 3 TO Q 1 -TA2 - message_queue_receive - receive from queue 3 - WAIT FOREVER -TA3 - number of tasks awakened = 2 -TA3 - message_queue_receive - receive from queue 3 - WAIT FOREVER -TA1 - buffer received: BUFFER 3 TO Q 1 -TA1 - task_delete - delete TA2 -TA1 - message_queue_send - BUFFER 1 TO Q 3 -TA1 - task_wake_after - sleep 5 seconds -TA3 - buffer received: BUFFER 1 TO Q 3 -TA3 - task_delete - delete self - -TA1 - message_queue_send - BUFFER 2 TO Q 3 -TA1 - message_queue_send - BUFFER 3 TO Q 3 -TA1 - message_queue_send - BUFFER 4 TO Q 3 -TA1 - message_queue_urgent - BUFFER 5 TO Q 3 -TA1 - message_queue_receive - receive from queue 3 - WAIT FOREVER -TA1 - buffer received: BUFFER 5 TO Q 3 -TA1 - message_queue_receive - receive from queue 3 - WAIT FOREVER -TA1 - buffer received: BUFFER 2 TO Q 3 -TA1 - message_queue_receive - receive from queue 3 - WAIT FOREVER -TA1 - buffer received: BUFFER 3 TO Q 3 -TA1 - message_queue_receive - receive from queue 3 - WAIT FOREVER -TA1 - buffer received: BUFFER 4 TO Q 3 -TA1 - message_queue_urgent - BUFFER 3 TO Q 2 -TA1 - message_queue_receive - receive from queue 2 - WAIT FOREVER -TA1 - buffer received: BUFFER 3 TO Q 2 - -TA1 - message_queue_delete - delete queue 1 -TA1 - message_queue_urgent - BUFFER 3 TO Q 2 -TA1 - message_queue_delete - delete queue 2 -TA1 - message_queue_get_number_pending - check Q 3 -TA1 - 0 messages are pending on Q 3 -TA1 - message_queue_flush - empty Q 3 -TA1 - 0 messages were flushed from Q 3 -TA1 - message_queue_send - BUFFER 1 TO Q 3 -TA1 - message_queue_send - BUFFER 2 TO Q 3 -TA1 - message_queue_broadcast - NO BUFFER TO Q1 -TA1 - number of tasks awakened = 0 -TA1 - message_queue_get_number_pending - check Q 3 -TA1 - 2 messages are pending on Q 3 -TA1 - message_queue_send - BUFFER 3 TO Q 3 -TA1 - message_queue_flush - Q 3 -TA1 - 3 messages were flushed from Q 3 -TA1 - message_queue_send - until all message buffers consumed -TA1 - message_queue_send - all message buffers consumed -TA1 - message_queue_flush - Q 3 -TA1 - 100 messages were flushed from Q 3 - -TA1 - create message queue of 20 bytes on queue 1 -TA1 - message_queue_delete - delete queue 1 - -TA1 - message_queue_create - variable sizes -TA1 - message_queue_create and send - variable sizes -*** END OF TEST 13 *** diff --git a/c/src/ada-tests/sptests/sp14/Makefile.am b/c/src/ada-tests/sptests/sp14/Makefile.am index 7584fa2c3b..45d6c5bbdb 100644 --- a/c/src/ada-tests/sptests/sp14/Makefile.am +++ b/c/src/ada-tests/sptests/sp14/Makefile.am @@ -5,14 +5,14 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am include $(top_srcdir)/ada.am -noinst_PROGRAMS = sp14.exe -sp14_exe_SOURCES = sp14.adb config.h sptest.adb sptest.ads -sp14_exe_SOURCES += ../../support/init.c +noinst_PROGRAMS = ada_sp14.exe +ada_sp14_exe_SOURCES = sp14.adb config.h sptest.adb sptest.ads +ada_sp14_exe_SOURCES += ../../support/init.c -sp14.exe: sp14.adb init.$(OBJEXT) +ada_sp14.exe: sp14.adb init.$(OBJEXT) $(GNATCOMPILE) -margs -a $< -o $@ scndir = $(rtems_ada_testsdir) -dist_scn_DATA = sp14.scn +dist_scn_DATA = ada_sp14.scn include $(top_srcdir)/../../../testsuites/automake/local.am diff --git a/c/src/ada-tests/sptests/sp14/ada_sp14.scn b/c/src/ada-tests/sptests/sp14/ada_sp14.scn new file mode 100644 index 0000000000..09b33721ef --- /dev/null +++ b/c/src/ada-tests/sptests/sp14/ada_sp14.scn @@ -0,0 +1,33 @@ +*** TEST 14 *** +TA1 - signal_catch - INTERRUPT_LEVEL( 3 ) +TA1 - signal_send - SIGNAL_16 to self +ASR - ENTRY - signal => 16#10000# +ASR - EXIT - signal => 16#10000# +TA1 - signal_send - SIGNAL_0 to self +ASR - ENTRY - signal => 16#1# +ASR - task_wake_after - yield processor +TA2 - signal_send - SIGNAL_17 to TA1 +TA2 - task_wake_after - yield processor +ASR - ENTRY - signal => 16#20000# +ASR - EXIT - signal => 16#20000# +ASR - EXIT - signal => 16#1# +TA1 - signal_catch - NO_ASR + +TA1 - signal_send - SIGNAL_1 to self +ASR - ENTRY - signal => 16#2# +ASR - task_wake_after - yield processor +TA2 - signal_send - SIGNAL_18 and SIGNAL_19 to TA1 +TA2 - task_wake_after - yield processor +ASR - EXIT - signal => 16#2# +ASR - ENTRY - signal => 16#C0000# +ASR - EXIT - signal => 16#C0000# +TA1 - task_mode - disable ASRs +TA1 - sending signal to SELF from timer +TA1 - waiting for signal to arrive +TA1 - timer routine got the correct arguments +TA1 - task_mode - enable ASRs +ASR - ENTRY - signal => 16#8# +ASR - EXIT - signal => 16#8# +TA1 - signal_catch - ASR ADDRESS of NULL +TA1 - task_delete - delete self +*** END OF TEST 14 *** diff --git a/c/src/ada-tests/sptests/sp14/sp14.scn b/c/src/ada-tests/sptests/sp14/sp14.scn deleted file mode 100644 index 09b33721ef..0000000000 --- a/c/src/ada-tests/sptests/sp14/sp14.scn +++ /dev/null @@ -1,33 +0,0 @@ -*** TEST 14 *** -TA1 - signal_catch - INTERRUPT_LEVEL( 3 ) -TA1 - signal_send - SIGNAL_16 to self -ASR - ENTRY - signal => 16#10000# -ASR - EXIT - signal => 16#10000# -TA1 - signal_send - SIGNAL_0 to self -ASR - ENTRY - signal => 16#1# -ASR - task_wake_after - yield processor -TA2 - signal_send - SIGNAL_17 to TA1 -TA2 - task_wake_after - yield processor -ASR - ENTRY - signal => 16#20000# -ASR - EXIT - signal => 16#20000# -ASR - EXIT - signal => 16#1# -TA1 - signal_catch - NO_ASR - -TA1 - signal_send - SIGNAL_1 to self -ASR - ENTRY - signal => 16#2# -ASR - task_wake_after - yield processor -TA2 - signal_send - SIGNAL_18 and SIGNAL_19 to TA1 -TA2 - task_wake_after - yield processor -ASR - EXIT - signal => 16#2# -ASR - ENTRY - signal => 16#C0000# -ASR - EXIT - signal => 16#C0000# -TA1 - task_mode - disable ASRs -TA1 - sending signal to SELF from timer -TA1 - waiting for signal to arrive -TA1 - timer routine got the correct arguments -TA1 - task_mode - enable ASRs -ASR - ENTRY - signal => 16#8# -ASR - EXIT - signal => 16#8# -TA1 - signal_catch - ASR ADDRESS of NULL -TA1 - task_delete - delete self -*** END OF TEST 14 *** diff --git a/c/src/ada-tests/sptests/sp15/Makefile.am b/c/src/ada-tests/sptests/sp15/Makefile.am index abad1527fc..5ce1e0fe7d 100644 --- a/c/src/ada-tests/sptests/sp15/Makefile.am +++ b/c/src/ada-tests/sptests/sp15/Makefile.am @@ -5,14 +5,14 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am include $(top_srcdir)/ada.am -noinst_PROGRAMS = sp15.exe -sp15_exe_SOURCES = sp15.adb config.h sptest.adb sptest.ads -sp15_exe_SOURCES += ../../support/init.c +noinst_PROGRAMS = ada_sp15.exe +ada_sp15_exe_SOURCES = sp15.adb config.h sptest.adb sptest.ads +ada_sp15_exe_SOURCES += ../../support/init.c -sp15.exe: sp15.adb init.$(OBJEXT) +ada_sp15.exe: sp15.adb init.$(OBJEXT) $(GNATCOMPILE) -margs -a $< -o $@ scndir = $(rtems_ada_testsdir) -dist_scn_DATA = sp15.scn +dist_scn_DATA = ada_sp15.scn include $(top_srcdir)/../../../testsuites/automake/local.am diff --git a/c/src/ada-tests/sptests/sp15/ada_sp15.scn b/c/src/ada-tests/sptests/sp15/ada_sp15.scn new file mode 100644 index 0000000000..9c9e68f3d7 --- /dev/null +++ b/c/src/ada-tests/sptests/sp15/ada_sp15.scn @@ -0,0 +1,16 @@ +*** TEST 15 *** +INIT - partition_create - partition 1 +INIT - partition_create - partition 2 +TA1 - partition_ident - partition 1 id = 16#2A010001# +TA1 - partition_ident - partition 2 id = 16#2A010002# +TA1 - partition_get_buffer - get buffer 1 from partition 1 - 16#0# +TA1 - partition_get_buffer - get buffer 2 from partition 1 - 16#200# +TA1 - partition_get_buffer - get buffer 1 from partition 2 - 16#0# +TA1 - partition_get_buffer - get buffer 2 from partition 2 - 16#80# +TA1 - partition_return_buffer - return buffer 1 to partition 1 - 16#0# +TA1 - partition_return_buffer - return buffer 2 to partition 1 - 16#200# +TA1 - partition_return_buffer - return buffer 1 to partition 2 - 16#0# +TA1 - partition_return_buffer - return buffer 2 to partition 2 - 16#80# +TA1 - partition_delete - delete partition 1 +TA1 - partition_delete - delete partition 2 +*** END OF TEST 15 *** diff --git a/c/src/ada-tests/sptests/sp15/sp15.scn b/c/src/ada-tests/sptests/sp15/sp15.scn deleted file mode 100644 index 9c9e68f3d7..0000000000 --- a/c/src/ada-tests/sptests/sp15/sp15.scn +++ /dev/null @@ -1,16 +0,0 @@ -*** TEST 15 *** -INIT - partition_create - partition 1 -INIT - partition_create - partition 2 -TA1 - partition_ident - partition 1 id = 16#2A010001# -TA1 - partition_ident - partition 2 id = 16#2A010002# -TA1 - partition_get_buffer - get buffer 1 from partition 1 - 16#0# -TA1 - partition_get_buffer - get buffer 2 from partition 1 - 16#200# -TA1 - partition_get_buffer - get buffer 1 from partition 2 - 16#0# -TA1 - partition_get_buffer - get buffer 2 from partition 2 - 16#80# -TA1 - partition_return_buffer - return buffer 1 to partition 1 - 16#0# -TA1 - partition_return_buffer - return buffer 2 to partition 1 - 16#200# -TA1 - partition_return_buffer - return buffer 1 to partition 2 - 16#0# -TA1 - partition_return_buffer - return buffer 2 to partition 2 - 16#80# -TA1 - partition_delete - delete partition 1 -TA1 - partition_delete - delete partition 2 -*** END OF TEST 15 *** diff --git a/c/src/ada-tests/sptests/sp16/Makefile.am b/c/src/ada-tests/sptests/sp16/Makefile.am index 0ec4441cbd..00bef3b0c8 100644 --- a/c/src/ada-tests/sptests/sp16/Makefile.am +++ b/c/src/ada-tests/sptests/sp16/Makefile.am @@ -5,14 +5,14 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am include $(top_srcdir)/ada.am -noinst_PROGRAMS = sp16.exe -sp16_exe_SOURCES = sp16.adb config.h sptest.adb sptest.ads -sp16_exe_SOURCES += ../../support/init.c +noinst_PROGRAMS = ada_sp16.exe +ada_sp16_exe_SOURCES = sp16.adb config.h sptest.adb sptest.ads +ada_sp16_exe_SOURCES += ../../support/init.c -sp16.exe: sp16.adb init.$(OBJEXT) +ada_sp16.exe: sp16.adb init.$(OBJEXT) $(GNATCOMPILE) -margs -a $< -o $@ scndir = $(rtems_ada_testsdir) -dist_scn_DATA = sp16.scn +dist_scn_DATA = ada_sp16.scn include $(top_srcdir)/../../../testsuites/automake/local.am diff --git a/c/src/ada-tests/sptests/sp16/ada_sp16.scn b/c/src/ada-tests/sptests/sp16/ada_sp16.scn new file mode 100644 index 0000000000..928dc4a9cf --- /dev/null +++ b/c/src/ada-tests/sptests/sp16/ada_sp16.scn @@ -0,0 +1,58 @@ +*** TEST 16 *** +TA1 - region_ident - rnid => 16#32010001# +TA1 - region_get_segment - wait on 100 byte segment from region 2 +TA1 - got segment from region 2 - 16#70# +TA1 - region_get_segment - wait on 3K segment from region 3 +TA1 - got segment from region 3 - 16#70# +TA1 - region_get_segment - get 3080 byte segment from region 1 - NO_WAIT +TA1 - got segment from region 1 - 16#60# +TA1 - task_wake_after - yield processor +TA2 - region_get_segment - wait on 2K segment from region 1 +TA3 - region_get_segment - wait on 3950 byte segment from region 2 + +TA1 - region_return_segment - return segment to region 1 - 16#60# +TA1 - region_get_segment - wait 10 seconds for 3K segment from region 1 +TA2 - got segment from region 1 - 16#60# +TA2 - region_return_segment - return segment to region 1 - 16#60# +TA2 - task_set_priority - make self highest priority task +TA2 - region_get_segment - wait on 3950 byte segment from region 2 +TA1 - got segment from region 1 - 16#60# +TA1 - region_return_segment - return segment to region 2 - 16#70# +TA2 - got segment from region 2 - 16#70# +TA2 - region_return_segment - return segment to region 2 - 16#70# +TA2 - task_delete - delete self +TA1 - task_wake_after - yield processor +TA3 - got segment from region 2 - 16#70# +TA3 - region_get_segment - wait on 2K segment from region 3 +TA1 - task_delete - delete TA3 + +TA1 - task_wake_after - yield processor +TA4 - region_get_segment - wait on 1.5K segment from region 1 +TA5 - region_get_segment - wait on 1.5K segment from region 1 +TA1 - region_return_segment - return segment to region 1 - 16#60# +TA1 - task_wake_after - yield processor +TA4 - got and returned 16#60# +TA5 - got and returned 16#6E0# +TA1 - region_get_segment - wait 10 seconds for 3K segment from region 1 +TA1 - got segment from region 1 - 16#60# +TA1 - task_wake_after - yield processor +TA5 - region_get_segment - wait on 3K segment from region 1 +TA4 - region_get_segment - wait on 3K segment from region 1 +TA1 - task_delete - delete TA4 +TA1 - region_return_segment - return segment to region 1 - 16#60# +TA1 - task_wake_after - yield processor +TA5 - got segment from region 1 - 16#60# +TA5 - region_return_segment - return segment to region 1 - 16#60# +TA5 - task_delete - delete self +TA1 - region_delete - delete region 1 +TA1 - region_get_segment - get 3K segment from region 4 +TA1 - got segment from region 4 - 16#70# +TA1 - region_get_segment - attempt to get 3K segment from region 4 +TA1 - task_get_note - UNSATISFIED +TA1 - region_extend - extend region 4 by 4K +TA1 - region_get_segment - attempt to get 3K segment from region 4 +TA1 - got 3K segment from region 4 - 16#CF0# +TA1 - return_segment - return segment to region 4 - 16#70# +TA1 - region_return_segment - return segment to region 4 - 16#CF0# +TA1 - region_delete - delete region 4 +*** END OF TEST 16 *** diff --git a/c/src/ada-tests/sptests/sp16/sp16.scn b/c/src/ada-tests/sptests/sp16/sp16.scn deleted file mode 100644 index 928dc4a9cf..0000000000 --- a/c/src/ada-tests/sptests/sp16/sp16.scn +++ /dev/null @@ -1,58 +0,0 @@ -*** TEST 16 *** -TA1 - region_ident - rnid => 16#32010001# -TA1 - region_get_segment - wait on 100 byte segment from region 2 -TA1 - got segment from region 2 - 16#70# -TA1 - region_get_segment - wait on 3K segment from region 3 -TA1 - got segment from region 3 - 16#70# -TA1 - region_get_segment - get 3080 byte segment from region 1 - NO_WAIT -TA1 - got segment from region 1 - 16#60# -TA1 - task_wake_after - yield processor -TA2 - region_get_segment - wait on 2K segment from region 1 -TA3 - region_get_segment - wait on 3950 byte segment from region 2 - -TA1 - region_return_segment - return segment to region 1 - 16#60# -TA1 - region_get_segment - wait 10 seconds for 3K segment from region 1 -TA2 - got segment from region 1 - 16#60# -TA2 - region_return_segment - return segment to region 1 - 16#60# -TA2 - task_set_priority - make self highest priority task -TA2 - region_get_segment - wait on 3950 byte segment from region 2 -TA1 - got segment from region 1 - 16#60# -TA1 - region_return_segment - return segment to region 2 - 16#70# -TA2 - got segment from region 2 - 16#70# -TA2 - region_return_segment - return segment to region 2 - 16#70# -TA2 - task_delete - delete self -TA1 - task_wake_after - yield processor -TA3 - got segment from region 2 - 16#70# -TA3 - region_get_segment - wait on 2K segment from region 3 -TA1 - task_delete - delete TA3 - -TA1 - task_wake_after - yield processor -TA4 - region_get_segment - wait on 1.5K segment from region 1 -TA5 - region_get_segment - wait on 1.5K segment from region 1 -TA1 - region_return_segment - return segment to region 1 - 16#60# -TA1 - task_wake_after - yield processor -TA4 - got and returned 16#60# -TA5 - got and returned 16#6E0# -TA1 - region_get_segment - wait 10 seconds for 3K segment from region 1 -TA1 - got segment from region 1 - 16#60# -TA1 - task_wake_after - yield processor -TA5 - region_get_segment - wait on 3K segment from region 1 -TA4 - region_get_segment - wait on 3K segment from region 1 -TA1 - task_delete - delete TA4 -TA1 - region_return_segment - return segment to region 1 - 16#60# -TA1 - task_wake_after - yield processor -TA5 - got segment from region 1 - 16#60# -TA5 - region_return_segment - return segment to region 1 - 16#60# -TA5 - task_delete - delete self -TA1 - region_delete - delete region 1 -TA1 - region_get_segment - get 3K segment from region 4 -TA1 - got segment from region 4 - 16#70# -TA1 - region_get_segment - attempt to get 3K segment from region 4 -TA1 - task_get_note - UNSATISFIED -TA1 - region_extend - extend region 4 by 4K -TA1 - region_get_segment - attempt to get 3K segment from region 4 -TA1 - got 3K segment from region 4 - 16#CF0# -TA1 - return_segment - return segment to region 4 - 16#70# -TA1 - region_return_segment - return segment to region 4 - 16#CF0# -TA1 - region_delete - delete region 4 -*** END OF TEST 16 *** diff --git a/c/src/ada-tests/sptests/sp17/Makefile.am b/c/src/ada-tests/sptests/sp17/Makefile.am index d3d992d2e6..ffd7b275af 100644 --- a/c/src/ada-tests/sptests/sp17/Makefile.am +++ b/c/src/ada-tests/sptests/sp17/Makefile.am @@ -5,14 +5,14 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am include $(top_srcdir)/ada.am -noinst_PROGRAMS = sp17.exe -sp17_exe_SOURCES = sp17.adb config.h sptest.adb sptest.ads -sp17_exe_SOURCES += ../../support/init.c +noinst_PROGRAMS = ada_sp17.exe +ada_sp17_exe_SOURCES = sp17.adb config.h sptest.adb sptest.ads +ada_sp17_exe_SOURCES += ../../support/init.c -sp17.exe: sp17.adb init.$(OBJEXT) +ada_sp17.exe: sp17.adb init.$(OBJEXT) $(GNATCOMPILE) -margs -a $< -o $@ scndir = $(rtems_ada_testsdir) -dist_scn_DATA = sp17.scn +dist_scn_DATA = ada_sp17.scn include $(top_srcdir)/../../../testsuites/automake/local.am diff --git a/c/src/ada-tests/sptests/sp17/ada_sp17.scn b/c/src/ada-tests/sptests/sp17/ada_sp17.scn new file mode 100644 index 0000000000..887284d877 --- /dev/null +++ b/c/src/ada-tests/sptests/sp17/ada_sp17.scn @@ -0,0 +1,8 @@ +*** TEST 17 *** +TA2 - Suspending self +TA1 - signal_catch: initializing signal catcher +TA1 - Sending signal to self +TA2 - signal_return preempted correctly +TA1 - TA2 correctly preempted me +TA1 - Got Back!!! +*** END OF TEST 17 *** diff --git a/c/src/ada-tests/sptests/sp17/sp17.scn b/c/src/ada-tests/sptests/sp17/sp17.scn deleted file mode 100644 index 887284d877..0000000000 --- a/c/src/ada-tests/sptests/sp17/sp17.scn +++ /dev/null @@ -1,8 +0,0 @@ -*** TEST 17 *** -TA2 - Suspending self -TA1 - signal_catch: initializing signal catcher -TA1 - Sending signal to self -TA2 - signal_return preempted correctly -TA1 - TA2 correctly preempted me -TA1 - Got Back!!! -*** END OF TEST 17 *** diff --git a/c/src/ada-tests/sptests/sp19/Makefile.am b/c/src/ada-tests/sptests/sp19/Makefile.am index e377870c52..f9a7580467 100644 --- a/c/src/ada-tests/sptests/sp19/Makefile.am +++ b/c/src/ada-tests/sptests/sp19/Makefile.am @@ -7,17 +7,17 @@ include $(top_srcdir)/ada.am AM_ADAFLAGS += -I. -noinst_PROGRAMS = sp19.exe +noinst_PROGRAMS = ada_sp19.exe -sp19_exe_SOURCES = sp19.adb sptest.adb config.h sptest.ads -sp19_exe_SOURCES += ../../support/init.c +ada_sp19_exe_SOURCES = sp19.adb sptest.adb config.h sptest.ads +ada_sp19_exe_SOURCES += ../../support/init.c CLEANFILES += sptest.adb -sp19.exe: sp19.adb sptest.adb sptest.ads init.$(OBJEXT) +ada_sp19.exe: sp19.adb sptest.adb sptest.ads init.$(OBJEXT) $(GNATCOMPILE) -margs -a $< -o $@ scndir = $(rtems_ada_testsdir) -dist_scn_DATA = sp19.scn +dist_scn_DATA = ada_sp19.scn include $(top_srcdir)/../../../testsuites/automake/local.am diff --git a/c/src/ada-tests/sptests/sp19/ada_sp19.scn b/c/src/ada-tests/sptests/sp19/ada_sp19.scn new file mode 100644 index 0000000000..573860bb59 --- /dev/null +++ b/c/src/ada-tests/sptests/sp19/ada_sp19.scn @@ -0,0 +1,55 @@ +*** TEST 19 *** +FP1 - integer base = ( 16#6000#) +FP1 - float base = ( 6.00060E+03) +FP1 - integer base = ( 16#6000#) +FP1 - float base = ( 6.00060E+03) +TA1 - integer base = ( 16#1000#) +TA1 - clock_get - 9: 0: 0 12/31/1988 +TA2 - integer base = ( 16#2000#) +TA2 - clock_get - 9: 0: 0 12/31/1988 +TA3 - integer base = ( 16#3000#) +TA3 - clock_get - 9: 0: 0 12/31/1988 +TA4 - integer base = ( 16#4000#) +TA4 - float base = ( 4.00040E+03) +TA4 - clock_get - 9: 0: 0 12/31/1988 +TA5 - integer base = ( 16#5000#) +TA5 - float base = ( 5.00050E+03) +TA5 - clock_get - 9: 0: 0 12/31/1988 +TA4 - clock_get - 9: 0: 1 12/31/1988 +TA5 - clock_get - 9: 0: 1 12/31/1988 +TA4 - clock_get - 9: 0: 2 12/31/1988 +TA5 - clock_get - 9: 0: 2 12/31/1988 +TA4 - clock_get - 9: 0: 3 12/31/1988 +TA5 - clock_get - 9: 0: 3 12/31/1988 +TA4 - clock_get - 9: 0: 4 12/31/1988 +TA5 - clock_get - 9: 0: 4 12/31/1988 +TA1 - clock_get - 9: 0: 5 12/31/1988 +TA4 - clock_get - 9: 0: 5 12/31/1988 +TA5 - clock_get - 9: 0: 5 12/31/1988 +TA4 - clock_get - 9: 0: 6 12/31/1988 +TA5 - clock_get - 9: 0: 6 12/31/1988 +TA4 - clock_get - 9: 0: 7 12/31/1988 +TA5 - clock_get - 9: 0: 7 12/31/1988 +TA4 - clock_get - 9: 0: 8 12/31/1988 +TA5 - clock_get - 9: 0: 8 12/31/1988 +TA4 - clock_get - 9: 0: 9 12/31/1988 +TA5 - clock_get - 9: 0: 9 12/31/1988 +TA2 - clock_get - 9: 0:10 12/31/1988 +TA1 - clock_get - 9: 0:10 12/31/1988 +TA4 - clock_get - 9: 0:10 12/31/1988 +TA5 - clock_get - 9: 0:10 12/31/1988 +TA4 - clock_get - 9: 0:11 12/31/1988 +TA5 - clock_get - 9: 0:11 12/31/1988 +TA4 - clock_get - 9: 0:12 12/31/1988 +TA5 - clock_get - 9: 0:12 12/31/1988 +TA4 - clock_get - 9: 0:13 12/31/1988 +TA5 - clock_get - 9: 0:13 12/31/1988 +TA4 - clock_get - 9: 0:14 12/31/1988 +TA5 - clock_get - 9: 0:14 12/31/1988 +TA1 - clock_get - 9: 0:15 12/31/1988 +TA3 - clock_get - 9: 0:15 12/31/1988 +TA4 - clock_get - 9: 0:15 12/31/1988 +TA5 - clock_get - 9: 0:15 12/31/1988 +TA4 - task_delete - self +TA5 - task_delete - TA3 +*** END OF TEST 19 *** diff --git a/c/src/ada-tests/sptests/sp19/sp19.scn b/c/src/ada-tests/sptests/sp19/sp19.scn deleted file mode 100644 index 573860bb59..0000000000 --- a/c/src/ada-tests/sptests/sp19/sp19.scn +++ /dev/null @@ -1,55 +0,0 @@ -*** TEST 19 *** -FP1 - integer base = ( 16#6000#) -FP1 - float base = ( 6.00060E+03) -FP1 - integer base = ( 16#6000#) -FP1 - float base = ( 6.00060E+03) -TA1 - integer base = ( 16#1000#) -TA1 - clock_get - 9: 0: 0 12/31/1988 -TA2 - integer base = ( 16#2000#) -TA2 - clock_get - 9: 0: 0 12/31/1988 -TA3 - integer base = ( 16#3000#) -TA3 - clock_get - 9: 0: 0 12/31/1988 -TA4 - integer base = ( 16#4000#) -TA4 - float base = ( 4.00040E+03) -TA4 - clock_get - 9: 0: 0 12/31/1988 -TA5 - integer base = ( 16#5000#) -TA5 - float base = ( 5.00050E+03) -TA5 - clock_get - 9: 0: 0 12/31/1988 -TA4 - clock_get - 9: 0: 1 12/31/1988 -TA5 - clock_get - 9: 0: 1 12/31/1988 -TA4 - clock_get - 9: 0: 2 12/31/1988 -TA5 - clock_get - 9: 0: 2 12/31/1988 -TA4 - clock_get - 9: 0: 3 12/31/1988 -TA5 - clock_get - 9: 0: 3 12/31/1988 -TA4 - clock_get - 9: 0: 4 12/31/1988 -TA5 - clock_get - 9: 0: 4 12/31/1988 -TA1 - clock_get - 9: 0: 5 12/31/1988 -TA4 - clock_get - 9: 0: 5 12/31/1988 -TA5 - clock_get - 9: 0: 5 12/31/1988 -TA4 - clock_get - 9: 0: 6 12/31/1988 -TA5 - clock_get - 9: 0: 6 12/31/1988 -TA4 - clock_get - 9: 0: 7 12/31/1988 -TA5 - clock_get - 9: 0: 7 12/31/1988 -TA4 - clock_get - 9: 0: 8 12/31/1988 -TA5 - clock_get - 9: 0: 8 12/31/1988 -TA4 - clock_get - 9: 0: 9 12/31/1988 -TA5 - clock_get - 9: 0: 9 12/31/1988 -TA2 - clock_get - 9: 0:10 12/31/1988 -TA1 - clock_get - 9: 0:10 12/31/1988 -TA4 - clock_get - 9: 0:10 12/31/1988 -TA5 - clock_get - 9: 0:10 12/31/1988 -TA4 - clock_get - 9: 0:11 12/31/1988 -TA5 - clock_get - 9: 0:11 12/31/1988 -TA4 - clock_get - 9: 0:12 12/31/1988 -TA5 - clock_get - 9: 0:12 12/31/1988 -TA4 - clock_get - 9: 0:13 12/31/1988 -TA5 - clock_get - 9: 0:13 12/31/1988 -TA4 - clock_get - 9: 0:14 12/31/1988 -TA5 - clock_get - 9: 0:14 12/31/1988 -TA1 - clock_get - 9: 0:15 12/31/1988 -TA3 - clock_get - 9: 0:15 12/31/1988 -TA4 - clock_get - 9: 0:15 12/31/1988 -TA5 - clock_get - 9: 0:15 12/31/1988 -TA4 - task_delete - self -TA5 - task_delete - TA3 -*** END OF TEST 19 *** diff --git a/c/src/ada-tests/sptests/sp20/Makefile.am b/c/src/ada-tests/sptests/sp20/Makefile.am index cd1d00c737..71aa31ec50 100644 --- a/c/src/ada-tests/sptests/sp20/Makefile.am +++ b/c/src/ada-tests/sptests/sp20/Makefile.am @@ -5,14 +5,14 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am include $(top_srcdir)/ada.am -noinst_PROGRAMS = sp20.exe -sp20_exe_SOURCES = sp20.adb config.h sptest.adb sptest.ads -sp20_exe_SOURCES += ../../support/init.c +noinst_PROGRAMS = ada_sp20.exe +ada_sp20_exe_SOURCES = sp20.adb config.h sptest.adb sptest.ads +ada_sp20_exe_SOURCES += ../../support/init.c -sp20.exe: sp20.adb init.$(OBJEXT) +ada_sp20.exe: sp20.adb init.$(OBJEXT) $(GNATCOMPILE) -margs -a $< -o $@ scndir = $(rtems_ada_testsdir) -dist_scn_DATA = sp20.scn +dist_scn_DATA = ada_sp20.scn include $(top_srcdir)/../../../testsuites/automake/local.am diff --git a/c/src/ada-tests/sptests/sp20/ada_sp20.scn b/c/src/ada-tests/sptests/sp20/ada_sp20.scn new file mode 100644 index 0000000000..5411361d76 --- /dev/null +++ b/c/src/ada-tests/sptests/sp20/ada_sp20.scn @@ -0,0 +1,40 @@ +*** TEST 20 *** +TA1 - rate_monotonic_create id = 16#42010001# +TA1 - rate_monotonic_ident id = 16#42010001# +TA1 - (16#42010001#) period 2 +TA2 - rate_monotonic_create id = 16#42010002# +TA2 - rate_monotonic_ident id = 16#42010002# +TA2 - (16#42010002#) period 2 +TA3 - rate_monotonic_create id = 16#42010003# +TA3 - rate_monotonic_ident id = 16#42010003# +TA3 - (16#42010003#) period 2 +TA4 - rate_monotonic_create id = 16#42010004# +TA4 - rate_monotonic_ident id = 16#42010004# +TA4 - (16#42010004#) period 2 +TA5 - rate_monotonic_create id = 16#42010005# +TA5 - rate_monotonic_ident id = 16#42010005# +TA5 - (16#42010005#) period 100 +TA6 - rate_monotonic_create id = 16#42010006# +TA6 - rate_monotonic_ident id = 16#42010006# +TA6 - (16#42010006#) period 0 +TA5 - PERIODS CHECK OK (1) +TA5 - PERIODS CHECK OK (2) +TA5 - PERIODS CHECK OK (3) +TA5 - PERIODS CHECK OK (4) +TA5 - PERIODS CHECK OK (5) +TA6 - Actual: 10 Expected: 10 - OK +TA6 - Actual: 20 Expected: 20 - OK +TA6 - Actual: 30 Expected: 30 - OK +TA6 - Actual: 40 Expected: 40 - OK +TA6 - Actual: 50 Expected: 50 - OK +TA6 - Actual: 60 Expected: 60 - OK +TA6 - Actual: 70 Expected: 70 - OK +TA6 - Actual: 80 Expected: 80 - OK +TA6 - Actual: 90 Expected: 90 - OK +TA6 - Actual: 100 Expected: 100 - OK +TA5 - PERIODS CHECK OK (6) +TA5 - PERIODS CHECK OK (7) +TA5 - PERIODS CHECK OK (8) +TA5 - PERIODS CHECK OK (9) +TA5 - PERIODS CHECK OK (10) +*** END OF TEST 20 *** diff --git a/c/src/ada-tests/sptests/sp20/sp20.scn b/c/src/ada-tests/sptests/sp20/sp20.scn deleted file mode 100644 index 5411361d76..0000000000 --- a/c/src/ada-tests/sptests/sp20/sp20.scn +++ /dev/null @@ -1,40 +0,0 @@ -*** TEST 20 *** -TA1 - rate_monotonic_create id = 16#42010001# -TA1 - rate_monotonic_ident id = 16#42010001# -TA1 - (16#42010001#) period 2 -TA2 - rate_monotonic_create id = 16#42010002# -TA2 - rate_monotonic_ident id = 16#42010002# -TA2 - (16#42010002#) period 2 -TA3 - rate_monotonic_create id = 16#42010003# -TA3 - rate_monotonic_ident id = 16#42010003# -TA3 - (16#42010003#) period 2 -TA4 - rate_monotonic_create id = 16#42010004# -TA4 - rate_monotonic_ident id = 16#42010004# -TA4 - (16#42010004#) period 2 -TA5 - rate_monotonic_create id = 16#42010005# -TA5 - rate_monotonic_ident id = 16#42010005# -TA5 - (16#42010005#) period 100 -TA6 - rate_monotonic_create id = 16#42010006# -TA6 - rate_monotonic_ident id = 16#42010006# -TA6 - (16#42010006#) period 0 -TA5 - PERIODS CHECK OK (1) -TA5 - PERIODS CHECK OK (2) -TA5 - PERIODS CHECK OK (3) -TA5 - PERIODS CHECK OK (4) -TA5 - PERIODS CHECK OK (5) -TA6 - Actual: 10 Expected: 10 - OK -TA6 - Actual: 20 Expected: 20 - OK -TA6 - Actual: 30 Expected: 30 - OK -TA6 - Actual: 40 Expected: 40 - OK -TA6 - Actual: 50 Expected: 50 - OK -TA6 - Actual: 60 Expected: 60 - OK -TA6 - Actual: 70 Expected: 70 - OK -TA6 - Actual: 80 Expected: 80 - OK -TA6 - Actual: 90 Expected: 90 - OK -TA6 - Actual: 100 Expected: 100 - OK -TA5 - PERIODS CHECK OK (6) -TA5 - PERIODS CHECK OK (7) -TA5 - PERIODS CHECK OK (8) -TA5 - PERIODS CHECK OK (9) -TA5 - PERIODS CHECK OK (10) -*** END OF TEST 20 *** diff --git a/c/src/ada-tests/sptests/sp22/Makefile.am b/c/src/ada-tests/sptests/sp22/Makefile.am index fd56162a28..e5081c40a4 100644 --- a/c/src/ada-tests/sptests/sp22/Makefile.am +++ b/c/src/ada-tests/sptests/sp22/Makefile.am @@ -5,14 +5,14 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am include $(top_srcdir)/ada.am -noinst_PROGRAMS = sp22.exe -sp22_exe_SOURCES = sp22.adb config.h sptest.adb sptest.ads -sp22_exe_SOURCES += ../../support/init.c +noinst_PROGRAMS = ada_sp22.exe +ada_sp22_exe_SOURCES = sp22.adb config.h sptest.adb sptest.ads +ada_sp22_exe_SOURCES += ../../support/init.c -sp22.exe: sp22.adb init.$(OBJEXT) +ada_sp22.exe: sp22.adb init.$(OBJEXT) $(GNATCOMPILE) -margs -a $< -o $@ scndir = $(rtems_ada_testsdir) -dist_scn_DATA = sp22.scn +dist_scn_DATA = ada_sp22.scn include $(top_srcdir)/../../../testsuites/automake/local.am diff --git a/c/src/ada-tests/sptests/sp22/ada_sp22.scn b/c/src/ada-tests/sptests/sp22/ada_sp22.scn new file mode 100644 index 0000000000..3e96936e24 --- /dev/null +++ b/c/src/ada-tests/sptests/sp22/ada_sp22.scn @@ -0,0 +1,29 @@ +*** TEST 22 *** +INIT - timer_create - creating timer 1 +INIT - timer 1 has id (16#12010001#) +TA1 - timer_ident - identing timer 1 +TA1 - timer 1 has id (16#12010001#) +TA1 - clock_get - 9: 0: 0 12/31/1988 +TA1 - timer_after - timer 1 in 3 seconds +TA1 - task_suspend( SELF ) +TA1 - clock_get - 9: 0: 3 12/31/1988 +TA1 - timer_after - timer 1 in 3 seconds +TA1 - task_wake_after - 1 second +TA1 - clock_get - 9: 0: 4 12/31/1988 +TA1 - timer_reset - timer 1 +TA1 - task_suspend( SELF ) +TA1 - clock_get - 9: 0: 7 12/31/1988 + +TA1 - timer_after - timer 1 in 3 seconds +TA1 - timer_cancel - timer 1 +TA1 - clock_get - 9: 0: 7 12/31/1988 +TA1 - timer_when - timer 1 in 3 seconds +TA1 - task_suspend( SELF ) +TA1 - clock_get - 9: 0:10 12/31/1988 +TA1 - timer_when - timer 1 in 3 seconds +TA1 - task_wake_after - 1 second +TA1 - clock_get - 9: 0:11 12/31/1988 +TA1 - timer_cancel - timer 1 +TA1 - task_wake_after - YIELD (only task at priority) +TA1 - timer_delete - timer 1 +*** END OF TEST 22 *** diff --git a/c/src/ada-tests/sptests/sp22/sp22.scn b/c/src/ada-tests/sptests/sp22/sp22.scn deleted file mode 100644 index 3e96936e24..0000000000 --- a/c/src/ada-tests/sptests/sp22/sp22.scn +++ /dev/null @@ -1,29 +0,0 @@ -*** TEST 22 *** -INIT - timer_create - creating timer 1 -INIT - timer 1 has id (16#12010001#) -TA1 - timer_ident - identing timer 1 -TA1 - timer 1 has id (16#12010001#) -TA1 - clock_get - 9: 0: 0 12/31/1988 -TA1 - timer_after - timer 1 in 3 seconds -TA1 - task_suspend( SELF ) -TA1 - clock_get - 9: 0: 3 12/31/1988 -TA1 - timer_after - timer 1 in 3 seconds -TA1 - task_wake_after - 1 second -TA1 - clock_get - 9: 0: 4 12/31/1988 -TA1 - timer_reset - timer 1 -TA1 - task_suspend( SELF ) -TA1 - clock_get - 9: 0: 7 12/31/1988 - -TA1 - timer_after - timer 1 in 3 seconds -TA1 - timer_cancel - timer 1 -TA1 - clock_get - 9: 0: 7 12/31/1988 -TA1 - timer_when - timer 1 in 3 seconds -TA1 - task_suspend( SELF ) -TA1 - clock_get - 9: 0:10 12/31/1988 -TA1 - timer_when - timer 1 in 3 seconds -TA1 - task_wake_after - 1 second -TA1 - clock_get - 9: 0:11 12/31/1988 -TA1 - timer_cancel - timer 1 -TA1 - task_wake_after - YIELD (only task at priority) -TA1 - timer_delete - timer 1 -*** END OF TEST 22 *** diff --git a/c/src/ada-tests/sptests/sp23/Makefile.am b/c/src/ada-tests/sptests/sp23/Makefile.am index f3dee078a4..d39d6bf89d 100644 --- a/c/src/ada-tests/sptests/sp23/Makefile.am +++ b/c/src/ada-tests/sptests/sp23/Makefile.am @@ -5,14 +5,14 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am include $(top_srcdir)/ada.am -noinst_PROGRAMS = sp23.exe -sp23_exe_SOURCES = sp23.adb config.h sptest.adb sptest.ads -sp23_exe_SOURCES += ../../support/init.c +noinst_PROGRAMS = ada_sp23.exe +ada_sp23_exe_SOURCES = sp23.adb config.h sptest.adb sptest.ads +ada_sp23_exe_SOURCES += ../../support/init.c -sp23.exe: sp23.adb init.$(OBJEXT) +ada_sp23.exe: sp23.adb init.$(OBJEXT) $(GNATCOMPILE) -margs -a $< -o $@ scndir = $(rtems_ada_testsdir) -dist_scn_DATA = sp23.scn +dist_scn_DATA = ada_sp23.scn include $(top_srcdir)/../../../testsuites/automake/local.am diff --git a/c/src/ada-tests/sptests/sp23/ada_sp23.scn b/c/src/ada-tests/sptests/sp23/ada_sp23.scn new file mode 100644 index 0000000000..2fc1e74582 --- /dev/null +++ b/c/src/ada-tests/sptests/sp23/ada_sp23.scn @@ -0,0 +1,9 @@ +*** TEST 23 *** +INIT - port_create - DP1 - internal = 16#1000# external = 16#2000# +TA1 - port_ident - 16#3A010001# +TA1 - port_external_to_internal - external: 16#200E# => internal: 16#100E# +TA1 - port_internal_to_external - internal: 16#100E# => external: 16#200E# +TA1 - port_external_to_internal - external: 16#300E# => internal: 16#300E# +TA1 - port_internal_to_external - internal: 16#50E# => external: 16#50E# +TA1 - port_delete - DP1 +*** END OF TEST 23 *** diff --git a/c/src/ada-tests/sptests/sp23/sp23.scn b/c/src/ada-tests/sptests/sp23/sp23.scn deleted file mode 100644 index 2fc1e74582..0000000000 --- a/c/src/ada-tests/sptests/sp23/sp23.scn +++ /dev/null @@ -1,9 +0,0 @@ -*** TEST 23 *** -INIT - port_create - DP1 - internal = 16#1000# external = 16#2000# -TA1 - port_ident - 16#3A010001# -TA1 - port_external_to_internal - external: 16#200E# => internal: 16#100E# -TA1 - port_internal_to_external - internal: 16#100E# => external: 16#200E# -TA1 - port_external_to_internal - external: 16#300E# => internal: 16#300E# -TA1 - port_internal_to_external - internal: 16#50E# => external: 16#50E# -TA1 - port_delete - DP1 -*** END OF TEST 23 *** diff --git a/c/src/ada-tests/sptests/sp24/Makefile.am b/c/src/ada-tests/sptests/sp24/Makefile.am index 09a31e118e..97a6e7017a 100644 --- a/c/src/ada-tests/sptests/sp24/Makefile.am +++ b/c/src/ada-tests/sptests/sp24/Makefile.am @@ -5,14 +5,14 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am include $(top_srcdir)/ada.am -noinst_PROGRAMS = sp24.exe -sp24_exe_SOURCES = sp24.adb config.h sptest.adb sptest.ads -sp24_exe_SOURCES += ../../support/init.c +noinst_PROGRAMS = ada_sp24.exe +ada_sp24_exe_SOURCES = sp24.adb config.h sptest.adb sptest.ads +ada_sp24_exe_SOURCES += ../../support/init.c -sp24.exe: sp24.adb init.$(OBJEXT) +ada_sp24.exe: sp24.adb init.$(OBJEXT) $(GNATCOMPILE) -margs -a $< -o $@ scndir = $(rtems_ada_testsdir) -dist_scn_DATA = sp24.scn +dist_scn_DATA = ada_sp24.scn include $(top_srcdir)/../../../testsuites/automake/local.am diff --git a/c/src/ada-tests/sptests/sp24/ada_sp24.scn b/c/src/ada-tests/sptests/sp24/ada_sp24.scn new file mode 100644 index 0000000000..eb626eb6b2 --- /dev/null +++ b/c/src/ada-tests/sptests/sp24/ada_sp24.scn @@ -0,0 +1,16 @@ +*** TEST 24 *** +TA1 - clock_get - 9: 0: 0 12/31/1988 +TA2 - clock_get - 9: 0: 0 12/31/1988 +TA3 - clock_get - 9: 0: 0 12/31/1988 +TA1 - clock_get - 9: 0: 5 12/31/1988 +TA1 - clock_get - 9: 0:10 12/31/1988 +TA2 - clock_get - 9: 0:10 12/31/1988 +TA1 - clock_get - 9: 0:15 12/31/1988 +TA3 - clock_get - 9: 0:15 12/31/1988 +TA1 - clock_get - 9: 0:20 12/31/1988 +TA2 - clock_get - 9: 0:20 12/31/1988 +TA1 - clock_get - 9: 0:25 12/31/1988 +TA1 - clock_get - 9: 0:30 12/31/1988 +TA3 - clock_get - 9: 0:30 12/31/1988 +TA2 - clock_get - 9: 0:30 12/31/1988 +*** END OF TEST 24 *** diff --git a/c/src/ada-tests/sptests/sp24/sp24.scn b/c/src/ada-tests/sptests/sp24/sp24.scn deleted file mode 100644 index eb626eb6b2..0000000000 --- a/c/src/ada-tests/sptests/sp24/sp24.scn +++ /dev/null @@ -1,16 +0,0 @@ -*** TEST 24 *** -TA1 - clock_get - 9: 0: 0 12/31/1988 -TA2 - clock_get - 9: 0: 0 12/31/1988 -TA3 - clock_get - 9: 0: 0 12/31/1988 -TA1 - clock_get - 9: 0: 5 12/31/1988 -TA1 - clock_get - 9: 0:10 12/31/1988 -TA2 - clock_get - 9: 0:10 12/31/1988 -TA1 - clock_get - 9: 0:15 12/31/1988 -TA3 - clock_get - 9: 0:15 12/31/1988 -TA1 - clock_get - 9: 0:20 12/31/1988 -TA2 - clock_get - 9: 0:20 12/31/1988 -TA1 - clock_get - 9: 0:25 12/31/1988 -TA1 - clock_get - 9: 0:30 12/31/1988 -TA3 - clock_get - 9: 0:30 12/31/1988 -TA2 - clock_get - 9: 0:30 12/31/1988 -*** END OF TEST 24 *** diff --git a/c/src/ada-tests/sptests/sp25/Makefile.am b/c/src/ada-tests/sptests/sp25/Makefile.am index 40f2dee699..bb69453fa7 100644 --- a/c/src/ada-tests/sptests/sp25/Makefile.am +++ b/c/src/ada-tests/sptests/sp25/Makefile.am @@ -5,14 +5,14 @@ include $(top_srcdir)/../../../testsuites/automake/compile.am include $(top_srcdir)/ada.am -noinst_PROGRAMS = sp25.exe -sp25_exe_SOURCES = sp25.adb config.h sptest.adb sptest.ads -sp25_exe_SOURCES += ../../support/init.c +noinst_PROGRAMS = ada_sp25.exe +ada_sp25_exe_SOURCES = sp25.adb config.h sptest.adb sptest.ads +ada_sp25_exe_SOURCES += ../../support/init.c -sp25.exe: sp25.adb init.$(OBJEXT) +ada_sp25.exe: sp25.adb init.$(OBJEXT) $(GNATCOMPILE) -margs -a $< -o $@ scndir = $(rtems_ada_testsdir) -dist_scn_DATA = sp25.scn +dist_scn_DATA = ada_sp25.scn include $(top_srcdir)/../../../testsuites/automake/local.am diff --git a/c/src/ada-tests/sptests/sp25/ada_sp25.scn b/c/src/ada-tests/sptests/sp25/ada_sp25.scn new file mode 100644 index 0000000000..bb568001ac --- /dev/null +++ b/c/src/ada-tests/sptests/sp25/ada_sp25.scn @@ -0,0 +1,29 @@ +*** TEST 25 *** +TA1 - region_ident - rnid => 16#32010001# +TA1 - region_get_segment - wait on 64 byte segment from region 1 +TA1 - got segment from region 1 - 16#10# +TA1 - region_get_segment - wait on 128 byte segment from region 1 +TA1 - got segment from region 1 - 16#70# +TA1 - region_get_segment - wait on 256 byte segment from region 1 +TA1 - got segment from region 1 - 16#110# +TA1 - region_get_segment - wait on 512 byte segment from region 1 +TA1 - got segment from region 1 - 16#230# +TA1 - region_get_segment - wait on 1024 byte segment from region 1 +TA1 - got segment from region 1 - 16#450# +TA1 - region_get_segment - wait on 2048 byte segment from region 1 +TA1 - got segment from region 1 - 16#870# +TA1 - region_get_segment - wait on 4096 byte segment from region 1 +TA1 - got segment from region 1 - 16#1090# +TA1 - region_get_segment - wait on 8192 byte segment from region 1 +TA1 - got segment from region 1 - 16#20B0# + +TA1 - region_return_segment - return segment to region 1 - 16#110# +TA1 - region_return_segment - return segment to region 1 - 16#230# +TA1 - region_return_segment - return segment to region 1 - 16#10# +TA1 - region_return_segment - return segment to region 1 - 16#70# +TA1 - region_return_segment - return segment to region 1 - 16#1090# +TA1 - region_return_segment - return segment to region 1 - 16#870# +TA1 - region_return_segment - return segment to region 1 - 16#20B0# +TA1 - region_return_segment - return segment to region 1 - 16#450# +TA1 - region_delete - walks heap if debug enabled +*** END OF TEST 25 *** diff --git a/c/src/ada-tests/sptests/sp25/sp25.scn b/c/src/ada-tests/sptests/sp25/sp25.scn deleted file mode 100644 index bb568001ac..0000000000 --- a/c/src/ada-tests/sptests/sp25/sp25.scn +++ /dev/null @@ -1,29 +0,0 @@ -*** TEST 25 *** -TA1 - region_ident - rnid => 16#32010001# -TA1 - region_get_segment - wait on 64 byte segment from region 1 -TA1 - got segment from region 1 - 16#10# -TA1 - region_get_segment - wait on 128 byte segment from region 1 -TA1 - got segment from region 1 - 16#70# -TA1 - region_get_segment - wait on 256 byte segment from region 1 -TA1 - got segment from region 1 - 16#110# -TA1 - region_get_segment - wait on 512 byte segment from region 1 -TA1 - got segment from region 1 - 16#230# -TA1 - region_get_segment - wait on 1024 byte segment from region 1 -TA1 - got segment from region 1 - 16#450# -TA1 - region_get_segment - wait on 2048 byte segment from region 1 -TA1 - got segment from region 1 - 16#870# -TA1 - region_get_segment - wait on 4096 byte segment from region 1 -TA1 - got segment from region 1 - 16#1090# -TA1 - region_get_segment - wait on 8192 byte segment from region 1 -TA1 - got segment from region 1 - 16#20B0# - -TA1 - region_return_segment - return segment to region 1 - 16#110# -TA1 - region_return_segment - return segment to region 1 - 16#230# -TA1 - region_return_segment - return segment to region 1 - 16#10# -TA1 - region_return_segment - return segment to region 1 - 16#70# -TA1 - region_return_segment - return segment to region 1 - 16#1090# -TA1 - region_return_segment - return segment to region 1 - 16#870# -TA1 - region_return_segment - return segment to region 1 - 16#20B0# -TA1 - region_return_segment - return segment to region 1 - 16#450# -TA1 - region_delete - walks heap if debug enabled -*** END OF TEST 25 *** -- cgit v1.2.3