diff --git a/debian/changelog b/debian/changelog index 7f461a40c6..f2904a726a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ rustc (1.47.0~beta.2+dfsg1-1~exp2) UNRELEASED; urgency=medium * Update to LLVM 11. + * Ignore more tests on big-endian. -- Ximin Luo Thu, 01 Oct 2020 17:25:07 +0100 diff --git a/debian/patches/series b/debian/patches/series index 2d9a47b24d..ebae6bad9d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,6 +5,7 @@ u-reproducible-build.patch u-make-tests-work-without-rpath.patch u-tests-ignore-arm.patch u-mips-fixes.diff +u-ignore-endian-big.patch #u-allow-system-compiler-rt.patch # not forwarded, or forwarded but unlikely to be merged diff --git a/debian/patches/u-ignore-endian-big.patch b/debian/patches/u-ignore-endian-big.patch new file mode 100644 index 0000000000..08bdbce971 --- /dev/null +++ b/debian/patches/u-ignore-endian-big.patch @@ -0,0 +1,60 @@ +diff --git a/src/test/mir-opt/const_prop/checked_add.rs b/src/test/mir-opt/const_prop/checked_add.rs +index 08d59b6fb..4f1bb6139 100644 +--- a/src/test/mir-opt/const_prop/checked_add.rs ++++ b/src/test/mir-opt/const_prop/checked_add.rs +@@ -1,4 +1,5 @@ + // compile-flags: -C overflow-checks=on ++// ignore-endian-big + + // EMIT_MIR checked_add.main.ConstProp.diff + fn main() { +diff --git a/src/test/mir-opt/const_prop/mutable_variable_aggregate.rs b/src/test/mir-opt/const_prop/mutable_variable_aggregate.rs +index e0b4b77ba..bbac22782 100644 +--- a/src/test/mir-opt/const_prop/mutable_variable_aggregate.rs ++++ b/src/test/mir-opt/const_prop/mutable_variable_aggregate.rs +@@ -1,4 +1,5 @@ + // compile-flags: -O ++// ignore-endian-big + + // EMIT_MIR mutable_variable_aggregate.main.ConstProp.diff + fn main() { +diff --git a/src/test/mir-opt/const_prop/mutable_variable_no_prop.rs b/src/test/mir-opt/const_prop/mutable_variable_no_prop.rs +index 4126fb3c6..3e8545e5c 100644 +--- a/src/test/mir-opt/const_prop/mutable_variable_no_prop.rs ++++ b/src/test/mir-opt/const_prop/mutable_variable_no_prop.rs +@@ -1,4 +1,5 @@ + // compile-flags: -O ++// ignore-endian-big + + static mut STATIC: u32 = 42; + +diff --git a/src/test/mir-opt/const_prop/optimizes_into_variable.rs b/src/test/mir-opt/const_prop/optimizes_into_variable.rs +index 17265b7eb..ce1c10312 100644 +--- a/src/test/mir-opt/const_prop/optimizes_into_variable.rs ++++ b/src/test/mir-opt/const_prop/optimizes_into_variable.rs +@@ -1,4 +1,5 @@ + // compile-flags: -C overflow-checks=on ++// ignore-endian-big + + struct Point { + x: u32, +diff --git a/src/test/mir-opt/const_prop/return_place.rs b/src/test/mir-opt/const_prop/return_place.rs +index 06a853696..f28c1b89f 100644 +--- a/src/test/mir-opt/const_prop/return_place.rs ++++ b/src/test/mir-opt/const_prop/return_place.rs +@@ -1,4 +1,5 @@ + // compile-flags: -C overflow-checks=on ++// ignore-endian-big + + // EMIT_MIR return_place.add.ConstProp.diff + // EMIT_MIR return_place.add.PreCodegen.before.mir +diff --git a/src/test/mir-opt/const_prop/tuple_literal_propagation.rs b/src/test/mir-opt/const_prop/tuple_literal_propagation.rs +index e644baec4..049052ad0 100644 +--- a/src/test/mir-opt/const_prop/tuple_literal_propagation.rs ++++ b/src/test/mir-opt/const_prop/tuple_literal_propagation.rs +@@ -1,3 +1,5 @@ ++// ignore-endian-big ++ + // EMIT_MIR tuple_literal_propagation.main.ConstProp.diff + fn main() { + let x = (1, 2);