RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2008-05-15 Joel Sherrill <joel.sherrill@oarcorp.com>

Browse Source 
* psxstat/psxstat.scn, psxstat/test.c: Eliminate patterns that look
	like CVS conflict markers.
This commit is contained in:
Joel Sherrill
2008-05-15 16:34:01 +00:00
parent 94056364ad
commit 1700430839
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
testsuites/psxtests/ChangeLog
View File

@@ -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> 2008-04-17 Joel Sherrill <joel.sherrill@oarcorp.com>
* psxchroot01/main.c, psxmount/main.c, psxreaddir/main.c: Use * psxchroot01/main.c, psxmount/main.c, psxreaddir/main.c: Use

2
testsuites/psxtests/psxstat/psxstat.scn
View File

@@ -1,5 +1,5 @@
*** STAT TEST 01 *** *** 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/dir1
Making directory /my_mount_point/dir2 Making directory /my_mount_point/dir2
Making directory /my_mount_point/dir3 Making directory /my_mount_point/dir3

2
testsuites/psxtests/psxstat/test.c
View File

@@ -715,7 +715,7 @@ void Show_Time()
rtems_status_code status; rtems_status_code status;
status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time ); status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
printf(">>>>Current Time: "); printf("--->Current Time: ");
print_time( " - rtems_clock_get - ", &time, "\n" ); print_time( " - rtems_clock_get - ", &time, "\n" );
} }