[PATCH 7/9] spevent_err03: New test split from sp09 screen 4.

Jennifer Averett jennifer.averett at oarcorp.com
Thu Mar 27 15:30:04 UTC 2014


From: Björn Larsson <BjornL at rtems.org>

---
 testsuites/sptests/Makefile.am                     |   2 +-
 testsuites/sptests/configure.ac                    |   1 +
 testsuites/sptests/sp09/Makefile.am                |   2 +-
 testsuites/sptests/sp09/screen04.c                 | 108 ---------------------
 testsuites/sptests/sp09/sp09.scn                   |  11 ---
 testsuites/sptests/sp09/task1.c                    |   3 -
 testsuites/sptests/spevent_err03/Makefile.am       |  22 +++++
 testsuites/sptests/spevent_err03/init.c            | 107 ++++++++++++++++++++
 testsuites/sptests/spevent_err03/spevent_err03.doc |  25 +++++
 testsuites/sptests/spevent_err03/spevent_err03.scn |  12 +++
 testsuites/sptests/spevent_err03/system.h          |  47 +++++++++
 11 files changed, 216 insertions(+), 124 deletions(-)
 delete mode 100644 testsuites/sptests/sp09/screen04.c
 create mode 100644 testsuites/sptests/spevent_err03/Makefile.am
 create mode 100644 testsuites/sptests/spevent_err03/init.c
 create mode 100644 testsuites/sptests/spevent_err03/spevent_err03.doc
 create mode 100644 testsuites/sptests/spevent_err03/spevent_err03.scn
 create mode 100644 testsuites/sptests/spevent_err03/system.h

diff --git a/testsuites/sptests/Makefile.am b/testsuites/sptests/Makefile.am
index a09c5d5..d5e43ae 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
+    spsem_err02 sptask_err01 spevent_err03
 SUBDIRS += spprofiling01
 SUBDIRS += spcache01
 SUBDIRS += sptls03
diff --git a/testsuites/sptests/configure.ac b/testsuites/sptests/configure.ac
index db0c0a2..545d1f8 100644
--- a/testsuites/sptests/configure.ac
+++ b/testsuites/sptests/configure.ac
@@ -143,6 +143,7 @@ spedfsched03/Makefile
 sperror01/Makefile
 sperror02/Makefile
 sperror03/Makefile
+spevent_err03/Makefile
 spfatal01/Makefile
 spfatal02/Makefile
 spfatal03/Makefile
diff --git a/testsuites/sptests/sp09/Makefile.am b/testsuites/sptests/sp09/Makefile.am
index b001205..2b4e16f 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 screen04.c \
+sp09_SOURCES = init.c delay.c isr.c screen01.c screen02.c screen03.c \
     task1.c task2.c task3.c \
     system.h
 
diff --git a/testsuites/sptests/sp09/screen04.c b/testsuites/sptests/sp09/screen04.c
deleted file mode 100644
index 99f5fc0..0000000
--- a/testsuites/sptests/sp09/screen04.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/*  Screen4
- *
- *  This routine generates error screen 4 for test 9.
- *
- *  Input parameters:  NONE
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-2009.
- *  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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "system.h"
-
-void Screen4()
-{
-  rtems_event_set   event_out;
-  rtems_time_of_day time;
-  struct timeval    tv;
-  time_t            seconds;
-  rtems_status_code status;
-
-  status = rtems_event_receive(
-    RTEMS_EVENT_16,
-    RTEMS_NO_WAIT,
-    RTEMS_NO_TIMEOUT,
-    NULL
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ADDRESS,
-    "rtems_event_receive NULL param"
-  );
-  puts( "TA1 - rtems_event_receive - NULL param - RTEMS_INVALID_ADDRESS" );
-
-  status = rtems_event_receive(
-    RTEMS_EVENT_16,
-    RTEMS_NO_WAIT,
-    RTEMS_NO_TIMEOUT,
-    &event_out
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_UNSATISFIED,
-    "rtems_event_receive unsatisfied (ALL)"
-  );
-  puts( "TA1 - rtems_event_receive - RTEMS_UNSATISFIED ( all conditions )" );
-
-  status = rtems_event_receive(
-    RTEMS_EVENT_16,
-    RTEMS_EVENT_ANY | RTEMS_NO_WAIT,
-    RTEMS_NO_TIMEOUT,
-    &event_out
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_UNSATISFIED,
-    "rtems_event_receive unsatisfied (ANY)"
-  );
-  puts( "TA1 - rtems_event_receive - RTEMS_UNSATISFIED ( any condition )" );
-
-  puts( "TA1 - rtems_event_receive - timeout in 3 seconds" );
-  status = rtems_event_receive(
-    RTEMS_EVENT_16,
-    RTEMS_DEFAULT_OPTIONS,
-    3 * rtems_clock_get_ticks_per_second(),
-    &event_out
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_TIMEOUT,
-    "rtems_event_receive"
-  );
-  puts( "TA1 - rtems_event_receive - woke up with RTEMS_TIMEOUT" );
-
-  status = rtems_event_send( 100, RTEMS_EVENT_16 );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_event_send with illegal id"
-  );
-  puts( "TA1 - rtems_event_send - RTEMS_INVALID_ID" );
-
-  puts( "TA1 - rtems_task_wake_after - sleep 1 second - RTEMS_SUCCESSFUL" );
-  status = rtems_task_wake_after( rtems_clock_get_ticks_per_second() );
-  directive_failed( status, "rtems_task_wake_after" );
-
-  build_time( &time, 2, 5, 1988, 8, 30, 45, 0 );
-  print_time( "TA1 - rtems_clock_set - ", &time, "" );
-  status = rtems_clock_set( &time );
-  directive_failed( status, "rtems_clock_set" );
-  puts( " - RTEMS_SUCCESSFUL" );
-
-  status = rtems_clock_get_tod_timeval( &tv );
-  directive_failed( status, "clock_get_tod_timeval OK" );
-
-  seconds = tv.tv_sec;
-  printf( "TA1 - current time - %s\n", ctime(&seconds) );
-
-}
diff --git a/testsuites/sptests/sp09/sp09.scn b/testsuites/sptests/sp09/sp09.scn
index db1f2a6..fc35d23 100644
--- a/testsuites/sptests/sp09/sp09.scn
+++ b/testsuites/sptests/sp09/sp09.scn
@@ -73,15 +73,4 @@ 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
-<pause - screen 4>
-TA1 - rtems_event_receive - NULL param - RTEMS_INVALID_ADDRESS
-TA1 - rtems_event_receive - RTEMS_UNSATISFIED ( all conditions )
-TA1 - rtems_event_receive - RTEMS_UNSATISFIED ( any condition )
-TA1 - rtems_event_receive - timeout in 3 seconds
-TA1 - rtems_event_receive - woke up with RTEMS_TIMEOUT
-TA1 - rtems_event_send - RTEMS_INVALID_ID
-TA1 - rtems_task_wake_after - sleep 1 second - RTEMS_SUCCESSFUL
-TA1 - rtems_clock_set - 08:30:45   02/05/1988 - RTEMS_SUCCESSFUL
-TA1 - current time - Fri Feb  5 08:30:45 1988
-
 *** END OF TEST 9 ***
diff --git a/testsuites/sptests/sp09/task1.c b/testsuites/sptests/sp09/task1.c
index 82daf64..5b09822 100644
--- a/testsuites/sptests/sp09/task1.c
+++ b/testsuites/sptests/sp09/task1.c
@@ -32,9 +32,6 @@ rtems_task Task_1(
   rtems_test_pause_and_screen_number( 3 );
 
   Screen3();
-  rtems_test_pause_and_screen_number( 4 );
-
-  Screen4();
   
   puts( "*** END OF TEST 9 ***" );
   rtems_test_exit( 0 );
diff --git a/testsuites/sptests/spevent_err03/Makefile.am b/testsuites/sptests/spevent_err03/Makefile.am
new file mode 100644
index 0000000..ce31f95
--- /dev/null
+++ b/testsuites/sptests/spevent_err03/Makefile.am
@@ -0,0 +1,22 @@
+
+rtems_tests_PROGRAMS = spevent_err03
+spevent_err03_SOURCES = init.c system.h
+
+dist_rtems_tests_DATA = spevent_err03.scn
+dist_rtems_tests_DATA += spevent_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 = $(spevent_err03_OBJECTS)
+LINK_LIBS = $(spevent_err03_LDLIBS)
+
+spevent_err03$(EXEEXT): $(spevent_err03_OBJECTS) $(spevent_err03_DEPENDENCIES)
+	@rm -f spevent_err03$(EXEEXT)
+	$(make-exe)
+
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/spevent_err03/init.c b/testsuites/sptests/spevent_err03/init.c
new file mode 100644
index 0000000..3930cd8
--- /dev/null
+++ b/testsuites/sptests/spevent_err03/init.c
@@ -0,0 +1,107 @@
+/*
+ *  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.com/license/LICENSE.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#define CONFIGURE_INIT
+#include "system.h"
+
+rtems_task Init(
+  rtems_task_argument argument
+)
+{
+  rtems_event_set   event_out;
+  rtems_time_of_day time;
+  struct timeval    tv;
+  time_t            seconds;
+  rtems_status_code status;
+  
+  puts( "\n\n*** TEST EVENT ERROR 03 ***" );
+  
+  status = rtems_event_receive(
+    RTEMS_EVENT_16,
+    RTEMS_NO_WAIT,
+    RTEMS_NO_TIMEOUT,
+    NULL
+  );
+  fatal_directive_status(
+    status,
+    RTEMS_INVALID_ADDRESS,
+    "rtems_event_receive NULL param"
+  );
+  puts( "TA1 - rtems_event_receive - NULL param - RTEMS_INVALID_ADDRESS" );
+
+  status = rtems_event_receive(
+    RTEMS_EVENT_16,
+    RTEMS_NO_WAIT,
+    RTEMS_NO_TIMEOUT,
+    &event_out
+  );
+  fatal_directive_status(
+    status,
+    RTEMS_UNSATISFIED,
+    "rtems_event_receive unsatisfied (ALL)"
+  );
+  puts( "TA1 - rtems_event_receive - RTEMS_UNSATISFIED ( all conditions )" );
+
+  status = rtems_event_receive(
+    RTEMS_EVENT_16,
+    RTEMS_EVENT_ANY | RTEMS_NO_WAIT,
+    RTEMS_NO_TIMEOUT,
+    &event_out
+  );
+  fatal_directive_status(
+    status,
+    RTEMS_UNSATISFIED,
+    "rtems_event_receive unsatisfied (ANY)"
+  );
+  puts( "TA1 - rtems_event_receive - RTEMS_UNSATISFIED ( any condition )" );
+
+  puts( "TA1 - rtems_event_receive - timeout in 3 seconds" );
+  status = rtems_event_receive(
+    RTEMS_EVENT_16,
+    RTEMS_DEFAULT_OPTIONS,
+    3 * rtems_clock_get_ticks_per_second(),
+    &event_out
+  );
+  fatal_directive_status(
+    status,
+    RTEMS_TIMEOUT,
+    "rtems_event_receive"
+  );
+  puts( "TA1 - rtems_event_receive - woke up with RTEMS_TIMEOUT" );
+
+  status = rtems_event_send( 100, RTEMS_EVENT_16 );
+  fatal_directive_status(
+    status,
+    RTEMS_INVALID_ID,
+    "rtems_event_send with illegal id"
+  );
+  puts( "TA1 - rtems_event_send - RTEMS_INVALID_ID" );
+
+  puts( "TA1 - rtems_task_wake_after - sleep 1 second - RTEMS_SUCCESSFUL" );
+  status = rtems_task_wake_after( rtems_clock_get_ticks_per_second() );
+  directive_failed( status, "rtems_task_wake_after" );
+
+  build_time( &time, 2, 5, 1988, 8, 30, 45, 0 );
+  print_time( "TA1 - rtems_clock_set - ", &time, "" );
+  status = rtems_clock_set( &time );
+  directive_failed( status, "rtems_clock_set" );
+  puts( " - RTEMS_SUCCESSFUL" );
+
+  status = rtems_clock_get_tod_timeval( &tv );
+  directive_failed( status, "clock_get_tod_timeval OK" );
+
+  seconds = tv.tv_sec;
+  printf( "TA1 - current time - %s\n", ctime(&seconds) );
+
+  puts( "*** END TEST EVENT ERROR 03 ***" );
+}
diff --git a/testsuites/sptests/spevent_err03/spevent_err03.doc b/testsuites/sptests/spevent_err03/spevent_err03.doc
new file mode 100644
index 0000000..9418933
--- /dev/null
+++ b/testsuites/sptests/spevent_err03/spevent_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:  spevent_err03
+
+directives:
+  ev_receive, ev_send 
+
+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/spevent_err03/spevent_err03.scn b/testsuites/sptests/spevent_err03/spevent_err03.scn
new file mode 100644
index 0000000..4d0a9e5
--- /dev/null
+++ b/testsuites/sptests/spevent_err03/spevent_err03.scn
@@ -0,0 +1,12 @@
+*** TEST EVENT ERROR 03 ***
+TA1 - rtems_event_receive - NULL param - RTEMS_INVALID_ADDRESS
+TA1 - rtems_event_receive - RTEMS_UNSATISFIED ( all conditions )
+TA1 - rtems_event_receive - RTEMS_UNSATISFIED ( any condition )
+TA1 - rtems_event_receive - timeout in 3 seconds
+TA1 - rtems_event_receive - woke up with RTEMS_TIMEOUT
+TA1 - rtems_event_send - RTEMS_INVALID_ID
+TA1 - rtems_task_wake_after - sleep 1 second - RTEMS_SUCCESSFUL
+TA1 - rtems_clock_set - 08:30:45   02/05/1988 - RTEMS_SUCCESSFUL
+TA1 - current time - Fri Feb  5 08:30:45 1988
+
+*** END TEST EVENT ERROR 03 ***
diff --git a/testsuites/sptests/spevent_err03/system.h b/testsuites/sptests/spevent_err03/system.h
new file mode 100644
index 0000000..9cb2b39
--- /dev/null
+++ b/testsuites/sptests/spevent_err03/system.h
@@ -0,0 +1,47 @@
+/*
+ *  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 */
+
+/* end of include file */
-- 
1.8.1.4




More information about the devel mailing list