2011-09-26 Petr Benes <benesp16@fel.cvut.cz>

	PR 1923/testing
	* spcbssched02/spcbssched02.scn, spcbssched02/system.h,
	spcbssched03/init.c, spcbssched03/system.h, spedfsched02/system.h,
	spedfsched03/system.h, sprbtree01/init.c: Improve coverage.

8 files changed, 25 insertions, 5 deletions

diff --git a/testsuites/sptests/ChangeLog b/testsuites/sptests/ChangeLog
index 5730089fe3..a3fc5998c3 100644
--- a/testsuites/sptests/ChangeLog
+++ b/testsuites/sptests/ChangeLog
@@ -1,3 +1,10 @@
+2011-09-26	Petr Benes <benesp16@fel.cvut.cz>
+
+	PR 1923/testing
+	* spcbssched02/spcbssched02.scn, spcbssched02/system.h,
+	spcbssched03/init.c, spcbssched03/system.h, spedfsched02/system.h,
+	spedfsched03/system.h, sprbtree01/init.c: Improve coverage.
+
 2011-09-20	Petr Benes <benesp16@fel.cvut.cz>
 
 	PR 1916/testing
diff --git a/testsuites/sptests/spcbssched02/spcbssched02.scn b/testsuites/sptests/spcbssched02/spcbssched02.scn
index 6f6017bd6e..56173eb37f 100644
--- a/testsuites/sptests/spcbssched02/spcbssched02.scn
+++ b/testsuites/sptests/spcbssched02/spcbssched02.scn
@@ -18,14 +18,23 @@ Periodic task: Remaining budget and Execution time
 Periodic task: Set parameters
 Periodic task: Approved budget
 Periodic task: Starting periodic behavior
+Periodic task: Starting periodic behavior
 P1-S ticks:1
 P1-F ticks:11
+P2-S ticks:11
+P2-F ticks:21
 P1-S ticks:31
 P1-F ticks:41
+P2-S ticks:41
+P2-F ticks:51
 P1-S ticks:61
 P1-F ticks:71
+P2-S ticks:71
+P2-F ticks:81
 P1-S ticks:91
 P1-F ticks:101
+P2-S ticks:101
+P2-F ticks:111
 P1-S ticks:121
 Periodic task: Deleting self
 Init: Checking server with a deleted task
diff --git a/testsuites/sptests/spcbssched02/system.h b/testsuites/sptests/spcbssched02/system.h
index 22a1409c0c..c1017431e1 100644
--- a/testsuites/sptests/spcbssched02/system.h
+++ b/testsuites/sptests/spcbssched02/system.h
@@ -30,7 +30,7 @@ rtems_task Task_Periodic(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
-#define CONFIGURE_MICROSECONDS_PER_TICK 100000
+#define CONFIGURE_MICROSECONDS_PER_TICK 20000
 
 #define CONFIGURE_MAXIMUM_TASKS               3
 #define CONFIGURE_MAXIMUM_PERIODS             10
diff --git a/testsuites/sptests/spcbssched03/init.c b/testsuites/sptests/spcbssched03/init.c
index 7774794aab..83601a6311 100644
--- a/testsuites/sptests/spcbssched03/init.c
+++ b/testsuites/sptests/spcbssched03/init.c
@@ -58,6 +58,8 @@ rtems_task Init(
     directive_failed( status, "rtems_task_start loop" );
   }
 
+  rtems_task_wake_after( RTEMS_YIELD_PROCESSOR );
+
   status = rtems_task_delete( RTEMS_SELF );
   directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
 }
diff --git a/testsuites/sptests/spcbssched03/system.h b/testsuites/sptests/spcbssched03/system.h
index 0fccc8136d..ed038cf550 100644
--- a/testsuites/sptests/spcbssched03/system.h
+++ b/testsuites/sptests/spcbssched03/system.h
@@ -34,13 +34,13 @@ rtems_task Tasks_Aperiodic(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
-#define CONFIGURE_MICROSECONDS_PER_TICK 100000
+#define CONFIGURE_MICROSECONDS_PER_TICK 20000
 
 #define CONFIGURE_MAXIMUM_TASKS               7
 #define CONFIGURE_MAXIMUM_PERIODS             10
 
 #define CONFIGURE_INIT_TASK_PRIORITY          100
-#define CONFIGURE_INIT_TASK_INITIAL_MODES     RTEMS_DEFAULT_MODES
+#define CONFIGURE_INIT_TASK_INITIAL_MODES     RTEMS_NO_PREEMPT
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_EXTRA_TASK_STACKS         (6 * 4 * RTEMS_MINIMUM_STACK_SIZE)
diff --git a/testsuites/sptests/spedfsched02/system.h b/testsuites/sptests/spedfsched02/system.h
index d397050dbd..3a3c8360bd 100644
--- a/testsuites/sptests/spedfsched02/system.h
+++ b/testsuites/sptests/spedfsched02/system.h
@@ -38,7 +38,7 @@ void Get_all_counters( void );
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
-#define CONFIGURE_MICROSECONDS_PER_TICK 100000
+#define CONFIGURE_MICROSECONDS_PER_TICK 20000
 
 #define CONFIGURE_MAXIMUM_TASKS               7
 #define CONFIGURE_MAXIMUM_PERIODS             10
diff --git a/testsuites/sptests/spedfsched03/system.h b/testsuites/sptests/spedfsched03/system.h
index e927909686..b386195c94 100644
--- a/testsuites/sptests/spedfsched03/system.h
+++ b/testsuites/sptests/spedfsched03/system.h
@@ -34,7 +34,7 @@ rtems_task Tasks_Aperiodic(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
-#define CONFIGURE_MICROSECONDS_PER_TICK 100000
+#define CONFIGURE_MICROSECONDS_PER_TICK 20000
 
 #define CONFIGURE_MAXIMUM_TASKS               7
 #define CONFIGURE_MAXIMUM_PERIODS             10
diff --git a/testsuites/sptests/sprbtree01/init.c b/testsuites/sptests/sprbtree01/init.c
index ceabf25cd9..03e1e685a3 100644
--- a/testsuites/sptests/sprbtree01/init.c
+++ b/testsuites/sptests/sprbtree01/init.c
@@ -465,6 +465,8 @@ rtems_task Init(
     puts ( "INIT - ERROR ON RBTREE NULL GRANDPARENT MISMATCH" );
   if ( _RBTree_Is_red( NULL ) != 0 )
     puts ( "INIT - ERROR ON RBTREE NULL IS RED MISMATCH" );
+  if ( _RBTree_Is_red( rbtree1.root ) != 0 )
+    puts ( "INIT - ERROR ON RBTREE NULL IS RED MISMATCH" );
 
   puts( "INIT - Removing 100 nodes" );