From ac43dbabd4188e7514bafdd37a0a41899bc0cb03 Mon Sep 17 00:00:00 2001 From: Oneirical Date: Wed, 24 Jul 2024 10:35:21 -0400 Subject: [PATCH] fix some broken "only-x86" compile directives --- tests/run-make/raw-dylib-import-name-type/rmake.rs | 2 +- tests/run-make/raw-dylib-stdcall-ordinal/rmake.rs | 8 ++++++-- .../rfc-2627-raw-dylib/import-name-type-unknown-value.rs | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/tests/run-make/raw-dylib-import-name-type/rmake.rs b/tests/run-make/raw-dylib-import-name-type/rmake.rs index f40a5ce700782..0692ecfc77f19 100644 --- a/tests/run-make/raw-dylib-import-name-type/rmake.rs +++ b/tests/run-make/raw-dylib-import-name-type/rmake.rs @@ -7,7 +7,7 @@ // with expected output. // See https://github.com/rust-lang/rust/pull/100732 -//@ only-x86 +//@ only-x86_64 //@ only-windows use run_make_support::{cc, diff, is_msvc, run, rustc}; diff --git a/tests/run-make/raw-dylib-stdcall-ordinal/rmake.rs b/tests/run-make/raw-dylib-stdcall-ordinal/rmake.rs index 6ea5f1dd701f3..2f39c4ad1c576 100644 --- a/tests/run-make/raw-dylib-stdcall-ordinal/rmake.rs +++ b/tests/run-make/raw-dylib-stdcall-ordinal/rmake.rs @@ -6,7 +6,7 @@ // such as stdcall. // See https://github.com/rust-lang/rust/pull/90782 -//@ only-x86 +//@ only-x86_64 //@ only-windows use run_make_support::{cc, diff, is_msvc, run, rustc}; @@ -32,5 +32,9 @@ fn main() { .run(); }; let out = run("driver").stdout_utf8(); - diff().expected_file("output.txt").actual_text("actual", out).normalize(r#"\r"#, "").run(); + diff() + .expected_file("expected_output.txt") + .actual_text("actual", out) + .normalize(r#"\r"#, "") + .run(); } diff --git a/tests/ui/rfcs/rfc-2627-raw-dylib/import-name-type-unknown-value.rs b/tests/ui/rfcs/rfc-2627-raw-dylib/import-name-type-unknown-value.rs index b3859ba1ce603..dee9dfd875249 100644 --- a/tests/ui/rfcs/rfc-2627-raw-dylib/import-name-type-unknown-value.rs +++ b/tests/ui/rfcs/rfc-2627-raw-dylib/import-name-type-unknown-value.rs @@ -1,7 +1,7 @@ //@ only-windows -//@ only-x86 +//@ only-x86_64 #[link(name = "foo", kind = "raw-dylib", import_name_type = "unknown")] //~^ ERROR unknown import name type `unknown`, expected one of: decorated, noprefix, undecorated -extern "C" { } +extern "C" {} fn main() {}