summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2007-05-11 19:44:17 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2007-05-11 19:44:17 +0000
commit8247be669e021d7101aea3338f1fb7c5dc3db840 (patch)
treed488922ff0301f656bf650c74c13d9dd7872c67e
parent2007-05-11 Joel Sherrill <joel.sherrill@OARcorp.com> (diff)
downloadrtems-8247be669e021d7101aea3338f1fb7c5dc3db840.tar.bz2
2007-05-11 Joel Sherrill <joel.sherrill@OARcorp.com>
* itronmbf01/init.c, itronmbf01/itronmbf01.scn, itrontask02/init.c, itrontask03/itrontask03.scn, itrontask03/task1.c, itrontask04/itrontask04.scn, itrontask04/task3.c: Add optional managers to Makefiles. Clean up test cases so last output line follows END OF pattern. Make sure test case all run. All tests appeared ok on sis.
-rw-r--r--testsuites/itrontests/ChangeLog9
-rw-r--r--testsuites/itrontests/itronmbf01/init.c2
-rw-r--r--testsuites/itrontests/itronmbf01/itronmbf01.scn2
-rw-r--r--testsuites/itrontests/itrontask02/init.c2
-rw-r--r--testsuites/itrontests/itrontask03/itrontask03.scn2
-rw-r--r--testsuites/itrontests/itrontask03/task1.c2
-rw-r--r--testsuites/itrontests/itrontask04/itrontask04.scn2
-rw-r--r--testsuites/itrontests/itrontask04/task3.c2
8 files changed, 16 insertions, 7 deletions
diff --git a/testsuites/itrontests/ChangeLog b/testsuites/itrontests/ChangeLog
index aebe535066..d3bd08d96e 100644
--- a/testsuites/itrontests/ChangeLog
+++ b/testsuites/itrontests/ChangeLog
@@ -1,3 +1,12 @@
+2007-05-11 Joel Sherrill <joel.sherrill@OARcorp.com>
+
+ * itronmbf01/init.c, itronmbf01/itronmbf01.scn, itrontask02/init.c,
+ itrontask03/itrontask03.scn, itrontask03/task1.c,
+ itrontask04/itrontask04.scn, itrontask04/task3.c: Add optional
+ managers to Makefiles. Clean up test cases so last output line
+ follows END OF pattern. Make sure test case all run. All tests
+ appeared ok on sis.
+
2007-02-06 Joel Sherrill <joel@OARcorp.com>
* itronmbf01/init.c: Address size_t/uint32_t typing issues in message
diff --git a/testsuites/itrontests/itronmbf01/init.c b/testsuites/itrontests/itronmbf01/init.c
index d9adcc4e21..b4cfa889e5 100644
--- a/testsuites/itrontests/itronmbf01/init.c
+++ b/testsuites/itrontests/itronmbf01/init.c
@@ -61,7 +61,7 @@ void ITRON_Init( void )
TestPrcv();
TestTrcv();
- printf("\n\n*** ITRONMBF01 --- ITRON MESSAGE BUFFER TEST ***\n");
+ printf("\n\n*** END OF ITRONMBF01 --- ITRON MESSAGE BUFFER TEST ***\n");
rtems_test_exit(0);
}
diff --git a/testsuites/itrontests/itronmbf01/itronmbf01.scn b/testsuites/itrontests/itronmbf01/itronmbf01.scn
index 011c133caf..d7164f308c 100644
--- a/testsuites/itrontests/itronmbf01/itronmbf01.scn
+++ b/testsuites/itrontests/itronmbf01/itronmbf01.scn
@@ -68,4 +68,4 @@ Init - trcv_mbf - tmout <-2 returns E_PAR
Init - trcv_mbf -- E_TMOUT
Init - starting to block at Fri Jan 1 00:00:00 1988
Init - time out at Fri Jan 1 00:00:01 1988
-*** ITRONMBF01 --- ITRON MESSAGE BUFFER TEST ***
+*** END OF ITRONMBF01 --- ITRON MESSAGE BUFFER TEST ***
diff --git a/testsuites/itrontests/itrontask02/init.c b/testsuites/itrontests/itrontask02/init.c
index 79f6fb7094..ba084cfd1f 100644
--- a/testsuites/itrontests/itrontask02/init.c
+++ b/testsuites/itrontests/itrontask02/init.c
@@ -489,7 +489,7 @@ void ITRON_Init( void )
puts( "Init - rsm_tsk - task is NON_DORMANT not suspended - E_OK" );
status = rsm_tsk( NON_DORMANT_TASK_ID );
- fatal_directive_status( status, E_OK, "rsm_tsk NON_DORMANT");
+ fatal_directive_status( status, E_OBJ, "rsm_tsk NON_DORMANT");
puts( "Init - rsm_tsk - task does not exist - E_NOEXS" );
status = rsm_tsk( 5 );
diff --git a/testsuites/itrontests/itrontask03/itrontask03.scn b/testsuites/itrontests/itrontask03/itrontask03.scn
index f933bf7161..50b468e44a 100644
--- a/testsuites/itrontests/itrontask03/itrontask03.scn
+++ b/testsuites/itrontests/itrontask03/itrontask03.scn
@@ -18,4 +18,4 @@ TA1 - sus_tsk - suspend TA2
TA1 - - delete TA2
TA1 - rtems_task_wake_after - sleep for 5 seconds
TA3 - exd_tsk - exit and delete self
-*** ITRON TASK TEST 3 ***
+*** END OF ITRON TASK TEST 3 ***
diff --git a/testsuites/itrontests/itrontask03/task1.c b/testsuites/itrontests/itrontask03/task1.c
index c771578972..ac7c929762 100644
--- a/testsuites/itrontests/itrontask03/task1.c
+++ b/testsuites/itrontests/itrontask03/task1.c
@@ -52,6 +52,6 @@ void Task_1()
status = rtems_task_wake_after( 5*TICKS_PER_SECOND );
directive_failed( status, "rtems_task_wake_after" );
- puts( "*** ITRON TASK TEST 3 ***" );
+ puts( "*** END OF ITRON TASK TEST 3 ***" );
rtems_test_exit( 0 );
}
diff --git a/testsuites/itrontests/itrontask04/itrontask04.scn b/testsuites/itrontests/itrontask04/itrontask04.scn
index c0680a5f6e..539a581c6a 100644
--- a/testsuites/itrontests/itrontask04/itrontask04.scn
+++ b/testsuites/itrontests/itrontask04/itrontask04.scn
@@ -31,4 +31,4 @@ TA3 - rot_rdq priority 2 queue
TA3 - rtems_task_wake_after - sleep 1 second
TA2 - rtems_task_suspend RTEMS_SELF
TA2 - rtems_task_suspend RTEMS_SELF
-*** ITRON TASK TEST 4 ***
+*** END OF ITRON TASK TEST 4 ***
diff --git a/testsuites/itrontests/itrontask04/task3.c b/testsuites/itrontests/itrontask04/task3.c
index af47694a28..aba0c25914 100644
--- a/testsuites/itrontests/itrontask04/task3.c
+++ b/testsuites/itrontests/itrontask04/task3.c
@@ -47,6 +47,6 @@ void Task_3()
directive_failed( status, "rtems_task_wake_after in TA3" );
}
- puts( "*** ITRON TASK TEST 4 ***" );
+ puts( "*** END OF ITRON TASK TEST 4 ***" );
rtems_test_exit( 0 );
}