Author: ken Date: 2011-11-28 09:27:34 -0700 (Mon, 28 Nov 2011) New Revision: 2339
Added: trunk/coreutils/coreutils-8.14-test_fix-1.patch Log: Add patch to fix coreutils test-parse-datetime when local daylight saving change has taken effect. Added: trunk/coreutils/coreutils-8.14-test_fix-1.patch =================================================================== --- trunk/coreutils/coreutils-8.14-test_fix-1.patch (rev 0) +++ trunk/coreutils/coreutils-8.14-test_fix-1.patch 2011-11-28 16:27:34 UTC (rev 2339) @@ -0,0 +1,85 @@ +not yet Submitted By: Ken Moffat <ken at linuxfromscratch dot org> +Date: 2011-11-21 +Initial Package Version: 8.14 +Upstream Status: Applied +Origin: http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/28825 +Description: Avoid false positive test in parse-datetime-test. + + Fixed up to apply directly to coreutils instead of gnulib. +[ i.e. gnulib-tests instead of tests ] +diff --git a/tests/test-parse-datetime.c b/tests/test-parse-datetime.c +index b9d08a6..22fe9bc 100644 +--- a/gnulib-tests/test-parse-datetime.c ++++ b/gnulib-tests/test-parse-datetime.c +@@ -94,20 +94,17 @@ tm_diff (struct tm const *a, struct tm const *b) + #endif /* ! HAVE_TM_GMTOFF */ + + static long +-gmt_offset () ++gmt_offset (time_t s) + { +- time_t now; + long gmtoff; + +- time (&now); +- + #if !HAVE_TM_GMTOFF +- struct tm tm_local = *localtime (&now); +- struct tm tm_gmt = *gmtime (&now); ++ struct tm tm_local = *localtime (&s); ++ struct tm tm_gmt = *gmtime (&s); + + gmtoff = tm_diff (&tm_local, &tm_gmt); + #else +- gmtoff = localtime (&now)->tm_gmtoff; ++ gmtoff = localtime (&s)->tm_gmtoff; + #endif + + return gmtoff; +@@ -123,16 +120,17 @@ main (int argc _GL_UNUSED, char **argv) + const char *p; + int i; + long gmtoff; ++ time_t ref_time = 1304250918; + + set_program_name (argv[0]); + +- gmtoff = gmt_offset (); ++ gmtoff = gmt_offset (ref_time); + + + /* ISO 8601 extended date and time of day representation, + 'T' separator, local time zone */ + p = "2011-05-01T11:55:18"; +- expected.tv_sec = 1304250918 - gmtoff; ++ expected.tv_sec = ref_time - gmtoff; + expected.tv_nsec = 0; + ASSERT (parse_datetime (&result, p, 0)); + LOG (p, expected, result); +@@ -142,7 +140,7 @@ main (int argc _GL_UNUSED, char **argv) + /* ISO 8601 extended date and time of day representation, + ' ' separator, local time zone */ + p = "2011-05-01 11:55:18"; +- expected.tv_sec = 1304250918 - gmtoff; ++ expected.tv_sec = ref_time - gmtoff; + expected.tv_nsec = 0; + ASSERT (parse_datetime (&result, p, 0)); + LOG (p, expected, result); +@@ -153,7 +151,7 @@ main (int argc _GL_UNUSED, char **argv) + /* ISO 8601, extended date and time of day representation, + 'T' separator, UTC */ + p = "2011-05-01T11:55:18Z"; +- expected.tv_sec = 1304250918; ++ expected.tv_sec = ref_time; + expected.tv_nsec = 0; + ASSERT (parse_datetime (&result, p, 0)); + LOG (p, expected, result); +@@ -163,7 +161,7 @@ main (int argc _GL_UNUSED, char **argv) + /* ISO 8601, extended date and time of day representation, + ' ' separator, UTC */ + p = "2011-05-01 11:55:18Z"; +- expected.tv_sec = 1304250918; ++ expected.tv_sec = ref_time; + expected.tv_nsec = 0; + ASSERT (parse_datetime (&result, p, 0)); + LOG (p, expected, result); -- http://linuxfromscratch.org/mailman/listinfo/patches FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
