diff options
| author | bors <bors@rust-lang.org> | 2018-06-17 11:53:56 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-06-17 11:53:56 +0000 |
| commit | 499583aa92203845353c45001e56d0dbe281e270 (patch) | |
| tree | 5071c59f03ec835bd157fdbe584dc908ffc7de04 | |
| parent | 594b05dd9786c09c916745c1b1c281a3c54cdbd1 (diff) | |
| parent | d63aabcb3662f82168a0d1f9795ff0b828c24c24 (diff) | |
| download | rust-499583aa92203845353c45001e56d0dbe281e270.tar.gz rust-499583aa92203845353c45001e56d0dbe281e270.zip | |
Auto merge of #51392 - glaubitz:powerpc-tests, r=petrochenkov
test: Ignore some problematic tests on powerpc and powerpc64* This updates the list of tests which can be safely ignored on powerpc and powerpc64*.
| -rw-r--r-- | src/test/codegen/repr-transparent-aggregates-2.rs | 3 | ||||
| -rw-r--r-- | src/test/codegen/stack-probes.rs | 2 | ||||
| -rw-r--r-- | src/test/codegen/x86_mmx.rs | 3 | ||||
| -rw-r--r-- | src/test/compile-fail/asm-bad-clobber.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/asm-in-bad-modifier.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/asm-misplaced-option.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/asm-out-no-modifier.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/asm-out-read-uninit.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/borrowck/borrowck-asm.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/asm-out-assign-imm.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/asm-out-assign-imm.stderr | 2 | ||||
| -rw-r--r-- | src/test/ui/target-feature-wrong.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/target-feature-wrong.stderr | 14 |
13 files changed, 32 insertions, 8 deletions
diff --git a/src/test/codegen/repr-transparent-aggregates-2.rs b/src/test/codegen/repr-transparent-aggregates-2.rs index bc000bd3165..b4623eb4913 100644 --- a/src/test/codegen/repr-transparent-aggregates-2.rs +++ b/src/test/codegen/repr-transparent-aggregates-2.rs @@ -13,6 +13,9 @@ // ignore-aarch64 // ignore-asmjs // ignore-mips64 +// ignore-powerpc +// ignore-powerpc64 +// ignore-powerpc64le // ignore-s390x // ignore-sparc // ignore-sparc64 diff --git a/src/test/codegen/stack-probes.rs b/src/test/codegen/stack-probes.rs index 2c86e609e7b..6ab71723a1d 100644 --- a/src/test/codegen/stack-probes.rs +++ b/src/test/codegen/stack-probes.rs @@ -13,6 +13,8 @@ // ignore-mips // ignore-mips64 // ignore-powerpc +// ignore-powerpc64 +// ignore-powerpc64le // ignore-s390x // ignore-sparc // ignore-sparc64 diff --git a/src/test/codegen/x86_mmx.rs b/src/test/codegen/x86_mmx.rs index ba51004a791..4424c30e0f8 100644 --- a/src/test/codegen/x86_mmx.rs +++ b/src/test/codegen/x86_mmx.rs @@ -13,6 +13,9 @@ // ignore-emscripten // ignore-mips // ignore-mips64 +// ignore-powerpc +// ignore-powerpc64 +// ignore-powerpc64le // ignore-sparc // ignore-sparc64 // compile-flags: -O diff --git a/src/test/compile-fail/asm-bad-clobber.rs b/src/test/compile-fail/asm-bad-clobber.rs index 900f5cce13b..c2b54e37e39 100644 --- a/src/test/compile-fail/asm-bad-clobber.rs +++ b/src/test/compile-fail/asm-bad-clobber.rs @@ -14,6 +14,8 @@ // ignore-s390x // ignore-emscripten // ignore-powerpc +// ignore-powerpc64 +// ignore-powerpc64le // ignore-sparc // ignore-sparc64 // ignore-mips diff --git a/src/test/compile-fail/asm-in-bad-modifier.rs b/src/test/compile-fail/asm-in-bad-modifier.rs index 3960fd50e17..2eefd4235bc 100644 --- a/src/test/compile-fail/asm-in-bad-modifier.rs +++ b/src/test/compile-fail/asm-in-bad-modifier.rs @@ -11,6 +11,8 @@ // ignore-s390x // ignore-emscripten // ignore-powerpc +// ignore-powerpc64 +// ignore-powerpc64le // ignore-sparc // ignore-sparc64 // ignore-mips diff --git a/src/test/compile-fail/asm-misplaced-option.rs b/src/test/compile-fail/asm-misplaced-option.rs index 77798201ff3..bfc1fd68fe0 100644 --- a/src/test/compile-fail/asm-misplaced-option.rs +++ b/src/test/compile-fail/asm-misplaced-option.rs @@ -14,6 +14,8 @@ // ignore-s390x // ignore-emscripten // ignore-powerpc +// ignore-powerpc64 +// ignore-powerpc64le // ignore-sparc // ignore-sparc64 // ignore-mips diff --git a/src/test/compile-fail/asm-out-no-modifier.rs b/src/test/compile-fail/asm-out-no-modifier.rs index e38112a2566..40d2ded8a88 100644 --- a/src/test/compile-fail/asm-out-no-modifier.rs +++ b/src/test/compile-fail/asm-out-no-modifier.rs @@ -11,6 +11,8 @@ // ignore-s390x // ignore-emscripten // ignore-powerpc +// ignore-powerpc64 +// ignore-powerpc64le // ignore-sparc // ignore-sparc64 // ignore-mips diff --git a/src/test/compile-fail/asm-out-read-uninit.rs b/src/test/compile-fail/asm-out-read-uninit.rs index bd0301e6cf9..c308a9f0850 100644 --- a/src/test/compile-fail/asm-out-read-uninit.rs +++ b/src/test/compile-fail/asm-out-read-uninit.rs @@ -11,6 +11,8 @@ // ignore-s390x // ignore-emscripten // ignore-powerpc +// ignore-powerpc64 +// ignore-powerpc64le // ignore-sparc // ignore-sparc64 // ignore-mips diff --git a/src/test/compile-fail/borrowck/borrowck-asm.rs b/src/test/compile-fail/borrowck/borrowck-asm.rs index 4cd74117ef7..d9816401b33 100644 --- a/src/test/compile-fail/borrowck/borrowck-asm.rs +++ b/src/test/compile-fail/borrowck/borrowck-asm.rs @@ -11,6 +11,8 @@ // ignore-s390x // ignore-emscripten // ignore-powerpc +// ignore-powerpc64 +// ignore-powerpc64le // ignore-sparc // ignore-sparc64 diff --git a/src/test/ui/asm-out-assign-imm.rs b/src/test/ui/asm-out-assign-imm.rs index 73a709b1686..f5bb07a9b35 100644 --- a/src/test/ui/asm-out-assign-imm.rs +++ b/src/test/ui/asm-out-assign-imm.rs @@ -11,6 +11,8 @@ // ignore-s390x // ignore-emscripten // ignore-powerpc +// ignore-powerpc64 +// ignore-powerpc64le // ignore-sparc // ignore-sparc64 // ignore-mips diff --git a/src/test/ui/asm-out-assign-imm.stderr b/src/test/ui/asm-out-assign-imm.stderr index 324dec77adc..7075914fa04 100644 --- a/src/test/ui/asm-out-assign-imm.stderr +++ b/src/test/ui/asm-out-assign-imm.stderr @@ -1,5 +1,5 @@ error[E0384]: cannot assign twice to immutable variable `x` - --> $DIR/asm-out-assign-imm.rs:31:9 + --> $DIR/asm-out-assign-imm.rs:33:9 | LL | x = 1; | ----- first assignment to `x` diff --git a/src/test/ui/target-feature-wrong.rs b/src/test/ui/target-feature-wrong.rs index ed9bbb60dcd..8983c0ea79b 100644 --- a/src/test/ui/target-feature-wrong.rs +++ b/src/test/ui/target-feature-wrong.rs @@ -14,6 +14,8 @@ // ignore-emscripten // ignore-mips // ignore-powerpc +// ignore-powerpc64 +// ignore-powerpc64le // ignore-s390x // ignore-sparc // ignore-sparc64 diff --git a/src/test/ui/target-feature-wrong.stderr b/src/test/ui/target-feature-wrong.stderr index 39362f74bdd..d4e1c978104 100644 --- a/src/test/ui/target-feature-wrong.stderr +++ b/src/test/ui/target-feature-wrong.stderr @@ -1,35 +1,35 @@ error: #[target_feature] attribute must be of the form #[target_feature(..)] - --> $DIR/target-feature-wrong.rs:23:1 + --> $DIR/target-feature-wrong.rs:25:1 | LL | #[target_feature = "+sse2"] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: the feature named `foo` is not valid for this target - --> $DIR/target-feature-wrong.rs:25:18 + --> $DIR/target-feature-wrong.rs:27:18 | LL | #[target_feature(enable = "foo")] | ^^^^^^^^^^^^^^ error: #[target_feature(..)] only accepts sub-keys of `enable` currently - --> $DIR/target-feature-wrong.rs:27:18 + --> $DIR/target-feature-wrong.rs:29:18 | LL | #[target_feature(bar)] | ^^^ error: #[target_feature(..)] only accepts sub-keys of `enable` currently - --> $DIR/target-feature-wrong.rs:29:18 + --> $DIR/target-feature-wrong.rs:31:18 | LL | #[target_feature(disable = "baz")] | ^^^^^^^^^^^^^^^ error: #[target_feature(..)] can only be applied to `unsafe` function - --> $DIR/target-feature-wrong.rs:33:1 + --> $DIR/target-feature-wrong.rs:35:1 | LL | #[target_feature(enable = "sse2")] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: attribute should be applied to a function - --> $DIR/target-feature-wrong.rs:37:1 + --> $DIR/target-feature-wrong.rs:39:1 | LL | #[target_feature(enable = "sse2")] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -38,7 +38,7 @@ LL | mod another {} | -------------- not a function error: cannot use #[inline(always)] with #[target_feature] - --> $DIR/target-feature-wrong.rs:41:1 + --> $DIR/target-feature-wrong.rs:43:1 | LL | #[inline(always)] | ^^^^^^^^^^^^^^^^^ |
