[golang/f21] patching the tzinfo test
Vincent Batts
vbatts at fedoraproject.org
Thu Sep 11 22:53:26 UTC 2014
commit 999ceca490b60f5963e7541b3aa5042fd290ef7b
Author: Vincent Batts <vbatts at redhat.com>
Date: Thu Sep 11 22:52:03 2014 +0000
patching the tzinfo test
golang.spec | 11 ++++++++++-
skip_syndey_time_test.patch | 13 +++++++++++++
2 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/golang.spec b/golang.spec
index 9ee4a59..c561065 100644
--- a/golang.spec
+++ b/golang.spec
@@ -39,7 +39,7 @@
Name: golang
Version: 1.3.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: The Go Programming Language
License: BSD
@@ -80,6 +80,9 @@ Patch4: ./go1.3-tar_reuse_buffer_writeHeader.patch
# https://code.google.com/p/go/source/detail?r=1b17b3426e3c
Patch5: ./go1.3-tar-fix_writing_of_pax_headers.patch
+# https://code.google.com/p/go/issues/detail?id=8547
+Patch6: ./skip_syndey_time_test.patch
+
# Having documentation separate was broken
Obsoletes: %{name}-docs < 1.1-4
@@ -357,6 +360,9 @@ end
# buffer the PAX header
%patch5 -p1
+# new tzinfo breaks a single unit test
+%patch6 -p1
+
# create a [dirty] gcc wrapper to allow us to build with our own flags
# (dirty because it is spoofing 'gcc' since CC value is stored in the go tool)
# TODO: remove this and just set CFLAGS/LDFLAGS once upstream supports it
@@ -898,6 +904,9 @@ fi
%changelog
+* Thu Sep 11 2014 Vincent Batts <vbatts at fedoraproject.org> - 1.3.1-3
+- patching the tzinfo failure
+
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/skip_syndey_time_test.patch b/skip_syndey_time_test.patch
new file mode 100644
index 0000000..265acd5
--- /dev/null
+++ b/skip_syndey_time_test.patch
@@ -0,0 +1,13 @@
+Index: go/src/pkg/time/format_test.go
+===================================================================
+--- go.orig/src/pkg/time/format_test.go
++++ go/src/pkg/time/format_test.go
+@@ -183,7 +183,7 @@ func TestParse(t *testing.T) {
+ }
+ }
+
+-func TestParseInSydney(t *testing.T) {
++func testParseInSydney(t *testing.T) {
+ loc, err := LoadLocation("Australia/Sydney")
+ if err != nil {
+ t.Fatal(err)
More information about the scm-commits
mailing list