diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-02-19 23:12:03 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-02-19 23:12:03 +0000 |
| commit | c30463643e0f18200197fa7fc700805eac4d020c (patch) | |
| tree | 599f32d5195512f7b700bb1f68abdbda7ee45281 /user/rust/0020-Ignore-broken-and-non-applicable-tests.patch | |
| parent | 3e7e0ccf80173731eef6d51f8a261b6058bfad72 (diff) | |
| parent | 3ad04696702c67ecbb84ee44d20b2489d77d841f (diff) | |
| download | packages-c30463643e0f18200197fa7fc700805eac4d020c.tar.gz packages-c30463643e0f18200197fa7fc700805eac4d020c.tar.bz2 packages-c30463643e0f18200197fa7fc700805eac4d020c.tar.xz packages-c30463643e0f18200197fa7fc700805eac4d020c.zip | |
Merge branch 'rust' into 'master'
user/rust: Bump to 1.31.1
This needs updated binaries from https://portage.smaeul.xyz/distfiles/adelie/
See merge request !131
Diffstat (limited to 'user/rust/0020-Ignore-broken-and-non-applicable-tests.patch')
| -rw-r--r-- | user/rust/0020-Ignore-broken-and-non-applicable-tests.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/user/rust/0020-Ignore-broken-and-non-applicable-tests.patch b/user/rust/0020-Ignore-broken-and-non-applicable-tests.patch new file mode 100644 index 000000000..3305b52d0 --- /dev/null +++ b/user/rust/0020-Ignore-broken-and-non-applicable-tests.patch @@ -0,0 +1,48 @@ +From 5fd5ee6042170262f6832b65a90c54989f6a9847 Mon Sep 17 00:00:00 2001 +From: Samuel Holland <samuel@sholland.org> +Date: Sun, 16 Sep 2018 16:38:48 +0000 +Subject: [PATCH 20/23] Ignore broken and non-applicable tests + +long-linker-command-lines: takes >10 minutes to run (but still passes) +sparc-struct-abi: no sparc target +sysroot-crates-are-unstable: can't run rustc without rpath +--- + src/test/codegen/sparc-struct-abi.rs | 1 + + src/test/run-make-fulldeps/long-linker-command-lines/Makefile | 1 - + src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile | 2 +- + 3 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/test/codegen/sparc-struct-abi.rs b/src/test/codegen/sparc-struct-abi.rs +index 56c4364d59..9aebf8f002 100644 +--- a/src/test/codegen/sparc-struct-abi.rs ++++ b/src/test/codegen/sparc-struct-abi.rs +@@ -13,6 +13,7 @@ + + // only-sparc64 + // compile-flags: -O --target=sparc64-unknown-linux-gnu --crate-type=rlib ++// ignore-test + #![feature(no_core, lang_items)] + #![no_core] + +diff --git a/src/test/run-make-fulldeps/long-linker-command-lines/Makefile b/src/test/run-make-fulldeps/long-linker-command-lines/Makefile +index 5876fbc94b..e9f5c33b77 100644 +--- a/src/test/run-make-fulldeps/long-linker-command-lines/Makefile ++++ b/src/test/run-make-fulldeps/long-linker-command-lines/Makefile +@@ -2,4 +2,3 @@ + + all: + $(RUSTC) foo.rs -g -O +- RUSTC="$(RUSTC_ORIGINAL)" $(call RUN,foo) +diff --git a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile +index 9e77070685..7784230b46 100644 +--- a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile ++++ b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile +@@ -1,4 +1,4 @@ + -include ../tools.mk + + all: +- env '$(HOST_RPATH_ENV)' python2.7 test.py ++ true +-- +2.19.2 + |