diff options
| author | Domen Kožar <domen@dev.si> | 2015-11-11 12:20:28 +0100 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2015-11-11 12:20:28 +0100 |
| commit | cf55e0b2ace91e383198dc3424525498644f1705 (patch) | |
| tree | 7785430611406fbb8659f9c3a30aedba839415a3 /pkgs | |
| parent | 7f25bc8d0a0f810ce5914f9e698e1a5c2ac876fe (diff) | |
| parent | adaf347bde3607476d51259991662aa54c4dbac3 (diff) | |
| download | nixlib-cf55e0b2ace91e383198dc3424525498644f1705.tar nixlib-cf55e0b2ace91e383198dc3424525498644f1705.tar.gz nixlib-cf55e0b2ace91e383198dc3424525498644f1705.tar.bz2 nixlib-cf55e0b2ace91e383198dc3424525498644f1705.tar.lz nixlib-cf55e0b2ace91e383198dc3424525498644f1705.tar.xz nixlib-cf55e0b2ace91e383198dc3424525498644f1705.tar.zst nixlib-cf55e0b2ace91e383198dc3424525498644f1705.zip | |
Merge pull request #10543 from LnL7/darwin-go
go: disabled some failing tests for darwin
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/go/1.4.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/compilers/go/1.5.nix | 5 |
2 files changed, 12 insertions, 1 deletions
diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix index 408759013e80..4f25b2674e79 100644 --- a/pkgs/development/compilers/go/1.4.nix +++ b/pkgs/development/compilers/go/1.4.nix @@ -63,9 +63,15 @@ stdenv.mkDerivation rec { '' + lib.optionalString stdenv.isDarwin '' sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go + sed -i '/TestCgoLookupIP/areturn' src/net/cgo_unix_test.go + sed -i '/TestChdirAndGetwd/areturn' src/os/os_test.go + sed -i '/TestDialDualStackLocalhost/areturn' src/net/dial_test.go sed -i '/TestRead0/areturn' src/os/os_test.go sed -i '/TestSystemRoots/areturn' src/crypto/x509/root_darwin_test.go - sed -i '/TestDialDualStackLocalhost/areturn' src/net/dial_test.go + + # fails when running inside tmux + sed -i '/TestNohup/areturn' src/os/signal/signal_test.go + # remove IP resolving tests, on darwin they can find fe80::1%lo while expecting ::1 sed -i '/TestResolveIPAddr/areturn' src/net/ipraw_test.go diff --git a/pkgs/development/compilers/go/1.5.nix b/pkgs/development/compilers/go/1.5.nix index ccbb50f42d10..ce5c2579b89f 100644 --- a/pkgs/development/compilers/go/1.5.nix +++ b/pkgs/development/compilers/go/1.5.nix @@ -74,9 +74,14 @@ stdenv.mkDerivation rec { sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go + sed -i '/TestCgoLookupIP/areturn' src/net/cgo_unix_test.go + sed -i '/TestChdirAndGetwd/areturn' src/os/os_test.go sed -i '/TestRead0/areturn' src/os/os_test.go sed -i '/TestSystemRoots/areturn' src/crypto/x509/root_darwin_test.go + sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/areturn' src/cmd/go/go_test.go + sed -i '/TestBuildDashIInstallsDependencies/areturn' src/cmd/go/go_test.go + sed -i '/TestDisasmExtld/areturn' src/cmd/objdump/objdump_test.go touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd |