[rtems commit] sptask_err03: New test split from sp09 screen 3.
Jennifer Averett
jennifer at rtems.org
Fri Mar 28 18:38:33 UTC 2014
Module: rtems
Branch: master
Commit: 719c7e55e4e9ee8c3e0184409cfd5862d501b1ba
Changeset: http://git.rtems.org/rtems/commit/?id=719c7e55e4e9ee8c3e0184409cfd5862d501b1ba
Author: Bjorn Larsson <bjornlarsson at oarcorp.com>
Date: Thu Mar 27 09:47:24 2014 -0500
sptask_err03: New test split from sp09 screen 3.
---
testsuites/sptests/Makefile.am | 2 +-
testsuites/sptests/configure.ac | 1 +
testsuites/sptests/sp09/Makefile.am | 2 +-
testsuites/sptests/sp09/sp09.scn | 17 -------
testsuites/sptests/sp09/task1.c | 3 -
testsuites/sptests/sptask_err03/Makefile.am | 22 +++++++++
.../{sp09/screen03.c => sptask_err03/init.c} | 46 ++++++++++++++-----
testsuites/sptests/sptask_err03/sptask_err03.doc | 25 ++++++++++
testsuites/sptests/sptask_err03/sptask_err03.scn | 18 +++++++
testsuites/sptests/sptask_err03/system.h | 49 ++++++++++++++++++++
10 files changed, 151 insertions(+), 34 deletions(-)
diff --git a/testsuites/sptests/Makefile.am b/testsuites/sptests/Makefile.am
index 86fc6ca..41dfc5f 100644
--- a/testsuites/sptests/Makefile.am
+++ b/testsuites/sptests/Makefile.am
@@ -31,7 +31,7 @@ SUBDIRS = \
spcbssched01 spcbssched02 spcbssched03 spqreslib sptimespec01 \
spregion_err01 sppartition_err01 spratemon_err01 spintr_err01 \
spsignal_err01 spport_err01 spmsgq_err01 spmsgq_err02 spsem_err01 \
- spsem_err02 sptask_err01 spevent_err03
+ spsem_err02 sptask_err01 spevent_err03 sptask_err03
SUBDIRS += spprofiling01
SUBDIRS += spcache01
SUBDIRS += sptls03
diff --git a/testsuites/sptests/configure.ac b/testsuites/sptests/configure.ac
index 4286130..9d6d4a9 100644
--- a/testsuites/sptests/configure.ac
+++ b/testsuites/sptests/configure.ac
@@ -223,6 +223,7 @@ sptimespec01/Makefile
spwatchdog/Makefile
spwkspace/Makefile
sptask_err01/Makefile
+sptask_err03/Makefile
sptimer_err01/Makefile
sptimer_err02/Makefile
spcpuset01/Makefile
diff --git a/testsuites/sptests/sp09/Makefile.am b/testsuites/sptests/sp09/Makefile.am
index 2b4e16f..2c6f903 100644
--- a/testsuites/sptests/sp09/Makefile.am
+++ b/testsuites/sptests/sp09/Makefile.am
@@ -1,6 +1,6 @@
rtems_tests_PROGRAMS = sp09
-sp09_SOURCES = init.c delay.c isr.c screen01.c screen02.c screen03.c \
+sp09_SOURCES = init.c delay.c isr.c screen01.c screen02.c \
task1.c task2.c task3.c \
system.h
diff --git a/testsuites/sptests/sp09/sp09.scn b/testsuites/sptests/sp09/sp09.scn
index fc35d23..001239d 100644
--- a/testsuites/sptests/sp09/sp09.scn
+++ b/testsuites/sptests/sp09/sp09.scn
@@ -56,21 +56,4 @@ TA1 - rtems_task_wake_when - 08:30:48 02/05/1961 - RTEMS_INVALID_CLOCK
TA1 - rtems_task_wake_when - 25:30:48 02/05/1988 - RTEMS_INVALID_CLOCK
TA1 - current time - 08:30:51 02/05/1988
TA1 - rtems_task_wake_when - 08:30:51 01/05/1988 - RTEMS_INVALID_CLOCK
-<pause - screen 3>
-TA1 - rtems_task_create - RTEMS_INVALID_NAME
-TA1 - rtems_task_create - RTEMS_INVALID_ADDRESS
-TA1 - rtems_task_create - stack size - RTEMS_UNSATISFIED -- SKIPPED
-TA1 - rtems_task_create - TA2 created - RTEMS_SUCCESSFUL
-TA1 - rtems_task_suspend - suspend TA2 - RTEMS_SUCCESSFUL
-TA1 - rtems_task_suspend - suspend TA2 - RTEMS_ALREADY_SUSPENDED
-TA1 - rtems_task_resume - TA2 resumed - RTEMS_SUCCESSFUL
-TA1 - rtems_task_create - TA3 created - RTEMS_SUCCESSFUL
-TA1 - rtems_task_create - 5 created - RTEMS_SUCCESSFUL
-TA1 - rtems_task_create - 6 created - RTEMS_SUCCESSFUL
-TA1 - rtems_task_create - 7 created - RTEMS_SUCCESSFUL
-TA1 - rtems_task_create - 8 created - RTEMS_SUCCESSFUL
-TA1 - rtems_task_create - 9 created - RTEMS_SUCCESSFUL
-TA1 - rtems_task_create - 10 created - RTEMS_SUCCESSFUL
-TA1 - rtems_task_create - 11 - RTEMS_TOO_MANY
-TA1 - rtems_task_create - RTEMS_MP_NOT_CONFIGURED
*** END OF TEST 9 ***
diff --git a/testsuites/sptests/sp09/task1.c b/testsuites/sptests/sp09/task1.c
index f606c28..7fce5c6 100644
--- a/testsuites/sptests/sp09/task1.c
+++ b/testsuites/sptests/sp09/task1.c
@@ -29,9 +29,6 @@ rtems_task Task_1(
rtems_test_pause_and_screen_number( 2 );
Screen2();
- rtems_test_pause_and_screen_number( 3 );
-
- Screen3();
TEST_END();
diff --git a/testsuites/sptests/sptask_err03/Makefile.am b/testsuites/sptests/sptask_err03/Makefile.am
new file mode 100644
index 0000000..9b70700
--- /dev/null
+++ b/testsuites/sptests/sptask_err03/Makefile.am
@@ -0,0 +1,22 @@
+
+rtems_tests_PROGRAMS = sptask_err03
+sptask_err03_SOURCES = init.c system.h
+
+dist_rtems_tests_DATA = sptask_err03.scn
+dist_rtems_tests_DATA += sptask_err03.doc
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
+
+
+AM_CPPFLAGS += -I$(top_srcdir)/../support/include
+
+LINK_OBJS = $(sptask_err03_OBJECTS)
+LINK_LIBS = $(sptask_err03_LDLIBS)
+
+sptask_err03$(EXEEXT): $(sptask_err03_OBJECTS) $(sptask_err03_DEPENDENCIES)
+ @rm -f sptask_err03$(EXEEXT)
+ $(make-exe)
+
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp09/screen03.c b/testsuites/sptests/sptask_err03/init.c
similarity index 83%
rename from testsuites/sptests/sp09/screen03.c
rename to testsuites/sptests/sptask_err03/init.c
index 7debabc..9d0ec29 100644
--- a/testsuites/sptests/sp09/screen03.c
+++ b/testsuites/sptests/sptask_err03/init.c
@@ -1,30 +1,41 @@
-/* Screen3
- *
- * This routine generates error screen 3 for test 9.
- *
- * Input parameters: NONE
- *
- * Output parameters: NONE
- *
- * COPYRIGHT (c) 1989-1999.
+/*
+ * COPYRIGHT (c) 2014.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
* found in the file LICENSE in this distribution or at
- * http://www.rtems.org/license/LICENSE.
+ * http://www.rtems.com/license/LICENSE.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
+#define CONFIGURE_INIT
#include "system.h"
-void Screen3()
+const char rtems_test_name[] = "SP TASK ERROR 03";
+
+rtems_task Init(
+ rtems_task_argument argument
+)
{
rtems_name task_name;
rtems_status_code status;
- bool skipUnsatisfied;
+ bool skipUnsatisfied;
+
+ TEST_BEGIN();
+
+ Task_name[ 1 ] = rtems_build_name( 'T', 'A', '1', ' ' );
+ Task_name[ 2 ] = rtems_build_name( 'T', 'A', '2', ' ' );
+ Task_name[ 3 ] = rtems_build_name( 'T', 'A', '3', ' ' );
+ Task_name[ 4 ] = rtems_build_name( 'T', 'A', '4', ' ' );
+ Task_name[ 5 ] = rtems_build_name( 'T', 'A', '5', ' ' );
+ Task_name[ 6 ] = rtems_build_name( 'T', 'A', '6', ' ' );
+ Task_name[ 7 ] = rtems_build_name( 'T', 'A', '7', ' ' );
+ Task_name[ 8 ] = rtems_build_name( 'T', 'A', '8', ' ' );
+ Task_name[ 9 ] = rtems_build_name( 'T', 'A', '9', ' ' );
+ Task_name[ 10 ] = rtems_build_name( 'T', 'A', 'A', ' ' );
/* task create bad name */
task_name = 1;
@@ -94,6 +105,15 @@ void Screen3()
);
puts( "TA1 - rtems_task_create - stack size - RTEMS_UNSATISFIED" );
}
+ status = rtems_task_create(
+ Task_name[ 1 ],
+ 4,
+ RTEMS_MINIMUM_STACK_SIZE * 3,
+ RTEMS_DEFAULT_MODES,
+ RTEMS_DEFAULT_ATTRIBUTES,
+ &Task_id[ 1 ]
+ );
+ directive_failed( status, "rtems_task_create of TA1" );
status = rtems_task_create(
Task_name[ 2 ],
@@ -235,4 +255,6 @@ void Screen3()
);
#endif
puts( "TA1 - rtems_task_create - RTEMS_MP_NOT_CONFIGURED" );
+
+ TEST_END();
}
diff --git a/testsuites/sptests/sptask_err03/sptask_err03.doc b/testsuites/sptests/sptask_err03/sptask_err03.doc
new file mode 100644
index 0000000..aa6a0f1
--- /dev/null
+++ b/testsuites/sptests/sptask_err03/sptask_err03.doc
@@ -0,0 +1,25 @@
+# COPYRIGHT (c) 1989-2014.
+# On-Line Applications Research Corporation (OAR).
+#
+# The license and distribution terms for this file may be
+# found in the file LICENSE in this distribution or at
+# http://www.rtems.com/license/LICENSE.
+#
+
+
+This file describes the directives and concepts tested by this test set.
+
+test set name: sptask_err03
+
+directives:
+ t_create, cf_gstackhook, cf_gworksize, t_resume, t_suspend,
+
+concepts:
+
+ a. Verifies all error codes returned by the executive in single
+ processor configurations.
+
+ b. Verifies error conditions in the following kernel routines or macros:
+ _Ck_date_time, _Expired, _Q_submit, _Get_mnodes, _Get_node,
+ _Free_mem, _Get_mem, _Valid_block, _Set_tcb, _Set_resource,
+ _In_range, _On_boundary
diff --git a/testsuites/sptests/sptask_err03/sptask_err03.scn b/testsuites/sptests/sptask_err03/sptask_err03.scn
new file mode 100644
index 0000000..2787baf
--- /dev/null
+++ b/testsuites/sptests/sptask_err03/sptask_err03.scn
@@ -0,0 +1,18 @@
+*** TEST TASK ERROR 03 ***
+TA1 - rtems_task_create - RTEMS_INVALID_NAME
+TA1 - rtems_task_create - RTEMS_INVALID_ADDRESS
+TA1 - rtems_task_create - stack size - RTEMS_UNSATISFIED -- SKIPPED
+TA1 - rtems_task_create - TA2 created - RTEMS_SUCCESSFUL
+TA1 - rtems_task_suspend - suspend TA2 - RTEMS_SUCCESSFUL
+TA1 - rtems_task_suspend - suspend TA2 - RTEMS_ALREADY_SUSPENDED
+TA1 - rtems_task_resume - TA2 resumed - RTEMS_SUCCESSFUL
+TA1 - rtems_task_create - TA3 created - RTEMS_SUCCESSFUL
+TA1 - rtems_task_create - 5 created - RTEMS_SUCCESSFUL
+TA1 - rtems_task_create - 6 created - RTEMS_SUCCESSFUL
+TA1 - rtems_task_create - 7 created - RTEMS_SUCCESSFUL
+TA1 - rtems_task_create - 8 created - RTEMS_SUCCESSFUL
+TA1 - rtems_task_create - 9 created - RTEMS_SUCCESSFUL
+TA1 - rtems_task_create - 10 created - RTEMS_SUCCESSFUL
+TA1 - rtems_task_create - 11 - RTEMS_TOO_MANY
+TA1 - rtems_task_create - RTEMS_MP_NOT_CONFIGURED
+*** END TEST TASK ERROR 03 ***
diff --git a/testsuites/sptests/sptask_err03/system.h b/testsuites/sptests/sptask_err03/system.h
new file mode 100644
index 0000000..4c7e51a
--- /dev/null
+++ b/testsuites/sptests/sptask_err03/system.h
@@ -0,0 +1,49 @@
+/*
+ * This include file contains information that is included in every
+ * function in the test set.
+ */
+
+/*
+ * COPYRIGHT (c) 1989-2014.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may be
+ * found in the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ */
+
+#include <tmacros.h>
+
+/* functions */
+
+rtems_task Init(
+ rtems_task_argument argument
+);
+
+/* configuration information */
+
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+
+#define CONFIGURE_MAXIMUM_TASKS 10
+#define CONFIGURE_MAXIMUM_TIMERS 1
+#define CONFIGURE_MAXIMUM_SEMAPHORES 2
+#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1
+#define CONFIGURE_MAXIMUM_PERIODS 1
+#define CONFIGURE_MAXIMUM_USER_EXTENSIONS 0
+#define CONFIGURE_TICKS_PER_TIMESLICE 100
+
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
+
+#define CONFIGURE_EXTRA_TASK_STACKS (20 * RTEMS_MINIMUM_STACK_SIZE)
+
+#include <rtems/confdefs.h>
+
+/* global variables */
+
+TEST_EXTERN rtems_id Task_id[ 11 ]; /* array of task ids */
+TEST_EXTERN rtems_name Task_name[ 11 ]; /* array of task names */
+
+TEST_EXTERN rtems_id Junk_id; /* id used to return errors */
+
+/* end of include file */
More information about the vc
mailing list