diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-05-15 16:34:01 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-05-15 16:34:01 +0000 |
| commit | 170043083949b7352f98d112875dd2060b464acb (patch) | |
| tree | b5e8ab7e411065d155450cdf13c2b6d37326d9b6 /testsuites | |
| parent | 2008-05-15 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
| download | rtems-170043083949b7352f98d112875dd2060b464acb.tar.bz2 | |
2008-05-15 Joel Sherrill <joel.sherrill@oarcorp.com>
* psxstat/psxstat.scn, psxstat/test.c: Eliminate patterns that look
like CVS conflict markers.
Diffstat (limited to 'testsuites')
| -rw-r--r-- | testsuites/psxtests/ChangeLog | 5 | ||||
| -rw-r--r-- | testsuites/psxtests/psxstat/psxstat.scn | 2 | ||||
| -rw-r--r-- | testsuites/psxtests/psxstat/test.c | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/testsuites/psxtests/ChangeLog b/testsuites/psxtests/ChangeLog index de2ea89fbe..7c9d6b9df0 100644 --- a/testsuites/psxtests/ChangeLog +++ b/testsuites/psxtests/ChangeLog @@ -1,3 +1,8 @@ +2008-05-15 Joel Sherrill <joel.sherrill@oarcorp.com> + + * psxstat/psxstat.scn, psxstat/test.c: Eliminate patterns that look + like CVS conflict markers. + 2008-04-17 Joel Sherrill <joel.sherrill@oarcorp.com> * psxchroot01/main.c, psxmount/main.c, psxreaddir/main.c: Use diff --git a/testsuites/psxtests/psxstat/psxstat.scn b/testsuites/psxtests/psxstat/psxstat.scn index 8be1a93e13..b819885da8 100644 --- a/testsuites/psxtests/psxstat/psxstat.scn +++ b/testsuites/psxtests/psxstat/psxstat.scn @@ -1,5 +1,5 @@ *** STAT TEST 01 *** ->>>>Current Time: - rtems_clock_get - 09:00:00 12/31/1988 +--->Current Time: - rtems_clock_get - 09:00:00 12/31/1988 Making directory /my_mount_point/dir1 Making directory /my_mount_point/dir2 Making directory /my_mount_point/dir3 diff --git a/testsuites/psxtests/psxstat/test.c b/testsuites/psxtests/psxstat/test.c index 1619b3498b..23caabcb27 100644 --- a/testsuites/psxtests/psxstat/test.c +++ b/testsuites/psxtests/psxstat/test.c @@ -715,7 +715,7 @@ void Show_Time() rtems_status_code status; status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time ); - printf(">>>>Current Time: "); + printf("--->Current Time: "); print_time( " - rtems_clock_get - ", &time, "\n" ); } |