[golang/el6: 1/2] skip flaky test
Vincent Batts
vbatts at fedoraproject.org
Fri Jan 24 19:04:50 UTC 2014
commit 25b1d04efe51bd8e40259eb2fbbcb8d787ca529c
Author: Vincent Batts <vbatts at redhat.com>
Date: Fri Jan 24 14:02:19 2014 -0500
skip flaky test
golang-1.2-skipCpuProfileTest.patch | 12 ++++++++++++
golang.spec | 12 +++++++++++-
2 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/golang-1.2-skipCpuProfileTest.patch b/golang-1.2-skipCpuProfileTest.patch
new file mode 100644
index 0000000..3dee29f
--- /dev/null
+++ b/golang-1.2-skipCpuProfileTest.patch
@@ -0,0 +1,12 @@
+diff -r 87dea3f5ebe7 src/pkg/runtime/pprof/pprof_test.go
+--- a/src/pkg/runtime/pprof/pprof_test.go Fri Nov 29 08:32:31 2013 +1100
++++ b/src/pkg/runtime/pprof/pprof_test.go Fri Jan 24 13:47:42 2014 -0500
+@@ -32,7 +32,7 @@
+ })
+ }
+
+-func TestCPUProfileMultithreaded(t *testing.T) {
++func testCPUProfileMultithreaded(t *testing.T) {
+ buf := make([]byte, 100000)
+ defer runtime.GOMAXPROCS(runtime.GOMAXPROCS(2))
+ testCPUProfile(t, []string{"crc32.ChecksumIEEE", "crc32.Update"}, func() {
diff --git a/golang.spec b/golang.spec
index b02a0a8..21428aa 100644
--- a/golang.spec
+++ b/golang.spec
@@ -25,7 +25,7 @@
Name: golang
Version: 1.2
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: The Go Programming Language
License: BSD
@@ -55,6 +55,10 @@ Patch0: golang-1.2-verbose-build.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1038683
Patch2: golang-1.2-remove-ECC-p224.patch
+# disable flaky test for now
+# http://code.google.com/p/go/issues/detail?id=6522
+Patch3: ./golang-1.2-skipCpuProfileTest.patch
+
# Having documentation separate was broken
Obsoletes: %{name}-docs < 1.1-4
@@ -135,6 +139,9 @@ end
# remove the P224 curve
%patch2 -p1
+# skip flaky test
+%patch3 -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
@@ -286,6 +293,9 @@ cp -av %{SOURCE101} $RPM_BUILD_ROOT%{_sysconfdir}/prelink.conf.d/golang.conf
%changelog
+* Thu Jan 24 2014 Vincent Batts <vbatts at redhat.com> 1.2-4
+- skip a flaky test that is sporadically failing on the build server
+
* Thu Jan 16 2014 Vincent Batts <vbatts at redhat.com> 1.2-3
- remove golang-godoc dependency. cyclic dependency on compiling godoc
More information about the scm-commits
mailing list