diff options
| author | Andrew Childs <lorne@cons.org.nz> | 2020-01-11 00:27:30 +0900 |
|---|---|---|
| committer | Wael Nasreddine <wael.nasreddine@gmail.com> | 2020-01-10 07:27:30 -0800 |
| commit | ffd68f21e86021ac2b53cbe7f7de4a5440c77941 (patch) | |
| tree | 9af70aae5d9a5004370a448240b96694cde1f0a4 | |
| parent | a69d3f33d4585942ae3bd8f4d594587e81dea20e (diff) | |
| download | nixpkgs-ffd68f21e86021ac2b53cbe7f7de4a5440c77941.tar nixpkgs-ffd68f21e86021ac2b53cbe7f7de4a5440c77941.tar.gz nixpkgs-ffd68f21e86021ac2b53cbe7f7de4a5440c77941.tar.bz2 nixpkgs-ffd68f21e86021ac2b53cbe7f7de4a5440c77941.tar.lz nixpkgs-ffd68f21e86021ac2b53cbe7f7de4a5440c77941.tar.xz nixpkgs-ffd68f21e86021ac2b53cbe7f7de4a5440c77941.tar.zst nixpkgs-ffd68f21e86021ac2b53cbe7f7de4a5440c77941.zip | |
go_1_12, go_1_13: skip TestExtraFiles on 32-bit arm (#76944)
The test is known to be flaky in some environments, and I'm seeing it consistently in an armv7l-linux vm.
| -rw-r--r-- | pkgs/development/compilers/go/1.12.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/compilers/go/1.13.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/compilers/go/skip-test-extra-files-on-aarch32.patch | 15 |
3 files changed, 23 insertions, 2 deletions
diff --git a/pkgs/development/compilers/go/1.12.nix b/pkgs/development/compilers/go/1.12.nix index b3b66fde2a1..c8ecdbf518f 100644 --- a/pkgs/development/compilers/go/1.12.nix +++ b/pkgs/development/compilers/go/1.12.nix @@ -141,8 +141,11 @@ stdenv.mkDerivation rec { ./go-1.9-skip-flaky-20072.patch ./skip-external-network-tests.patch ./skip-nohup-tests.patch + ] ++ [ # breaks under load: https://github.com/golang/go/issues/25628 - ./skip-test-extra-files-on-386.patch + (if stdenv.isAarch32 + then ./skip-test-extra-files-on-aarch32.patch + else ./skip-test-extra-files-on-386.patch) ]; postPatch = '' diff --git a/pkgs/development/compilers/go/1.13.nix b/pkgs/development/compilers/go/1.13.nix index 6b7c99c0743..9a748ea1173 100644 --- a/pkgs/development/compilers/go/1.13.nix +++ b/pkgs/development/compilers/go/1.13.nix @@ -138,8 +138,11 @@ stdenv.mkDerivation rec { ./go-1.9-skip-flaky-20072.patch ./skip-external-network-tests.patch ./skip-nohup-tests.patch + ] ++ [ # breaks under load: https://github.com/golang/go/issues/25628 - ./skip-test-extra-files-on-386.patch + (if stdenv.isAarch32 + then ./skip-test-extra-files-on-aarch32.patch + else ./skip-test-extra-files-on-386.patch) ]; postPatch = '' diff --git a/pkgs/development/compilers/go/skip-test-extra-files-on-aarch32.patch b/pkgs/development/compilers/go/skip-test-extra-files-on-aarch32.patch new file mode 100644 index 00000000000..f3566b3ddaa --- /dev/null +++ b/pkgs/development/compilers/go/skip-test-extra-files-on-aarch32.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 == "arm" { ++ 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 { |