From 73598e3787b34385d04e46830e9a7fdf89cc8ede Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Fri, 17 Nov 2017 18:03:52 +0000 Subject: [PATCH] go_1_9: skip flaky TestWaitGroupMisuse2 https://github.com/golang/go/issues/20072 https://hydra.nixos.org/build/64351217/nixlog/1 --- pkgs/development/compilers/go/1.9.nix | 1 + .../go/go-1.9-skip-flaky-20072.patch | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/compilers/go/go-1.9-skip-flaky-20072.patch diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix index b8660008d941..007b81d995b7 100644 --- a/pkgs/development/compilers/go/1.9.nix +++ b/pkgs/development/compilers/go/1.9.nix @@ -119,6 +119,7 @@ stdenv.mkDerivation rec { ./creds-test.patch ./remove-test-pie-1.9.patch ./go-1.9-skip-flaky-19608.patch + ./go-1.9-skip-flaky-20072.patch ]; postPatch = optionalString stdenv.isDarwin '' diff --git a/pkgs/development/compilers/go/go-1.9-skip-flaky-20072.patch b/pkgs/development/compilers/go/go-1.9-skip-flaky-20072.patch new file mode 100644 index 000000000000..13db40ababc3 --- /dev/null +++ b/pkgs/development/compilers/go/go-1.9-skip-flaky-20072.patch @@ -0,0 +1,20 @@ +diff --git a/src/sync/waitgroup_test.go b/src/sync/waitgroup_test.go +index e3e3096..f80d1e2 100644 +--- a/src/sync/waitgroup_test.go ++++ b/src/sync/waitgroup_test.go +@@ -6,6 +6,7 @@ package sync_test + + import ( + "internal/race" ++ "internal/testenv" + "runtime" + . "sync" + "sync/atomic" +@@ -73,6 +74,7 @@ func TestWaitGroupMisuse2(t *testing.T) { + if runtime.NumCPU() <= 4 { + t.Skip("NumCPU<=4, skipping: this test requires parallelism") + } ++ testenv.SkipFlaky(t, 20072) + defer func() { + err := recover() + if err != "sync: negative WaitGroup counter" &&