moving extern-so tests to a new dir so we can add compiler flags in compiletests.rs

Author: Ellen Arteca

tests/compiletest.rs

@@ -9,7 +9,7 @@ fn miri_path() -> PathBuf {
 }
 
 // Build the shared object file for testing external C function calls.
-fn build_so_for_c_ffi_tests() {
+fn build_so_for_c_ffi_tests() -> PathBuf {
     let cc = option_env!("CC").unwrap_or("cc");
     // Target directory that we can write to.
     let so_target_dir = Path::new(&env::var_os("CARGO_TARGET_DIR").unwrap()).join("miri-extern-so");
@@ -34,6 +34,7 @@ fn build_so_for_c_ffi_tests() {
     if !cc_output.status.success() {
         panic!("error in generating shared object file for testing external C function calls");
     }
+    so_file_path
 }
 
 fn run_tests(mode: Mode, path: &str, target: Option<String>) -> Result<()> {
@@ -63,9 +64,14 @@ fn run_tests(mode: Mode, path: &str, target: Option<String>) -> Result<()> {
         flags.push(target.into());
     }
 
-    // If we're on linux, then build the shared object file for testing external C function calls.
-    if cfg!(target_os = "linux") {
-        build_so_for_c_ffi_tests();
+    // If we're on linux, and we're testing the extern-so functionality,
+    // then build the shared object file for testing external C function calls
+    // and push the relevant compiler flag.
+    if cfg!(target_os = "linux") && path.starts_with("tests/extern-so/") {
+        let so_file_path = build_so_for_c_ffi_tests();
+        let mut flag = std::ffi::OsString::from("-Zmiri-extern-so-file=");
+        flag.push(so_file_path.into_os_string());
+        flags.push(flag);
     }
 
     let skip_ui_checks = env::var_os("MIRI_SKIP_UI_CHECKS").is_some();
@@ -192,6 +198,10 @@ fn main() -> Result<()> {
     ui(Mode::Pass, "tests/pass")?;
     ui(Mode::Panic, "tests/panic")?;
     ui(Mode::Fail, "tests/fail")?;
+    if cfg!(target_os = "linux") {
+        ui(Mode::Pass, "tests/extern-so/pass")?;
+        ui(Mode::Fail, "tests/extern-so/fail")?;
+    }
 
     Ok(())
 }

tests/fail/extern-so/function_not_in_so.rs renamed to tests/extern-so/fail/function_not_in_so.rs

@@ -1,6 +1,5 @@
 //@only-target-linux
 //@only-on-host
-//@compile-flags: -Zmiri-extern-so-file=target/miri-extern-so/libtestlib.so
 
 extern "C" {
     fn foo();

tests/fail/extern-so/function_not_in_so.stderr renamed to tests/extern-so/fail/function_not_in_so.stderr

@@ -1,6 +1,5 @@
 //@only-target-linux
 //@only-on-host
-//@compile-flags: -Zmiri-extern-so-file=target/miri-extern-so/libtestlib.so
 
 extern "C" {
     fn add_one_int(x: i32) -> i32;