tst-strptime.c: More tests

tst-strptime.c: More tests

[Andreas Jaeger]

glibc 2.1 or 2.1.1 (I'm not sure) fail AFAIK on the this test
according to a posting in a german newsgroup.  

#include <stdio.h>
#include <time.h>

int main()
{
    struct tm foo;
    strptime("17410105012000","%H%M%S%d%m%Y", &foo);
    puts(asctime(&foo));
    return 0;
}

(gdb) print foo
$1 = {tm_sec = 10, tm_min = 41, tm_hour = 17, tm_mday = 5, tm_mon = 11,
  tm_year = -1900, tm_wday = 134514064, tm_yday = 134513648,
  tm_isdst = 1074113551, __tm_gmtoff__ = 0, __tm_zone__ = 0xbffffd4c ""}

This is fixed in glibc 2.1.2! I've made a regression test out of this.

Andreas

2000-01-03  Andreas Jaeger  <aj@suse.de>

	* time/tst-strptime.c (test_tm): Add tests for all fields of
	struct tm.

============================================================
Index: time/tst-strptime.c
--- time/tst-strptime.c	1999/07/14 21:04:09	1.2
+++ time/tst-strptime.c	2000/01/03 11:21:36
@@ -1,5 +1,5 @@
 /* Test for strptime.
-   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
@@ -38,6 +38,69 @@
 };
 
 
+static const struct
+{
+  const char *input;
+  const char *format;
+  const char *output;
+  int wday;
+  int yday;
+} tm_tests [] =
+{
+  {"17410105012000", "%H%M%S%d%m%Y", "2000-01-05 17:41:01", 3, 4}
+};
+
+
+
+static int
+test_tm (void)
+{
+  struct tm tm;
+  int i;
+  int result = 0;
+  char buf[100];
+  
+  for (i = 0; i < sizeof (tm_tests) / sizeof (tm_tests[0]); ++i)
+    {
+      memset (&tm, '\0', sizeof (tm));
+
+      if (*strptime (tm_tests[i].input, tm_tests[i].format, &tm) != '\0')
+	{
+	  printf ("not all of `%s' read\n", tm_tests[i].input);
+	  result = 1;
+	}
+      strftime (buf, sizeof (buf), "%F %T", &tm);
+      printf ("strptime (\"%s\", \"%s\", ...)\n"
+	      "\tshould be: %s, wday = %d, yday = %3d\n"
+	      "\t       is: %s, wday = %d, yday = %3d\n",
+	      tm_tests[i].input, tm_tests[i].format,
+	      tm_tests[i].output,
+	      tm_tests[i].wday, tm_tests[i].yday,
+	      buf, tm.tm_wday, tm.tm_yday);
+
+      if (strcmp (buf, tm_tests[i].output) != 0)
+	{
+	  printf ("Time and date are not correct.\n");
+	  result = 1;
+	}
+      if (tm.tm_wday != tm_tests[i].wday)
+	{
+	  printf ("weekday for `%s' incorrect: %d instead of %d\n",
+		  tm_tests[i].input, tm.tm_wday, tm_tests[i].wday);
+	  result = 1;
+	}
+      if (tm.tm_yday != tm_tests[i].yday)
+	{
+	  printf ("yearday for `%s' incorrect: %d instead of %d\n",
+		  tm_tests[i].input, tm.tm_yday, tm_tests[i].yday);
+	  result = 1;
+	}
+    }
+
+  return result;
+}
+
+
 int
 main (int argc, char *argv[])
 {
@@ -76,5 +139,7 @@
 	}
     }
 
+  result |= test_tm ();
+  
   return result;
 }

-- 
 Andreas Jaeger
  SuSE Labs aj@suse.de
   private aj@arthur.rhein-neckar.de

Re: tst-strptime.c: More tests

[Ulrich Drepper]

Andreas Jaeger <aj@suse.de> writes:

> This is fixed in glibc 2.1.2! I've made a regression test out of this.

Thanks, I've added this.

-- 
---------------.      drepper at gnu.org  ,-.   1325 Chesapeake Terrace
Ulrich Drepper  \    ,-------------------'   \  Sunnyvale, CA 94089 USA
Cygnus Solutions `--' drepper at cygnus.com   `------------------------