From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Fri, 28 Oct 2016 20:21:52 +0000 (+0000)
Subject: re PR go/78144 (FAIL: time on systems with tzdata2016g installed)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a5742b01585d78d5e9c39e8dbc9cfce7796af492;p=gcc.git

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
---

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 26f77ca69db..e2fb0db49b8 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-4a8df8f8622c140777996786866395448622ac3f
+5ddcdfb0b2bb992a70b391ab34bf15291a514e48
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
diff --git a/libgo/go/time/time_test.go b/libgo/go/time/time_test.go
index b7ebb372967..c9665ea04b5 100644
--- a/libgo/go/time/time_test.go
+++ b/libgo/go/time/time_test.go
@@ -939,8 +939,11 @@ func TestLoadFixed(t *testing.T) {
 	// but Go and most other systems use "east is positive".
 	// So GMT+1 corresponds to -3600 in the Go zone, not +3600.
 	name, offset := Now().In(loc).Zone()
-	if name != "GMT+1" || offset != -1*60*60 {
-		t.Errorf("Now().In(loc).Zone() = %q, %d, want %q, %d", name, offset, "GMT+1", -1*60*60)
+	// The zone abbreviation is "-01" since tzdata-2016g, and "GMT+1"
+	// 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)
 	}
 }