tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

Merge #39000: rustc: disable tests for aarch64

(cherry picked from commit 74ed06efa040a12413c8aa72e89627caa6c48d33)

authored by Jörg Thalheim and committed by Vladimír Čunát b694e7b8 563ee7f8

+8 -17
unified split
+6 -3
pkgs/development/compilers/rust/default.nix
··· 20 20 21 21 configureFlags = [ "--release-channel=stable" ]; 22 22 23 + # Upstream is not running tests on aarch64: 24 + # see https://github.com/rust-lang/rust/issues/49807#issuecomment-380860567 25 + # So we do the same. 26 + doCheck = !stdenv.isAarch64; 27 + 23 28 patches = [ 24 29 ./patches/0001-Disable-fragile-tests-libstd-net-tcp-on-Darwin-Linux.patch 25 - ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch 26 - # https://github.com/rust-lang/rust/issues/45410 27 - ++ stdenv.lib.optional stdenv.isAarch64 ./patches/aarch64-disable-test_loading_cosine.patch; 30 + ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; 28 31 29 32 }; 30 33
-12
pkgs/development/compilers/rust/patches/aarch64-disable-test_loading_cosine.patch
··· 1 - diff --git a/src/librustc_metadata/dynamic_lib.rs b/src/librustc_metadata/dynamic_lib.rs 2 - index 1b42fa0..92256dc 100644 3 - --- a/src/librustc_metadata/dynamic_lib.rs 4 - +++ b/src/librustc_metadata/dynamic_lib.rs 5 - @@ -80,6 +80,7 @@ mod tests { 6 - use std::mem; 7 - 8 - #[test] 9 - + #[ignore] 10 - fn test_loading_cosine() { 11 - if cfg!(windows) { 12 - return
+2 -2
pkgs/development/compilers/rust/rustc.nix
··· 55 55 RUSTFLAGS = "-Ccodegen-units=10"; 56 56 57 57 # We need rust to build rust. If we don't provide it, configure will try to download it. 58 + # Reference: https://github.com/rust-lang/rust/blob/master/src/bootstrap/configure.py 58 59 configureFlags = configureFlags 59 60 ++ [ "--enable-local-rust" "--local-rust-root=${rustPlatform.rust.rustc}" "--enable-rpath" ] 60 61 ++ [ "--enable-vendor" ] ··· 102 103 103 104 # Useful debugging parameter 104 105 # export VERBOSE=1 105 - '' 106 - + optionalString stdenv.isDarwin '' 106 + '' + optionalString stdenv.isDarwin '' 107 107 # Disable all lldb tests. 108 108 # error: Can't run LLDB test because LLDB's python path is not set 109 109 rm -vr src/test/debuginfo/*