From: "Đoàn Trần Công Danh" <congdanhqx@gmail.com>
To: git@vger.kernel.org
Cc: "Đoàn Trần Công Danh" <congdanhqx@gmail.com>
Subject: [PATCH v2] t9604: Fix test for musl libc and new Debian
Date: Wed, 10 Apr 2024 10:28:12 +0700 [thread overview]
Message-ID: <20240410032812.30476-1-congdanhqx@gmail.com> (raw)
In-Reply-To: <23a4298eababe54ca4b43d7b675b858605d20ec5.1712374021.git.congdanhqx@gmail.com>
CST6CDT and the like are POSIX timezone, with no rule for transition.
And POSIX doesn't enforce how to interpret the rule if it's omited.
Some libc (e.g. glibc) resorted back to IANA (formerly Olson) db rules
for those timezones. Some libc (e.g. FreeBSD) uses a fixed rule.
Other libc (e.g. musl) interpret that as no transition at all [1].
In addition, distributions (notoriously Debian-derived, which uses IANA
db for CST6CDT and the like) started to split "legacy" timezones
like CST6CDT, EST5EDT into `tzdata-legacy', which will not be installed
by default [2].
In those cases, t9604 will run into failure.
Let's switch to POSIX timezone with rules to change timezone.
1: http://mm.icann.org/pipermail/tz/2024-March/058751.html
2: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1043250
Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
---
Range-diff against v1:
1: 23a4298eababe ! 1: 9494adb39120c t9604: Fix test for musl libc and new Debian
@@ Commit message
CST6CDT and the like are POSIX timezone, with no rule for transition.
And POSIX doesn't enforce how to interpret the rule if it's omited.
- Some libc resorted back to IANA (formerly Olson) db rules for those
- timezones. Other libc (e.g. musl) interpret that as no transition at
- all [1].
+ Some libc (e.g. glibc) resorted back to IANA (formerly Olson) db rules
+ for those timezones. Some libc (e.g. FreeBSD) uses a fixed rule.
+ Other libc (e.g. musl) interpret that as no transition at all [1].
In addition, distributions (notoriously Debian-derived, which uses IANA
db for CST6CDT and the like) started to split "legacy" timezones
@@ Commit message
Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
## t/t9604-cvsimport-timestamps.sh ##
-@@ t/t9604-cvsimport-timestamps.sh: test_description='git cvsimport timestamps'
+@@
+ test_description='git cvsimport timestamps'
+ . ./lib-cvs.sh
++test_lazy_prereq POSIX_TIMEZONE '
++ local tz=XST-1XDT,M3.5.0,M11.1.0
++ echo "1711846799 -> 2024-03-31 01:59:59 +0100" >expected &&
++ TZ="$tz" test-tool date show:iso-local 1711846799 >actual &&
++ test_cmp expected actual &&
++ echo "1711846800 -> 2024-03-31 03:00:00 +0200" >expected &&
++ TZ="$tz" test-tool date show:iso-local 1711846800 >actual &&
++ test_cmp expected actual &&
++ echo "1730591999 -> 2024-11-03 01:59:59 +0200" >expected &&
++ TZ="$tz" test-tool date show:iso-local 1730591999 >actual &&
++ test_cmp expected actual &&
++ echo "1730592000 -> 2024-11-03 01:00:00 +0100" >expected &&
++ TZ="$tz" test-tool date show:iso-local 1730592000 >actual &&
++ test_cmp expected actual
++'
++
setup_cvs_test_repository t9604
-test_expect_success PERL 'check timestamps are UTC (TZ=CST6CDT)' '
-+test_expect_success PERL 'check timestamps are UTC (TZ=America/Chicago)' '
++test_expect_success PERL,POSIX_TIMEZONE 'check timestamps are UTC' '
- TZ=CST6CDT git cvsimport -p"-x" -C module-1 module &&
+ TZ=CST6CDT,M4.1.0,M10.5.0 \
@@ t/t9604-cvsimport-timestamps.sh: test_description='git cvsimport timestamps'
git cvsimport -p"-x" -C module-1 module &&
(
cd module-1 &&
-@@ t/t9604-cvsimport-timestamps.sh: test_expect_success PERL 'check timestamps with author-specific timezones' '
+@@ t/t9604-cvsimport-timestamps.sh: test_expect_success PERL 'check timestamps are UTC (TZ=CST6CDT)' '
+ test_cmp expect-1 actual-1
+ '
+
+-test_expect_success PERL 'check timestamps with author-specific timezones' '
++test_expect_success PERL,POSIX_TIMEZONE 'check timestamps with author-specific timezones' '
cat >cvs-authors <<-EOF &&
user1=User One <user1@domain.org>
t/t9604-cvsimport-timestamps.sh | 29 +++++++++++++++++++++++------
1 file changed, 23 insertions(+), 6 deletions(-)
diff --git a/t/t9604-cvsimport-timestamps.sh b/t/t9604-cvsimport-timestamps.sh
index 2ff4aa932df44..2d03259729b5f 100755
--- a/t/t9604-cvsimport-timestamps.sh
+++ b/t/t9604-cvsimport-timestamps.sh
@@ -3,11 +3,28 @@
test_description='git cvsimport timestamps'
. ./lib-cvs.sh
+test_lazy_prereq POSIX_TIMEZONE '
+ local tz=XST-1XDT,M3.5.0,M11.1.0
+ echo "1711846799 -> 2024-03-31 01:59:59 +0100" >expected &&
+ TZ="$tz" test-tool date show:iso-local 1711846799 >actual &&
+ test_cmp expected actual &&
+ echo "1711846800 -> 2024-03-31 03:00:00 +0200" >expected &&
+ TZ="$tz" test-tool date show:iso-local 1711846800 >actual &&
+ test_cmp expected actual &&
+ echo "1730591999 -> 2024-11-03 01:59:59 +0200" >expected &&
+ TZ="$tz" test-tool date show:iso-local 1730591999 >actual &&
+ test_cmp expected actual &&
+ echo "1730592000 -> 2024-11-03 01:00:00 +0100" >expected &&
+ TZ="$tz" test-tool date show:iso-local 1730592000 >actual &&
+ test_cmp expected actual
+'
+
setup_cvs_test_repository t9604
-test_expect_success PERL 'check timestamps are UTC (TZ=CST6CDT)' '
+test_expect_success PERL,POSIX_TIMEZONE 'check timestamps are UTC' '
- TZ=CST6CDT git cvsimport -p"-x" -C module-1 module &&
+ TZ=CST6CDT,M4.1.0,M10.5.0 \
+ git cvsimport -p"-x" -C module-1 module &&
git cvsimport -p"-x" -C module-1 module &&
(
cd module-1 &&
@@ -34,13 +51,13 @@ test_expect_success PERL 'check timestamps are UTC (TZ=CST6CDT)' '
test_cmp expect-1 actual-1
'
-test_expect_success PERL 'check timestamps with author-specific timezones' '
+test_expect_success PERL,POSIX_TIMEZONE 'check timestamps with author-specific timezones' '
cat >cvs-authors <<-EOF &&
user1=User One <user1@domain.org>
- user2=User Two <user2@domain.org> CST6CDT
- user3=User Three <user3@domain.org> EST5EDT
- user4=User Four <user4@domain.org> MST7MDT
+ user2=User Two <user2@domain.org> CST6CDT,M4.1.0,M10.5.0
+ user3=User Three <user3@domain.org> EST5EDT,M4.1.0,M10.5.0
+ user4=User Four <user4@domain.org> MST7MDT,M4.1.0,M10.5.0
EOF
git cvsimport -p"-x" -A cvs-authors -C module-2 module &&
(
--
2.44.0.rc0.258.g7320e9588666f
next prev parent reply other threads:[~2024-04-10 3:28 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-06 3:29 [PATCH] t9604: Fix test for musl libc and new Debian Đoàn Trần Công Danh
2024-04-06 12:11 ` Junio C Hamano
2024-04-07 1:38 ` Đoàn Trần Công Danh
2024-04-08 17:34 ` Junio C Hamano
2024-04-07 1:33 ` Jeff King
2024-04-07 1:45 ` Đoàn Trần Công Danh
2024-04-07 1:50 ` Đoàn Trần Công Danh
2024-04-10 3:28 ` Đoàn Trần Công Danh [this message]
2024-04-10 3:29 ` [PATCH v2] " Eric Sunshine
2024-04-10 3:35 ` Đoàn Trần Công Danh
2024-04-10 3:37 ` Eric Sunshine
2024-04-10 7:10 ` Đoàn Trần Công Danh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240410032812.30476-1-congdanhqx@gmail.com \
--to=congdanhqx@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.