[PATCH] testsuites: Remove rtems_test_pause*()
Sebastian Huber
sebastian.huber at embedded-brains.de
Mon Dec 2 07:19:57 UTC 2019
The rtems_test_pause() and rtems_test_pause_and_screen_number() macros
had different implementations depending on the RTEMS_TEST_NO_PAUSE
define. This define was defined to 1 by default. The user was able to
change this via the undocumented --disable-test-no-pause configure
command line option.
Pausing tests and waiting for user input contradicts the goal of having
automated test runs. Remove this feature.
---
testsuites/aclocal/rtems-test-no-pause.m4 | 18 ------------------
testsuites/libtests/configure.ac | 1 -
testsuites/rhealstone/configure.ac | 2 --
testsuites/sptests/configure.ac | 1 -
testsuites/sptests/sp07/sp07.scn | 1 -
testsuites/sptests/sp07/task1.c | 2 --
testsuites/sptests/sp11/sp11.scn | 4 ----
testsuites/sptests/sp11/task1.c | 8 --------
testsuites/sptests/sp12/init.c | 4 ----
testsuites/sptests/sp12/sp12.scn | 4 ----
testsuites/sptests/sp12/task1.c | 4 ----
testsuites/sptests/sp13/sp13.scn | 5 -----
testsuites/sptests/sp13/task1.c | 10 ----------
testsuites/sptests/sp14/sp14.scn | 1 -
testsuites/sptests/sp14/task1.c | 2 --
testsuites/sptests/sp16/sp16.scn | 2 --
testsuites/sptests/sp16/task1.c | 4 ----
testsuites/sptests/sp22/sp22.scn | 1 -
testsuites/sptests/sp22/task1.c | 2 --
testsuites/sptests/sp25/sp25.scn | 1 -
testsuites/sptests/sp25/task1.c | 2 --
testsuites/sptests/sp31/sp31.scn | 1 -
testsuites/sptests/sp31/task1.c | 2 --
testsuites/sptests/sp42/init.c | 2 --
testsuites/sptests/sp42/sp42.scn | 1 -
testsuites/sptests/sp43/init.c | 10 +++-------
testsuites/sptests/sp43/sp43.scn | 3 ---
testsuites/support/include/tmacros.h | 28 ----------------------------
testsuites/tmtests/configure.ac | 1 -
testsuites/tmtests/tmck/task1.c | 1 -
testsuites/tmtests/tmoverhd/testtask.c | 6 ------
31 files changed, 3 insertions(+), 131 deletions(-)
delete mode 100644 testsuites/aclocal/rtems-test-no-pause.m4
diff --git a/testsuites/aclocal/rtems-test-no-pause.m4 b/testsuites/aclocal/rtems-test-no-pause.m4
deleted file mode 100644
index 338f0cddf1..0000000000
--- a/testsuites/aclocal/rtems-test-no-pause.m4
+++ /dev/null
@@ -1,18 +0,0 @@
-AC_DEFUN([RTEMS_ENABLE_RTEMS_TEST_NO_PAUSE],
-[AC_ARG_ENABLE(test-no-pause,
-AS_HELP_STRING(--disable-test-no-pause,disable RTEMS_TEST_NO_PAUSE),
-[case "${enableval}" in
- yes) RTEMS_TEST_NO_PAUSE=yes ;;
- no) RTEMS_TEST_NO_PAUSE=no ;;
- *) AC_MSG_ERROR([bad value ${enableval} for RTEMS_TEST_NO_PAUSE]) ;;
-esac],[RTEMS_TEST_NO_PAUSE=yes])
-])
-
-AC_DEFUN([RTEMS_CHECK_RTEMS_TEST_NO_PAUSE],
-[AC_REQUIRE([RTEMS_ENABLE_RTEMS_TEST_NO_PAUSE])
-if test x"${RTEMS_TEST_NO_PAUSE}" = x"yes";
-then
- AC_DEFINE_UNQUOTED(RTEMS_TEST_NO_PAUSE,1,[if RTEMS_TEST_NO_PAUSE is enabled])
-fi
-])
-
diff --git a/testsuites/libtests/configure.ac b/testsuites/libtests/configure.ac
index f3a1cd586d..b6177e08e3 100644
--- a/testsuites/libtests/configure.ac
+++ b/testsuites/libtests/configure.ac
@@ -16,7 +16,6 @@ AM_MAINTAINER_MODE
RTEMS_ENABLE_CXX
RTEMS_ENV_RTEMSBSP
-RTEMS_CHECK_RTEMS_TEST_NO_PAUSE
RTEMS_PROJECT_ROOT
diff --git a/testsuites/rhealstone/configure.ac b/testsuites/rhealstone/configure.ac
index 0a89fe5c18..0457f35ab8 100644
--- a/testsuites/rhealstone/configure.ac
+++ b/testsuites/rhealstone/configure.ac
@@ -15,8 +15,6 @@ AM_MAINTAINER_MODE
RTEMS_ENV_RTEMSBSP
-RTEMS_CHECK_RTEMS_TEST_NO_PAUSE
-
RTEMS_PROJECT_ROOT
RTEMS_PROG_CC_FOR_TARGET
diff --git a/testsuites/sptests/configure.ac b/testsuites/sptests/configure.ac
index 322219696d..467d2417f5 100644
--- a/testsuites/sptests/configure.ac
+++ b/testsuites/sptests/configure.ac
@@ -15,7 +15,6 @@ AM_MAINTAINER_MODE
RTEMS_ENABLE_CXX
RTEMS_ENV_RTEMSBSP
-RTEMS_CHECK_RTEMS_TEST_NO_PAUSE
RTEMS_PROJECT_ROOT
diff --git a/testsuites/sptests/sp07/sp07.scn b/testsuites/sptests/sp07/sp07.scn
index 414b46754e..c3964c575a 100644
--- a/testsuites/sptests/sp07/sp07.scn
+++ b/testsuites/sptests/sp07/sp07.scn
@@ -10,7 +10,6 @@ rtems_extension_ident -- OK
rtems_extension_ident - bad name -- RTEMS_INVALID_NAME
rtems_extension_ident - bad name -- RTEMS_INVALID_ADDRESS
rtems_extension_create - harmless -- OK
-<pause>
TA1 - rtems_task_set_priority - get initial priority of self: 04
TA1 - rtems_task_set_priority - set TA2's priority: 03
TA2 - rtems_task_set_priority - set TA1's priority: 02
diff --git a/testsuites/sptests/sp07/task1.c b/testsuites/sptests/sp07/task1.c
index 6c7f38eab4..c1896b9c70 100644
--- a/testsuites/sptests/sp07/task1.c
+++ b/testsuites/sptests/sp07/task1.c
@@ -21,8 +21,6 @@ rtems_task Task_1(
rtems_task_priority the_priority;
rtems_task_priority previous_priority;
- rtems_test_pause();
-
status = rtems_task_set_priority(
RTEMS_SELF,
RTEMS_CURRENT_PRIORITY,
diff --git a/testsuites/sptests/sp11/sp11.scn b/testsuites/sptests/sp11/sp11.scn
index 1f54724b87..809e1f5269 100644
--- a/testsuites/sptests/sp11/sp11.scn
+++ b/testsuites/sptests/sp11/sp11.scn
@@ -16,7 +16,6 @@ TA2 - rtems_event_receive - waiting forever on RTEMS_EVENT_10
TA1 - RTEMS_EVENT_14 received - eventout => 00004000
TA1 - rtems_event_send - send RTEMS_EVENT_19 to TA2
TA1 - rtems_clock_get_tod - 08:15:00 02/12/1988
-<pause>
TA1 - rtems_event_send - send RTEMS_EVENT_18 to self after 5 seconds
TA1 - rtems_event_receive - waiting forever on RTEMS_EVENT_18
TA2 - RTEMS_EVENT_10 received - eventout => 00000400
@@ -34,7 +33,6 @@ TA1 - RTEMS_EVENT_3 received - eventout => 00000008
TA1 - rtems_event_send - send RTEMS_EVENT_4 to self
TA1 - rtems_event_receive - RTEMS_EVENT_4 or RTEMS_EVENT_5 - forever and ANY
TA1 - RTEMS_EVENT_4 received - eventout => 00000010
-<pause>
TA1 - rtems_event_send - send RTEMS_EVENT_18 to self after 5 seconds
TA1 - rtems_timer_cancel - cancelling timer for event RTEMS_EVENT_18
TA1 - rtems_event_send - send RTEMS_EVENT_8 to self after 60 seconds
@@ -47,7 +45,6 @@ TA1 - RTEMS_EVENT_1 received - eventout => 00000002 - at 08:15:01 02/12/1988
TA1 - RTEMS_EVENT_1 received - eventout => 00000002 - at 08:15:02 02/12/1988
TA1 - RTEMS_EVENT_1 received - eventout => 00000002 - at 08:15:03 02/12/1988
TA1 - rtems_timer_cancel - cancelling timer for event RTEMS_EVENT_1
-<pause>
TA1 - rtems_event_send - sending RTEMS_EVENT_11 to self in 1 day
TA1 - rtems_event_send - sending RTEMS_EVENT_11 to self in 1 day
TA1 - rtems_event_send - sending RTEMS_EVENT_11 to self in 2 days
@@ -57,7 +54,6 @@ TA1 - rtems_event_send - resending RTEMS_EVENT_11 to self in 2 days
TA1 - rtems_clock_set - 08:15:03 02/15/1988
TA1 - rtems_event_receive - waiting forever on RTEMS_EVENT_11
TA1 - RTEMS_EVENT_11 received - eventout => 00000800
-<pause>
TA1 - rtems_event_send/rtems_event_receive combination
TA1 - rtems_clock_set - 08:15:00 02/12/1988
TA1 - rtems_event_receive all outstanding events
diff --git a/testsuites/sptests/sp11/task1.c b/testsuites/sptests/sp11/task1.c
index 60e569374c..d10746bae9 100644
--- a/testsuites/sptests/sp11/task1.c
+++ b/testsuites/sptests/sp11/task1.c
@@ -72,8 +72,6 @@ rtems_task Task_1(
directive_failed( status, "rtems_clock_get_tod" );
print_time( "TA1 - rtems_clock_get_tod - ", &time, "\n" );
-rtems_test_pause();
-
puts( "TA1 - rtems_event_send - send RTEMS_EVENT_18 to self after 5 seconds");
status = rtems_timer_fire_after(
Timer_id[ 1 ],
@@ -140,8 +138,6 @@ rtems_test_pause();
eventout
);
-rtems_test_pause();
-
puts( "TA1 - rtems_event_send - send RTEMS_EVENT_18 to self after 5 seconds");
status = rtems_timer_fire_after(
Timer_id[ 1 ],
@@ -234,8 +230,6 @@ rtems_test_pause();
status = rtems_timer_cancel( Timer_id[ 1 ] );
directive_failed( status, "rtems_timer_cancel" );
-rtems_test_pause();
-
time.day = 13;
puts( "TA1 - rtems_event_send - sending RTEMS_EVENT_11 to self in 1 day" );
status = rtems_timer_fire_when(
@@ -306,8 +300,6 @@ rtems_test_pause();
eventout
);
-rtems_test_pause();
-
puts( "TA1 - rtems_event_send/rtems_event_receive combination" );
status = rtems_timer_fire_after(
Timer_id[ 1 ],
diff --git a/testsuites/sptests/sp12/init.c b/testsuites/sptests/sp12/init.c
index 7f4dba6baf..789f7e3249 100644
--- a/testsuites/sptests/sp12/init.c
+++ b/testsuites/sptests/sp12/init.c
@@ -85,8 +85,6 @@ rtems_task Init(
puts( "INIT - Backward priority queue test" );
Priority_test_driver( (RTEMS_MAXIMUM_PRIORITY / 2u) + 1u );
-rtems_test_pause();
-
puts( "INIT - Binary Semaphore and Priority Inheritance Test" );
status = rtems_semaphore_delete( Semaphore_id[ 2 ] );
@@ -121,8 +119,6 @@ rtems_test_pause();
Priority_test_driver( PRIORITY_INHERIT_BASE_PRIORITY );
-rtems_test_pause();
-
status = rtems_semaphore_delete( Semaphore_id[ 2 ] );
directive_failed( status, "rtems_semaphore_delete of SM2 #3" );
diff --git a/testsuites/sptests/sp12/sp12.scn b/testsuites/sptests/sp12/sp12.scn
index bdc269cdf4..90605d02ad 100644
--- a/testsuites/sptests/sp12/sp12.scn
+++ b/testsuites/sptests/sp12/sp12.scn
@@ -11,7 +11,6 @@ PRI4 - rtems_semaphore_obtain - wait forever on SM2
PRI3 - rtems_semaphore_obtain - wait forever on SM2
PRI2 - rtems_semaphore_obtain - wait forever on SM2
PRI1 - rtems_semaphore_obtain - wait forever on SM2
-<pause>
INIT - Binary Semaphore and Priority Inheritance Test
INIT - rtems_semaphore_create - allocated binary semaphore
INIT - rtems_semaphore_release - allocated binary semaphore
@@ -35,7 +34,6 @@ PRI5 - rtems_semaphore_obtain - nested
PRI5 - rtems_semaphore_release - nested
PRI5 - rtems_semaphore_release - restore priority
PRI5 - priority of PRI5 is 9
-<pause>
TA1 - rtems_semaphore_ident - smid => 1a010009
TA1 - rtems_semaphore_obtain - wait forever on SM2
TA1 - got SM2
@@ -46,7 +44,6 @@ TA1 - got SM1
TA1 - rtems_task_wake_after - sleep 5 seconds
TA2 - rtems_semaphore_obtain - wait forever on SM1
TA3 - rtems_semaphore_obtain - wait forever on SM2
-<pause>
TA1 - rtems_semaphore_release - release SM1
TA1 - rtems_semaphore_obtain - waiting for SM1 with 10 second timeout
TA2 - got SM1
@@ -62,7 +59,6 @@ TA1 - rtems_task_wake_after - sleep 5 seconds
TA3 - got SM2
TA3 - rtems_semaphore_release - release SM2
TA3 - rtems_semaphore_obtain - wait forever on SM3
-<pause>
TA1 - rtems_task_delete - delete TA3
TA1 - rtems_task_wake_after - sleep 5 seconds
TA4 - rtems_semaphore_obtain - wait forever on SM1
diff --git a/testsuites/sptests/sp12/task1.c b/testsuites/sptests/sp12/task1.c
index e3197fe279..633e0ab32f 100644
--- a/testsuites/sptests/sp12/task1.c
+++ b/testsuites/sptests/sp12/task1.c
@@ -67,8 +67,6 @@ rtems_task Task_1(
status = rtems_task_wake_after( 5 * rtems_clock_get_ticks_per_second() );
directive_failed( status, "rtems_task_wake_after" );
-rtems_test_pause();
-
puts( "TA1 - rtems_semaphore_release - release SM1" );
status = rtems_semaphore_release( Semaphore_id[ 1 ] );
directive_failed( status, "rtems_semaphore_release of SM1" );
@@ -92,8 +90,6 @@ rtems_test_pause();
status = rtems_task_wake_after( 5 * rtems_clock_get_ticks_per_second() );
directive_failed( status, "rtems_task_wake_after" );
-rtems_test_pause();
-
puts( "TA1 - rtems_task_delete - delete TA3" );
status = rtems_task_delete( Task_id[ 3 ] );
directive_failed( status, "rtems_task_delete of TA3" );
diff --git a/testsuites/sptests/sp13/sp13.scn b/testsuites/sptests/sp13/sp13.scn
index 47b4dfb334..d4f965cbe6 100644
--- a/testsuites/sptests/sp13/sp13.scn
+++ b/testsuites/sptests/sp13/sp13.scn
@@ -14,7 +14,6 @@ TA1 - rtems_task_wake_after - sleep 5 seconds
TA2 - buffer received: BUFFER 3 TO Q 1
TA2 - rtems_task_set_priority - make self highest priority task
TA2 - rtems_message_queue_receive - receive from queue 2 - RTEMS_WAIT FOREVER
-<pause>
TA1 - rtems_message_queue_send - BUFFER 1 TO Q 2
TA2 - buffer received: BUFFER 1 TO Q 2
TA2 - rtems_message_queue_send - BUFFER 2 TO Q 2
@@ -32,7 +31,6 @@ TA1 - rtems_message_queue_send - BUFFER 1 TO Q 3
TA1 - rtems_task_wake_after - sleep 5 seconds
TA3 - buffer received: BUFFER 1 TO Q 3
TA3 - rtems_task_exit
-<pause>
TA1 - rtems_message_queue_send - BUFFER 2 TO Q 3
TA1 - rtems_message_queue_send - BUFFER 3 TO Q 3
TA1 - rtems_message_queue_send - BUFFER 4 TO Q 3
@@ -48,7 +46,6 @@ TA1 - buffer received: BUFFER 4 TO Q 3
TA1 - rtems_message_queue_urgent - BUFFER 3 TO Q 2
TA1 - rtems_message_queue_receive - receive from queue 2 - RTEMS_WAIT FOREVER
TA1 - buffer received: BUFFER 3 TO Q 2
-<pause>
TA1 - rtems_message_queue_delete - delete queue 1
TA1 - rtems_message_queue_urgent - BUFFER 3 TO Q 2
TA1 - rtems_message_queue_delete - delete queue 2
@@ -69,10 +66,8 @@ TA1 - rtems_message_queue_send until all message buffers consumed
TA1 - all message buffers consumed
TA1 - rtems_message_queue_flush - Q 3
TA1 - 100 messages were flushed from Q 3
-<pause>
TA1 - create message queue of 20 bytes on queue 1
TA1 - rtems_message_queue_delete - delete queue 1
-<pause>
TA1 - rtems_message_queue_create - variable sizes
TA1 - rtems_message_queue_create and send - variable sizes
*** END OF TEST 13 ***
diff --git a/testsuites/sptests/sp13/task1.c b/testsuites/sptests/sp13/task1.c
index c27beda842..ccf543b791 100644
--- a/testsuites/sptests/sp13/task1.c
+++ b/testsuites/sptests/sp13/task1.c
@@ -89,8 +89,6 @@ rtems_task Task_1(
status = rtems_task_wake_after( 5*rtems_clock_get_ticks_per_second() );
directive_failed( status, "rtems_task_wake_after" );
-rtems_test_pause();
-
Fill_buffer( "BUFFER 1 TO Q 2", buffer );
puts( "TA1 - rtems_message_queue_send - BUFFER 1 TO Q 2" );
status = rtems_message_queue_send( Queue_id[ 2 ], buffer, MESSAGE_SIZE );
@@ -123,8 +121,6 @@ rtems_test_pause();
status = rtems_task_wake_after( 5*rtems_clock_get_ticks_per_second() );
directive_failed( status, "rtems_task_wake_after" );
-rtems_test_pause();
-
Fill_buffer( "BUFFER 2 TO Q 3", buffer );
puts( "TA1 - rtems_message_queue_send - BUFFER 2 TO Q 3" );
status = rtems_message_queue_send( Queue_id[ 3 ], buffer, MESSAGE_SIZE );
@@ -184,8 +180,6 @@ rtems_test_pause();
Put_buffer( buffer );
new_line;
-rtems_test_pause();
-
puts( "TA1 - rtems_message_queue_delete - delete queue 1" );
status = rtems_message_queue_delete( Queue_id[ 1 ] );
directive_failed( status, "rtems_message_queue_delete" );
@@ -256,8 +250,6 @@ rtems_test_pause();
status = rtems_message_queue_flush( Queue_id[ 3 ], &count );
printf( "TA1 - %" PRIu32 " messages were flushed from Q 3\n", count );
-rtems_test_pause();
-
puts( "TA1 - create message queue of 20 bytes on queue 1" );
status = rtems_message_queue_create(
Queue_name[ 1 ],
@@ -278,8 +270,6 @@ rtems_test_pause();
status = rtems_message_queue_delete( Queue_id[ 1 ] );
directive_failed( status, "rtems_message_queue_delete" );
-rtems_test_pause();
-
puts( "TA1 - rtems_message_queue_create - variable sizes " );
for (queue_size = 1; queue_size < 1030; queue_size++) {
status = rtems_message_queue_create(
diff --git a/testsuites/sptests/sp14/sp14.scn b/testsuites/sptests/sp14/sp14.scn
index ced1d99729..f81419b8e4 100644
--- a/testsuites/sptests/sp14/sp14.scn
+++ b/testsuites/sptests/sp14/sp14.scn
@@ -8,7 +8,6 @@ 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
diff --git a/testsuites/sptests/sp14/task1.c b/testsuites/sptests/sp14/task1.c
index 5c674dd362..e1b80c71b4 100644
--- a/testsuites/sptests/sp14/task1.c
+++ b/testsuites/sptests/sp14/task1.c
@@ -52,8 +52,6 @@ rtems_task Task_1(
status = rtems_signal_catch( Process_asr, RTEMS_NO_ASR );
directive_failed( status, "rtems_signal_catch" );
- rtems_test_pause();
-
puts( "TA1 - rtems_signal_send - RTEMS_SIGNAL_1 to self" );
status = rtems_signal_send( RTEMS_SELF, RTEMS_SIGNAL_1 );
directive_failed( status, "rtems_signal_send" );
diff --git a/testsuites/sptests/sp16/sp16.scn b/testsuites/sptests/sp16/sp16.scn
index a8e691a830..e43b34b107 100644
--- a/testsuites/sptests/sp16/sp16.scn
+++ b/testsuites/sptests/sp16/sp16.scn
@@ -9,7 +9,6 @@ TA1 - got segment from region 1 - 0x00000070
TA1 - rtems_task_wake_after - yield processor
TA2 - rtems_region_get_segment - wait on 2K segment from region 1
TA3 - rtems_region_get_segment - wait on 3750 byte segment from region 2
-<pause>
TA1 - rtems_region_return_segment - return segment to region 1 - 0x00000070
TA1 - rtems_region_get_segment - wait 10 seconds for 3K segment from region 1
TA2 - got segment from region 1 - 0x00000070
@@ -25,7 +24,6 @@ TA1 - rtems_task_wake_after - yield processor
TA3 - got segment from region 2 - 0x00000040
TA3 - rtems_region_get_segment - wait on 2K segment from region 3
TA1 - rtems_task_delete - delete TA3
-<pause>
TA1 - rtems_task_wake_after - yield processor
TA4 - rtems_region_get_segment - wait on 1.5K segment from region 1
TA5 - rtems_region_get_segment - wait on 1.5K segment from region 1
diff --git a/testsuites/sptests/sp16/task1.c b/testsuites/sptests/sp16/task1.c
index 2df450f653..aa147a9260 100644
--- a/testsuites/sptests/sp16/task1.c
+++ b/testsuites/sptests/sp16/task1.c
@@ -82,8 +82,6 @@ rtems_task Task_1(
status = rtems_task_wake_after( RTEMS_YIELD_PROCESSOR );
directive_failed( status, "rtems_task_wake_after" );
-rtems_test_pause();
-
puts_nocr(
"TA1 - rtems_region_return_segment - return segment to region 1 - "
);
@@ -124,8 +122,6 @@ rtems_test_pause();
status = rtems_task_delete( Task_id[ 3 ] );
directive_failed( status, "rtems_task_delete of TA3" );
-rtems_test_pause();
-
status = rtems_task_create(
Task_name[ 4 ],
BASE_PRIORITY,
diff --git a/testsuites/sptests/sp22/sp22.scn b/testsuites/sptests/sp22/sp22.scn
index a34d845ec8..25dba5e4a8 100644
--- a/testsuites/sptests/sp22/sp22.scn
+++ b/testsuites/sptests/sp22/sp22.scn
@@ -13,7 +13,6 @@ TA1 - rtems_clock_get_tod - 09:00:04 12/31/1988
TA1 - rtems_timer_reset - timer 1
TA1 - rtems_task_suspend( RTEMS_SELF )
TA1 - rtems_clock_get_tod - 09:00:07 12/31/1988
-<pause>
TA1 - rtems_timer_fire_after - timer 1 in 3 seconds
TA1 - rtems_timer_cancel - timer 1
TA1 - rtems_clock_get_tod - 09:00:07 12/31/1988
diff --git a/testsuites/sptests/sp22/task1.c b/testsuites/sptests/sp22/task1.c
index 3910bb249e..c44be77f7a 100644
--- a/testsuites/sptests/sp22/task1.c
+++ b/testsuites/sptests/sp22/task1.c
@@ -83,8 +83,6 @@ rtems_task Task_1(
Print_time();
- rtems_test_pause();
-
/*
* Reset the time since we do not know how long the user waited
* before pressing <cr> at the pause. This insures that the
diff --git a/testsuites/sptests/sp25/sp25.scn b/testsuites/sptests/sp25/sp25.scn
index 986cae9548..3a5990bc9e 100644
--- a/testsuites/sptests/sp25/sp25.scn
+++ b/testsuites/sptests/sp25/sp25.scn
@@ -27,7 +27,6 @@ TA1 - rtems_region_get_information - 0x32010001
TA1 - got information - free = 1, used = 8
TA1 - rtems_region_get_free_information - 0x32010001
TA1 - got free information - free = 1, used = 0
-<pause>
TA1 - rtems_region_return_segment - return segment to region 1 - 0xXXXXXXXX
TA1 - rtems_region_return_segment - return segment to region 1 - 0xXXXXXXXX
TA1 - rtems_region_return_segment - return segment to region 1 - 0xXXXXXXXX
diff --git a/testsuites/sptests/sp25/task1.c b/testsuites/sptests/sp25/task1.c
index ae7e8b8d8e..69fe6309d4 100644
--- a/testsuites/sptests/sp25/task1.c
+++ b/testsuites/sptests/sp25/task1.c
@@ -204,8 +204,6 @@ rtems_task Task_1(
region_info.Used.number
);
-rtems_test_pause();
-
puts_nocr(
"TA1 - rtems_region_return_segment - return segment to region 1 - "
);
diff --git a/testsuites/sptests/sp31/sp31.scn b/testsuites/sptests/sp31/sp31.scn
index 9db60d23b2..432e32c990 100644
--- a/testsuites/sptests/sp31/sp31.scn
+++ b/testsuites/sptests/sp31/sp31.scn
@@ -36,7 +36,6 @@ TA1 - rtems_clock_get_tod - 09:00:06 12/31/1988
TA1 - rtems_timer_reset - timer 1
TA1 - rtems_task_suspend( RTEMS_SELF )
TA1 - rtems_clock_get_tod - 09:00:09 12/31/1988
-<pause>
TA1 - rtems_timer_server_fire_after - timer 1 in 3 seconds
TA1 - rtems_timer_cancel - timer 1
TA1 - rtems_clock_get_tod - 09:00:07 12/31/1988
diff --git a/testsuites/sptests/sp31/task1.c b/testsuites/sptests/sp31/task1.c
index c3f0ae13fc..0abc0efc11 100644
--- a/testsuites/sptests/sp31/task1.c
+++ b/testsuites/sptests/sp31/task1.c
@@ -198,8 +198,6 @@ rtems_task Task_1(
Print_time();
- rtems_test_pause();
-
/*
* Reset the time since we do not know how long the user waited
* before pressing <cr> at the pause. This insures that the
diff --git a/testsuites/sptests/sp42/init.c b/testsuites/sptests/sp42/init.c
index f023652115..10e49275e5 100644
--- a/testsuites/sptests/sp42/init.c
+++ b/testsuites/sptests/sp42/init.c
@@ -206,8 +206,6 @@ static rtems_task Init(
puts( "Exercising blocking discipline w/unblock in FIFO order" );
do_test( RTEMS_FIFO, FALSE );
- rtems_test_pause_and_screen_number( 2 );
-
puts( "Exercising blocking discipline w/extract in priority order " );
do_test( RTEMS_PRIORITY, TRUE );
diff --git a/testsuites/sptests/sp42/sp42.scn b/testsuites/sptests/sp42/sp42.scn
index 206d05c40b..ba17dd4e85 100644
--- a/testsuites/sptests/sp42/sp42.scn
+++ b/testsuites/sptests/sp42/sp42.scn
@@ -21,7 +21,6 @@ TA16 - unblocked - OK
TA17 - unblocked - OK
TA18 - unblocked - OK
TA19 - unblocked - OK
-<pause - screen 2>
Exercising blocking discipline w/extract in priority order
Exercising blocking discipline w/unblock in priority order
TA04 - unblocked - OK
diff --git a/testsuites/sptests/sp43/init.c b/testsuites/sptests/sp43/init.c
index 2f6cbfdfca..b57c158173 100644
--- a/testsuites/sptests/sp43/init.c
+++ b/testsuites/sptests/sp43/init.c
@@ -296,9 +296,8 @@ rtems_task Init(
rtems_test_assert( part == 1 );
/*
- * Start another screen and do the API/Class min/max routines
+ * API/Class min/max routines
*/
- rtems_test_pause();
printf( "rtems_object_id_api_minimum returned %d\n",
rtems_object_id_api_minimum() );
@@ -330,9 +329,8 @@ rtems_task Init(
rtems_object_api_maximum_class(OBJECTS_CLASSIC_API) );
/*
- * Another screen break for the API and class name tests
+ * API and class name tests
*/
- rtems_test_pause();
printf( "rtems_object_get_api_name(0) = %s\n", rtems_object_get_api_name(0) );
printf( "rtems_object_get_api_name(255) = %s\n",
@@ -355,11 +353,9 @@ rtems_task Init(
OBJECTS_CLASSIC_API, OBJECTS_RTEMS_BARRIERS));
/*
- * Another screen break for the information
+ * Class information
*/
- rtems_test_pause();
-
puts( "rtems_object_get_class_information - INVALID_ADDRESS" );
sc = rtems_object_get_class_information(
OBJECTS_INTERNAL_API, OBJECTS_INTERNAL_THREADS, NULL );
diff --git a/testsuites/sptests/sp43/sp43.scn b/testsuites/sptests/sp43/sp43.scn
index 999e4c1f94..04af7f9596 100644
--- a/testsuites/sptests/sp43/sp43.scn
+++ b/testsuites/sptests/sp43/sp43.scn
@@ -43,7 +43,6 @@ rtems_object_id_get_api - OK
rtems_object_id_get_class - OK
rtems_object_id_get_node - OK
rtems_object_id_get_index - OK
-<pause>
rtems_object_id_api_minimum returned 1
rtems_object_id_api_maximum returned 3
rtems_object_api_minimum_class(0) returned -1
@@ -56,7 +55,6 @@ rtems_object_api_minimum_class(OBJECTS_INTERNAL_API) returned 1
rtems_object_api_maximum_class(OBJECTS_INTERNAL_API) returned 1
rtems_object_api_minimum_class(OBJECTS_CLASSIC_API) returned 1
rtems_object_api_maximum_class(OBJECTS_CLASSIC_API) returned 10
-<pause>
rtems_object_get_api_name(0) = BAD CLASS
rtems_object_get_api_name(255) = BAD CLASS
rtems_object_get_api_name(INTERNAL_API) = Internal
@@ -65,7 +63,6 @@ rtems_object_get_api_class_name(0, RTEMS_TASKS) = BAD API
rtems_object_get_api_class_name(CLASSIC_API, 0) = BAD CLASS
rtems_object_get_api_class_name(INTERNAL_API, THREADS) = Thread
rtems_object_get_api_class_name(CLASSIC_API, RTEMS_BARRIERS) = Barrier
-<pause>
rtems_object_get_class_information - INVALID_ADDRESS
rtems_object_get_class_information - INVALID_NUMBER (bad API)
rtems_object_get_class_information - INVALID_NUMBER (api=0xff)
diff --git a/testsuites/support/include/tmacros.h b/testsuites/support/include/tmacros.h
index ff016605db..2c885c6ecc 100644
--- a/testsuites/support/include/tmacros.h
+++ b/testsuites/support/include/tmacros.h
@@ -219,34 +219,6 @@ extern "C" {
#define puts_nocr printf
-#ifdef RTEMS_TEST_NO_PAUSE
-#define rtems_test_pause() \
- do { \
- printf( "<pause>\n" ); \
- } while ( 0 )
-
-#define rtems_test_pause_and_screen_number( _screen ) \
- do { \
- printf( "<pause - screen %d>\n", (_screen) ); \
- } while ( 0 )
-#else
-#define rtems_test_pause() \
- do { \
- char buffer[ 80 ]; \
- printf( "<pause>" ); \
- gets( buffer ); \
- puts( "" ); \
- } while ( 0 )
-
-#define rtems_test_pause_and_screen_number( _screen ) \
- do { \
- char buffer[ 80 ]; \
- printf( "<pause - screen %d>", (_screen) ); \
- gets( buffer ); \
- puts( "" ); \
- } while ( 0 )
-#endif
-
#define put_name( name, crlf ) \
{ int c0, c1, c2, c3; \
c0 = (name >> 24) & 0xff; \
diff --git a/testsuites/tmtests/configure.ac b/testsuites/tmtests/configure.ac
index c5b36f32b8..c696965c2f 100644
--- a/testsuites/tmtests/configure.ac
+++ b/testsuites/tmtests/configure.ac
@@ -14,7 +14,6 @@ AM_INIT_AUTOMAKE([no-define foreign subdir-objects 1.12.2])
AM_MAINTAINER_MODE
RTEMS_ENV_RTEMSBSP
-RTEMS_CHECK_RTEMS_TEST_NO_PAUSE
RTEMS_PROJECT_ROOT
diff --git a/testsuites/tmtests/tmck/task1.c b/testsuites/tmtests/tmck/task1.c
index f509e839d3..5cc378aa1b 100644
--- a/testsuites/tmtests/tmck/task1.c
+++ b/testsuites/tmtests/tmck/task1.c
@@ -74,7 +74,6 @@ rtems_task Task_1(
uint32_t index;
check_read_timer();
-rtems_test_pause();
benchmark_timer_initialize();
end_time = benchmark_timer_read();
diff --git a/testsuites/tmtests/tmoverhd/testtask.c b/testsuites/tmtests/tmoverhd/testtask.c
index 532fa34d42..9fb2a8e9a7 100644
--- a/testsuites/tmtests/tmoverhd/testtask.c
+++ b/testsuites/tmtests/tmoverhd/testtask.c
@@ -341,8 +341,6 @@ rtems_task Task_1(
0
);
-rtems_test_pause();
-
/* rtems_timer_create */
benchmark_timer_initialize();
@@ -677,8 +675,6 @@ rtems_test_pause();
0
);
-rtems_test_pause();
-
/* rtems_event_send */
benchmark_timer_initialize();
@@ -1003,8 +999,6 @@ rtems_test_pause();
0
);
-rtems_test_pause();
-
/* rtems_io_initialize */
benchmark_timer_initialize();
--
2.16.4
More information about the devel
mailing list