Modifications from Tony Bennett accepted to tune this test a little.

8 files changed, 44 insertions, 22 deletions

diff --git a/c/src/tests/mptests/mp14/evtask1.c b/c/src/tests/mptests/mp14/evtask1.c
index 6f8175e4d4..f14bb9d2fd 100644
--- a/c/src/tests/mptests/mp14/evtask1.c
+++ b/c/src/tests/mptests/mp14/evtask1.c
@@ -54,7 +54,8 @@ rtems_task Test_task(
 
     if ( status == RTEMS_SUCCESSFUL )
       break;
-    puts( "rtems_task_ident" );
+    puts( "rtems_task_ident FAILED!!" );
+    rtems_task_wake_after(2);
   }
 
   if ( Multiprocessing_configuration.node == 1 ) {
diff --git a/c/src/tests/mptests/mp14/msgtask1.c b/c/src/tests/mptests/mp14/msgtask1.c
index 78430a80ef..a8a3ddbd60 100644
--- a/c/src/tests/mptests/mp14/msgtask1.c
+++ b/c/src/tests/mptests/mp14/msgtask1.c
@@ -49,6 +49,7 @@ rtems_task Message_queue_task(
     if ( status == RTEMS_SUCCESSFUL )
       break;
     puts( "rtems_message_queue_ident FAILED!!" );
+    rtems_task_wake_after(2);
   }
 
   if ( Multiprocessing_configuration.node == 1 ) {
diff --git a/c/src/tests/mptests/mp14/pttask1.c b/c/src/tests/mptests/mp14/pttask1.c
index f6af1b0969..6aa1c714fc 100644
--- a/c/src/tests/mptests/mp14/pttask1.c
+++ b/c/src/tests/mptests/mp14/pttask1.c
@@ -29,6 +29,7 @@ rtems_task Partition_task(
 {
   rtems_unsigned32   count;
   rtems_status_code  status;
+  rtems_unsigned32   yield_count;
   void              *buffer;
 
   puts( "Getting ID of partition" );
@@ -43,8 +44,11 @@ rtems_task Partition_task(
       break;
 
     puts( "rtems_partition_ident FAILED!!" );
+    rtems_task_wake_after(2);
   }
 
+  yield_count = 100;
+
   while ( Stop_Test == FALSE ) {
     for ( count=PARTITION_DOT_COUNT ; Stop_Test == FALSE && count ; count-- ) {
       status = rtems_partition_get_buffer( Partition_id[ 1 ], &buffer );
@@ -53,10 +57,12 @@ rtems_task Partition_task(
       status = rtems_partition_return_buffer( Partition_id[ 1 ], buffer );
       directive_failed( status, "rtems_partition_return_buffer" );
 
-      if ( Multiprocessing_configuration.node == 1 ) {
-        status = rtems_task_wake_after( RTEMS_YIELD_PROCESSOR );
-        directive_failed( status, "rtems_task_wake_after" );
-      }
+      if (Stop_Test == FALSE)
+        if ( Multiprocessing_configuration.node == 1 && --yield_count == 0 ) {
+          status = rtems_task_wake_after( 1 );
+          directive_failed( status, "rtems_task_wake_after" );
+          yield_count = 100;
+        }
     }
     put_dot( 'p' );
   }
diff --git a/c/src/tests/mptests/mp14/smtask1.c b/c/src/tests/mptests/mp14/smtask1.c
index c4d71c0101..5bb14ee0da 100644
--- a/c/src/tests/mptests/mp14/smtask1.c
+++ b/c/src/tests/mptests/mp14/smtask1.c
@@ -40,10 +40,12 @@ rtems_task Semaphore_task(
     if ( status == RTEMS_SUCCESSFUL )
       break;
     puts( "rtems_semaphore_ident FAILED!!" );
+    rtems_task_wake_after(2);
   }
 
+  yield_count = 100;
+
   while ( Stop_Test == FALSE ) {
-    yield_count = 100;
 
     for ( count=SEMAPHORE_DOT_COUNT ; Stop_Test == FALSE && count ; count-- ) {
       status = rtems_semaphore_obtain(
@@ -56,12 +58,13 @@ rtems_task Semaphore_task(
       status = rtems_semaphore_release( Semaphore_id[ 1 ] );
       directive_failed( status, "rtems_semaphore_release" );
 
-      if ( Multiprocessing_configuration.node == 1 && --yield_count == 0 ) {
-        status = rtems_task_wake_after( RTEMS_YIELD_PROCESSOR );
-        directive_failed( status, "rtems_task_wake_after" );
+      if ( Stop_Test == FALSE )
+        if ( Multiprocessing_configuration.node == 1 && --yield_count == 0 ) {
+          status = rtems_task_wake_after( RTEMS_YIELD_PROCESSOR );
+          directive_failed( status, "rtems_task_wake_after" );
 
-        yield_count = 100;
-      }
+          yield_count = 100;
+        }
     }
     put_dot( 's' );
   }
diff --git a/testsuites/mptests/mp14/evtask1.c b/testsuites/mptests/mp14/evtask1.c
index 6f8175e4d4..f14bb9d2fd 100644
--- a/testsuites/mptests/mp14/evtask1.c
+++ b/testsuites/mptests/mp14/evtask1.c
@@ -54,7 +54,8 @@ rtems_task Test_task(
 
     if ( status == RTEMS_SUCCESSFUL )
       break;
-    puts( "rtems_task_ident" );
+    puts( "rtems_task_ident FAILED!!" );
+    rtems_task_wake_after(2);
   }
 
   if ( Multiprocessing_configuration.node == 1 ) {
diff --git a/testsuites/mptests/mp14/msgtask1.c b/testsuites/mptests/mp14/msgtask1.c
index 78430a80ef..a8a3ddbd60 100644
--- a/testsuites/mptests/mp14/msgtask1.c
+++ b/testsuites/mptests/mp14/msgtask1.c
@@ -49,6 +49,7 @@ rtems_task Message_queue_task(
     if ( status == RTEMS_SUCCESSFUL )
       break;
     puts( "rtems_message_queue_ident FAILED!!" );
+    rtems_task_wake_after(2);
   }
 
   if ( Multiprocessing_configuration.node == 1 ) {
diff --git a/testsuites/mptests/mp14/pttask1.c b/testsuites/mptests/mp14/pttask1.c
index f6af1b0969..6aa1c714fc 100644
--- a/testsuites/mptests/mp14/pttask1.c
+++ b/testsuites/mptests/mp14/pttask1.c
@@ -29,6 +29,7 @@ rtems_task Partition_task(
 {
   rtems_unsigned32   count;
   rtems_status_code  status;
+  rtems_unsigned32   yield_count;
   void              *buffer;
 
   puts( "Getting ID of partition" );
@@ -43,8 +44,11 @@ rtems_task Partition_task(
       break;
 
     puts( "rtems_partition_ident FAILED!!" );
+    rtems_task_wake_after(2);
   }
 
+  yield_count = 100;
+
   while ( Stop_Test == FALSE ) {
     for ( count=PARTITION_DOT_COUNT ; Stop_Test == FALSE && count ; count-- ) {
       status = rtems_partition_get_buffer( Partition_id[ 1 ], &buffer );
@@ -53,10 +57,12 @@ rtems_task Partition_task(
       status = rtems_partition_return_buffer( Partition_id[ 1 ], buffer );
       directive_failed( status, "rtems_partition_return_buffer" );
 
-      if ( Multiprocessing_configuration.node == 1 ) {
-        status = rtems_task_wake_after( RTEMS_YIELD_PROCESSOR );
-        directive_failed( status, "rtems_task_wake_after" );
-      }
+      if (Stop_Test == FALSE)
+        if ( Multiprocessing_configuration.node == 1 && --yield_count == 0 ) {
+          status = rtems_task_wake_after( 1 );
+          directive_failed( status, "rtems_task_wake_after" );
+          yield_count = 100;
+        }
     }
     put_dot( 'p' );
   }
diff --git a/testsuites/mptests/mp14/smtask1.c b/testsuites/mptests/mp14/smtask1.c
index c4d71c0101..5bb14ee0da 100644
--- a/testsuites/mptests/mp14/smtask1.c
+++ b/testsuites/mptests/mp14/smtask1.c
@@ -40,10 +40,12 @@ rtems_task Semaphore_task(
     if ( status == RTEMS_SUCCESSFUL )
       break;
     puts( "rtems_semaphore_ident FAILED!!" );
+    rtems_task_wake_after(2);
   }
 
+  yield_count = 100;
+
   while ( Stop_Test == FALSE ) {
-    yield_count = 100;
 
     for ( count=SEMAPHORE_DOT_COUNT ; Stop_Test == FALSE && count ; count-- ) {
       status = rtems_semaphore_obtain(
@@ -56,12 +58,13 @@ rtems_task Semaphore_task(
       status = rtems_semaphore_release( Semaphore_id[ 1 ] );
       directive_failed( status, "rtems_semaphore_release" );
 
-      if ( Multiprocessing_configuration.node == 1 && --yield_count == 0 ) {
-        status = rtems_task_wake_after( RTEMS_YIELD_PROCESSOR );
-        directive_failed( status, "rtems_task_wake_after" );
+      if ( Stop_Test == FALSE )
+        if ( Multiprocessing_configuration.node == 1 && --yield_count == 0 ) {
+          status = rtems_task_wake_after( RTEMS_YIELD_PROCESSOR );
+          directive_failed( status, "rtems_task_wake_after" );
 
-        yield_count = 100;
-      }
+          yield_count = 100;
+        }
     }
     put_dot( 's' );
   }