Commit a5742b01 by Ian Lance Taylor

re PR go/78144 (FAIL: time on systems with tzdata2016g installed)

	PR go/78144
    libgo: incorporate fix for timezone test
    
    This brings over the test-only fix for issue 17276 into gccgo/libgo
    (with tzdata-2016g there is a new zone abbreviation).  This is a
    copy of https://golang.org/cl/29995.
    
    Reviewed-on: https://go-review.googlesource.com/32182

From-SVN: r241661
parent e72531b9
4a8df8f8622c140777996786866395448622ac3f 5ddcdfb0b2bb992a70b391ab34bf15291a514e48
The first line of this file holds the git revision number of the last The first line of this file holds the git revision number of the last
merge done from the gofrontend repository. merge done from the gofrontend repository.
...@@ -939,8 +939,11 @@ func TestLoadFixed(t *testing.T) { ...@@ -939,8 +939,11 @@ func TestLoadFixed(t *testing.T) {
// but Go and most other systems use "east is positive". // but Go and most other systems use "east is positive".
// So GMT+1 corresponds to -3600 in the Go zone, not +3600. // So GMT+1 corresponds to -3600 in the Go zone, not +3600.
name, offset := Now().In(loc).Zone() name, offset := Now().In(loc).Zone()
if name != "GMT+1" || offset != -1*60*60 { // The zone abbreviation is "-01" since tzdata-2016g, and "GMT+1"
t.Errorf("Now().In(loc).Zone() = %q, %d, want %q, %d", name, offset, "GMT+1", -1*60*60) // on earlier versions; we accept both. (Issue #17276).
if !(name == "GMT+1" || name == "-01") || offset != -1*60*60 {
t.Errorf("Now().In(loc).Zone() = %q, %d, want %q or %q, %d",
name, offset, "GMT+1", "-01", -1*60*60)
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment