ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2025-01-06 04:24:28 +03:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
go: skip flaky os/exec TestExtraFiles
This commit is contained in:
Jörg Thalheim 2018-09-16 11:03:30 +01:00 committed by GitHub
commit c6773e8e43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/compilers/go/1.11.nix
View File

@ -125,6 +125,7 @@ stdenv.mkDerivation rec {
./remove-fhs-test-references.patch ./remove-fhs-test-references.patch
./skip-external-network-tests.patch ./skip-external-network-tests.patch
./skip-nohup-tests.patch ./skip-nohup-tests.patch
./skip-test-extra-files-on-386.patch
]; ];
postPatch = optionalString stdenv.isDarwin '' postPatch = optionalString stdenv.isDarwin ''

15
pkgs/development/compilers/go/skip-test-extra-files-on-386.patch Normal file
View File

@ -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 {