Unverified Commit 74ed06ef authored by Jörg Thalheim's avatar Jörg Thalheim Committed by GitHub
Browse files

Merge pull request #39000 from Mic92/rustc-disable-aarch64-tests 

rustc: disable tests for aarch64
parents 63a865c4 dee60d8e

pkgs/development/compilers/rust/default.nix

+6 −3
Original line number Diff line number Diff line
@@ -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;



  };

pkgs/development/compilers/rust/patches/aarch64-disable-test_loading_cosine.patch

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
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

pkgs/development/compilers/rust/rustc.nix

+0 −3
Original line number Diff line number Diff line
@@ -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