[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] posixtm: don't reject a time with "60" as the number of seco
|
From: |
Jim Meyering |
|
Subject: |
Re: [PATCH] posixtm: don't reject a time with "60" as the number of seconds |
|
Date: |
Sat, 19 Sep 2009 18:46:16 +0200 |
Jim Meyering wrote:
> Paolo Bonzini wrote:
>
>>> { "12131415.16", 13, " 1039788916 Fri Dec 13 14:15:16 2002" },
>>> { "12131415.16", 13, " 1039788916 Fri Dec 13 14:15:16 2002" },
>>
>> Uhm, why 2002? You could pre-generate all possible outputs from 2009
>> to 2038 and only one of them will be checked.
>
> Good idea. But at least with a date in December,
> I'll stop at 2037, in order to keep the second count under 2^31.
>
> I'll be adding the lines generated by this, one way or another:
>
> for i in $(seq 2009 2037); do
> date -u -d "$i-12-13 14:15:16" \
> "+{ \"12131415.16\", 13, \" %s %a %b %d %T %Y\" },"
> done
>
> { "12131415.16", 13, " 1260713716 Sun Dec 13 14:15:16 2009" },
> { "12131415.16", 13, " 1292249716 Mon Dec 13 14:15:16 2010" },
> { "12131415.16", 13, " 1323785716 Tue Dec 13 14:15:16 2011" },
Actually I found a better way.
Cross-check with the result of calling posixtime using the
same string, but with the year prepended.
I've revamped those tests and pushed these four c-sets:
>From c67d87d7d22e5b049a1893d6ff644d79595151d0 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Wed, 16 Sep 2009 08:36:40 +0200
Subject: [PATCH 1/4] posixtm: move #ifdef'd tests into a new module
* lib/posixtm.c (posixtime): Remove #ifdef'd tests. Move to...
* tests/test-posixtm.c: ... this new file.
* modules/posixtm-tests: New module.
---
ChangeLog | 7 ++
lib/posixtm.c | 96 ---------------------------
modules/posixtm-tests | 13 ++++
tests/test-posixtm.c | 175 +++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 195 insertions(+), 96 deletions(-)
create mode 100644 modules/posixtm-tests
create mode 100644 tests/test-posixtm.c
diff --git a/ChangeLog b/ChangeLog
index 6b17480..0206594 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-09-16 Jim Meyering <address@hidden>
+
+ posixtm: move #ifdef'd tests into a new module
+ * lib/posixtm.c (posixtime): Remove #ifdef'd tests. Move to...
+ * tests/test-posixtm.c: ... this new file.
+ * modules/posixtm-tests: New module.
+
2009-09-19 Eric Blake <address@hidden>
openat: simplify use of at-func.c
diff --git a/lib/posixtm.c b/lib/posixtm.c
index 0a1e779..b94c341 100644
--- a/lib/posixtm.c
+++ b/lib/posixtm.c
@@ -234,99 +234,3 @@ posixtime (time_t *p, const char *s, unsigned int
syntax_bits)
*p = t;
return true;
}
-
-#ifdef TEST_POSIXTIME
-/*
- Test mainly with syntax_bits == 13
- (aka: (PDS_LEADING_YEAR | PDS_CENTURY | PDS_SECONDS))
-
- This test data assumes Universal Time, e.g., TZ="UTC0".
-
- This test data also assumes that time_t is signed and is at least
- 39 bits wide, so that it can represent all years from 0000 through
- 9999. A host with 32-bit signed time_t can represent only time
- stamps in the range 1901-12-13 20:45:52 through 2038-01-18
- 03:14:07 UTC, assuming POSIX time_t with no leap seconds, so test
- cases outside this range will not work on such a host.
-
- Also, the first two lines of test data assume that the current
- year is 2002.
-
-BEGIN-DATA
-12131415.16 13 1039788916 Fri Dec 13 14:15:16 2002
-12131415.16 13 1039788916 Fri Dec 13 14:15:16 2002
-000001010000.00 13 -62167132800 Sun Jan 1 00:00:00 0000
-190112132045.52 13 -2147483648 Fri Dec 13 20:45:52 1901
-190112132045.53 13 -2147483647 Fri Dec 13 20:45:53 1901
-190112132046.52 13 -2147483588 Fri Dec 13 20:46:52 1901
-190112132145.52 13 -2147480048 Fri Dec 13 21:45:52 1901
-190112142045.52 13 -2147397248 Sat Dec 14 20:45:52 1901
-190201132045.52 13 -2144805248 Mon Jan 13 20:45:52 1902
-196912312359.59 13 -1 Wed Dec 31 23:59:59 1969
-197001010000.00 13 0 Thu Jan 1 00:00:00 1970
-197001010000.01 13 1 Thu Jan 1 00:00:01 1970
-197001010001.00 13 60 Thu Jan 1 00:01:00 1970
-197001010000.60 13 60 Thu Jan 1 00:01:00 1970
-197001010100.00 13 3600 Thu Jan 1 01:00:00 1970
-197001020000.00 13 86400 Fri Jan 2 00:00:00 1970
-197002010000.00 13 2678400 Sun Feb 1 00:00:00 1970
-197101010000.00 13 31536000 Fri Jan 1 00:00:00 1971
-197001000000.00 13 * *
-197000010000.00 13 * *
-197001010060.00 13 * *
-197001012400.00 13 * *
-197001320000.00 13 * *
-197013010000.00 13 * *
-203801190314.06 13 2147483646 Tue Jan 19 03:14:06 2038
-203801190314.07 13 2147483647 Tue Jan 19 03:14:07 2038
-203801190314.08 13 2147483648 Tue Jan 19 03:14:08 2038
-999912312359.59 13 253402300799 Fri Dec 31 23:59:59 9999
-1112131415 13 1323785700 Tue Dec 13 14:15:00 2011
-1112131415.16 13 1323785716 Tue Dec 13 14:15:16 2011
-201112131415.16 13 1323785716 Tue Dec 13 14:15:16 2011
-191112131415.16 13 -1831974284 Wed Dec 13 14:15:16 1911
-203712131415.16 13 2144326516 Sun Dec 13 14:15:16 2037
-3712131415.16 13 2144326516 Sun Dec 13 14:15:16 2037
-6812131415.16 13 3122633716 Thu Dec 13 14:15:16 2068
-6912131415.16 13 -1590284 Sat Dec 13 14:15:16 1969
-7012131415.16 13 29945716 Sun Dec 13 14:15:16 1970
-1213141599 2 945094500 Mon Dec 13 14:15:00 1999
-1213141500 2 976716900 Wed Dec 13 14:15:00 2000
-END-DATA
-
-*/
-
-# define MAX_BUFF_LEN 1024
-
-int
-main (void)
-{
- char buff[MAX_BUFF_LEN + 1];
-
- buff[MAX_BUFF_LEN] = 0;
- while (fgets (buff, MAX_BUFF_LEN, stdin) && buff[0])
- {
- char time_str[MAX_BUFF_LEN];
- unsigned int syntax_bits;
- time_t t;
- if (sscanf (buff, "%s %u", time_str, &syntax_bits) != 2)
- printf ("*\n");
- else
- {
- printf ("%-15s %2u ", time_str, syntax_bits);
- if (posixtime (&t, time_str, syntax_bits))
- printf ("%12ld %s", (long int) t, ctime (&t));
- else
- printf ("%12s %s", "*", "*\n");
- }
- }
- exit (0);
-
-}
-#endif
-
-/*
-Local Variables:
-compile-command: "gcc -DTEST_POSIXTIME -g -O -Wall -W posixtm.c"
-End:
-*/
diff --git a/modules/posixtm-tests b/modules/posixtm-tests
new file mode 100644
index 0000000..de4d12c
--- /dev/null
+++ b/modules/posixtm-tests
@@ -0,0 +1,13 @@
+Files:
+tests/test-posixtm.c
+
+Depends-on:
+intprops
+setenv
+strftime
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-posixtm
+check_PROGRAMS += test-posixtm
diff --git a/tests/test-posixtm.c b/tests/test-posixtm.c
new file mode 100644
index 0000000..2f9f565
--- /dev/null
+++ b/tests/test-posixtm.c
@@ -0,0 +1,175 @@
+/* Test that openat_safer leave standard fds alone.
+ Copyright (C) 2009 Free Software Foundation, Inc.
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+/* Written by Jim Meyering. */
+
+#include <config.h>
+
+#include "posixtm.h"
+#include "intprops.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
+
+#define STREQ(a, b) (strcmp (a, b) == 0)
+
+#define ASSERT(expr) \
+ do \
+ { \
+ if (!(expr)) \
+ { \
+ fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+ fflush (stderr); \
+ abort (); \
+ } \
+ } \
+ while (0)
+
+struct posixtm_test
+{
+ char const *in;
+ unsigned int syntax_bits;
+ char const *expected;
+};
+
+/* Test mainly with syntax_bits == 13
+ (aka: (PDS_LEADING_YEAR | PDS_CENTURY | PDS_SECONDS)) */
+
+static struct posixtm_test T[] =
+ {
+ { "12131415.16", 13, " 1039788916 Fri Dec 13 14:15:16 2002" },
+ { "12131415.16", 13, " 1039788916 Fri Dec 13 14:15:16 2002" },
+ { "000001010000.00", 13, "-62167132800 Sun Jan 1 00:00:00 0000" },
+ { "190112132045.52", 13, " -2147483648 Fri Dec 13 20:45:52 1901" },
+ { "190112132045.53", 13, " -2147483647 Fri Dec 13 20:45:53 1901" },
+ { "190112132046.52", 13, " -2147483588 Fri Dec 13 20:46:52 1901" },
+ { "190112132145.52", 13, " -2147480048 Fri Dec 13 21:45:52 1901" },
+ { "190112142045.52", 13, " -2147397248 Sat Dec 14 20:45:52 1901" },
+ { "190201132045.52", 13, " -2144805248 Mon Jan 13 20:45:52 1902" },
+ { "196912312359.59", 13, " -1 Wed Dec 31 23:59:59 1969" },
+ { "197001010000.00", 13, " 0 Thu Jan 1 00:00:00 1970" },
+ { "197001010000.01", 13, " 1 Thu Jan 1 00:00:01 1970" },
+ { "197001010001.00", 13, " 60 Thu Jan 1 00:01:00 1970" },
+ { "197001010000.60", 13, " 60 Thu Jan 1 00:01:00 1970" },
+ { "197001010100.00", 13, " 3600 Thu Jan 1 01:00:00 1970" },
+ { "197001020000.00", 13, " 86400 Fri Jan 2 00:00:00 1970" },
+ { "197002010000.00", 13, " 2678400 Sun Feb 1 00:00:00 1970" },
+ { "197101010000.00", 13, " 31536000 Fri Jan 1 00:00:00 1971" },
+ { "197001000000.00", 13, " * *" },
+ { "197000010000.00", 13, " * *" },
+ { "197001010060.00", 13, " * *" },
+ { "197001012400.00", 13, " * *" },
+ { "197001320000.00", 13, " * *" },
+ { "197013010000.00", 13, " * *" },
+ { "203801190314.06", 13, " 2147483646 Tue Jan 19 03:14:06 2038" },
+ { "203801190314.07", 13, " 2147483647 Tue Jan 19 03:14:07 2038" },
+ { "203801190314.08", 13, " 2147483648 Tue Jan 19 03:14:08 2038" },
+ { "999912312359.59", 13, "253402300799 Fri Dec 31 23:59:59 9999" },
+ { "1112131415", 13, " 1323785700 Tue Dec 13 14:15:00 2011" },
+ { "1112131415.16", 13, " 1323785716 Tue Dec 13 14:15:16 2011" },
+ { "201112131415.16", 13, " 1323785716 Tue Dec 13 14:15:16 2011" },
+ { "191112131415.16", 13, " -1831974284 Wed Dec 13 14:15:16 1911" },
+ { "203712131415.16", 13, " 2144326516 Sun Dec 13 14:15:16 2037" },
+ { "3712131415.16", 13, " 2144326516 Sun Dec 13 14:15:16 2037" },
+ { "6812131415.16", 13, " 3122633716 Thu Dec 13 14:15:16 2068" },
+ { "6912131415.16", 13, " -1590284 Sat Dec 13 14:15:16 1969" },
+ { "7012131415.16", 13, " 29945716 Sun Dec 13 14:15:16 1970" },
+ { "1213141599", 2, " 945094500 Mon Dec 13 14:15:00 1999" },
+ { "1213141500", 2, " 976716900 Wed Dec 13 14:15:00 2000" },
+ { NULL, 0, NULL }
+ };
+
+int
+main (void)
+{
+ unsigned int i;
+ int fail = 0;
+ char curr_year_str[30];
+ struct tm *tm;
+ time_t t_now;
+ int err;
+ size_t n_bytes;
+
+ /* The above test data requires Universal Time, e.g., TZ="UTC0". */
+ err = setenv ("TZ", "UTC0", 1);
+ ASSERT (err == 0);
+
+ t_now = time (NULL);
+ ASSERT (t_now != (time_t) -1);
+ tm = localtime (&t_now);
+ ASSERT (tm);
+ n_bytes = strftime (curr_year_str, sizeof curr_year_str, "%Y", tm);
+ ASSERT (0 < n_bytes);
+
+ /* This test data also assumes that time_t is signed and is at least
+ 39 bits wide, so that it can represent all years from 0000 through
+ 9999. A host with 32-bit signed time_t can represent only time
+ stamps in the range 1901-12-13 20:45:52 through 2038-01-18
+ 03:14:07 UTC, assuming POSIX time_t with no leap seconds, so test
+ cases outside this range will not work on such a host. */
+ if ( ! TYPE_SIGNED (time_t))
+ {
+ fprintf (stderr, "%s: this test requires signed time_t\n");
+ return 77;
+ }
+
+ if (sizeof (time_t) * CHAR_BIT < 39)
+ {
+ fprintf (stderr, "%s: this test requires time_t at least 39 bits
wide\n");
+ return 77;
+ }
+
+
+ for (i = 0; T[i].in; i++)
+ {
+ char out_buf[100];
+ time_t t;
+
+ /* The first two tests assume that the current year is 2002.
+ If an input string does not specify the year number, and
+ the expected output year is not the same as the current year,
+ then skip the test. For example:
+ { "12131415.16", " 1039788916 Fri Dec 13 14:15:16 2002" }, */
+ if (8 <= strlen (T[i].in)
+ && (T[i].in[8] == '.' || T[i].in[8] == '\0')
+ && 4 < strlen (T[i].expected)
+ && ! STREQ (T[i].expected + (strlen (T[i].expected) - 4),
+ curr_year_str))
+ continue;
+
+ if (posixtime (&t, T[i].in, T[i].syntax_bits))
+ sprintf (out_buf, "%12ld %s", (long int) t, ctime (&t));
+ else
+ sprintf (out_buf, "%12s %s", "*", "*\n");
+
+ out_buf[strlen (out_buf) - 1] = '\0';
+ if (!STREQ (out_buf, T[i].expected))
+ {
+ printf ("mismatch (-: actual; +:expected)\n-%s\n+%s\n",
+ out_buf, T[i].expected);
+ fail = 1;
+ }
+ }
+
+ return fail;
+}
+
+/*
+Local Variables:
+indent-tabs-mode: nil
+End:
+*/
--
1.6.5.rc1.192.g63b0
>From e6372a5c51f2d34e8a426dac627550a0444b293d Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Wed, 16 Sep 2009 10:36:36 +0200
Subject: [PATCH 2/4] posixtm-tests: correct the sole failing test
* tests/test-posixtm.c: Correct 0000-01-01 00:00:00 test so that
expected output matches what mktime now produces. Cross-checked via
erlang's calendar:datetime_to_gregorian_seconds({{1970,1,1},{0,0,0}})
---
ChangeLog | 5 +++++
tests/test-posixtm.c | 2 +-
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0206594..1544a73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2009-09-16 Jim Meyering <address@hidden>
+ posixtm-tests: adjust the sole failing test
+ * tests/test-posixtm.c: Correct 0000-01-01 00:00:00 test so that
+ expected output matches what mktime now produces. Cross-checked via
+ erlang's calendar:datetime_to_gregorian_seconds({{1970,1,1},{0,0,0}})
+
posixtm: move #ifdef'd tests into a new module
* lib/posixtm.c (posixtime): Remove #ifdef'd tests. Move to...
* tests/test-posixtm.c: ... this new file.
diff --git a/tests/test-posixtm.c b/tests/test-posixtm.c
index 2f9f565..8473b66 100644
--- a/tests/test-posixtm.c
+++ b/tests/test-posixtm.c
@@ -53,7 +53,7 @@ static struct posixtm_test T[] =
{
{ "12131415.16", 13, " 1039788916 Fri Dec 13 14:15:16 2002" },
{ "12131415.16", 13, " 1039788916 Fri Dec 13 14:15:16 2002" },
- { "000001010000.00", 13, "-62167132800 Sun Jan 1 00:00:00 0000" },
+ { "000001010000.00", 13, "-62167219200 Sat Jan 1 00:00:00 0" },
{ "190112132045.52", 13, " -2147483648 Fri Dec 13 20:45:52 1901" },
{ "190112132045.53", 13, " -2147483647 Fri Dec 13 20:45:53 1901" },
{ "190112132046.52", 13, " -2147483588 Fri Dec 13 20:46:52 1901" },
--
1.6.5.rc1.192.g63b0
>From de9d0ef74570f3faec1951ad2d1869d2c2f15533 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Wed, 16 Sep 2009 20:20:17 +0200
Subject: [PATCH 3/4] posixtm-tests: make T const-correct; add a test case
* tests/test-posixtm.c (T): Declare const.
Add a test for -(2^31+1).
Remove useless can-succeed-only-in-2002 test.
---
ChangeLog | 5 +++++
tests/test-posixtm.c | 5 ++---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 1544a73..f67c52a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2009-09-16 Jim Meyering <address@hidden>
+ posixtm-tests: make T const-correct; add a test case
+ * tests/test-posixtm.c (T): Declare const.
+ Add a test for -(2^31+1).
+ Remove useless can-succeed-only-in-2002 test.
+
posixtm-tests: adjust the sole failing test
* tests/test-posixtm.c: Correct 0000-01-01 00:00:00 test so that
expected output matches what mktime now produces. Cross-checked via
diff --git a/tests/test-posixtm.c b/tests/test-posixtm.c
index 8473b66..a77a558 100644
--- a/tests/test-posixtm.c
+++ b/tests/test-posixtm.c
@@ -49,11 +49,10 @@ struct posixtm_test
/* Test mainly with syntax_bits == 13
(aka: (PDS_LEADING_YEAR | PDS_CENTURY | PDS_SECONDS)) */
-static struct posixtm_test T[] =
+static struct posixtm_test const T[] =
{
- { "12131415.16", 13, " 1039788916 Fri Dec 13 14:15:16 2002" },
- { "12131415.16", 13, " 1039788916 Fri Dec 13 14:15:16 2002" },
{ "000001010000.00", 13, "-62167219200 Sat Jan 1 00:00:00 0" },
+ { "190112132045.51", 13, " -2147483649 Fri Dec 13 20:45:51 1901" },
{ "190112132045.52", 13, " -2147483648 Fri Dec 13 20:45:52 1901" },
{ "190112132045.53", 13, " -2147483647 Fri Dec 13 20:45:53 1901" },
{ "190112132046.52", 13, " -2147483588 Fri Dec 13 20:46:52 1901" },
--
1.6.5.rc1.192.g63b0
>From eee5595d424b0df7e9a135dbf11b999673a821f0 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Thu, 17 Sep 2009 14:15:38 +0200
Subject: [PATCH 4/4] posixtm-tests: revamp
Record only the expected time_t value, not the ctime string.
Skip any test that would require a time_t value larger than
currently representable (e.g., if run with 32-bit time_t,
this skips any test that expects an out-of-range value).
* tests/test-posixtm.c (struct posixtm_test) [valid, t_expected]:
New members.
[expected]: Remove member.
(T): Include new column: valid. Move date strings into comments.
(main): Adapt.
Print a diagnostic for each skipped test.
Don't skip the entire test (exit 77) if time_t is unsigned.
Instead, skip only the individual tests with a negative result.
---
tests/test-posixtm.c | 175 ++++++++++++++++++++++++++-----------------------
1 files changed, 93 insertions(+), 82 deletions(-)
diff --git a/tests/test-posixtm.c b/tests/test-posixtm.c
index a77a558..0e6167f 100644
--- a/tests/test-posixtm.c
+++ b/tests/test-posixtm.c
@@ -19,12 +19,15 @@
#include <config.h>
#include "posixtm.h"
-#include "intprops.h"
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
#include <time.h>
+#include "intprops.h"
+
#define STREQ(a, b) (strcmp (a, b) == 0)
#define ASSERT(expr) \
@@ -43,7 +46,8 @@ struct posixtm_test
{
char const *in;
unsigned int syntax_bits;
- char const *expected;
+ bool valid;
+ int64_t t_expected;
};
/* Test mainly with syntax_bits == 13
@@ -51,49 +55,53 @@ struct posixtm_test
static struct posixtm_test const T[] =
{
- { "000001010000.00", 13, "-62167219200 Sat Jan 1 00:00:00 0" },
- { "190112132045.51", 13, " -2147483649 Fri Dec 13 20:45:51 1901" },
- { "190112132045.52", 13, " -2147483648 Fri Dec 13 20:45:52 1901" },
- { "190112132045.53", 13, " -2147483647 Fri Dec 13 20:45:53 1901" },
- { "190112132046.52", 13, " -2147483588 Fri Dec 13 20:46:52 1901" },
- { "190112132145.52", 13, " -2147480048 Fri Dec 13 21:45:52 1901" },
- { "190112142045.52", 13, " -2147397248 Sat Dec 14 20:45:52 1901" },
- { "190201132045.52", 13, " -2144805248 Mon Jan 13 20:45:52 1902" },
- { "196912312359.59", 13, " -1 Wed Dec 31 23:59:59 1969" },
- { "197001010000.00", 13, " 0 Thu Jan 1 00:00:00 1970" },
- { "197001010000.01", 13, " 1 Thu Jan 1 00:00:01 1970" },
- { "197001010001.00", 13, " 60 Thu Jan 1 00:01:00 1970" },
- { "197001010000.60", 13, " 60 Thu Jan 1 00:01:00 1970" },
- { "197001010100.00", 13, " 3600 Thu Jan 1 01:00:00 1970" },
- { "197001020000.00", 13, " 86400 Fri Jan 2 00:00:00 1970" },
- { "197002010000.00", 13, " 2678400 Sun Feb 1 00:00:00 1970" },
- { "197101010000.00", 13, " 31536000 Fri Jan 1 00:00:00 1971" },
- { "197001000000.00", 13, " * *" },
- { "197000010000.00", 13, " * *" },
- { "197001010060.00", 13, " * *" },
- { "197001012400.00", 13, " * *" },
- { "197001320000.00", 13, " * *" },
- { "197013010000.00", 13, " * *" },
- { "203801190314.06", 13, " 2147483646 Tue Jan 19 03:14:06 2038" },
- { "203801190314.07", 13, " 2147483647 Tue Jan 19 03:14:07 2038" },
- { "203801190314.08", 13, " 2147483648 Tue Jan 19 03:14:08 2038" },
- { "999912312359.59", 13, "253402300799 Fri Dec 31 23:59:59 9999" },
- { "1112131415", 13, " 1323785700 Tue Dec 13 14:15:00 2011" },
- { "1112131415.16", 13, " 1323785716 Tue Dec 13 14:15:16 2011" },
- { "201112131415.16", 13, " 1323785716 Tue Dec 13 14:15:16 2011" },
- { "191112131415.16", 13, " -1831974284 Wed Dec 13 14:15:16 1911" },
- { "203712131415.16", 13, " 2144326516 Sun Dec 13 14:15:16 2037" },
- { "3712131415.16", 13, " 2144326516 Sun Dec 13 14:15:16 2037" },
- { "6812131415.16", 13, " 3122633716 Thu Dec 13 14:15:16 2068" },
- { "6912131415.16", 13, " -1590284 Sat Dec 13 14:15:16 1969" },
- { "7012131415.16", 13, " 29945716 Sun Dec 13 14:15:16 1970" },
- { "1213141599", 2, " 945094500 Mon Dec 13 14:15:00 1999" },
- { "1213141500", 2, " 976716900 Wed Dec 13 14:15:00 2000" },
- { NULL, 0, NULL }
+ /* no year specified; cross-check via another posixtime call */
+ { "12131415.16", 13, 1, 0}, /* ??? Dec 13 14:15:16 ???? */
+ { "12131415", 13, 1, 0}, /* ??? Dec 13 14:15:00 ???? */
+
+ { "000001010000.00", 13, 1, -62167219200}, /* Sat Jan 1 00:00:00 0 */
+ { "190112132045.51", 13, 1, -2147483649}, /* Fri Dec 13 20:45:51 1901 */
+ { "190112132045.52", 13, 1, -2147483648}, /* Fri Dec 13 20:45:52 1901 */
+ { "190112132045.53", 13, 1, -2147483647}, /* Fri Dec 13 20:45:53 1901 */
+ { "190112132046.52", 13, 1, -2147483588}, /* Fri Dec 13 20:46:52 1901 */
+ { "190112132145.52", 13, 1, -2147480048}, /* Fri Dec 13 21:45:52 1901 */
+ { "190112142045.52", 13, 1, -2147397248}, /* Sat Dec 14 20:45:52 1901 */
+ { "190201132045.52", 13, 1, -2144805248}, /* Mon Jan 13 20:45:52 1902 */
+ { "196912312359.59", 13, 1, -1}, /* Wed Dec 31 23:59:59 1969 */
+ { "197001010000.00", 13, 1, 0}, /* Thu Jan 1 00:00:00 1970 */
+ { "197001010000.01", 13, 1, 1}, /* Thu Jan 1 00:00:01 1970 */
+ { "197001010001.00", 13, 1, 60}, /* Thu Jan 1 00:01:00 1970 */
+ { "197001010000.60", 13, 1, 60}, /* Thu Jan 1 00:01:00 1970 */
+ { "197001010100.00", 13, 1, 3600}, /* Thu Jan 1 01:00:00 1970 */
+ { "197001020000.00", 13, 1, 86400}, /* Fri Jan 2 00:00:00 1970 */
+ { "197002010000.00", 13, 1, 2678400}, /* Sun Feb 1 00:00:00 1970 */
+ { "197101010000.00", 13, 1, 31536000}, /* Fri Jan 1 00:00:00 1971 */
+ { "197001000000.00", 13, 0, 0}, /* -- */
+ { "197000010000.00", 13, 0, 0}, /* -- */
+ { "197001010060.00", 13, 0, 0}, /* -- */
+ { "197001012400.00", 13, 0, 0}, /* -- */
+ { "197001320000.00", 13, 0, 0}, /* -- */
+ { "197013010000.00", 13, 0, 0}, /* -- */
+ { "203801190314.06", 13, 1, 2147483646}, /* Tue Jan 19 03:14:06 2038 */
+ { "203801190314.07", 13, 1, 2147483647}, /* Tue Jan 19 03:14:07 2038 */
+ { "203801190314.08", 13, 1, 2147483648}, /* Tue Jan 19 03:14:08 2038 */
+ { "999912312359.59", 13, 1, 253402300799}, /* Fri Dec 31 23:59:59 9999 */
+ { "1112131415", 13, 1, 1323785700}, /* Tue Dec 13 14:15:00 2011 */
+ { "1112131415.16", 13, 1, 1323785716}, /* Tue Dec 13 14:15:16 2011 */
+ { "201112131415.16", 13, 1, 1323785716}, /* Tue Dec 13 14:15:16 2011 */
+ { "191112131415.16", 13, 1, -1831974284}, /* Wed Dec 13 14:15:16 1911 */
+ { "203712131415.16", 13, 1, 2144326516}, /* Sun Dec 13 14:15:16 2037 */
+ { "3712131415.16", 13, 1, 2144326516}, /* Sun Dec 13 14:15:16 2037 */
+ { "6812131415.16", 13, 1, 3122633716}, /* Thu Dec 13 14:15:16 2068 */
+ { "6912131415.16", 13, 1, -1590284}, /* Sat Dec 13 14:15:16 1969 */
+ { "7012131415.16", 13, 1, 29945716}, /* Sun Dec 13 14:15:16 1970 */
+ { "1213141599", 2, 1, 945094500}, /* Mon Dec 13 14:15:00 1999 */
+ { "1213141500", 2, 1, 976716900}, /* Wed Dec 13 14:15:00 2000 */
+ { NULL, 0, 0, 0}
};
int
-main (void)
+main (int argc, char **argv)
{
unsigned int i;
int fail = 0;
@@ -114,52 +122,55 @@ main (void)
n_bytes = strftime (curr_year_str, sizeof curr_year_str, "%Y", tm);
ASSERT (0 < n_bytes);
- /* This test data also assumes that time_t is signed and is at least
- 39 bits wide, so that it can represent all years from 0000 through
- 9999. A host with 32-bit signed time_t can represent only time
- stamps in the range 1901-12-13 20:45:52 through 2038-01-18
- 03:14:07 UTC, assuming POSIX time_t with no leap seconds, so test
- cases outside this range will not work on such a host. */
- if ( ! TYPE_SIGNED (time_t))
+ for (i = 0; T[i].in; i++)
{
- fprintf (stderr, "%s: this test requires signed time_t\n");
- return 77;
- }
+ time_t t_out;
+ time_t t_exp = T[i].t_expected;
+ bool ok;
- if (sizeof (time_t) * CHAR_BIT < 39)
- {
- fprintf (stderr, "%s: this test requires time_t at least 39 bits
wide\n");
- return 77;
- }
+ /* Some tests assume that time_t is signed.
+ If it is unsigned and the result is negative, skip the test. */
+ if (T[i].t_expected < 0 && ! TYPE_SIGNED (time_t))
+ {
+ printf ("skipping %s: result is negative, "
+ "but your time_t is unsigned\n", T[i].in);
+ continue;
+ }
+ if (T[i].valid && t_exp != T[i].t_expected)
+ {
+ printf ("skipping %s: result is out of range of your time_t\n",
+ T[i].in);
+ continue;
+ }
- for (i = 0; T[i].in; i++)
- {
- char out_buf[100];
- time_t t;
-
- /* The first two tests assume that the current year is 2002.
- If an input string does not specify the year number, and
- the expected output year is not the same as the current year,
- then skip the test. For example:
- { "12131415.16", " 1039788916 Fri Dec 13 14:15:16 2002" }, */
+ /* If an input string does not specify the year number, determine
+ the expected output by calling posixtime with an otherwise
+ equivalent string that starts with the current year. */
if (8 <= strlen (T[i].in)
- && (T[i].in[8] == '.' || T[i].in[8] == '\0')
- && 4 < strlen (T[i].expected)
- && ! STREQ (T[i].expected + (strlen (T[i].expected) - 4),
- curr_year_str))
- continue;
-
- if (posixtime (&t, T[i].in, T[i].syntax_bits))
- sprintf (out_buf, "%12ld %s", (long int) t, ctime (&t));
- else
- sprintf (out_buf, "%12s %s", "*", "*\n");
-
- out_buf[strlen (out_buf) - 1] = '\0';
- if (!STREQ (out_buf, T[i].expected))
+ && (T[i].in[8] == '.' || T[i].in[8] == '\0'))
+ {
+ char tmp_buf[20];
+ stpcpy (stpcpy (tmp_buf, curr_year_str), T[i].in);
+ ASSERT (posixtime (&t_exp, tmp_buf, T[i].syntax_bits));
+ }
+
+ ok = posixtime (&t_out, T[i].in, T[i].syntax_bits);
+ if (ok != !!T[i].valid)
+ {
+ printf ("%s return value mismatch: got %d, expected %d\n",
+ T[i].in, !!ok, T[i].valid);
+ fail = 1;
+ continue;
+ }
+
+ if (!ok)
+ continue;
+
+ if (t_out != t_exp)
{
- printf ("mismatch (-: actual; +:expected)\n-%s\n+%s\n",
- out_buf, T[i].expected);
+ printf ("%s mismatch (-: actual; +:expected)\n-%12ld\n+%12ld\n",
+ T[i].in, t_out, t_exp);
fail = 1;
}
}
--
1.6.5.rc1.192.g63b0
- [PATCH] posixtm: don't reject a time with "60" as the number of seconds, Jim Meyering, 2009/09/14
- Re: [PATCH] posixtm: don't reject a time with "60" as the number of seconds, Paolo Bonzini, 2009/09/14
- Re: [PATCH] posixtm: don't reject a time with "60" as the number of seconds, Jim Meyering, 2009/09/15
- Re: [PATCH] posixtm: don't reject a time with "60" as the number of seconds, Paolo Bonzini, 2009/09/15
- Re: [PATCH] posixtm: don't reject a time with "60" as the number of seconds, Jim Meyering, 2009/09/16
- Re: [PATCH] posixtm: don't reject a time with "60" as the number of seconds, Jim Meyering, 2009/09/16
- Re: [PATCH] posixtm: don't reject a time with "60" as the number of seconds, Eric Blake, 2009/09/16
- Re: [PATCH] posixtm: don't reject a time with "60" as the number of seconds, Jim Meyering, 2009/09/16
- Re: [PATCH] posixtm: don't reject a time with "60" as the number of seconds, Paolo Bonzini, 2009/09/16
- Re: [PATCH] posixtm: don't reject a time with "60" as the number of seconds, Jim Meyering, 2009/09/16
- Re: [PATCH] posixtm: don't reject a time with "60" as the number of seconds,
Jim Meyering <=
- Re: [PATCH] posixtm: don't reject a time with "60" as the number of seconds, Eric Blake, 2009/09/19
- Re: [PATCH] posixtm: don't reject a time with "60" as the number of seconds, Jim Meyering, 2009/09/19