Skip to content

Commit

Permalink
Rollup merge of #95116 - bjorn3:cg_clif_test_fixes, r=Dylan-DPC
Browse files Browse the repository at this point in the history
Add needs-* directives to many tests

These are necessary to ignore tests that need features unsupported by cg_clif.
  • Loading branch information
matthiaskrgr authored Mar 21, 2022
2 parents e41e510 + c542cd7 commit 08995e1
Show file tree
Hide file tree
Showing 24 changed files with 107 additions and 88 deletions.
1 change: 1 addition & 0 deletions src/test/ui/abi/abi-sysv64-register-usage.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
// ignore-android
// ignore-arm
// ignore-aarch64
// needs-asm-support
#![feature(asm_sym)]

#[cfg(target_arch = "x86_64")]
Expand Down
1 change: 1 addition & 0 deletions src/test/ui/asm/aarch64/const.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// only-aarch64
// run-pass
// needs-asm-support
// revisions: mirunsafeck thirunsafeck
// [thirunsafeck]compile-flags: -Z thir-unsafeck

Expand Down
1 change: 1 addition & 0 deletions src/test/ui/asm/aarch64/duplicate-options.fixed
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// only-aarch64
// needs-asm-support
// run-rustfix

use std::arch::asm;
Expand Down
1 change: 1 addition & 0 deletions src/test/ui/asm/aarch64/duplicate-options.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// only-aarch64
// needs-asm-support
// run-rustfix

use std::arch::asm;
Expand Down
18 changes: 9 additions & 9 deletions src/test/ui/asm/aarch64/duplicate-options.stderr
Original file line number Diff line number Diff line change
@@ -1,53 +1,53 @@
error: the `nomem` option was already provided
--> $DIR/duplicate-options.rs:8:33
--> $DIR/duplicate-options.rs:9:33
|
LL | asm!("", options(nomem, nomem));
| ^^^^^ this option was already provided

error: the `preserves_flags` option was already provided
--> $DIR/duplicate-options.rs:10:43
--> $DIR/duplicate-options.rs:11:43
|
LL | asm!("", options(preserves_flags, preserves_flags));
| ^^^^^^^^^^^^^^^ this option was already provided

error: the `nostack` option was already provided
--> $DIR/duplicate-options.rs:12:61
--> $DIR/duplicate-options.rs:13:61
|
LL | asm!("", options(nostack, preserves_flags), options(nostack));
| ^^^^^^^ this option was already provided

error: the `nostack` option was already provided
--> $DIR/duplicate-options.rs:14:35
--> $DIR/duplicate-options.rs:15:35
|
LL | asm!("", options(nostack, nostack), options(nostack), options(nostack));
| ^^^^^^^ this option was already provided

error: the `nostack` option was already provided
--> $DIR/duplicate-options.rs:14:53
--> $DIR/duplicate-options.rs:15:53
|
LL | asm!("", options(nostack, nostack), options(nostack), options(nostack));
| ^^^^^^^ this option was already provided

error: the `nostack` option was already provided
--> $DIR/duplicate-options.rs:14:71
--> $DIR/duplicate-options.rs:15:71
|
LL | asm!("", options(nostack, nostack), options(nostack), options(nostack));
| ^^^^^^^ this option was already provided

error: the `noreturn` option was already provided
--> $DIR/duplicate-options.rs:21:38
--> $DIR/duplicate-options.rs:22:38
|
LL | options(preserves_flags, noreturn),
| ^^^^^^^^ this option was already provided

error: the `nomem` option was already provided
--> $DIR/duplicate-options.rs:22:21
--> $DIR/duplicate-options.rs:23:21
|
LL | options(nomem, nostack),
| ^^^^^ this option was already provided

error: the `noreturn` option was already provided
--> $DIR/duplicate-options.rs:23:21
--> $DIR/duplicate-options.rs:24:21
|
LL | options(noreturn),
| ^^^^^^^^ this option was already provided
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/asm/aarch64/interpolated-idents.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// only-aarch64

// needs-asm-support
use std::arch::asm;

macro_rules! m {
Expand Down
1 change: 1 addition & 0 deletions src/test/ui/asm/aarch64/srcloc.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// only-aarch64
// build-fail
// needs-asm-support
// compile-flags: -Ccodegen-units=1

use std::arch::asm;
Expand Down
46 changes: 23 additions & 23 deletions src/test/ui/asm/aarch64/srcloc.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error: unrecognized instruction mnemonic
--> $DIR/srcloc.rs:11:15
--> $DIR/srcloc.rs:12:15
|
LL | asm!("invalid_instruction");
| ^
Expand All @@ -11,7 +11,7 @@ LL | invalid_instruction
| ^

error: unrecognized instruction mnemonic
--> $DIR/srcloc.rs:15:13
--> $DIR/srcloc.rs:16:13
|
LL | invalid_instruction
| ^
Expand All @@ -23,7 +23,7 @@ LL | invalid_instruction
| ^

error: unrecognized instruction mnemonic
--> $DIR/srcloc.rs:20:13
--> $DIR/srcloc.rs:21:13
|
LL | invalid_instruction
| ^
Expand All @@ -35,7 +35,7 @@ LL | invalid_instruction
| ^

error: unrecognized instruction mnemonic
--> $DIR/srcloc.rs:26:13
--> $DIR/srcloc.rs:27:13
|
LL | invalid_instruction
| ^
Expand All @@ -47,7 +47,7 @@ LL | invalid_instruction
| ^

error: unrecognized instruction mnemonic
--> $DIR/srcloc.rs:33:13
--> $DIR/srcloc.rs:34:13
|
LL | invalid_instruction
| ^
Expand All @@ -59,7 +59,7 @@ LL | invalid_instruction
| ^

error: unrecognized instruction mnemonic
--> $DIR/srcloc.rs:38:14
--> $DIR/srcloc.rs:39:14
|
LL | asm!(concat!("invalid", "_", "instruction"));
| ^
Expand All @@ -71,7 +71,7 @@ LL | invalid_instruction
| ^

error: unrecognized instruction mnemonic
--> $DIR/srcloc.rs:42:14
--> $DIR/srcloc.rs:43:14
|
LL | "invalid_instruction",
| ^
Expand All @@ -83,7 +83,7 @@ LL | invalid_instruction
| ^

error: unrecognized instruction mnemonic
--> $DIR/srcloc.rs:48:14
--> $DIR/srcloc.rs:49:14
|
LL | "invalid_instruction",
| ^
Expand All @@ -95,7 +95,7 @@ LL | invalid_instruction
| ^

error: unrecognized instruction mnemonic
--> $DIR/srcloc.rs:55:14
--> $DIR/srcloc.rs:56:14
|
LL | "invalid_instruction",
| ^
Expand All @@ -107,7 +107,7 @@ LL | invalid_instruction
| ^

error: unrecognized instruction mnemonic
--> $DIR/srcloc.rs:62:13
--> $DIR/srcloc.rs:63:13
|
LL | concat!("invalid", "_", "instruction"),
| ^
Expand All @@ -119,7 +119,7 @@ LL | invalid_instruction
| ^

error: unrecognized instruction mnemonic
--> $DIR/srcloc.rs:69:13
--> $DIR/srcloc.rs:70:13
|
LL | concat!("invalid", "_", "instruction"),
| ^
Expand All @@ -131,7 +131,7 @@ LL | invalid_instruction
| ^

error: unrecognized instruction mnemonic
--> $DIR/srcloc.rs:76:14
--> $DIR/srcloc.rs:77:14
|
LL | "invalid_instruction1",
| ^
Expand All @@ -143,7 +143,7 @@ LL | invalid_instruction1
| ^

error: unrecognized instruction mnemonic
--> $DIR/srcloc.rs:77:14
--> $DIR/srcloc.rs:78:14
|
LL | "invalid_instruction2",
| ^
Expand All @@ -155,7 +155,7 @@ LL | invalid_instruction2
| ^

error: unrecognized instruction mnemonic
--> $DIR/srcloc.rs:83:13
--> $DIR/srcloc.rs:84:13
|
LL | concat!(
| ^
Expand All @@ -167,7 +167,7 @@ LL | invalid_instruction1
| ^

error: unrecognized instruction mnemonic
--> $DIR/srcloc.rs:83:13
--> $DIR/srcloc.rs:84:13
|
LL | concat!(
| ^
Expand All @@ -179,7 +179,7 @@ LL | invalid_instruction2
| ^

error: unrecognized instruction mnemonic
--> $DIR/srcloc.rs:92:13
--> $DIR/srcloc.rs:93:13
|
LL | concat!(
| ^
Expand All @@ -191,7 +191,7 @@ LL | invalid_instruction1
| ^

error: unrecognized instruction mnemonic
--> $DIR/srcloc.rs:92:13
--> $DIR/srcloc.rs:93:13
|
LL | concat!(
| ^
Expand All @@ -203,7 +203,7 @@ LL | invalid_instruction2
| ^

error: unrecognized instruction mnemonic
--> $DIR/srcloc.rs:96:13
--> $DIR/srcloc.rs:97:13
|
LL | concat!(
| ^
Expand All @@ -215,7 +215,7 @@ LL | invalid_instruction3
| ^

error: unrecognized instruction mnemonic
--> $DIR/srcloc.rs:96:13
--> $DIR/srcloc.rs:97:13
|
LL | concat!(
| ^
Expand All @@ -227,7 +227,7 @@ LL | invalid_instruction4
| ^

error: unrecognized instruction mnemonic
--> $DIR/srcloc.rs:107:13
--> $DIR/srcloc.rs:108:13
|
LL | concat!(
| ^
Expand All @@ -239,7 +239,7 @@ LL | invalid_instruction1
| ^

error: unrecognized instruction mnemonic
--> $DIR/srcloc.rs:107:13
--> $DIR/srcloc.rs:108:13
|
LL | concat!(
| ^
Expand All @@ -251,7 +251,7 @@ LL | invalid_instruction2
| ^

error: unrecognized instruction mnemonic
--> $DIR/srcloc.rs:111:13
--> $DIR/srcloc.rs:112:13
|
LL | concat!(
| ^
Expand All @@ -263,7 +263,7 @@ LL | invalid_instruction3
| ^

error: unrecognized instruction mnemonic
--> $DIR/srcloc.rs:111:13
--> $DIR/srcloc.rs:112:13
|
LL | concat!(
| ^
Expand Down
1 change: 1 addition & 0 deletions src/test/ui/asm/aarch64/sym.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// only-aarch64
// only-linux
// needs-asm-support
// run-pass

#![feature(thread_local, asm_sym)]
Expand Down
12 changes: 6 additions & 6 deletions src/test/ui/asm/inline-syntax.arm.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ LL | .intel_syntax noprefix
| ^

error: unknown directive
--> $DIR/inline-syntax.rs:31:15
--> $DIR/inline-syntax.rs:32:15
|
LL | asm!(".intel_syntax noprefix", "nop");
| ^
Expand All @@ -25,7 +25,7 @@ LL | .intel_syntax noprefix
| ^

error: unknown directive
--> $DIR/inline-syntax.rs:34:15
--> $DIR/inline-syntax.rs:35:15
|
LL | asm!(".intel_syntax aaa noprefix", "nop");
| ^
Expand All @@ -37,7 +37,7 @@ LL | .intel_syntax aaa noprefix
| ^

error: unknown directive
--> $DIR/inline-syntax.rs:37:15
--> $DIR/inline-syntax.rs:38:15
|
LL | asm!(".att_syntax noprefix", "nop");
| ^
Expand All @@ -49,7 +49,7 @@ LL | .att_syntax noprefix
| ^

error: unknown directive
--> $DIR/inline-syntax.rs:40:15
--> $DIR/inline-syntax.rs:41:15
|
LL | asm!(".att_syntax bbb noprefix", "nop");
| ^
Expand All @@ -61,7 +61,7 @@ LL | .att_syntax bbb noprefix
| ^

error: unknown directive
--> $DIR/inline-syntax.rs:43:15
--> $DIR/inline-syntax.rs:44:15
|
LL | asm!(".intel_syntax noprefix; nop");
| ^
Expand All @@ -73,7 +73,7 @@ LL | .intel_syntax noprefix; nop
| ^

error: unknown directive
--> $DIR/inline-syntax.rs:49:13
--> $DIR/inline-syntax.rs:50:13
|
LL | .intel_syntax noprefix
| ^
Expand Down
1 change: 1 addition & 0 deletions src/test/ui/asm/inline-syntax.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
//[arm] compile-flags: --target armv7-unknown-linux-gnueabihf
//[arm] build-fail
//[arm] needs-llvm-components: arm
// needs-asm-support

#![feature(no_core, lang_items, rustc_attrs)]
#![crate_type = "rlib"]
Expand Down
Loading

0 comments on commit 08995e1

Please sign in to comment.