Merge master into staging-next

2020-01-10 18:32:07 +01:00
parent 5ad16cb27f e2e90a0e64
commit 348eaa280b
69 changed files with 1061 additions and 560 deletions
@@ -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 = ''
@@ -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 = ''
@@ -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 {