diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-09-16 11:03:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-16 11:03:30 +0100 |
| commit | c6773e8e439010b5c60e5a70d7b40302182ef380 (patch) | |
| tree | 098dae79af3a16c36c9a6e33d89bdedaaf32ce8b /pkgs/development/compilers | |
| parent | 772e2f9671aae8bcdaf87a8caff359f3997d9fa3 (diff) | |
| parent | 0bf6b440d90acc6b581c6dd18ce3eb6b335eccd7 (diff) | |
| download | nixlib-c6773e8e439010b5c60e5a70d7b40302182ef380.tar nixlib-c6773e8e439010b5c60e5a70d7b40302182ef380.tar.gz nixlib-c6773e8e439010b5c60e5a70d7b40302182ef380.tar.bz2 nixlib-c6773e8e439010b5c60e5a70d7b40302182ef380.tar.lz nixlib-c6773e8e439010b5c60e5a70d7b40302182ef380.tar.xz nixlib-c6773e8e439010b5c60e5a70d7b40302182ef380.tar.zst nixlib-c6773e8e439010b5c60e5a70d7b40302182ef380.zip | |
Merge pull request #46706 from bobvanderlinden/pr-go-skip-flaky-test
go: skip flaky os/exec TestExtraFiles
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/go/1.11.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/compilers/go/skip-test-extra-files-on-386.patch | 15 |
2 files changed, 16 insertions, 0 deletions
diff --git a/pkgs/development/compilers/go/1.11.nix b/pkgs/development/compilers/go/1.11.nix index 237f74e319f7..4a84c622a73e 100644 --- a/pkgs/development/compilers/go/1.11.nix +++ b/pkgs/development/compilers/go/1.11.nix @@ -125,6 +125,7 @@ stdenv.mkDerivation rec { ./remove-fhs-test-references.patch ./skip-external-network-tests.patch ./skip-nohup-tests.patch + ./skip-test-extra-files-on-386.patch ]; postPatch = optionalString stdenv.isDarwin '' diff --git a/pkgs/development/compilers/go/skip-test-extra-files-on-386.patch b/pkgs/development/compilers/go/skip-test-extra-files-on-386.patch new file mode 100644 index 000000000000..afe5aea3d916 --- /dev/null +++ b/pkgs/development/compilers/go/skip-test-extra-files-on-386.patch @@ -0,0 +1,15 @@ +diff --git a/src/os/exec/exec_test.go b/src/os/exec/exec_test.go +index 558345ff63..22129bf022 100644 +--- a/src/os/exec/exec_test.go ++++ b/src/os/exec/exec_test.go +@@ -593,6 +593,10 @@ func TestExtraFiles(t *testing.T) { + t.Skipf("skipping test on %q", runtime.GOOS) + } + ++ if runtime.GOOS == "linux" && runtime.GOARCH == "386" { ++ t.Skipf("skipping test on %q %q", runtime.GOARCH, runtime.GOOS) ++ } ++ + // Ensure that file descriptors have not already been leaked into + // our environment. + if !testedAlreadyLeaked { |