diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2016-07-22 18:15:38 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2016-07-22 18:15:38 +0000 |
| commit | 22b955cca564a9a3a5b8c9d9dd1e295b7943c128 (patch) | |
| tree | abdbd898676e1f853fca2d7e031d105d7ebcf676 /libgo/go/time/zoneinfo_unix.go | |
| parent | 9d04a3af4c6491536badf6bde9707c907e4d196b (diff) | |
| download | gcc-22b955cca564a9a3a5b8c9d9dd1e295b7943c128.tar.gz | |
libgo: update to go1.7rc3
Reviewed-on: https://go-review.googlesource.com/25150
From-SVN: r238662
Diffstat (limited to 'libgo/go/time/zoneinfo_unix.go')
| -rw-r--r-- | libgo/go/time/zoneinfo_unix.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libgo/go/time/zoneinfo_unix.go b/libgo/go/time/zoneinfo_unix.go index 5fc669e478d..6c7aafff77b 100644 --- a/libgo/go/time/zoneinfo_unix.go +++ b/libgo/go/time/zoneinfo_unix.go @@ -18,8 +18,12 @@ import ( ) func initTestingZone() { - syscall.Setenv("TZ", "America/Los_Angeles") - initLocal() + z, err := loadLocation("America/Los_Angeles") + if err != nil { + panic("cannot load America/Los_Angeles for testing: " + err.Error()) + } + z.name = "Local" + localLoc = *z } // Many systems use /usr/share/zoneinfo, Solaris 2 has |