From 82b7b0f6a5bb6e1093b0847d4fe03c2b134b680e Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 19 Nov 2020 17:04:00 +1000 Subject: [PATCH] go_bootstrap: 1.4-bootstrap-20161024 -> 1.4-bootstrap-bdd4b95 Remove tests, they are disabled by upstream. https://github.com/golang/go/commit/182bdbb1e1d62fe53f8386e7b02c7738898d373b > The 1.4 tests aren't necessarily supposed to pass. --- pkgs/development/compilers/go/1.4.nix | 67 +------------------ .../compilers/go/creds-test-1.4.patch | 17 ----- 2 files changed, 3 insertions(+), 81 deletions(-) delete mode 100644 pkgs/development/compilers/go/creds-test-1.4.patch diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix index efea9d0eb82..75667a6cb2b 100644 --- a/pkgs/development/compilers/go/1.4.nix +++ b/pkgs/development/compilers/go/1.4.nix @@ -9,12 +9,12 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.4-bootstrap-20161024"; - revision = "79d85a4965ea7c46db483314c3981751909d7883"; + version = "1.4-bootstrap-${builtins.substring 0 7 revision}"; + revision = "bdd4b9503e47c2c38a9d0a9bb2f5d95ec5ff8ef6"; src = fetchurl { url = "https://github.com/golang/go/archive/${revision}.tar.gz"; - sha256 = "1ljbllwjysya323xxm9s792z8y9jdw19n8sj3mlc8picjclrx5xf"; + sha256 = "1zdyf883awaqdzm4r3fs76nbpiqx3iswl2p4qxclw2sl5vvynas5"; }; nativeBuildInputs = [ pkgconfig ]; @@ -43,22 +43,6 @@ stdenv.mkDerivation rec { cd go patchShebangs ./ # replace /bin/bash - # Disable timezone tests (these fail when `tzdata` is updated) - rm src/time/{example,format}_test.go - # Disabling the 'os/http/net' tests (they want files not available in - # chroot builds) - rm src/net/{multicast_test.go,parse_test.go,port_test.go} - # !!! substituteInPlace does not seems to be effective. - # The os test wants to read files in an existing path. Just don't let it be /usr/bin. - sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go - sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go - # Disable the unix socket test - sed -i '/TestShutdownUnix/areturn' src/net/net_test.go - # Disable network timeout test - sed -i '/TestDialTimeout/areturn' src/net/dial_test.go - # Disable the hostname test - sed -i '/TestHostname/areturn' src/os/os_test.go - sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go '' + lib.optionalString stdenv.isLinux '' # prepend the nix path to the zoneinfo files but also leave the original value for static binaries @@ -70,55 +54,10 @@ stdenv.mkDerivation rec { # Replace references to the loader find src/cmd -name asm.c -exec sed -i "s,/lib/ld-linux.*\.so\.[0-9],$LOADER," {} \; - '' + 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 - - # fails when running inside tmux - sed -i '/TestNohup/areturn' src/os/signal/signal_test.go - - # unix socket tests fail on darwin - sed -i '/TestConnAndListener/areturn' src/net/conn_test.go - sed -i '/TestPacketConn/areturn' src/net/conn_test.go - sed -i '/TestPacketConn/areturn' src/net/packetconn_test.go - sed -i '/TestConnAndPacketConn/areturn' src/net/packetconn_test.go - sed -i '/TestUnixListenerSpecificMethods/areturn' src/net/packetconn_test.go - sed -i '/TestUnixConnSpecificMethods/areturn' src/net/packetconn_test.go - sed -i '/TestUnixListenerSpecificMethods/areturn' src/net/protoconn_test.go - sed -i '/TestUnixConnSpecificMethods/areturn' src/net/protoconn_test.go - sed -i '/TestStreamConnServer/areturn' src/net/server_test.go - sed -i '/TestReadUnixgramWithUnnamedSocket/areturn' src/net/unix_test.go - sed -i '/TestReadUnixgramWithZeroBytesBuffer/areturn' src/net/unix_test.go - sed -i '/TestUnixgramWrite/areturn' src/net/unix_test.go - sed -i '/TestUnixConnLocalAndRemoteNames/areturn' src/net/unix_test.go - sed -i '/TestUnixgramConnLocalAndRemoteNames/areturn' src/net/unix_test.go - sed -i '/TestWithSimulated/areturn' src/log/syslog/syslog_test.go - sed -i '/TestFlap/areturn' src/log/syslog/syslog_test.go - sed -i '/TestNew/areturn' src/log/syslog/syslog_test.go - sed -i '/TestNewLogger/areturn' src/log/syslog/syslog_test.go - sed -i '/TestDial/areturn' src/log/syslog/syslog_test.go - sed -i '/TestWrite/areturn' src/log/syslog/syslog_test.go - sed -i '/TestConcurrentWrite/areturn' src/log/syslog/syslog_test.go - sed -i '/TestConcurrentReconnect/areturn' src/log/syslog/syslog_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 - sed -i '/TestResolveTCPAddr/areturn' src/net/tcp_test.go - sed -i '/TestResolveUDPAddr/areturn' src/net/udp_test.go - - sed -i '/TestCgoExternalThreadSIGPROF/areturn' src/runtime/crash_cgo_test.go - - touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd ''; patches = [ ./remove-tools-1.4.patch - ./creds-test-1.4.patch ]; GOOS = if stdenv.isDarwin then "darwin" else "linux"; diff --git a/pkgs/development/compilers/go/creds-test-1.4.patch b/pkgs/development/compilers/go/creds-test-1.4.patch deleted file mode 100644 index 98cec532dcc..00000000000 --- a/pkgs/development/compilers/go/creds-test-1.4.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/go-go1.4.3/src/syscall/creds_test.go b/go-go1.4.3/src/syscall/creds_test.go -index b1894c6..b2d6b4e 100644 ---- a/src/syscall/creds_test.go -+++ b/src/syscall/creds_test.go -@@ -56,9 +56,10 @@ func TestSCMCredentials(t *testing.T) { - ucred.Gid = 0 - oob := syscall.UnixCredentials(&ucred) - _, _, err := cli.(*net.UnixConn).WriteMsgUnix(nil, oob, nil) -- if err.(*net.OpError).Err != syscall.EPERM { -- t.Fatalf("WriteMsgUnix failed with %v, want EPERM", err) -+ if err.(*net.OpError).Err != syscall.EPERM && err.(*net.OpError).Err != syscall.EINVAL { -+ t.Fatalf("WriteMsgUnix failed with %v, want EPERM or EINVAL", err) - } -+ - } - - ucred.Pid = int32(os.Getpid())