|
 |
6c08f9 |
diff -up go-dd7cbf3a846c2cb125ac65173abaf6a8b9f903ff/src/time/internal_test.go.time go-dd7cbf3a846c2cb125ac65173abaf6a8b9f903ff/src/time/internal_test.go
|
|
|
6c08f9 |
--- go-dd7cbf3a846c2cb125ac65173abaf6a8b9f903ff/src/time/internal_test.go.time 2017-12-05 01:10:10.000000000 +0100
|
|
|
6c08f9 |
+++ go-dd7cbf3a846c2cb125ac65173abaf6a8b9f903ff/src/time/internal_test.go 2017-12-05 14:55:10.574637475 +0100
|
|
|
6c08f9 |
@@ -4,13 +4,15 @@
|
|
|
6c08f9 |
|
|
|
6c08f9 |
package time
|
|
|
6c08f9 |
|
|
|
6c08f9 |
+import "runtime"
|
|
|
6c08f9 |
+
|
|
|
6c08f9 |
func init() {
|
|
|
6c08f9 |
// force US/Pacific for time zone tests
|
|
|
6c08f9 |
ForceUSPacificForTesting()
|
|
|
6c08f9 |
}
|
|
|
6c08f9 |
|
|
|
6c08f9 |
func initTestingZone() {
|
|
|
6c08f9 |
- z, err := loadLocation("America/Los_Angeles", zoneSources[len(zoneSources)-1:])
|
|
|
6c08f9 |
+ z, err := loadLocation("America/Los_Angeles", zoneSources)
|
|
|
6c08f9 |
if err != nil {
|
|
|
6c08f9 |
panic("cannot load America/Los_Angeles for testing: " + err.Error())
|
|
|
6c08f9 |
}
|
|
|
6c08f9 |
@@ -21,8 +23,9 @@ func initTestingZone() {
|
|
|
6c08f9 |
var OrigZoneSources = zoneSources
|
|
|
6c08f9 |
|
|
|
6c08f9 |
func forceZipFileForTesting(zipOnly bool) {
|
|
|
6c08f9 |
- zoneSources = make([]string, len(OrigZoneSources))
|
|
|
6c08f9 |
+ zoneSources = make([]string, len(OrigZoneSources)+1)
|
|
|
6c08f9 |
copy(zoneSources, OrigZoneSources)
|
|
|
6c08f9 |
+ zoneSources = append(zoneSources, runtime.GOROOT()+"/lib/time/zoneinfo.zip")
|
|
|
6c08f9 |
if zipOnly {
|
|
|
6c08f9 |
zoneSources = zoneSources[len(zoneSources)-1:]
|
|
|
6c08f9 |
}
|
|
|
6c08f9 |
diff -up go-dd7cbf3a846c2cb125ac65173abaf6a8b9f903ff/src/time/zoneinfo_test.go.time go-dd7cbf3a846c2cb125ac65173abaf6a8b9f903ff/src/time/zoneinfo_test.go
|
|
|
6c08f9 |
--- go-dd7cbf3a846c2cb125ac65173abaf6a8b9f903ff/src/time/zoneinfo_test.go.time 2017-12-05 01:10:10.000000000 +0100
|
|
|
6c08f9 |
+++ go-dd7cbf3a846c2cb125ac65173abaf6a8b9f903ff/src/time/zoneinfo_test.go 2017-12-05 14:58:09.823109248 +0100
|
|
|
6c08f9 |
@@ -8,6 +8,7 @@ import (
|
|
|
6c08f9 |
"fmt"
|
|
|
6c08f9 |
"os"
|
|
|
6c08f9 |
"reflect"
|
|
|
6c08f9 |
+ "runtime"
|
|
|
6c08f9 |
"testing"
|
|
|
6c08f9 |
"time"
|
|
|
6c08f9 |
)
|
|
|
6c08f9 |
@@ -128,7 +129,7 @@ func TestLoadLocationFromTZData(t *testi
|
|
|
6c08f9 |
t.Fatal(err)
|
|
|
6c08f9 |
}
|
|
|
6c08f9 |
|
|
|
6c08f9 |
- tzinfo, err := time.LoadTzinfo(locationName, time.OrigZoneSources[len(time.OrigZoneSources)-1])
|
|
|
6c08f9 |
+ tzinfo, err := time.LoadTzinfo(locationName, runtime.GOROOT()+"/lib/time/zoneinfo.zip")
|
|
|
6c08f9 |
if err != nil {
|
|
|
6c08f9 |
t.Fatal(err)
|
|
|
6c08f9 |
}
|
|
|
6c08f9 |
diff -up go-dd7cbf3a846c2cb125ac65173abaf6a8b9f903ff/src/time/zoneinfo_unix.go.time go-dd7cbf3a846c2cb125ac65173abaf6a8b9f903ff/src/time/zoneinfo_unix.go
|
|
|
6c08f9 |
--- go-dd7cbf3a846c2cb125ac65173abaf6a8b9f903ff/src/time/zoneinfo_unix.go.time 2017-12-05 01:10:10.000000000 +0100
|
|
|
6c08f9 |
+++ go-dd7cbf3a846c2cb125ac65173abaf6a8b9f903ff/src/time/zoneinfo_unix.go 2017-12-05 14:55:10.574637475 +0100
|
|
|
6c08f9 |
@@ -12,7 +12,6 @@
|
|
|
6c08f9 |
package time
|
|
|
6c08f9 |
|
|
|
6c08f9 |
import (
|
|
|
6c08f9 |
- "runtime"
|
|
|
6c08f9 |
"syscall"
|
|
|
6c08f9 |
)
|
|
|
6c08f9 |
|
|
|
6c08f9 |
@@ -22,7 +21,6 @@ var zoneSources = []string{
|
|
|
6c08f9 |
"/usr/share/zoneinfo/",
|
|
|
6c08f9 |
"/usr/share/lib/zoneinfo/",
|
|
|
6c08f9 |
"/usr/lib/locale/TZ/",
|
|
|
6c08f9 |
- runtime.GOROOT() + "/lib/time/zoneinfo.zip",
|
|
|
6c08f9 |
}
|
|
|
6c08f9 |
|
|
|
6c08f9 |
func initLocal() {
|