From 936c8d6c9033d16de17da0c21cc415a12ee407b1 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Fri, 3 May 2013 16:46:09 +0200 Subject: psxtests/psxtime: Reduce test time --- testsuites/psxtests/psxtime/psxtime.scn | 370 ++++++++++++-------------------- testsuites/psxtests/psxtime/test.c | 4 +- 2 files changed, 139 insertions(+), 235 deletions(-) diff --git a/testsuites/psxtests/psxtime/psxtime.scn b/testsuites/psxtests/psxtime/psxtime.scn index d41082d6fe..174f9d71ba 100644 --- a/testsuites/psxtests/psxtime/psxtime.scn +++ b/testsuites/psxtests/psxtime/psxtime.scn @@ -11,7 +11,7 @@ adjtime - delta of one second forward, olddelta=NULL adjtime - delta of one second forward adjtime - delta of almost two seconds forward adjtime - delta of almost one second forward which bumps second -rtems_clock_get_tod 12:45:05 01/01/1988 +rtems_clock_get_tod 12:44:48 01/01/1988 rtems_clock_set 12:45:00 01/01/1988 rtems_clock_get_tod 12:45:00 01/01/1988 gettimeofday: Fri Jan 1 12:45:00 1988 @@ -19,35 +19,23 @@ time: Fri Jan 1 12:45:00 1988 localtime: Fri Jan 1 12:45:00 1988 gmtime: Fri Jan 1 12:45:00 1988 -rtems_clock_get_tod 12:45:05 01/01/1988 -gettimeofday: Fri Jan 1 12:45:05 1988 -time: Fri Jan 1 12:45:05 1988 -localtime: Fri Jan 1 12:45:05 1988 -gmtime: Fri Jan 1 12:45:05 1988 - -rtems_clock_get_tod 12:45:10 01/01/1988 -gettimeofday: Fri Jan 1 12:45:10 1988 -time: Fri Jan 1 12:45:10 1988 -localtime: Fri Jan 1 12:45:10 1988 -gmtime: Fri Jan 1 12:45:10 1988 - -rtems_clock_get_tod 12:45:15 01/01/1988 -gettimeofday: Fri Jan 1 12:45:15 1988 -time: Fri Jan 1 12:45:15 1988 -localtime: Fri Jan 1 12:45:15 1988 -gmtime: Fri Jan 1 12:45:15 1988 - -rtems_clock_get_tod 12:45:20 01/01/1988 -gettimeofday: Fri Jan 1 12:45:20 1988 -time: Fri Jan 1 12:45:20 1988 -localtime: Fri Jan 1 12:45:20 1988 -gmtime: Fri Jan 1 12:45:20 1988 - -rtems_clock_get_tod 12:45:25 01/01/1988 -gettimeofday: Fri Jan 1 12:45:25 1988 -time: Fri Jan 1 12:45:25 1988 -localtime: Fri Jan 1 12:45:25 1988 -gmtime: Fri Jan 1 12:45:25 1988 +rtems_clock_get_tod 12:45:01 01/01/1988 +gettimeofday: Fri Jan 1 12:45:01 1988 +time: Fri Jan 1 12:45:01 1988 +localtime: Fri Jan 1 12:45:01 1988 +gmtime: Fri Jan 1 12:45:01 1988 + +rtems_clock_get_tod 12:45:02 01/01/1988 +gettimeofday: Fri Jan 1 12:45:02 1988 +time: Fri Jan 1 12:45:02 1988 +localtime: Fri Jan 1 12:45:02 1988 +gmtime: Fri Jan 1 12:45:02 1988 + +rtems_clock_get_tod 12:45:03 01/01/1988 +gettimeofday: Fri Jan 1 12:45:03 1988 +time: Fri Jan 1 12:45:03 1988 +localtime: Fri Jan 1 12:45:03 1988 +gmtime: Fri Jan 1 12:45:03 1988 rtems_clock_set 09:00:00 12/31/1988 rtems_clock_get_tod 09:00:00 12/31/1988 @@ -56,35 +44,23 @@ time: Sat Dec 31 09:00:00 1988 localtime: Sat Dec 31 09:00:00 1988 gmtime: Sat Dec 31 09:00:00 1988 -rtems_clock_get_tod 09:00:05 12/31/1988 -gettimeofday: Sat Dec 31 09:00:05 1988 -time: Sat Dec 31 09:00:05 1988 -localtime: Sat Dec 31 09:00:05 1988 -gmtime: Sat Dec 31 09:00:05 1988 - -rtems_clock_get_tod 09:00:10 12/31/1988 -gettimeofday: Sat Dec 31 09:00:10 1988 -time: Sat Dec 31 09:00:10 1988 -localtime: Sat Dec 31 09:00:10 1988 -gmtime: Sat Dec 31 09:00:10 1988 - -rtems_clock_get_tod 09:00:15 12/31/1988 -gettimeofday: Sat Dec 31 09:00:15 1988 -time: Sat Dec 31 09:00:15 1988 -localtime: Sat Dec 31 09:00:15 1988 -gmtime: Sat Dec 31 09:00:15 1988 - -rtems_clock_get_tod 09:00:20 12/31/1988 -gettimeofday: Sat Dec 31 09:00:20 1988 -time: Sat Dec 31 09:00:20 1988 -localtime: Sat Dec 31 09:00:20 1988 -gmtime: Sat Dec 31 09:00:20 1988 - -rtems_clock_get_tod 09:00:25 12/31/1988 -gettimeofday: Sat Dec 31 09:00:25 1988 -time: Sat Dec 31 09:00:25 1988 -localtime: Sat Dec 31 09:00:25 1988 -gmtime: Sat Dec 31 09:00:25 1988 +rtems_clock_get_tod 09:00:01 12/31/1988 +gettimeofday: Sat Dec 31 09:00:01 1988 +time: Sat Dec 31 09:00:01 1988 +localtime: Sat Dec 31 09:00:01 1988 +gmtime: Sat Dec 31 09:00:01 1988 + +rtems_clock_get_tod 09:00:02 12/31/1988 +gettimeofday: Sat Dec 31 09:00:02 1988 +time: Sat Dec 31 09:00:02 1988 +localtime: Sat Dec 31 09:00:02 1988 +gmtime: Sat Dec 31 09:00:02 1988 + +rtems_clock_get_tod 09:00:03 12/31/1988 +gettimeofday: Sat Dec 31 09:00:03 1988 +time: Sat Dec 31 09:00:03 1988 +localtime: Sat Dec 31 09:00:03 1988 +gmtime: Sat Dec 31 09:00:03 1988 rtems_clock_set 23:55:59 12/31/1999 rtems_clock_get_tod 23:55:59 12/31/1999 @@ -93,35 +69,23 @@ time: Fri Dec 31 23:55:59 1999 localtime: Fri Dec 31 23:55:59 1999 gmtime: Fri Dec 31 23:55:59 1999 -rtems_clock_get_tod 23:56:04 12/31/1999 -gettimeofday: Fri Dec 31 23:56:04 1999 -time: Fri Dec 31 23:56:04 1999 -localtime: Fri Dec 31 23:56:04 1999 -gmtime: Fri Dec 31 23:56:04 1999 - -rtems_clock_get_tod 23:56:09 12/31/1999 -gettimeofday: Fri Dec 31 23:56:09 1999 -time: Fri Dec 31 23:56:09 1999 -localtime: Fri Dec 31 23:56:09 1999 -gmtime: Fri Dec 31 23:56:09 1999 - -rtems_clock_get_tod 23:56:14 12/31/1999 -gettimeofday: Fri Dec 31 23:56:14 1999 -time: Fri Dec 31 23:56:14 1999 -localtime: Fri Dec 31 23:56:14 1999 -gmtime: Fri Dec 31 23:56:14 1999 - -rtems_clock_get_tod 23:56:19 12/31/1999 -gettimeofday: Fri Dec 31 23:56:19 1999 -time: Fri Dec 31 23:56:19 1999 -localtime: Fri Dec 31 23:56:19 1999 -gmtime: Fri Dec 31 23:56:19 1999 - -rtems_clock_get_tod 23:56:24 12/31/1999 -gettimeofday: Fri Dec 31 23:56:24 1999 -time: Fri Dec 31 23:56:24 1999 -localtime: Fri Dec 31 23:56:24 1999 -gmtime: Fri Dec 31 23:56:24 1999 +rtems_clock_get_tod 23:56:00 12/31/1999 +gettimeofday: Fri Dec 31 23:56:00 1999 +time: Fri Dec 31 23:56:00 1999 +localtime: Fri Dec 31 23:56:00 1999 +gmtime: Fri Dec 31 23:56:00 1999 + +rtems_clock_get_tod 23:56:01 12/31/1999 +gettimeofday: Fri Dec 31 23:56:01 1999 +time: Fri Dec 31 23:56:01 1999 +localtime: Fri Dec 31 23:56:01 1999 +gmtime: Fri Dec 31 23:56:01 1999 + +rtems_clock_get_tod 23:56:02 12/31/1999 +gettimeofday: Fri Dec 31 23:56:02 1999 +time: Fri Dec 31 23:56:02 1999 +localtime: Fri Dec 31 23:56:02 1999 +gmtime: Fri Dec 31 23:56:02 1999 rtems_clock_set 00:01:30 06/30/1999 rtems_clock_get_tod 00:01:30 06/30/1999 @@ -130,35 +94,23 @@ time: Wed Jun 30 00:01:30 1999 localtime: Wed Jun 30 00:01:30 1999 gmtime: Wed Jun 30 00:01:30 1999 -rtems_clock_get_tod 00:01:35 06/30/1999 -gettimeofday: Wed Jun 30 00:01:35 1999 -time: Wed Jun 30 00:01:35 1999 -localtime: Wed Jun 30 00:01:35 1999 -gmtime: Wed Jun 30 00:01:35 1999 - -rtems_clock_get_tod 00:01:40 06/30/1999 -gettimeofday: Wed Jun 30 00:01:40 1999 -time: Wed Jun 30 00:01:40 1999 -localtime: Wed Jun 30 00:01:40 1999 -gmtime: Wed Jun 30 00:01:40 1999 - -rtems_clock_get_tod 00:01:45 06/30/1999 -gettimeofday: Wed Jun 30 00:01:45 1999 -time: Wed Jun 30 00:01:45 1999 -localtime: Wed Jun 30 00:01:45 1999 -gmtime: Wed Jun 30 00:01:45 1999 - -rtems_clock_get_tod 00:01:50 06/30/1999 -gettimeofday: Wed Jun 30 00:01:50 1999 -time: Wed Jun 30 00:01:50 1999 -localtime: Wed Jun 30 00:01:50 1999 -gmtime: Wed Jun 30 00:01:50 1999 - -rtems_clock_get_tod 00:01:55 06/30/1999 -gettimeofday: Wed Jun 30 00:01:55 1999 -time: Wed Jun 30 00:01:55 1999 -localtime: Wed Jun 30 00:01:55 1999 -gmtime: Wed Jun 30 00:01:55 1999 +rtems_clock_get_tod 00:01:31 06/30/1999 +gettimeofday: Wed Jun 30 00:01:31 1999 +time: Wed Jun 30 00:01:31 1999 +localtime: Wed Jun 30 00:01:31 1999 +gmtime: Wed Jun 30 00:01:31 1999 + +rtems_clock_get_tod 00:01:32 06/30/1999 +gettimeofday: Wed Jun 30 00:01:32 1999 +time: Wed Jun 30 00:01:32 1999 +localtime: Wed Jun 30 00:01:32 1999 +gmtime: Wed Jun 30 00:01:32 1999 + +rtems_clock_get_tod 00:01:33 06/30/1999 +gettimeofday: Wed Jun 30 00:01:33 1999 +time: Wed Jun 30 00:01:33 1999 +localtime: Wed Jun 30 00:01:33 1999 +gmtime: Wed Jun 30 00:01:33 1999 rtems_clock_set 00:15:59 01/01/2000 rtems_clock_get_tod 00:15:59 01/01/2000 @@ -167,35 +119,23 @@ time: Sat Jan 1 00:15:59 2000 localtime: Sat Jan 1 00:15:59 2000 gmtime: Sat Jan 1 00:15:59 2000 -rtems_clock_get_tod 00:16:04 01/01/2000 -gettimeofday: Sat Jan 1 00:16:04 2000 -time: Sat Jan 1 00:16:04 2000 -localtime: Sat Jan 1 00:16:04 2000 -gmtime: Sat Jan 1 00:16:04 2000 - -rtems_clock_get_tod 00:16:09 01/01/2000 -gettimeofday: Sat Jan 1 00:16:09 2000 -time: Sat Jan 1 00:16:09 2000 -localtime: Sat Jan 1 00:16:09 2000 -gmtime: Sat Jan 1 00:16:09 2000 - -rtems_clock_get_tod 00:16:14 01/01/2000 -gettimeofday: Sat Jan 1 00:16:14 2000 -time: Sat Jan 1 00:16:14 2000 -localtime: Sat Jan 1 00:16:14 2000 -gmtime: Sat Jan 1 00:16:14 2000 - -rtems_clock_get_tod 00:16:19 01/01/2000 -gettimeofday: Sat Jan 1 00:16:19 2000 -time: Sat Jan 1 00:16:19 2000 -localtime: Sat Jan 1 00:16:19 2000 -gmtime: Sat Jan 1 00:16:19 2000 - -rtems_clock_get_tod 00:16:24 01/01/2000 -gettimeofday: Sat Jan 1 00:16:24 2000 -time: Sat Jan 1 00:16:24 2000 -localtime: Sat Jan 1 00:16:24 2000 -gmtime: Sat Jan 1 00:16:24 2000 +rtems_clock_get_tod 00:16:00 01/01/2000 +gettimeofday: Sat Jan 1 00:16:00 2000 +time: Sat Jan 1 00:16:00 2000 +localtime: Sat Jan 1 00:16:00 2000 +gmtime: Sat Jan 1 00:16:00 2000 + +rtems_clock_get_tod 00:16:01 01/01/2000 +gettimeofday: Sat Jan 1 00:16:01 2000 +time: Sat Jan 1 00:16:01 2000 +localtime: Sat Jan 1 00:16:01 2000 +gmtime: Sat Jan 1 00:16:01 2000 + +rtems_clock_get_tod 00:16:02 01/01/2000 +gettimeofday: Sat Jan 1 00:16:02 2000 +time: Sat Jan 1 00:16:02 2000 +localtime: Sat Jan 1 00:16:02 2000 +gmtime: Sat Jan 1 00:16:02 2000 rtems_clock_set 05:10:59 02/02/2005 rtems_clock_get_tod 05:10:59 02/02/2005 @@ -204,35 +144,23 @@ time: Wed Feb 2 05:10:59 2005 localtime: Wed Feb 2 05:10:59 2005 gmtime: Wed Feb 2 05:10:59 2005 -rtems_clock_get_tod 05:11:04 02/02/2005 -gettimeofday: Wed Feb 2 05:11:04 2005 -time: Wed Feb 2 05:11:04 2005 -localtime: Wed Feb 2 05:11:04 2005 -gmtime: Wed Feb 2 05:11:04 2005 - -rtems_clock_get_tod 05:11:09 02/02/2005 -gettimeofday: Wed Feb 2 05:11:09 2005 -time: Wed Feb 2 05:11:09 2005 -localtime: Wed Feb 2 05:11:09 2005 -gmtime: Wed Feb 2 05:11:09 2005 - -rtems_clock_get_tod 05:11:14 02/02/2005 -gettimeofday: Wed Feb 2 05:11:14 2005 -time: Wed Feb 2 05:11:14 2005 -localtime: Wed Feb 2 05:11:14 2005 -gmtime: Wed Feb 2 05:11:14 2005 - -rtems_clock_get_tod 05:11:19 02/02/2005 -gettimeofday: Wed Feb 2 05:11:19 2005 -time: Wed Feb 2 05:11:19 2005 -localtime: Wed Feb 2 05:11:19 2005 -gmtime: Wed Feb 2 05:11:19 2005 - -rtems_clock_get_tod 05:11:24 02/02/2005 -gettimeofday: Wed Feb 2 05:11:24 2005 -time: Wed Feb 2 05:11:24 2005 -localtime: Wed Feb 2 05:11:24 2005 -gmtime: Wed Feb 2 05:11:24 2005 +rtems_clock_get_tod 05:11:00 02/02/2005 +gettimeofday: Wed Feb 2 05:11:00 2005 +time: Wed Feb 2 05:11:00 2005 +localtime: Wed Feb 2 05:11:00 2005 +gmtime: Wed Feb 2 05:11:00 2005 + +rtems_clock_get_tod 05:11:01 02/02/2005 +gettimeofday: Wed Feb 2 05:11:01 2005 +time: Wed Feb 2 05:11:01 2005 +localtime: Wed Feb 2 05:11:01 2005 +gmtime: Wed Feb 2 05:11:01 2005 + +rtems_clock_get_tod 05:11:02 02/02/2005 +gettimeofday: Wed Feb 2 05:11:02 2005 +time: Wed Feb 2 05:11:02 2005 +localtime: Wed Feb 2 05:11:02 2005 +gmtime: Wed Feb 2 05:11:02 2005 rtems_clock_set 10:05:59 03/03/2010 rtems_clock_get_tod 10:05:59 03/03/2010 @@ -241,35 +169,23 @@ time: Wed Mar 3 10:05:59 2010 localtime: Wed Mar 3 10:05:59 2010 gmtime: Wed Mar 3 10:05:59 2010 -rtems_clock_get_tod 10:06:04 03/03/2010 -gettimeofday: Wed Mar 3 10:06:04 2010 -time: Wed Mar 3 10:06:04 2010 -localtime: Wed Mar 3 10:06:04 2010 -gmtime: Wed Mar 3 10:06:04 2010 - -rtems_clock_get_tod 10:06:09 03/03/2010 -gettimeofday: Wed Mar 3 10:06:09 2010 -time: Wed Mar 3 10:06:09 2010 -localtime: Wed Mar 3 10:06:09 2010 -gmtime: Wed Mar 3 10:06:09 2010 - -rtems_clock_get_tod 10:06:14 03/03/2010 -gettimeofday: Wed Mar 3 10:06:14 2010 -time: Wed Mar 3 10:06:14 2010 -localtime: Wed Mar 3 10:06:14 2010 -gmtime: Wed Mar 3 10:06:14 2010 - -rtems_clock_get_tod 10:06:19 03/03/2010 -gettimeofday: Wed Mar 3 10:06:19 2010 -time: Wed Mar 3 10:06:19 2010 -localtime: Wed Mar 3 10:06:19 2010 -gmtime: Wed Mar 3 10:06:19 2010 - -rtems_clock_get_tod 10:06:24 03/03/2010 -gettimeofday: Wed Mar 3 10:06:24 2010 -time: Wed Mar 3 10:06:24 2010 -localtime: Wed Mar 3 10:06:24 2010 -gmtime: Wed Mar 3 10:06:24 2010 +rtems_clock_get_tod 10:06:00 03/03/2010 +gettimeofday: Wed Mar 3 10:06:00 2010 +time: Wed Mar 3 10:06:00 2010 +localtime: Wed Mar 3 10:06:00 2010 +gmtime: Wed Mar 3 10:06:00 2010 + +rtems_clock_get_tod 10:06:01 03/03/2010 +gettimeofday: Wed Mar 3 10:06:01 2010 +time: Wed Mar 3 10:06:01 2010 +localtime: Wed Mar 3 10:06:01 2010 +gmtime: Wed Mar 3 10:06:01 2010 + +rtems_clock_get_tod 10:06:02 03/03/2010 +gettimeofday: Wed Mar 3 10:06:02 2010 +time: Wed Mar 3 10:06:02 2010 +localtime: Wed Mar 3 10:06:02 2010 +gmtime: Wed Mar 3 10:06:02 2010 rtems_clock_set 15:00:59 04/04/2020 rtems_clock_get_tod 15:00:59 04/04/2020 @@ -278,35 +194,23 @@ time: Sat Apr 4 15:00:59 2020 localtime: Sat Apr 4 15:00:59 2020 gmtime: Sat Apr 4 15:00:59 2020 -rtems_clock_get_tod 15:01:04 04/04/2020 -gettimeofday: Sat Apr 4 15:01:04 2020 -time: Sat Apr 4 15:01:04 2020 -localtime: Sat Apr 4 15:01:04 2020 -gmtime: Sat Apr 4 15:01:04 2020 - -rtems_clock_get_tod 15:01:09 04/04/2020 -gettimeofday: Sat Apr 4 15:01:09 2020 -time: Sat Apr 4 15:01:09 2020 -localtime: Sat Apr 4 15:01:09 2020 -gmtime: Sat Apr 4 15:01:09 2020 - -rtems_clock_get_tod 15:01:14 04/04/2020 -gettimeofday: Sat Apr 4 15:01:14 2020 -time: Sat Apr 4 15:01:14 2020 -localtime: Sat Apr 4 15:01:14 2020 -gmtime: Sat Apr 4 15:01:14 2020 - -rtems_clock_get_tod 15:01:19 04/04/2020 -gettimeofday: Sat Apr 4 15:01:19 2020 -time: Sat Apr 4 15:01:19 2020 -localtime: Sat Apr 4 15:01:19 2020 -gmtime: Sat Apr 4 15:01:19 2020 - -rtems_clock_get_tod 15:01:24 04/04/2020 -gettimeofday: Sat Apr 4 15:01:24 2020 -time: Sat Apr 4 15:01:24 2020 -localtime: Sat Apr 4 15:01:24 2020 -gmtime: Sat Apr 4 15:01:24 2020 +rtems_clock_get_tod 15:01:00 04/04/2020 +gettimeofday: Sat Apr 4 15:01:00 2020 +time: Sat Apr 4 15:01:00 2020 +localtime: Sat Apr 4 15:01:00 2020 +gmtime: Sat Apr 4 15:01:00 2020 + +rtems_clock_get_tod 15:01:01 04/04/2020 +gettimeofday: Sat Apr 4 15:01:01 2020 +time: Sat Apr 4 15:01:01 2020 +localtime: Sat Apr 4 15:01:01 2020 +gmtime: Sat Apr 4 15:01:01 2020 + +rtems_clock_get_tod 15:01:02 04/04/2020 +gettimeofday: Sat Apr 4 15:01:02 2020 +time: Sat Apr 4 15:01:02 2020 +localtime: Sat Apr 4 15:01:02 2020 +gmtime: Sat Apr 4 15:01:02 2020 diff --git a/testsuites/psxtests/psxtime/test.c b/testsuites/psxtests/psxtime/test.c index a895273651..c8741d8fa5 100644 --- a/testsuites/psxtests/psxtime/test.c +++ b/testsuites/psxtests/psxtime/test.c @@ -92,11 +92,11 @@ void check_a_tod( a_tm = gmtime( &a_time_t ); printf( "gmtime: %s\n", asctime( a_tm ) ); - status = rtems_task_wake_after( 5 * rtems_clock_get_ticks_per_second() ); + status = rtems_task_wake_after( rtems_clock_get_ticks_per_second() ); i++; - } while( i < 6 ); + } while( i <= 3 ); } void test_adjtime(void) -- cgit v1.2.3