JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #34244 from LnL7/rust-skip-test

Browse Source 
rust: disable another fragile test
This commit is contained in:
Daiderd Jordan 2018-01-27 18:26:03 +01:00 committed by GitHub
commit e39f211575
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/compilers/rust/rustc.nix
View File

@ -84,8 +84,9 @@ stdenv.mkDerivation {
#[ -f src/liballoc_jemalloc/lib.rs ] && sed -i 's,je_,,g' src/liballoc_jemalloc/lib.rs #[ -f src/liballoc_jemalloc/lib.rs ] && sed -i 's,je_,,g' src/liballoc_jemalloc/lib.rs
#[ -f src/liballoc/heap.rs ] && sed -i 's,je_,,g' src/liballoc/heap.rs # Remove for 1.4.0+ #[ -f src/liballoc/heap.rs ] && sed -i 's,je_,,g' src/liballoc/heap.rs # Remove for 1.4.0+
# Disable fragile linker-output-non-utf8 test # Disable fragile tests.
rm -vr src/test/run-make/linker-output-non-utf8 || true rm -vr src/test/run-make/linker-output-non-utf8 || true
rm -vr src/test/run-make/issue-26092.rs || true
# Remove test targeted at LLVM 3.9 - https://github.com/rust-lang/rust/issues/36835 # 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/run-pass/issue-36023.rs || true