diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-04-16 14:14:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-16 14:14:22 +0100 |
| commit | 74ed06efa040a12413c8aa72e89627caa6c48d33 (patch) | |
| tree | 650c5044e0a45201f026f7090bb91c6434024537 /pkgs/development | |
| parent | 63a865c403c56e538eee4bd6eca28338e37160f1 (diff) | |
| parent | dee60d8e2cbd001d2f8e1982e09f654c3a172abb (diff) | |
| download | nixpkgs-74ed06efa040a12413c8aa72e89627caa6c48d33.tar nixpkgs-74ed06efa040a12413c8aa72e89627caa6c48d33.tar.gz nixpkgs-74ed06efa040a12413c8aa72e89627caa6c48d33.tar.bz2 nixpkgs-74ed06efa040a12413c8aa72e89627caa6c48d33.tar.lz nixpkgs-74ed06efa040a12413c8aa72e89627caa6c48d33.tar.xz nixpkgs-74ed06efa040a12413c8aa72e89627caa6c48d33.tar.zst nixpkgs-74ed06efa040a12413c8aa72e89627caa6c48d33.zip | |
Merge pull request #39000 from Mic92/rustc-disable-aarch64-tests
rustc: disable tests for aarch64
Diffstat (limited to 'pkgs/development')
3 files changed, 6 insertions, 18 deletions
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index d9a36273ce1..f47c1f753ee 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -20,11 +20,14 @@ in rec { configureFlags = [ "--release-channel=stable" ]; + # Upstream is not running tests on aarch64: + # see https://github.com/rust-lang/rust/issues/49807#issuecomment-380860567 + # So we do the same. + doCheck = !stdenv.isAarch64; + patches = [ ./patches/0001-Disable-fragile-tests-libstd-net-tcp-on-Darwin-Linux.patch - ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch - # https://github.com/rust-lang/rust/issues/45410 - ++ stdenv.lib.optional stdenv.isAarch64 ./patches/aarch64-disable-test_loading_cosine.patch; + ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; }; diff --git a/pkgs/development/compilers/rust/patches/aarch64-disable-test_loading_cosine.patch b/pkgs/development/compilers/rust/patches/aarch64-disable-test_loading_cosine.patch deleted file mode 100644 index bafab0e9ef7..00000000000 --- a/pkgs/development/compilers/rust/patches/aarch64-disable-test_loading_cosine.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/librustc_metadata/dynamic_lib.rs b/src/librustc_metadata/dynamic_lib.rs -index 1b42fa0..92256dc 100644 ---- a/src/librustc_metadata/dynamic_lib.rs -+++ b/src/librustc_metadata/dynamic_lib.rs -@@ -80,6 +80,7 @@ mod tests { - use std::mem; - - #[test] -+ #[ignore] - fn test_loading_cosine() { - if cfg!(windows) { - return diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 1395d8e9a3b..19c4a590e45 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -108,9 +108,6 @@ stdenv.mkDerivation { # Useful debugging parameter # export VERBOSE=1 - '' + optionalString stdenv.isAarch64 '' - # https://github.com/rust-lang/rust/issues/49807 - rm -vr src/test/debuginfo/by-value-self-argument-in-trait-impl.rs '' + optionalString stdenv.isDarwin '' # Disable all lldb tests. # error: Can't run LLDB test because LLDB's python path is not set |