11 files changed, 15 insertions, 44 deletions
diff --git a/tests/run-make/wasm-abi/rmake.rs b/tests/run-make/wasm-abi/rmake.rs
index f4d0027798a..6d3d5b36c67 100644
--- a/tests/run-make/wasm-abi/rmake.rs
+++ b/tests/run-make/wasm-abi/rmake.rs
@@ -1,3 +1,5 @@
+//@ only-wasm32-wasip1
+
 extern crate run_make_support;
 
 use run_make_support::{rustc, tmp_dir};
@@ -5,10 +7,6 @@ use std::path::Path;
 use std::process::Command;
 
 fn main() {
-    if std::env::var("TARGET").unwrap() != "wasm32-wasip1" {
-        return;
-    }
-
     rustc().input("foo.rs").target("wasm32-wasip1").run();
 
     let file = tmp_dir().join("foo.wasm");
diff --git a/tests/run-make/wasm-custom-section/rmake.rs b/tests/run-make/wasm-custom-section/rmake.rs
index 31fb5fb3230..825fcf71514 100644
--- a/tests/run-make/wasm-custom-section/rmake.rs
+++ b/tests/run-make/wasm-custom-section/rmake.rs
@@ -1,13 +1,10 @@
+//@ only-wasm32-wasip1
 extern crate run_make_support;
 
 use run_make_support::{rustc, tmp_dir, wasmparser};
 use std::collections::HashMap;
 
 fn main() {
-    if std::env::var("TARGET").unwrap() != "wasm32-wasip1" {
-        return;
-    }
-
     rustc().input("foo.rs").target("wasm32-wasip1").run();
     rustc().input("bar.rs").target("wasm32-wasip1").arg("-Clto").opt().run();
 
diff --git a/tests/run-make/wasm-custom-sections-opt/rmake.rs b/tests/run-make/wasm-custom-sections-opt/rmake.rs
index 3164de1b4c9..634683adc22 100644
--- a/tests/run-make/wasm-custom-sections-opt/rmake.rs
+++ b/tests/run-make/wasm-custom-sections-opt/rmake.rs
@@ -1,3 +1,4 @@
+//@ only-wasm32-wasip1
 extern crate run_make_support;
 
 use run_make_support::{tmp_dir, wasmparser, rustc};
@@ -5,10 +6,6 @@ use std::collections::HashMap;
 use std::path::Path;
 
 fn main() {
-    if std::env::var("TARGET").unwrap() != "wasm32-wasip1" {
-        return;
-    }
-
     rustc().input("foo.rs").target("wasm32-wasip1").opt().run();
 
     verify(&tmp_dir().join("foo.wasm"));
diff --git a/tests/run-make/wasm-export-all-symbols/rmake.rs b/tests/run-make/wasm-export-all-symbols/rmake.rs
index 13101a97444..400d6db5651 100644
--- a/tests/run-make/wasm-export-all-symbols/rmake.rs
+++ b/tests/run-make/wasm-export-all-symbols/rmake.rs
@@ -1,3 +1,5 @@
+//@ only-wasm32-wasip1
+
 extern crate run_make_support;
 
 use run_make_support::{tmp_dir, wasmparser, rustc};
@@ -6,10 +8,6 @@ use std::path::Path;
 use wasmparser::ExternalKind::*;
 
 fn main() {
-    if std::env::var("TARGET").unwrap() != "wasm32-wasip1" {
-        return;
-    }
-
     test(&[]);
     test(&["-O"]);
     test(&["-Clto"]);
diff --git a/tests/run-make/wasm-import-module/rmake.rs b/tests/run-make/wasm-import-module/rmake.rs
index 3962bd80a89..1b814e9ccce 100644
--- a/tests/run-make/wasm-import-module/rmake.rs
+++ b/tests/run-make/wasm-import-module/rmake.rs
@@ -1,3 +1,5 @@
+//@ only-wasm32-wasip1
+
 extern crate run_make_support;
 
 use run_make_support::{tmp_dir, wasmparser, rustc};
@@ -5,10 +7,6 @@ use std::collections::HashMap;
 use wasmparser::TypeRef::Func;
 
 fn main() {
-    if std::env::var("TARGET").unwrap() != "wasm32-wasip1" {
-        return;
-    }
-
     rustc().input("foo.rs").target("wasm32-wasip1").run();
     rustc()
         .input("bar.rs")
diff --git a/tests/run-make/wasm-panic-small/rmake.rs b/tests/run-make/wasm-panic-small/rmake.rs
index 7941b503994..bffa311d93a 100644
--- a/tests/run-make/wasm-panic-small/rmake.rs
+++ b/tests/run-make/wasm-panic-small/rmake.rs
@@ -1,3 +1,4 @@
+//@ only-wasm32-wasip1
 #![deny(warnings)]
 
 extern crate run_make_support;
@@ -5,10 +6,6 @@ extern crate run_make_support;
 use run_make_support::{rustc, tmp_dir};
 
 fn main() {
-    if std::env::var("TARGET").unwrap() != "wasm32-wasip1" {
-        return;
-    }
-
     test("a");
     test("b");
     test("c");
diff --git a/tests/run-make/wasm-spurious-import/rmake.rs b/tests/run-make/wasm-spurious-import/rmake.rs
index 9dafa6f594a..8f716061d28 100644
--- a/tests/run-make/wasm-spurious-import/rmake.rs
+++ b/tests/run-make/wasm-spurious-import/rmake.rs
@@ -1,13 +1,11 @@
+//@ only-wasm32-wasip1
+
 extern crate run_make_support;
 
 use run_make_support::{rustc, tmp_dir, wasmparser};
 use std::collections::HashMap;
 
 fn main() {
-    if std::env::var("TARGET").unwrap() != "wasm32-wasip1" {
-        return;
-    }
-
     rustc()
         .input("main.rs")
         .target("wasm32-wasip1")
diff --git a/tests/run-make/wasm-stringify-ints-small/rmake.rs b/tests/run-make/wasm-stringify-ints-small/rmake.rs
index 6b3ad871a70..5efbfee8d38 100644
--- a/tests/run-make/wasm-stringify-ints-small/rmake.rs
+++ b/tests/run-make/wasm-stringify-ints-small/rmake.rs
@@ -1,3 +1,4 @@
+//@ only-wasm32-wasip1
 #![deny(warnings)]
 
 extern crate run_make_support;
@@ -5,10 +6,6 @@ extern crate run_make_support;
 use run_make_support::{rustc, tmp_dir};
 
 fn main() {
-    if std::env::var("TARGET").unwrap() != "wasm32-wasip1" {
-        return;
-    }
-
     rustc().input("foo.rs").target("wasm32-wasip1").arg("-Clto").opt().run();
 
     let bytes = std::fs::read(&tmp_dir().join("foo.wasm")).unwrap();
diff --git a/tests/run-make/wasm-symbols-different-module/rmake.rs b/tests/run-make/wasm-symbols-different-module/rmake.rs
index a27da446baa..88bd16a404c 100644
--- a/tests/run-make/wasm-symbols-different-module/rmake.rs
+++ b/tests/run-make/wasm-symbols-different-module/rmake.rs
@@ -1,13 +1,10 @@
+//@ only-wasm32-wasip1
 extern crate run_make_support;
 
 use run_make_support::{rustc, tmp_dir, wasmparser};
 use std::collections::{HashMap, HashSet};
 
 fn main() {
-    if std::env::var("TARGET").unwrap() != "wasm32-wasip1" {
-        return;
-    }
-
     test_file("foo.rs", &[("a", &["foo"]), ("b", &["foo"])]);
     test_file("bar.rs", &[("m1", &["f", "g"]), ("m2", &["f"])]);
     test_file("baz.rs", &[("sqlite", &["allocate", "deallocate"])]);
diff --git a/tests/run-make/wasm-symbols-not-exported/rmake.rs b/tests/run-make/wasm-symbols-not-exported/rmake.rs
index da536f2af71..c9207f70ae5 100644
--- a/tests/run-make/wasm-symbols-not-exported/rmake.rs
+++ b/tests/run-make/wasm-symbols-not-exported/rmake.rs
@@ -1,13 +1,10 @@
+//@ only-wasm32-wasip1
 extern crate run_make_support;
 
 use run_make_support::{rustc, tmp_dir, wasmparser};
 use std::path::Path;
 
 fn main() {
-    if std::env::var("TARGET").unwrap() != "wasm32-wasip1" {
-        return;
-    }
-
     rustc().input("foo.rs").target("wasm32-wasip1").run();
     verify_symbols(&tmp_dir().join("foo.wasm"));
     rustc().input("foo.rs").target("wasm32-wasip1").opt().run();
diff --git a/tests/run-make/wasm-symbols-not-imported/rmake.rs b/tests/run-make/wasm-symbols-not-imported/rmake.rs
index b784b6aff6a..4d41dc7c0aa 100644
--- a/tests/run-make/wasm-symbols-not-imported/rmake.rs
+++ b/tests/run-make/wasm-symbols-not-imported/rmake.rs
@@ -1,13 +1,10 @@
+//@ only-wasm32-wasip1
 extern crate run_make_support;
 
 use run_make_support::{rustc, tmp_dir, wasmparser};
 use std::path::Path;
 
 fn main() {
-    if std::env::var("TARGET").unwrap() != "wasm32-wasip1" {
-        return;
-    }
-
     rustc().input("foo.rs").target("wasm32-wasip1").run();
     verify_symbols(&tmp_dir().join("foo.wasm"));
     rustc().input("foo.rs").target("wasm32-wasip1").arg("-Clto").run();