merging upstream

Author: Ellen Arteca

Cargo.lock

@@ -40,7 +40,7 @@ libc = "0.2"
 
 [dev-dependencies]
 colored = "2"
-ui_test = { path = "ui_test" }
+ui_test = "0.1"
 # Features chosen to match those required by env_logger, to avoid rebuilds
 regex = { version = "1.5.5", default-features = false, features = ["perf", "std"] }
 lazy_static = "1.4.0"

Cargo.toml

@@ -187,9 +187,8 @@ test|bless)
         export MIRI_BLESS="Gesundheit"
     fi
     # Then test, and let caller control flags.
-    # Only in root project and ui_test as `cargo-miri` has no tests.
+    # Only in root project as `cargo-miri` has no tests.
     $CARGO test $CARGO_EXTRA_FLAGS --manifest-path "$MIRIDIR"/Cargo.toml "$@"
-    $CARGO test $CARGO_EXTRA_FLAGS --manifest-path "$MIRIDIR"/ui_test/Cargo.toml "$@"
     ;;
 run)
     # Scan for "--target" to overwrite the "MIRI_TEST_TARGET" env var so
@@ -220,7 +219,6 @@ fmt)
     ;;
 clippy)
     $CARGO clippy $CARGO_EXTRA_FLAGS --manifest-path "$MIRIDIR"/Cargo.toml --all-targets "$@"
-    $CARGO clippy $CARGO_EXTRA_FLAGS --manifest-path "$MIRIDIR"/ui_test/Cargo.toml --all-targets "$@"
     $CARGO clippy $CARGO_EXTRA_FLAGS --manifest-path "$MIRIDIR"/cargo-miri/Cargo.toml "$@"
     ;;
 cargo)

miri

@@ -37,7 +37,12 @@ fn build_so_for_c_ffi_tests() -> PathBuf {
     so_file_path
 }
 
-fn run_tests(mode: Mode, path: &str, target: Option<String>) -> Result<()> {
+fn run_tests(
+    mode: Mode,
+    path: &str,
+    target: Option<String>,
+    with_dependencies: bool,
+) -> Result<()> {
     let in_rustc_test_suite = option_env!("RUSTC_STAGE").is_some();
 
     // Add some flags we always want.
@@ -107,7 +112,7 @@ fn run_tests(mode: Mode, path: &str, target: Option<String>) -> Result<()> {
         path_filter: path_filter.collect(),
         program: miri_path(),
         output_conflict_handling,
-        dependencies_crate_manifest_path: use_std
+        dependencies_crate_manifest_path: (with_dependencies && use_std)
             .then(|| Path::new("test_dependencies").join("Cargo.toml")),
         dependency_builder: Some(DependencyBuilder {
             program: std::env::var_os("CARGO").unwrap().into(),
@@ -171,7 +176,14 @@ regexes! {
     r"[^ ]*/\.?cargo/registry/.*/(.*\.rs)"  => "CARGO_REGISTRY/.../$1",
 }
 
-fn ui(mode: Mode, path: &str) -> Result<()> {
+enum Dependencies {
+    WithDependencies,
+    WithoutDependencies,
+}
+
+use Dependencies::*;
+
+fn ui(mode: Mode, path: &str, with_dependencies: Dependencies) -> Result<()> {
     let target = get_target();
 
     let msg = format!(
@@ -180,7 +192,11 @@ fn ui(mode: Mode, path: &str) -> Result<()> {
     );
     eprintln!("{}", msg.green().bold());
 
-    run_tests(mode, path, target)
+    let with_dependencies = match with_dependencies {
+        WithDependencies => true,
+        WithoutDependencies => false,
+    };
+    run_tests(mode, path, target, with_dependencies)
 }
 
 fn get_target() -> Option<String> {
@@ -195,12 +211,13 @@ fn main() -> Result<()> {
     // Let the tests know where to store temp files (they might run for a different target, which can make this hard to find).
     env::set_var("MIRI_TEMP", env::temp_dir());
 
-    ui(Mode::Pass, "tests/pass")?;
-    ui(Mode::Panic, "tests/panic")?;
-    ui(Mode::Fail, "tests/fail")?;
+    ui(Mode::Pass, "tests/pass", WithoutDependencies)?;
+    ui(Mode::Pass, "tests/pass-dep", WithDependencies)?;
+    ui(Mode::Panic, "tests/panic", WithDependencies)?;
+    ui(Mode::Fail, "tests/fail", WithDependencies)?;
     if cfg!(target_os = "linux") {
-        ui(Mode::Pass, "tests/extern-so/pass")?;
-        ui(Mode::Fail, "tests/extern-so/fail")?;
+        ui(Mode::Pass, "tests/extern-so/pass", WithoutDependencies)?;
+        ui(Mode::Fail, "tests/extern-so/fail", WithDependencies)?;
     }
 
     Ok(())