2009-12-10 Joel Sherrill <joel.sherrill@oarcorp.com>

	* sp14/sp14.doc, sp14/sp14.scn: doc file have scn contents. Fix and
	update.

2 files changed, 34 insertions, 40 deletions

diff --git a/testsuites/sptests/sp14/sp14.doc b/testsuites/sptests/sp14/sp14.doc
index 4e9274fdb7..4254a87e4b 100644
--- a/testsuites/sptests/sp14/sp14.doc
+++ b/testsuites/sptests/sp14/sp14.doc
@@ -1,34 +1,27 @@
-Could not open '/dev/kqemu' - QEMU acceleration layer not activated: No such file or directory
+#
+#  $Id$
+#
+#  COPYRIGHT (c) 1989-1999.
+#  On-Line Applications Research Corporation (OAR).
+#
+#  The license and distribution terms for this file may be
+#  found in the file LICENSE in this distribution or at
+#  http://www.rtems.com/license/LICENSE.
+#
 
 
-*** TEST 14 ***
-TA1 - rtems_signal_catch - RTEMS_INTERRUPT_LEVEL( 3 )
-TA1 - rtems_signal_send - RTEMS_SIGNAL_16 to self
-ASR - ENTRY - signal => 00010000
-ASR - EXIT  - signal => 00010000
-TA1 - rtems_signal_send - RTEMS_SIGNAL_0 to self
-ASR - ENTRY - signal => 00000001
-ASR - rtems_task_wake_after - yield processor
-ASR - EXIT  - signal => 00000001
-TA1 - rtems_signal_catch - RTEMS_NO_ASR
-<pause>
-TA1 - rtems_signal_send - RTEMS_SIGNAL_1 to self
-ASR - ENTRY - signal => 00000002
-ASR - rtems_task_wake_after - yield processor
-ASR - EXIT  - signal => 00000002
-TA1 - rtems_task_mode - disable ASRs
-TA1 - sending signal to RTEMS_SELF from timer
-TA1 - waiting for signal to arrive
-TA1 - timer routine got the correct arguments
-TA1 - rtems_task_mode - enable ASRs
-ASR - ENTRY - signal => 00000008
-ASR - EXIT  - signal => 00000008
-TA2 - rtems_signal_send - RTEMS_SIGNAL_17 to TA1
-TA2 - rtems_task_wake_after - yield processor
-TA2 - rtems_signal_send - RTEMS_SIGNAL_18 and RTEMS_SIGNAL_19 to TA1
-TA2 - rtems_task_wake_after - yield processor
-ASR - ENTRY - signal => 000e0000
-ASR - EXIT  - signal => 000e0000
-TA1 - rtems_signal_catch - asraddr of NULL
-TA1 - rtems_task_delete - delete self
-*** END OF TEST 14 ***
+This file describes the directives and concepts tested by this test set.
+
+test set name:  test14
+
+directives:
+  rtems_task_create
+  rtems_task_start
+  rtems_task_delete
+  rtems_signal_catch
+  rtems_signal_send
+  rtems_task_wake_after
+
+concepts:
+
+  a.  This test checks out the signal manager.
diff --git a/testsuites/sptests/sp14/sp14.scn b/testsuites/sptests/sp14/sp14.scn
index 31e6d067d2..4e9274fdb7 100644
--- a/testsuites/sptests/sp14/sp14.scn
+++ b/testsuites/sptests/sp14/sp14.scn
@@ -1,3 +1,6 @@
+Could not open '/dev/kqemu' - QEMU acceleration layer not activated: No such file or directory
+
+
 *** TEST 14 ***
 TA1 - rtems_signal_catch - RTEMS_INTERRUPT_LEVEL( 3 )
 TA1 - rtems_signal_send - RTEMS_SIGNAL_16 to self
@@ -6,21 +9,13 @@ ASR - EXIT  - signal => 00010000
 TA1 - rtems_signal_send - RTEMS_SIGNAL_0 to self
 ASR - ENTRY - signal => 00000001
 ASR - rtems_task_wake_after - yield processor
-TA2 - rtems_signal_send - RTEMS_SIGNAL_17 to TA1
-TA2 - rtems_task_wake_after - yield processor
-ASR - ENTRY - signal => 00020000
-ASR - EXIT  - signal => 00020000
 ASR - EXIT  - signal => 00000001
 TA1 - rtems_signal_catch - RTEMS_NO_ASR
 <pause>
 TA1 - rtems_signal_send - RTEMS_SIGNAL_1 to self
 ASR - ENTRY - signal => 00000002
 ASR - rtems_task_wake_after - yield processor
-TA2 - rtems_signal_send - RTEMS_SIGNAL_18 and RTEMS_SIGNAL_19 to TA1
-TA2 - rtems_task_wake_after - yield processor
 ASR - EXIT  - signal => 00000002
-ASR - ENTRY - signal => 000c0000
-ASR - EXIT  - signal => 000c0000
 TA1 - rtems_task_mode - disable ASRs
 TA1 - sending signal to RTEMS_SELF from timer
 TA1 - waiting for signal to arrive
@@ -28,6 +23,12 @@ TA1 - timer routine got the correct arguments
 TA1 - rtems_task_mode - enable ASRs
 ASR - ENTRY - signal => 00000008
 ASR - EXIT  - signal => 00000008
+TA2 - rtems_signal_send - RTEMS_SIGNAL_17 to TA1
+TA2 - rtems_task_wake_after - yield processor
+TA2 - rtems_signal_send - RTEMS_SIGNAL_18 and RTEMS_SIGNAL_19 to TA1
+TA2 - rtems_task_wake_after - yield processor
+ASR - ENTRY - signal => 000e0000
+ASR - EXIT  - signal => 000e0000
 TA1 - rtems_signal_catch - asraddr of NULL
 TA1 - rtems_task_delete - delete self
 *** END OF TEST 14 ***