From c065bc70ef45003216271ba42bdd4a4c321ac38a Mon Sep 17 00:00:00 2001 From: Bryan Mills Date: Thu, 3 Nov 2022 19:13:31 +0000 Subject: [PATCH] Revert "cmd/go: update TestScripts/svn to not depend on TZ database" This reverts CL 447335. Reason for revert: broke test on solaris-amd64-oraclerel, which does have a TZ database but has a non-UTC system time zone. Change-Id: Id61f182d331fc5ca8475845fe0ebf3f1d105d8a3 Reviewed-on: https://go-review.googlesource.com/c/go/+/447756 Reviewed-by: Than McIntosh Auto-Submit: Bryan Mills TryBot-Bypass: Bryan Mills Run-TryBot: Bryan Mills Reviewed-by: Quim Muntal --- src/cmd/go/testdata/vcstest/svn/hello.txt | 5 ++--- src/cmd/go/testdata/vcstest/svn/test1-svn-git.txt | 14 ++++++-------- src/cmd/go/testdata/vcstest/svn/test2-svn-git.txt | 10 ++++------ 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/src/cmd/go/testdata/vcstest/svn/hello.txt b/src/cmd/go/testdata/vcstest/svn/hello.txt index 526d00fc4b..b68ce95969 100644 --- a/src/cmd/go/testdata/vcstest/svn/hello.txt +++ b/src/cmd/go/testdata/vcstest/svn/hello.txt @@ -1,7 +1,6 @@ handle svn -# Ensure SVN displays dates using UTC. -env TZ='' +env TZ='America/New_York' mkdir db/transactions mkdir db/txn-protorevs @@ -31,7 +30,7 @@ func main() { } -- .checkout/.svn-log -- ------------------------------------------------------------------------ -r1 | rsc | 2017-09-22 01:12:45 +0000 (Fri, 22 Sep 2017) | 3 lines +r1 | rsc | 2017-09-21 21:12:45 -0400 (Thu, 21 Sep 2017) | 3 lines hello world diff --git a/src/cmd/go/testdata/vcstest/svn/test1-svn-git.txt b/src/cmd/go/testdata/vcstest/svn/test1-svn-git.txt index 3190e823e5..06ceef1a41 100644 --- a/src/cmd/go/testdata/vcstest/svn/test1-svn-git.txt +++ b/src/cmd/go/testdata/vcstest/svn/test1-svn-git.txt @@ -13,9 +13,7 @@ env GIT_AUTHOR_NAME='Russ Cox' env GIT_AUTHOR_EMAIL='rsc@golang.org' env GIT_COMMITTER_NAME=$GIT_AUTHOR_NAME env GIT_COMMITTER_EMAIL=$GIT_AUTHOR_EMAIL - -# Ensure SVN displays dates using UTC. -env TZ='' +env TZ='America/New_York' mkdir db/transactions mkdir db/txn-protorevs @@ -110,23 +108,23 @@ import _ "vcs-test.swtch.com/go/test1-svn-git/git-README-only/other" package tiny -- .checkout/.svn-log -- ------------------------------------------------------------------------ -r5 | rsc | 2017-10-04 15:08:26 +0000 (Wed, 04 Oct 2017) | 1 line +r5 | rsc | 2017-10-04 11:08:26 -0400 (Wed, 04 Oct 2017) | 1 line move from vcs-test.swtch.com to vcs-test.golang.org ------------------------------------------------------------------------ -r4 | rsc | 2017-09-27 17:48:18 +0000 (Wed, 27 Sep 2017) | 1 line +r4 | rsc | 2017-09-27 13:48:18 -0400 (Wed, 27 Sep 2017) | 1 line add tiny ------------------------------------------------------------------------ -r3 | rsc | 2017-09-22 16:56:16 +0000 (Fri, 22 Sep 2017) | 1 line +r3 | rsc | 2017-09-22 12:56:16 -0400 (Fri, 22 Sep 2017) | 1 line add other ------------------------------------------------------------------------ -r2 | rsc | 2017-09-22 15:49:11 +0000 (Fri, 22 Sep 2017) | 1 line +r2 | rsc | 2017-09-22 11:49:11 -0400 (Fri, 22 Sep 2017) | 1 line use git-README-only/pkg ------------------------------------------------------------------------ -r1 | rsc | 2017-09-22 15:41:54 +0000 (Fri, 22 Sep 2017) | 1 line +r1 | rsc | 2017-09-22 11:41:54 -0400 (Fri, 22 Sep 2017) | 1 line add modified git-README-only ------------------------------------------------------------------------ diff --git a/src/cmd/go/testdata/vcstest/svn/test2-svn-git.txt b/src/cmd/go/testdata/vcstest/svn/test2-svn-git.txt index ee0f90996b..71d84c45c2 100644 --- a/src/cmd/go/testdata/vcstest/svn/test2-svn-git.txt +++ b/src/cmd/go/testdata/vcstest/svn/test2-svn-git.txt @@ -13,9 +13,7 @@ env GIT_AUTHOR_NAME='Russ Cox' env GIT_AUTHOR_EMAIL='rsc@golang.org' env GIT_COMMITTER_NAME=$GIT_AUTHOR_NAME env GIT_COMMITTER_EMAIL=$GIT_AUTHOR_EMAIL - -# Ensure SVN displays dates using UTC. -env TZ='' +env TZ='America/New_York' mkdir db/transactions mkdir db/txn-protorevs @@ -88,15 +86,15 @@ README package p1 -- .checkout/.svn-log -- ------------------------------------------------------------------------ -r3 | rsc | 2017-10-04 15:09:35 +0000 (Wed, 04 Oct 2017) | 1 line +r3 | rsc | 2017-10-04 11:09:35 -0400 (Wed, 04 Oct 2017) | 1 line move from vcs-test.swtch.com to vcs-test.golang.org ------------------------------------------------------------------------ -r2 | rsc | 2017-09-27 18:16:14 +0000 (Wed, 27 Sep 2017) | 1 line +r2 | rsc | 2017-09-27 14:16:14 -0400 (Wed, 27 Sep 2017) | 1 line add p1 ------------------------------------------------------------------------ -r1 | rsc | 2017-09-27 18:00:52 +0000 (Wed, 27 Sep 2017) | 1 line +r1 | rsc | 2017-09-27 14:00:52 -0400 (Wed, 27 Sep 2017) | 1 line git ------------------------------------------------------------------------ -- 2.50.0