diff options
author | Daiderd Jordan <daiderd@gmail.com> | 2018-10-26 12:14:24 +0100 |
---|---|---|
committer | Daiderd Jordan <daiderd@gmail.com> | 2018-10-26 12:14:24 +0100 |
commit | 0d64e81ce6166eb5920e01563b78b9cb6e2c2043 (patch) | |
tree | 403585923fe63c52aeed12bb672ec3ec96ea3ba6 /pkgs/development/compilers | |
parent | cafecf16afa57863f6981aa7a5adac6f1c29cda6 (diff) | |
download | nixlib-0d64e81ce6166eb5920e01563b78b9cb6e2c2043.tar nixlib-0d64e81ce6166eb5920e01563b78b9cb6e2c2043.tar.gz nixlib-0d64e81ce6166eb5920e01563b78b9cb6e2c2043.tar.bz2 nixlib-0d64e81ce6166eb5920e01563b78b9cb6e2c2043.tar.lz nixlib-0d64e81ce6166eb5920e01563b78b9cb6e2c2043.tar.xz nixlib-0d64e81ce6166eb5920e01563b78b9cb6e2c2043.tar.zst nixlib-0d64e81ce6166eb5920e01563b78b9cb6e2c2043.zip |
rustc: fix moved tests and darwin build
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r-- | pkgs/development/compilers/rust/rustc.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index a054ed0eb557..decf14a32948 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -92,15 +92,15 @@ stdenv.mkDerivation { #[ -f src/liballoc/heap.rs ] && sed -i 's,je_,,g' src/liballoc/heap.rs # Remove for 1.4.0+ # Disable fragile tests. - rm -vr src/test/run-make/linker-output-non-utf8 || true - rm -vr src/test/run-make/issue-26092 || true + rm -vr src/test/run-make-fulldeps/linker-output-non-utf8 || true + rm -vr src/test/run-make-fulldeps/issue-26092 || true # Remove test targeted at LLVM 3.9 - https://github.com/rust-lang/rust/issues/36835 - rm -vr src/test/run-pass/issue-36023.rs || true + rm -vr src/test/ui/run-pass/issue-36023.rs || true # Disable test getting stuck on hydra - possible fix: # https://reviews.llvm.org/rL281650 - rm -vr src/test/run-pass/issue-36474.rs || true + rm -vr src/test/ui/run-pass/issue-36474.rs || true # On Hydra: `TcpListener::bind(&addr)`: Address already in use (os error 98)' sed '/^ *fn fast_rebind()/i#[ignore]' -i src/libstd/net/tcp.rs @@ -116,18 +116,18 @@ stdenv.mkDerivation { # Disable all lldb tests. # error: Can't run LLDB test because LLDB's python path is not set rm -vr src/test/debuginfo/* - rm -v src/test/run-pass/backtrace-debuginfo.rs + rm -v src/test/run-pass/backtrace-debuginfo.rs || true # error: No such file or directory - rm -v src/test/run-pass/issue-45731.rs + rm -v src/test/ui/run-pass/issues/issue-45731.rs || true # Disable tests that fail when sandboxing is enabled. substituteInPlace src/libstd/sys/unix/ext/net.rs \ --replace '#[test]' '#[test] #[ignore]' substituteInPlace src/test/run-pass/env-home-dir.rs \ --replace 'home_dir().is_some()' true - rm -v src/test/run-pass/fds-are-cloexec.rs # FIXME: pipes? - rm -v src/test/run-pass/sync-send-in-std.rs # FIXME: ??? + rm -v src/test/run-pass/fds-are-cloexec.rs || true # FIXME: pipes? + rm -v src/test/ui/run-pass/threads-sendsync/sync-send-in-std.rs || true # FIXME: ??? ''; # rustc unfortunately need cmake for compiling llvm-rt but doesn't |