pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #46706 from bobvanderlinden/pr-go-skip-flaky-test

go: skip flaky os/exec TestExtraFiles

authored by

Jörg Thalheim and committed by
GitHub c6773e8e 772e2f96

+16
unified split
+1
pkgs/development/compilers/go/1.11.nix
··· 125 ./remove-fhs-test-references.patch 126 ./skip-external-network-tests.patch 127 ./skip-nohup-tests.patch 128 ]; 129 130 postPatch = optionalString stdenv.isDarwin ''
··· 125 ./remove-fhs-test-references.patch 126 ./skip-external-network-tests.patch 127 ./skip-nohup-tests.patch 128 + ./skip-test-extra-files-on-386.patch 129 ]; 130 131 postPatch = optionalString stdenv.isDarwin ''
+15
pkgs/development/compilers/go/skip-test-extra-files-on-386.patch
···
··· 1 + diff --git a/src/os/exec/exec_test.go b/src/os/exec/exec_test.go 2 + index 558345ff63..22129bf022 100644 3 + --- a/src/os/exec/exec_test.go 4 + +++ b/src/os/exec/exec_test.go 5 + @@ -593,6 +593,10 @@ func TestExtraFiles(t *testing.T) { 6 + t.Skipf("skipping test on %q", runtime.GOOS) 7 + } 8 + 9 + + if runtime.GOOS == "linux" && runtime.GOARCH == "386" { 10 + + t.Skipf("skipping test on %q %q", runtime.GOARCH, runtime.GOOS) 11 + + } 12 + + 13 + // Ensure that file descriptors have not already been leaked into 14 + // our environment. 15 + if !testedAlreadyLeaked {