1
0
mirror of https://github.com/golang/go synced 2024-11-19 11:34:49 -07:00

time: zoneinfo support on darwin/arm

A future change will include an NSTimeZone hook so we can determine
the device's current time zone.

Change-Id: Ia4bd6b955e4cb720c518055541b66ff57a4dd303
Reviewed-on: https://go-review.googlesource.com/6511
Reviewed-by: Hyang-Ah Hana Kim <hyangah@gmail.com>
Run-TryBot: David Crawshaw <crawshaw@golang.org>
This commit is contained in:
David Crawshaw 2015-03-02 16:01:20 -05:00
parent 66416c00eb
commit 54efdc596f
3 changed files with 56 additions and 1 deletions

View File

@ -383,6 +383,10 @@ func TestOverflowSleep(t *testing.T) {
// Test that a panic while deleting a timer does not leave // Test that a panic while deleting a timer does not leave
// the timers mutex held, deadlocking a ticker.Stop in a defer. // the timers mutex held, deadlocking a ticker.Stop in a defer.
func TestIssue5745(t *testing.T) { func TestIssue5745(t *testing.T) {
if runtime.GOOS == "darwin" && runtime.GOARCH == "arm" {
t.Skipf("skipping on %s/%s, see issue 10043", runtime.GOOS, runtime.GOARCH)
}
ticker := NewTicker(Hour) ticker := NewTicker(Hour)
defer func() { defer func() {
// would deadlock here before the fix due to // would deadlock here before the fix due to

View File

@ -0,0 +1,51 @@
// Copyright 2015 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
// +build darwin
// +build arm arm64
package time
import "syscall"
var zoneFile string
func init() {
wd, err := syscall.Getwd()
if err != nil {
return
}
// The working directory at initialization is the root of the
// app bundle: "/private/.../bundlename.app". That's where we
// keep zoneinfo.zip.
zoneFile = wd + "/zoneinfo.zip"
}
func forceZipFileForTesting(zipOnly bool) {
// On iOS we only have the zip file.
}
func initTestingZone() {
z, err := loadZoneFile(zoneFile, "America/Los_Angeles")
if err != nil {
panic("cannot load America/Los_Angeles for testing: " + err.Error())
}
z.name = "Local"
localLoc = *z
}
func initLocal() {
// TODO(crawshaw): [NSTimeZone localTimeZone]
localLoc = *UTC
}
func loadLocation(name string) (*Location, error) {
z, err := loadZoneFile(zoneFile, name)
if err != nil {
return nil, err
}
z.name = name
return z, nil
}

View File

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file. // license that can be found in the LICENSE file.
// +build darwin dragonfly freebsd linux nacl netbsd openbsd solaris // +build darwin,!arm,!arm64 dragonfly freebsd linux nacl netbsd openbsd solaris
// Parse "zoneinfo" time zone file. // Parse "zoneinfo" time zone file.
// This is a fairly standard file format used on OS X, Linux, BSD, Sun, and others. // This is a fairly standard file format used on OS X, Linux, BSD, Sun, and others.