testsuite/rtems++: Output format change.

Alter the output to avoid sending out what is the MI protocol. The SIS
simulator is currently broken and outputs directly to GDB's stdout and
so this output gets parsed as MI output.
This commit is contained in:
Chris Johns
2014-01-10 10:57:08 +11:00
parent e327e692c3
commit e83be2871f
2 changed files with 104 additions and 101 deletions

View File

@@ -49,7 +49,7 @@ void Task1::body(rtems_task_argument argument)
{
rtems_test_pause_and_screen_number(1);
printf(" * START Task Class test *\n");
printf(" START Task Class test\n");
printf("%s - test argument - ", name_string());
if (argument != 0xDEADDEAD)
@@ -328,7 +328,7 @@ void Task1::screen2(void)
task_2.set_note(0, current_note);
printf("%s\n", task_2.last_status_string());
printf(" * END Task Class test *\n");
printf(" END Task Class test\n");
}
#define RTEMS_ALL_MODES (RTEMS_PREEMPT_MASK | \
@@ -338,7 +338,7 @@ void Task1::screen2(void)
void Task1::screen3(void)
{
printf(" * START TaskMode Class test *\n");
printf(" START TaskMode Class test\n");
rtemsTask self;
rtemsTaskMode task_mode;
@@ -443,12 +443,12 @@ void Task1::screen3(void)
print_mode(mode, RTEMS_ALL_MODES);
printf("\n");
printf(" * END TaskMode Class test *\n");
printf(" END TaskMode Class test\n");
}
void Task1::screen4(void)
{
printf(" * START Event Class test *\n");
printf(" START Event Class test\n");
printf("%s - create task 2 - ", name_string());
Task2 task_2("TA2", (rtems_task_priority) 9, RTEMS_MINIMUM_STACK_SIZE * 6);
@@ -494,21 +494,21 @@ void Task1::screen4(void)
printf("%s - waiting 5 secs for TA2 to finish\n", name_string());
wake_after(500000);
printf(" * END Event Class test *\n");
printf(" END Event Class test\n");
}
void Task1::screen5(void)
{
printf(" * START Interrupt Class test *\n");
printf(" START Interrupt Class test\n");
printf(" do not know a portable BSP type interrupt test\n");
printf(" * END Interrupt Class test *\n");
printf(" END Interrupt Class test\n");
}
void Task1::screen6(void)
{
printf(" * START MessageQueue Class test *\n");
printf(" START MessageQueue Class test\n");
printf("%s - construct message queue 1 with no memory error - ", name_string());
rtemsMessageQueue mq_1("MQ1", 1000000, 1000);
@@ -665,7 +665,7 @@ void Task1::screen6(void)
mq_2.flush(count);
printf("%s, flushed=%" PRIi32 "\n", mq_2.last_status_string(), count);
printf(" * END MessageQueue Class test *\n");
printf(" END MessageQueue Class test\n");
}
void Task1::print_mode(rtems_mode mode, rtems_mode mask)

View File

@@ -1,11 +1,14 @@
*** RTEMS++ TEST ***
INIT - Task.create() - RTEMS[19] invalid thread priority
INIT - Task.create() - RTEMS[00] successful completion
INIT - Task.create() - RTEMS[16] illegal on calling thread
INIT - Task.restart() - RTEMS[14] thread is in wrong state
INIT - Task.start(0xDEADDEAD) - RTEMS[00] successful completion
INIT - Destroy it's self
<pause - screen 1>
* START Task Class test *
START Task Class test
TA1 - test argument - argument matched
TA1 - copy constructor - local and this id's match
TA1 - copy constructor - local and this name's match
@@ -14,7 +17,7 @@ TA1 - copy operator - local and this name's match
TA1 - not owner destroy's task - RTEMS[23] not owner of resource
TA1 - connect to a local valid task name - RTEMS[00] successful completion
TA1 - connect to an invalid task name - RTEMS[03] invalid object name
SELF - connect to a task on an invalid node - RTEMS[21] invalid node id
SELF - connect to a task on an invalid node - RTEMS[03] invalid object name
TA1 - restart from a non-owner - RTEMS[23] not owner of resource
<pause - screen 2>
TA1 - wake after 0 secs - RTEMS[00] successful completion
@@ -56,37 +59,37 @@ SELF - self object get with bad notepad number - RTEMS[10] number was invalid, n
SELF - self object set note to 0xDEADBEEF - RTEMS[00] successful completion
SELF - self object get note - RTEMS[00] successful completion, notepad is 0xDEADBEEF
SELF - self object set note to original value - RTEMS[00] successful completion
* END Task Class test *
END Task Class test
<pause - screen 3>
* START TaskMode Class test *
START TaskMode Class test
SELF - get mode - RTEMS[00] successful completion,
mode is 0x00000100, RTEMS_NO_PREEMPT RTEMS_NO_TIMESLICE RTEMS_NO_ASR INTMASK=0
mode is 0x00000500, RTEMS_NO_PREEMPT RTEMS_NO_TIMESLICE RTEMS_ASR INTMASK=0
SELF - get preemption state - RTEMS[00] successful completion,
mode is 0x00000100, RTEMS_NO_PREEMPT
SELF - set preemption state to RTEMS_PREEMPT - RTEMS[00] successful completion,
mode is 0x00000000, RTEMS_PREEMPT RTEMS_TIMESLICE RTEMS_NO_ASR INTMASK=0
mode is 0x00000400, RTEMS_PREEMPT RTEMS_TIMESLICE RTEMS_ASR INTMASK=0
SELF - set preemption state to RTEMS_NO_PREEMPT - RTEMS[00] successful completion,
mode is 0x00000100, RTEMS_NO_PREEMPT RTEMS_NO_TIMESLICE RTEMS_NO_ASR INTMASK=0
mode is 0x00000500, RTEMS_NO_PREEMPT RTEMS_NO_TIMESLICE RTEMS_ASR INTMASK=0
SELF - get timeslice state - RTEMS[00] successful completion,
mode is 0x00000000, RTEMS_TIMESLICE
SELF - set timeslice state to RTEMS_TIMESLICE - RTEMS[00] successful completion,
mode is 0x00000300, RTEMS_NO_PREEMPT RTEMS_NO_TIMESLICE RTEMS_NO_ASR INTMASK=0
mode is 0x00000700, RTEMS_NO_PREEMPT RTEMS_NO_TIMESLICE RTEMS_ASR INTMASK=0
SELF - set timeslice state to RTEMS_NO_TIMESLICE - RTEMS[00] successful completion,
mode is 0x00000100, RTEMS_NO_PREEMPT RTEMS_NO_TIMESLICE RTEMS_NO_ASR INTMASK=0
mode is 0x00000500, RTEMS_NO_PREEMPT RTEMS_NO_TIMESLICE RTEMS_ASR INTMASK=0
SELF - get asr state - RTEMS[00] successful completion,
mode is 0x00000000, RTEMS_NO_ASR
mode is 0x00000400, RTEMS_ASR
SELF - set asr state to RTEMS_ASR - RTEMS[00] successful completion,
mode is 0x00000100, RTEMS_NO_PREEMPT RTEMS_NO_TIMESLICE RTEMS_NO_ASR INTMASK=0
SELF - set asr state to RTEMS_NO_ASR - RTEMS[00] successful completion,
mode is 0x00000500, RTEMS_NO_PREEMPT RTEMS_NO_TIMESLICE RTEMS_ASR INTMASK=0
SELF - get current interrupt level - RTEMS[00] successful completion, level is 0
SELF - set interrupt level to 102 - RTEMS[00] successful completion
SELF - set interrupt level to original level - RTEMS[00] successful completion, level was 0
SELF - set interrupt level to original level - RTEMS[00] successful completion, level was 6
SELF - set mode to original mode - RTEMS[00] successful completion,
mode is 0x00000100, RTEMS_NO_PREEMPT RTEMS_NO_TIMESLICE RTEMS_NO_ASR INTMASK=0
* END TaskMode Class test *
mode is 0x00000500, RTEMS_NO_PREEMPT RTEMS_NO_TIMESLICE RTEMS_ASR INTMASK=0
END TaskMode Class test
<pause - screen 4>
* START Event Class test *
START Event Class test
TA1 - create task 2 - RTEMS[00] successful completion
TA1 - start task 2 - RTEMS[00] successful completion
TA1 - construct event connecting to task 2 - RTEMS[00] successful completion
@@ -107,15 +110,15 @@ TA1 - waiting 5 secs for TA2 to finish
TA2 - RTEMS[00] successful completion, signals out are 0x80000001
TA2 - send event signal 1 - RTEMS[00] successful completion
TA2 - event wait forever for signal 1 from TA2 - RTEMS[00] successful completion, signals out are 0x00000002
TA2 - destory itself
* END Event Class test *
TA2 - destroy itself
END Event Class test
<pause - screen 5>
* START Interrupt Class test *
START Interrupt Class test
do not know a portable BSP type interrupt test
* END Interrupt Class test *
END Interrupt Class test
<pause - screen 6>
* START MessageQueue Class test *
TA1 - construct message queue 1 with no memory error - RTEMS[05] too many
START MessageQueue Class test
TA1 - construct message queue 1 with no memory error - RTEMS[13] request not satisfied
TA1 - construct/create message queue 2 - RTEMS[00] successful completion
TA1 - send u1 to mq_2 - RTEMS[00] successful completion
TA1 - urgent send u2 to mq_2 - RTEMS[00] successful completion
@@ -143,10 +146,10 @@ TA1 - broadcast send b1 ...
TA1 - mq_2 broadcast send - RTEMS[00] successful completion, count=2
TA31 - mq_2 receive - RTEMS[00] successful completion, size=18, message string size=17
TA31 - loopback to mq_2 - RTEMS[00] successful completion
TA31 - destory itself
TA31 - destroy itself
TA32 - mq_2 receive - RTEMS[00] successful completion, size=18, message string size=17
TA32 - loopback to mq_2 - RTEMS[00] successful completion
TA32 - destory itself
TA32 - destroy itself
TA1 - receive message b1 on mq_2 from TA31...
TA1 - RTEMS[00] successful completion
TA1 - message b1 received correctly
@@ -157,5 +160,5 @@ TA1 - send f1 to mq_2 - RTEMS[00] successful completion
TA1 - send f1 to mq_2 - RTEMS[00] successful completion
TA1 - send f1 to mq_2 - RTEMS[00] successful completion
TA1 - flush mq_2 - RTEMS[00] successful completion, flushed=3
* END MessageQueue Class test *
<pause - screen 7>
END MessageQueue Class test
*** END OF RTEMS++ TEST ***