tests: produce artifacts for target

Author: jieyouxu

tests/run-make/crate-data-smoke/rmake.rs

@@ -1,21 +1,43 @@
-use run_make_support::{bin_name, rust_lib_name, rustc};
+use run_make_support::{bin_name, rust_lib_name, rustc, target};
 
 fn main() {
-    rustc().print("crate-name").input("crate.rs").run().assert_stdout_equals("foo");
-    rustc().print("file-names").input("crate.rs").run().assert_stdout_equals(bin_name("foo"));
     rustc()
+        .target(target())
+        .print("crate-name")
+        .input("crate.rs")
+        .run()
+        .assert_stdout_equals("foo");
+    rustc()
+        .target(target())
+        .print("file-names")
+        .input("crate.rs")
+        .run()
+        .assert_stdout_equals(bin_name("foo"));
+    rustc()
+        .target(target())
         .print("file-names")
         .crate_type("lib")
         .arg("--test")
         .input("crate.rs")
         .run()
         .assert_stdout_equals(bin_name("foo"));
     rustc()
+        .target(target())
         .print("file-names")
         .arg("--test")
         .input("lib.rs")
         .run()
         .assert_stdout_equals(bin_name("mylib"));
-    rustc().print("file-names").input("lib.rs").run().assert_stdout_equals(rust_lib_name("mylib"));
-    rustc().print("file-names").input("rlib.rs").run().assert_stdout_equals(rust_lib_name("mylib"));
+    rustc()
+        .target(target())
+        .print("file-names")
+        .input("lib.rs")
+        .run()
+        .assert_stdout_equals(rust_lib_name("mylib"));
+    rustc()
+        .target(target())
+        .print("file-names")
+        .input("rlib.rs")
+        .run()
+        .assert_stdout_equals(rust_lib_name("mylib"));
 }

tests/run-make/crate-name-priority/rmake.rs

@@ -4,15 +4,15 @@
 // and the compiler flags, and checks that the flag is favoured each time.
 // See https://github.com/rust-lang/rust/pull/15518
 
-use run_make_support::{bin_name, rfs, rustc};
+use run_make_support::{bin_name, rfs, rustc, target};
 
 fn main() {
-    rustc().input("foo.rs").run();
+    rustc().target(target()).input("foo.rs").run();
     rfs::remove_file(bin_name("foo"));
-    rustc().input("foo.rs").crate_name("bar").run();
+    rustc().target(target()).input("foo.rs").crate_name("bar").run();
     rfs::remove_file(bin_name("bar"));
-    rustc().input("foo1.rs").run();
+    rustc().target(target()).input("foo1.rs").run();
     rfs::remove_file(bin_name("foo"));
-    rustc().input("foo1.rs").output(bin_name("bar1")).run();
+    rustc().target(target()).input("foo1.rs").output(bin_name("bar1")).run();
     rfs::remove_file(bin_name("bar1"));
 }

tests/run-make/extra-filename-with-temp-outputs/rmake.rs

@@ -6,10 +6,12 @@
 // are named as expected.
 // See https://github.com/rust-lang/rust/pull/15686
 
-use run_make_support::{bin_name, cwd, has_prefix, has_suffix, rfs, rustc, shallow_find_files};
+use run_make_support::{
+    bin_name, cwd, has_prefix, has_suffix, rfs, rustc, shallow_find_files, target,
+};
 
 fn main() {
-    rustc().extra_filename("bar").input("foo.rs").arg("-Csave-temps").run();
+    rustc().target(target()).extra_filename("bar").input("foo.rs").arg("-Csave-temps").run();
     let object_files = shallow_find_files(cwd(), |path| {
         has_prefix(path, "foobar.foo") && has_suffix(path, "0.rcgu.o")
     });

tests/run-make/strip/rmake.rs

@@ -2,7 +2,7 @@
 
 // Test that -Cstrip correctly strips/preserves debuginfo and symbols.
 
-use run_make_support::{bin_name, is_darwin, llvm_dwarfdump, llvm_nm, rustc};
+use run_make_support::{bin_name, is_darwin, llvm_dwarfdump, llvm_nm, rustc, target};
 
 fn main() {
     // We use DW_ (the start of any DWARF name) to check that some debuginfo is present.
@@ -20,21 +20,21 @@ fn main() {
     // for std.
 
     // -Cstrip=none should preserve symbols and debuginfo.
-    rustc().arg("hello.rs").arg("-Cdebuginfo=2").arg("-Cstrip=none").run();
+    rustc().target(target()).arg("hello.rs").arg("-Cdebuginfo=2").arg("-Cstrip=none").run();
     llvm_nm().input(binary).run().assert_stdout_contains(test_symbol);
     if do_debuginfo_check {
         llvm_dwarfdump().input(binary).run().assert_stdout_contains(dwarf_indicator);
     }
 
     // -Cstrip=debuginfo should preserve symbols and strip debuginfo.
-    rustc().arg("hello.rs").arg("-Cdebuginfo=2").arg("-Cstrip=debuginfo").run();
+    rustc().target(target()).arg("hello.rs").arg("-Cdebuginfo=2").arg("-Cstrip=debuginfo").run();
     llvm_nm().input(binary).run().assert_stdout_contains(test_symbol);
     if do_debuginfo_check {
         llvm_dwarfdump().input(binary).run().assert_stdout_not_contains(dwarf_indicator);
     }
 
     // -Cstrip=symbols should strip symbols and strip debuginfo.
-    rustc().arg("hello.rs").arg("-Cdebuginfo=2").arg("-Cstrip=symbols").run();
+    rustc().target(target()).arg("hello.rs").arg("-Cdebuginfo=2").arg("-Cstrip=symbols").run();
     llvm_nm().input(binary).run().assert_stderr_not_contains(test_symbol);
     if do_debuginfo_check {
         llvm_dwarfdump().input(binary).run().assert_stdout_not_contains(dwarf_indicator);