From c01d2e13623a7bd1f0544b816b213fcb8e8f9ae4 Mon Sep 17 00:00:00 2001 From: Ross Sullivan Date: Sun, 7 Dec 2025 15:17:33 +0900 Subject: [PATCH 1/5] refactor: Moved logic to enable new layout to dedicated function --- src/cargo/core/compiler/build_runner/compilation_files.rs | 3 ++- src/cargo/core/compiler/build_runner/mod.rs | 3 ++- src/cargo/core/compiler/layout.rs | 3 ++- src/cargo/core/compiler/mod.rs | 3 ++- src/cargo/core/features.rs | 5 +++++ src/cargo/ops/cargo_clean.rs | 3 ++- 6 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/cargo/core/compiler/build_runner/compilation_files.rs b/src/cargo/core/compiler/build_runner/compilation_files.rs index a914dc7056d..bbc13c1536a 100644 --- a/src/cargo/core/compiler/build_runner/compilation_files.rs +++ b/src/cargo/core/compiler/build_runner/compilation_files.rs @@ -11,6 +11,7 @@ use tracing::debug; use super::{BuildContext, BuildRunner, CompileKind, FileFlavor, Layout}; use crate::core::compiler::{CompileMode, CompileTarget, CrateType, FileType, Unit}; +use crate::core::features::is_new_build_dir_layout_enabled; use crate::core::{Target, TargetKind, Workspace}; use crate::util::{self, CargoResult, OnceExt, StableHasher}; @@ -245,7 +246,7 @@ impl<'a, 'gctx: 'a> CompilationFiles<'a, 'gctx> { /// Note that some units may share the same directory, so care should be /// taken in those cases! fn pkg_dir(&self, unit: &Unit) -> String { - let separator = match self.ws.gctx().cli_unstable().build_dir_new_layout { + let separator = match is_new_build_dir_layout_enabled(self.ws.gctx()) { true => "/", false => "-", }; diff --git a/src/cargo/core/compiler/build_runner/mod.rs b/src/cargo/core/compiler/build_runner/mod.rs index 02f3c62267a..f64284ee8e2 100644 --- a/src/cargo/core/compiler/build_runner/mod.rs +++ b/src/cargo/core/compiler/build_runner/mod.rs @@ -7,6 +7,7 @@ use std::sync::{Arc, Mutex}; use crate::core::PackageId; use crate::core::compiler::compilation::{self, UnitOutput}; use crate::core::compiler::{self, Unit, UserIntent, artifact}; +use crate::core::features::is_new_build_dir_layout_enabled; use crate::util::cache_lock::CacheLockMode; use crate::util::errors::CargoResult; use annotate_snippets::{Level, Message}; @@ -467,7 +468,7 @@ impl<'a, 'gctx> BuildRunner<'a, 'gctx> { .root_output .insert(kind, artifact_dir.dest().to_path_buf()); } - if self.bcx.gctx.cli_unstable().build_dir_new_layout { + if is_new_build_dir_layout_enabled(self.bcx.gctx) { for (unit, _) in self.bcx.unit_graph.iter() { let dep_dir = self.files().deps_dir(unit); paths::create_dir_all(&dep_dir)?; diff --git a/src/cargo/core/compiler/layout.rs b/src/cargo/core/compiler/layout.rs index 272e8198e27..664ccd41c9e 100644 --- a/src/cargo/core/compiler/layout.rs +++ b/src/cargo/core/compiler/layout.rs @@ -103,6 +103,7 @@ use crate::core::Workspace; use crate::core::compiler::CompileTarget; +use crate::core::features::is_new_build_dir_layout_enabled; use crate::util::flock::is_on_nfs_mount; use crate::util::{CargoResult, FileLock}; use cargo_util::paths; @@ -129,7 +130,7 @@ impl Layout { dest: &str, must_take_artifact_dir_lock: bool, ) -> CargoResult { - let is_new_layout = ws.gctx().cli_unstable().build_dir_new_layout; + let is_new_layout = is_new_build_dir_layout_enabled(ws.gctx()); let mut root = ws.target_dir(); let mut build_root = ws.build_dir(); if let Some(target) = target { diff --git a/src/cargo/core/compiler/mod.rs b/src/cargo/core/compiler/mod.rs index 4ad36afdbb8..4df1bb57672 100644 --- a/src/cargo/core/compiler/mod.rs +++ b/src/cargo/core/compiler/mod.rs @@ -95,6 +95,7 @@ use self::unit_graph::UnitDep; use crate::core::compiler::future_incompat::FutureIncompatReport; use crate::core::compiler::timings::SectionTiming; pub use crate::core::compiler::unit::{Unit, UnitInterner}; +use crate::core::features::is_new_build_dir_layout_enabled; use crate::core::manifest::TargetSourcePath; use crate::core::profiles::{PanicStrategy, Profile, StripInner}; use crate::core::{Feature, PackageId, Target, Verbosity}; @@ -1825,7 +1826,7 @@ pub fn lib_search_paths( unit: &Unit, ) -> CargoResult> { let mut lib_search_paths = Vec::new(); - if build_runner.bcx.gctx.cli_unstable().build_dir_new_layout { + if is_new_build_dir_layout_enabled(build_runner.bcx.gctx) { let mut map = BTreeMap::new(); // Recursively add all dependency args to rustc process diff --git a/src/cargo/core/features.rs b/src/cargo/core/features.rs index 36bb8414296..ca502d663d5 100644 --- a/src/cargo/core/features.rs +++ b/src/cargo/core/features.rs @@ -1556,3 +1556,8 @@ pub fn cargo_docs_link(path: &str) -> String { }; format!("https://doc.rust-lang.org/{url_channel}cargo/{path}") } + +/// Returns true of the new build dir layout is enabled. +pub fn is_new_build_dir_layout_enabled(gctx: &GlobalContext) -> bool { + gctx.cli_unstable().build_dir_new_layout +} diff --git a/src/cargo/ops/cargo_clean.rs b/src/cargo/ops/cargo_clean.rs index 7f445259dcc..28ad6e4be16 100644 --- a/src/cargo/ops/cargo_clean.rs +++ b/src/cargo/ops/cargo_clean.rs @@ -1,4 +1,5 @@ use crate::core::compiler::{CompileKind, CompileMode, Layout, RustcTargetData}; +use crate::core::features::is_new_build_dir_layout_enabled; use crate::core::profiles::Profiles; use crate::core::{PackageIdSpec, PackageIdSpecQuery, TargetKind, Workspace}; use crate::ops; @@ -196,7 +197,7 @@ fn clean_specs( clean_ctx.progress = Box::new(CleaningPackagesBar::new(clean_ctx.gctx, packages.len())); let mut dirs_to_clean = DirectoriesToClean::default(); - if clean_ctx.gctx.cli_unstable().build_dir_new_layout { + if is_new_build_dir_layout_enabled(clean_ctx.gctx) { for pkg in packages { clean_ctx.progress.on_cleaning_package(&pkg.name())?; From c0641a0d6c1e70a1c92783b8f655a61170e9a24a Mon Sep 17 00:00:00 2001 From: Ross Sullivan Date: Thu, 4 Dec 2025 17:53:05 +0900 Subject: [PATCH 2/5] feat: Added CARGO_BUILD_DIR_LAYOUT_V2 env var to opt in/out of new layout --- src/cargo/core/features.rs | 7 ++++- tests/testsuite/build_dir.rs | 57 ++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 1 deletion(-) diff --git a/src/cargo/core/features.rs b/src/cargo/core/features.rs index ca502d663d5..82f71ae3bc7 100644 --- a/src/cargo/core/features.rs +++ b/src/cargo/core/features.rs @@ -1558,6 +1558,11 @@ pub fn cargo_docs_link(path: &str) -> String { } /// Returns true of the new build dir layout is enabled. +#[allow(clippy::disallowed_methods)] pub fn is_new_build_dir_layout_enabled(gctx: &GlobalContext) -> bool { - gctx.cli_unstable().build_dir_new_layout + match std::env::var("CARGO_BUILD_DIR_LAYOUT_V2").as_deref() { + Ok("true") => true, + Ok("false") => false, + Ok(_) | Err(_) => gctx.cli_unstable().build_dir_new_layout, + } } diff --git a/tests/testsuite/build_dir.rs b/tests/testsuite/build_dir.rs index 8c0e591dcaa..30b44d7def8 100644 --- a/tests/testsuite/build_dir.rs +++ b/tests/testsuite/build_dir.rs @@ -1094,6 +1094,63 @@ fn template_should_handle_reject_unmatched_brackets() { .run(); } +#[cargo_test] +fn fallback_env_var_should_allow_overriding() { + let p = project() + .file("src/main.rs", r#"fn main() { println!("Hello, World!") }"#) + .file( + ".cargo/config.toml", + r#" + [build] + target-dir = "target-dir" + build-dir = "build-dir" + "#, + ) + .build(); + + // Stable + CARGO_BUILD_DIR_LAYOUT_V2=true should opt in + p.cargo("build") + .env("CARGO_BUILD_DIR_LAYOUT_V2", "true") + .enable_mac_dsym() + .run(); + + p.root().join("build-dir").assert_build_dir_layout(str![[r#" +[ROOT]/foo/build-dir/.rustc_info.json +[ROOT]/foo/build-dir/CACHEDIR.TAG +[ROOT]/foo/build-dir/debug/.cargo-lock +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/bin-foo +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/bin-foo.json +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/dep-bin-foo +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/invoked.timestamp +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/deps/foo[..][EXE] +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/deps/foo[..].d + +"#]]); + + p.root().join("build-dir").rm_rf(); + + // Nightly + -Zbuild-dir-new-layout + CARGO_BUILD_DIR_LAYOUT_V2=false should allow user to fall + // back to old layout + p.cargo("-Zbuild-dir-new-layout build") + .masquerade_as_nightly_cargo(&["new build-dir layout"]) + .env("CARGO_BUILD_DIR_LAYOUT_V2", "false") + .enable_mac_dsym() + .run(); + + p.root().join("build-dir").assert_build_dir_layout(str![[r#" +[ROOT]/foo/build-dir/.rustc_info.json +[ROOT]/foo/build-dir/CACHEDIR.TAG +[ROOT]/foo/build-dir/debug/.cargo-lock +[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/bin-foo +[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/bin-foo.json +[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/dep-bin-foo +[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/invoked.timestamp +[ROOT]/foo/build-dir/debug/deps/foo[..][EXE] +[ROOT]/foo/build-dir/debug/deps/foo[..].d + +"#]]); +} + fn parse_workspace_manifest_path_hash(hash_dir: &PathBuf) -> PathBuf { // Since the hash will change between test runs simply find the first directories and assume // that is the hash dir. The format is a 2 char directory followed by the remaining hash in the From 567b9ccdd401fb38f93c8e256d01b83aaf640f4b Mon Sep 17 00:00:00 2001 From: Ross Sullivan Date: Thu, 4 Dec 2025 10:16:56 +0900 Subject: [PATCH 3/5] docs: Added CARGO_BUILD_DIR_LAYOUT_V2 to unstable docs --- src/doc/src/reference/unstable.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/doc/src/reference/unstable.md b/src/doc/src/reference/unstable.md index 9e684dc1d9d..dcf158cfce8 100644 --- a/src/doc/src/reference/unstable.md +++ b/src/doc/src/reference/unstable.md @@ -2040,6 +2040,12 @@ enabled = true Enables the new build-dir filesystem layout. This layout change unblocks work towards caching and locking improvements. +In addition to `-Zbuild-dir-new-layout`, `CARGO_BUILD_DIR_LAYOUT_V2` also exists as +a way to opt in and out of the new layout during the transition period. +`CARGO_BUILD_DIR_LAYOUT_V2=true` allows users to opt in to the new layout, even on stable. +`CARGO_BUILD_DIR_LAYOUT_V2=false` allows users to opt out to the new layout. +This includes post stabilization but it's important to note that this is a temporary flag and will +eventually be removed. See the tracking issue for the transition plan and updates. ## compile-time-deps From f64089fc2a599ec2191788de8993a17e1b5f73a2 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Tue, 9 Dec 2025 10:29:24 -0600 Subject: [PATCH 4/5] WIP --- crates/cargo-test-support/src/lib.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/crates/cargo-test-support/src/lib.rs b/crates/cargo-test-support/src/lib.rs index adee716923f..e0f7329abe6 100644 --- a/crates/cargo-test-support/src/lib.rs +++ b/crates/cargo-test-support/src/lib.rs @@ -1427,6 +1427,7 @@ pub trait TestEnvCommandExt: Sized { // don't particularly need. Tests that specifically need to check // the incremental behavior should turn this back on. .env("CARGO_INCREMENTAL", "0") + .env("CARGO_BUILD_DIR_LAYOUT_V2", "true") // Don't read the system git config which is out of our control. .env("GIT_CONFIG_NOSYSTEM", "1") .env_remove("__CARGO_DEFAULT_LIB_METADATA") From a860382e2095431aeae9950df22cd035a248f4b1 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Wed, 10 Dec 2025 11:05:17 -0600 Subject: [PATCH 5/5] test: Update --- tests/testsuite/artifact_dep.rs | 18 +- tests/testsuite/bench.rs | 116 ++++---- tests/testsuite/binary_name.rs | 2 +- tests/testsuite/build.rs | 12 +- tests/testsuite/build_analysis.rs | 2 +- tests/testsuite/build_dir_legacy.rs | 270 +++++++++--------- tests/testsuite/build_script.rs | 141 ++++----- .../testsuite/build_script_extra_link_arg.rs | 6 +- tests/testsuite/build_scripts_multiple.rs | 10 +- tests/testsuite/cargo_alias_config.rs | 2 +- tests/testsuite/cargo_config/mod.rs | 9 + tests/testsuite/check.rs | 48 +++- tests/testsuite/check_cfg.rs | 2 +- tests/testsuite/clean.rs | 23 +- tests/testsuite/collisions.rs | 2 +- tests/testsuite/cross_compile.rs | 32 +-- tests/testsuite/doc.rs | 76 ++--- tests/testsuite/features2.rs | 2 +- tests/testsuite/freshness.rs | 36 +-- tests/testsuite/freshness_checksum.rs | 41 +-- tests/testsuite/git.rs | 4 +- tests/testsuite/glob_targets.rs | 12 +- tests/testsuite/install.rs | 2 +- tests/testsuite/jobserver.rs | 4 +- tests/testsuite/lto.rs | 38 +-- tests/testsuite/messages.rs | 4 +- tests/testsuite/metabuild.rs | 2 +- tests/testsuite/multitarget.rs | 2 - tests/testsuite/path.rs | 4 +- tests/testsuite/proc_macro.rs | 2 +- tests/testsuite/profile_config.rs | 4 +- tests/testsuite/profile_overrides.rs | 4 +- tests/testsuite/profile_targets.rs | 58 ++-- tests/testsuite/profile_trim_paths.rs | 4 +- tests/testsuite/profiles.rs | 25 +- tests/testsuite/rename_deps.rs | 2 +- tests/testsuite/required_features.rs | 36 +-- tests/testsuite/run.rs | 8 +- tests/testsuite/rustc.rs | 8 +- tests/testsuite/rustdoc.rs | 12 +- tests/testsuite/rustflags.rs | 22 +- tests/testsuite/script/cargo.rs | 2 +- tests/testsuite/test.rs | 203 ++++++------- tests/testsuite/tool_paths.rs | 4 +- 44 files changed, 687 insertions(+), 629 deletions(-) diff --git a/tests/testsuite/artifact_dep.rs b/tests/testsuite/artifact_dep.rs index 1d893b88e3b..c8d8f15bb0a 100644 --- a/tests/testsuite/artifact_dep.rs +++ b/tests/testsuite/artifact_dep.rs @@ -947,7 +947,7 @@ fn allow_artifact_and_no_artifact_dep_to_same_package_within_different_dep_categ [COMPILING] bar v0.5.0 ([ROOT]/foo/bar) [COMPILING] foo v0.0.0 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/debug/deps/foo-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH][EXE]) [DOCTEST] foo "#]]) @@ -1296,7 +1296,7 @@ fn cross_doctests_works_with_artifacts() { [COMPILING] bar v0.5.0 ([ROOT]/foo/bar) [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/[HOST_TARGET]/debug/deps/foo-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/[HOST_TARGET]/debug/build/foo/[HASH]/deps/foo-[HASH][EXE]) [DOCTEST] foo "#]]) @@ -1320,7 +1320,7 @@ fn cross_doctests_works_with_artifacts() { [RUNNING] `rustc --crate-name foo [..] [RUNNING] `rustc --crate-name foo [..] [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] `[ROOT]/foo/target/[ALT_TARGET]/debug/deps/foo-[HASH][EXE]` +[RUNNING] `[ROOT]/foo/target/[ALT_TARGET]/debug/build/foo/[HASH]/deps/foo-[HASH][EXE]` [DOCTEST] foo [RUNNING] `rustdoc [..]--test src/lib.rs --test-run-directory [ROOT]/foo --target [ALT_TARGET] [..] @@ -1426,7 +1426,7 @@ fn profile_override_basic() { [RUNNING] `rustc --crate-name bar --edition=2015 bar/src/lib.rs [..] -C opt-level=1 [..]` [RUNNING] `rustc --crate-name bar --edition=2015 bar/src/lib.rs [..] -C opt-level=3 [..]` [RUNNING] `rustc --crate-name foo [..] -C opt-level=3 [..]` -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` [FINISHED] `dev` profile [optimized + debuginfo] target(s) in [ELAPSED]s [COMPILING] foo v0.0.1 ([ROOT]/foo) @@ -2210,8 +2210,8 @@ fn env_vars_and_build_products_for_various_build_targets() { [COMPILING] bar v0.5.0 ([ROOT]/foo/bar) [COMPILING] foo v0.0.0 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/debug/deps/foo-[HASH][EXE]) -[RUNNING] tests/main.rs (target/debug/deps/main-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH][EXE]) +[RUNNING] tests/main.rs (target/debug/build/foo/[HASH]/deps/main-[HASH][EXE]) [DOCTEST] foo "#]]) @@ -2825,7 +2825,7 @@ fn with_assumed_host_target_and_optional_build_dep() { [COMPILING] d1 v0.0.1 ([ROOT]/foo/d1) [RUNNING] `rustc --crate-name build_script_build --edition=2021 [..]--crate-type bin[..] [RUNNING] `rustc --crate-name d1 --edition=2021 [..]--crate-type bin[..] -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` [RUNNING] `rustc --crate-name foo --edition=2021 [..]--cfg[..]d1[..] [FINISHED] `dev` profile [..] [COMPILING] foo v0.0.1 ([ROOT]/foo) @@ -3492,7 +3492,7 @@ fn artifact_dep_target_does_not_propagate_to_deps_of_build_script() { [COMPILING] artifact v0.0.1 ([ROOT]/foo/artifact) [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/main.rs (target/debug/deps/foo-[HASH][EXE]) +[RUNNING] unittests src/main.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH][EXE]) "#]]) .masquerade_as_nightly_cargo(&["bindeps"]) @@ -3584,7 +3584,7 @@ fn artifact_dep_target_does_not_propagate_to_proc_macro() { [COMPILING] artifact v0.0.1 ([ROOT]/foo/artifact) [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/main.rs (target/debug/deps/foo-[HASH][EXE]) +[RUNNING] unittests src/main.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH][EXE]) "#]]) .masquerade_as_nightly_cargo(&["bindeps"]) diff --git a/tests/testsuite/bench.rs b/tests/testsuite/bench.rs index a11822a5e3c..752df1acbb9 100644 --- a/tests/testsuite/bench.rs +++ b/tests/testsuite/bench.rs @@ -44,7 +44,7 @@ hello .with_stderr_data(str![[r#" [COMPILING] foo v0.5.0 ([ROOT]/foo) [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] unittests src/main.rs (target/release/deps/foo-[HASH][EXE]) +[RUNNING] unittests src/main.rs (target/release/build/foo/[HASH]/deps/foo-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -94,8 +94,8 @@ fn bench_bench_implicit() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] [..] (target/release/deps/foo-[HASH][EXE]) -[RUNNING] [..] (target/release/deps/mybench-[HASH][EXE]) +[RUNNING] unittests src/main.rs (target/release/build/foo/[HASH]/deps/foo-[HASH]) +[RUNNING] benches/mybench.rs (target/release/build/foo/[HASH]/deps/mybench-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -151,7 +151,7 @@ fn bench_bin_implicit() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] [..] (target/release/deps/foo-[HASH][EXE]) +[RUNNING] unittests src/main.rs (target/release/build/foo/[HASH]/deps/foo-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -191,7 +191,7 @@ fn bench_tarname() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] [..] (target/release/deps/bin2-[HASH][EXE]) +[RUNNING] benches/bin2.rs (target/release/build/foo/[HASH]/deps/bin2-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -240,8 +240,8 @@ fn bench_multiple_targets() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] benches/bin1.rs (target/release/deps/bin1-[HASH][EXE]) -[RUNNING] benches/bin2.rs (target/release/deps/bin2-[HASH][EXE]) +[RUNNING] benches/bin1.rs (target/release/build/foo/[HASH]/deps/bin1-[HASH]) +[RUNNING] benches/bin2.rs (target/release/build/foo/[HASH]/deps/bin2-[HASH]) "#]]) .run(); @@ -268,7 +268,7 @@ fn cargo_bench_verbose() { [COMPILING] foo v0.5.0 ([ROOT]/foo) [RUNNING] `rustc [..] src/main.rs [..]` [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] `[..]target/release/deps/foo-[HASH][EXE] hello --bench` +[RUNNING] `[ROOT]/foo/target/release/build/foo/[HASH]/deps/foo-[HASH] hello --bench` "#]]) .with_stdout_data(str![[r#" @@ -385,7 +385,7 @@ hello .with_stderr_data(str![[r#" [COMPILING] foo v0.5.0 ([ROOT]/foo) [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] [..] (target/release/deps/foo-[HASH][EXE]) +[RUNNING] unittests src/main.rs (target/release/build/foo/[HASH]/deps/foo-[HASH]) [ERROR] bench failed, to rerun pass `--bin foo` "#]]) @@ -450,8 +450,8 @@ fn bench_with_lib_dep() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] [..] (target/release/deps/foo-[HASH][EXE]) -[RUNNING] [..] (target/release/deps/baz-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/release/build/foo/[HASH]/deps/foo-[HASH]) +[RUNNING] unittests src/main.rs (target/release/build/foo/[HASH]/deps/baz-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -526,7 +526,7 @@ fn bench_with_deep_lib_dep() { [COMPILING] foo v0.0.1 ([ROOT]/foo) [COMPILING] bar v0.0.1 ([ROOT]/bar) [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] [..] (target/release/deps/bar-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/release/build/bar/[HASH]/deps/bar-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -588,8 +588,8 @@ fn external_bench_explicit() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] [..] (target/release/deps/foo-[HASH][EXE]) -[RUNNING] [..] (target/release/deps/bench-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/release/build/foo/[HASH]/deps/foo-[HASH]) +[RUNNING] src/bench.rs (target/release/build/foo/[HASH]/deps/bench-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -644,8 +644,8 @@ fn external_bench_implicit() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] [..] (target/release/deps/foo-[HASH][EXE]) -[RUNNING] [..] (target/release/deps/external-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/release/build/foo/[HASH]/deps/foo-[HASH]) +[RUNNING] benches/external.rs (target/release/build/foo/[HASH]/deps/external-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -732,7 +732,7 @@ For more information on this warning you can consult https://github.com/rust-lang/cargo/issues/5330 [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] [..] (target/release/deps/foo-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/release/build/foo/[HASH]/deps/foo-[HASH]) "#]]) .run(); @@ -770,7 +770,7 @@ fn pass_through_command_line() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] [..] (target/release/deps/foo-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/release/build/foo/[HASH]/deps/foo-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -787,7 +787,7 @@ test result: ok. 0 passed; 0 failed; 0 ignored; 1 measured; 1 filtered out; fini p.cargo("bench foo") .with_stderr_data(str![[r#" [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] [..] (target/release/deps/foo-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/release/build/foo/[HASH]/deps/foo-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -873,8 +873,8 @@ fn lib_bin_same_name() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] [..] (target/release/deps/foo-[HASH][EXE]) -[RUNNING] [..] (target/release/deps/foo-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/release/build/foo/[HASH]/deps/foo-[HASH]) +[RUNNING] unittests src/main.rs (target/release/build/foo/[HASH]/deps/foo-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -932,8 +932,8 @@ fn lib_with_standard_name() { .with_stderr_data(str![[r#" [COMPILING] syntax v0.0.1 ([ROOT]/foo) [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] [..] (target/release/deps/syntax-[HASH][EXE]) -[RUNNING] [..] (target/release/deps/bench-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/release/build/syntax/[HASH]/deps/syntax-[HASH]) +[RUNNING] benches/bench.rs (target/release/build/syntax/[HASH]/deps/bench-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -994,7 +994,7 @@ fn lib_with_standard_name2() { .with_stderr_data(str![[r#" [COMPILING] syntax v0.0.1 ([ROOT]/foo) [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] [..] (target/release/deps/syntax-[HASH][EXE]) +[RUNNING] unittests src/main.rs (target/release/build/syntax/[HASH]/deps/syntax-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -1081,8 +1081,8 @@ fn bench_dylib() { [RUNNING] [..] -C opt-level=3 [..] [RUNNING] [..] -C opt-level=3 [..] [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] `[..]target/release/deps/foo-[HASH][EXE] --bench` -[RUNNING] `[..]target/release/deps/bench-[HASH][EXE] --bench` +[RUNNING] `[ROOT]/foo/target/release/build/foo/[HASH]/deps/foo-[HASH] --bench` +[RUNNING] `[ROOT]/foo/target/release/build/foo/[HASH]/deps/bench-[HASH] --bench` "#]]) .with_stdout_data(str![[r#" @@ -1108,8 +1108,8 @@ test result: ok. 0 passed; 0 failed; 0 ignored; 1 measured; 0 filtered out; fini [FRESH] bar v0.0.1 ([ROOT]/foo/bar) [FRESH] foo v0.0.1 ([ROOT]/foo) [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] `[..]target/release/deps/foo-[HASH][EXE] --bench` -[RUNNING] `[..]target/release/deps/bench-[HASH][EXE] --bench` +[RUNNING] `[ROOT]/foo/target/release/build/foo/[HASH]/deps/foo-[HASH] --bench` +[RUNNING] `[ROOT]/foo/target/release/build/foo/[HASH]/deps/bench-[HASH] --bench` "#]]) .with_stdout_data(str![[r#" @@ -1161,7 +1161,7 @@ fn bench_twice_with_build_cmd() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] [..] (target/release/deps/foo-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/release/build/foo/[HASH]/deps/foo-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -1178,7 +1178,7 @@ test result: ok. 0 passed; 0 failed; 0 ignored; 1 measured; 0 filtered out; fini p.cargo("bench") .with_stderr_data(str![[r#" [FINISHED] `bench` profile [optimized] target(s) in [..] -[RUNNING] [..] (target/release/deps/foo-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/release/build/foo/[HASH]/deps/foo-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -1268,8 +1268,8 @@ fn bench_with_examples() { [RUNNING] `rustc [..]` [RUNNING] `rustc [..]` [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] `[ROOT]/foo/target/release/deps/foo-[HASH][EXE] --bench` -[RUNNING] `[ROOT]/foo/target/release/deps/testb1-[HASH][EXE] --bench` +[RUNNING] `[ROOT]/foo/target/release/build/foo/[HASH]/deps/foo-[HASH] --bench` +[RUNNING] `[ROOT]/foo/target/release/build/foo/[HASH]/deps/testb1-[HASH] --bench` "#]]) .with_stdout_data(str![[r#" @@ -1320,7 +1320,7 @@ fn test_a_bench() { .with_stderr_data(str![[r#" [COMPILING] foo v0.1.0 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] [..] (target/debug/deps/b-[HASH][EXE]) +[RUNNING] benches/b.rs (target/debug/build/foo/[HASH]/deps/b-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -1358,8 +1358,8 @@ fn test_bench_no_run() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s -[EXECUTABLE] benches src/lib.rs (target/release/deps/foo-[HASH][EXE]) -[EXECUTABLE] benches/bbaz.rs (target/release/deps/bbaz-[HASH][EXE]) +[EXECUTABLE] benches src/lib.rs (target/release/build/foo/[HASH]/deps/foo-[HASH]) +[EXECUTABLE] benches/bbaz.rs (target/release/build/foo/[HASH]/deps/bbaz-[HASH]) "#]]) .run(); @@ -1438,9 +1438,9 @@ fn test_bench_no_fail_fast() { .with_stderr_data(str![[r#" [COMPILING] foo v0.5.0 ([ROOT]/foo) [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] unittests src/main.rs (target/release/deps/foo-[HASH][EXE]) +[RUNNING] unittests src/main.rs (target/release/build/foo/[HASH]/deps/foo-[HASH]) [ERROR] bench failed, to rerun pass `--bin foo` -[RUNNING] benches/b1.rs (target/release/deps/b1-[HASH][EXE]) +[RUNNING] benches/b1.rs (target/release/build/foo/[HASH]/deps/b1-[HASH]) [ERROR] bench failed, to rerun pass `--bench b1` [ERROR] 2 targets failed: `--bin foo` @@ -1555,10 +1555,10 @@ fn test_bench_multiple_packages() { [COMPILING] bar v0.1.0 ([ROOT]/bar) [COMPILING] baz v0.1.0 ([ROOT]/baz) [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/release/deps/bar-[HASH][EXE]) -[RUNNING] benches/bbar.rs (target/release/deps/bbar-[HASH][EXE]) -[RUNNING] unittests src/lib.rs (target/release/deps/baz-[HASH][EXE]) -[RUNNING] benches/bbaz.rs (target/release/deps/bbaz-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/release/build/bar/[HASH]/deps/bar-[HASH]) +[RUNNING] benches/bbar.rs (target/release/build/bar/[HASH]/deps/bbar-[HASH]) +[RUNNING] unittests src/lib.rs (target/release/build/baz/[HASH]/deps/baz-[HASH]) +[RUNNING] benches/bbaz.rs (target/release/build/baz/[HASH]/deps/bbaz-[HASH]) "#]] .unordered(), @@ -1617,10 +1617,10 @@ fn bench_all_workspace() { [COMPILING] bar v0.1.0 ([ROOT]/foo/bar) [COMPILING] foo v0.1.0 ([ROOT]/foo) [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/release/deps/bar-[HASH][EXE]) -[RUNNING] benches/bar.rs (target/release/deps/bar-[HASH][EXE]) -[RUNNING] unittests src/main.rs (target/release/deps/foo-[HASH][EXE]) -[RUNNING] benches/foo.rs (target/release/deps/foo-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/release/build/bar/[HASH]/deps/bar-[HASH]) +[RUNNING] benches/bar.rs (target/release/build/bar/[HASH]/deps/bar-[HASH]) +[RUNNING] unittests src/main.rs (target/release/build/foo/[HASH]/deps/foo-[HASH]) +[RUNNING] benches/foo.rs (target/release/build/foo/[HASH]/deps/foo-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -1808,10 +1808,10 @@ fn bench_all_virtual_manifest() { [COMPILING] bar v0.1.0 ([ROOT]/foo/bar) [COMPILING] baz v0.1.0 ([ROOT]/foo/baz) [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/release/deps/bar-[HASH][EXE]) -[RUNNING] benches/bar.rs (target/release/deps/bar-[HASH][EXE]) -[RUNNING] unittests src/lib.rs (target/release/deps/baz-[HASH][EXE]) -[RUNNING] benches/baz.rs (target/release/deps/baz-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/release/build/bar/[HASH]/deps/bar-[HASH]) +[RUNNING] benches/bar.rs (target/release/build/bar/[HASH]/deps/bar-[HASH]) +[RUNNING] unittests src/lib.rs (target/release/build/baz/[HASH]/deps/baz-[HASH]) +[RUNNING] benches/baz.rs (target/release/build/baz/[HASH]/deps/baz-[HASH]) "#]] .unordered(), @@ -1889,8 +1889,8 @@ fn bench_virtual_manifest_glob() { .with_stderr_data(str![[r#" [COMPILING] baz v0.1.0 ([ROOT]/foo/baz) [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/release/deps/baz-[HASH][EXE]) -[RUNNING] benches/baz.rs (target/release/deps/baz-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/release/build/baz/[HASH]/deps/baz-[HASH]) +[RUNNING] benches/baz.rs (target/release/build/baz/[HASH]/deps/baz-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -1947,8 +1947,8 @@ fn legacy_bench_name() { please set bench.path in Cargo.toml [COMPILING] foo v0.1.0 ([ROOT]/foo) [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/release/deps/foo-[HASH][EXE]) -[RUNNING] src/bench.rs (target/release/deps/bench-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/release/build/foo/[HASH]/deps/foo-[HASH]) +[RUNNING] src/bench.rs (target/release/build/foo/[HASH]/deps/bench-[HASH]) "#]]) .run(); @@ -1998,10 +1998,10 @@ fn bench_virtual_manifest_all_implied() { [COMPILING] bar v0.1.0 ([ROOT]/foo/bar) [COMPILING] baz v0.1.0 ([ROOT]/foo/baz) [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/release/deps/bar-[HASH][EXE]) -[RUNNING] benches/bar.rs (target/release/deps/bar-[HASH][EXE]) -[RUNNING] unittests src/lib.rs (target/release/deps/baz-[HASH][EXE]) -[RUNNING] benches/baz.rs (target/release/deps/baz-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/release/build/bar/[HASH]/deps/bar-[HASH]) +[RUNNING] benches/bar.rs (target/release/build/bar/[HASH]/deps/bar-[HASH]) +[RUNNING] unittests src/lib.rs (target/release/build/baz/[HASH]/deps/baz-[HASH]) +[RUNNING] benches/baz.rs (target/release/build/baz/[HASH]/deps/baz-[HASH]) "#]] .unordered(), @@ -2122,7 +2122,7 @@ fn cargo_bench_print_env_verbose() { [COMPILING] foo v0.0.1 ([ROOT]/foo) [RUNNING] `[..]CARGO_MANIFEST_DIR=[ROOT]/foo[..] rustc[..]` [FINISHED] `bench` profile [optimized] target(s) in [..] -[RUNNING] `[..]CARGO_MANIFEST_DIR=[ROOT]/foo[..] [ROOT]/foo/target/release/deps/foo-[HASH][EXE] --bench` +[RUNNING] `CARGO=/home/epage/src/personal/cargo/target/debug/cargo CARGO_MANIFEST_DIR=[ROOT]/foo CARGO_MANIFEST_PATH=[ROOT]/foo/Cargo.toml CARGO_PKG_AUTHORS='' CARGO_PKG_DESCRIPTION='' CARGO_PKG_HOMEPAGE='' CARGO_PKG_LICENSE='' CARGO_PKG_LICENSE_FILE='' CARGO_PKG_NAME=foo CARGO_PKG_README='' CARGO_PKG_REPOSITORY='' CARGO_PKG_RUST_VERSION='' CARGO_PKG_VERSION=0.0.1 CARGO_PKG_VERSION_MAJOR=0 CARGO_PKG_VERSION_MINOR=0 CARGO_PKG_VERSION_PATCH=1 CARGO_PKG_VERSION_PRE='' LD_LIBRARY_PATH='[ROOT]/foo/target/release:[ROOT]/foo/target/release/build/foo/[HASH]/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/src/personal/cargo/target/debug:/home/epage/.cargo/build/[HASH]/debug/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib' [ROOT]/foo/target/release/build/foo/[HASH]/deps/foo-[HASH] --bench` "#]]) .run(); diff --git a/tests/testsuite/binary_name.rs b/tests/testsuite/binary_name.rs index f1e04004cb7..e310163fe71 100644 --- a/tests/testsuite/binary_name.rs +++ b/tests/testsuite/binary_name.rs @@ -195,7 +195,7 @@ fn binary_name2() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/main.rs (target/debug/deps/foo-[..][EXE]) +[RUNNING] unittests src/main.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH][EXE]) "#]]) .with_stdout_data(str![[r#" diff --git a/tests/testsuite/build.rs b/tests/testsuite/build.rs index 5605f4736ec..71a1c2bc734 100644 --- a/tests/testsuite/build.rs +++ b/tests/testsuite/build.rs @@ -127,7 +127,7 @@ fn cargo_compile_incremental() { [COMPILING] foo v0.5.0 ([ROOT]/foo) [RUNNING] `rustc [..] -C incremental=[ROOT]/foo/target/debug/incremental[..]` [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] `[ROOT]/foo/target/debug/deps/foo-[HASH][EXE]` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/deps/foo-[HASH][EXE]` "#]]) .run(); @@ -1561,7 +1561,7 @@ fn cargo_default_env_metadata_env_var() { .with_stderr_data(format!( "\ ... -[RUNNING] `rustc --crate-name foo [..]--extern bar=[ROOT]/foo/target/debug/deps/{dll_prefix}bar{dll_suffix}` +[RUNNING] `rustc --crate-name foo [..]--extern bar=[ROOT]/foo/target/debug/build/bar/[HASH]/deps/{dll_prefix}bar{dll_suffix}` ... ")) .run(); @@ -1574,7 +1574,7 @@ fn cargo_default_env_metadata_env_var() { .with_stderr_data(format!( "\ ... -[RUNNING] `rustc --crate-name foo [..]--extern bar=[ROOT]/foo/target/debug/deps/{dll_prefix}bar-[..]{dll_suffix}` +[RUNNING] `rustc --crate-name foo [..]--extern bar=[ROOT]/foo/target/debug/build/bar/[HASH]/deps/{dll_prefix}bar-[..]{dll_suffix}` ... ")) .run(); @@ -3589,7 +3589,7 @@ fn compiler_json_error_format() { "env": [], "linked_libs": [], "linked_paths": [], - "out_dir": "[ROOT]/foo/target/debug/build/foo-[HASH]/out", + "out_dir": "[ROOT]/foo/target/debug/build/foo/[HASH]/build-script-executed/out", "package_id": "path+[ROOTURL]/foo#0.5.0", "reason": "build-script-executed" }, @@ -4808,7 +4808,7 @@ fn deterministic_cfg_flags() { .with_stderr_data(str![[r#" [COMPILING] foo v0.1.0 ([ROOT]/foo) [RUNNING] `rustc [..]` -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` [RUNNING] `rustc --crate-name foo [..] --cfg[..]default[..]--cfg[..]f_a[..]--cfg[..]f_b[..] --cfg[..]f_c[..]--cfg[..]f_d[..] --cfg cfg_a --cfg cfg_b --cfg cfg_c --cfg cfg_d --cfg cfg_e` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -5825,7 +5825,7 @@ fn build_lib_only() { p.cargo("build --lib -v") .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) -[RUNNING] `rustc --crate-name foo --edition=2015 src/lib.rs [..]--crate-type lib --emit=[..]link[..] -L dependency=[ROOT]/foo/target/debug/deps` +[RUNNING] `rustc --crate-name foo --edition=2015 src/lib.rs [..]--crate-type lib --emit=[..]link[..] -L dependency=[ROOT]/foo/target/debug/build/foo/[HASH]/deps` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s "#]]) diff --git a/tests/testsuite/build_analysis.rs b/tests/testsuite/build_analysis.rs index 4a15bed21a5..72c38ab87b2 100644 --- a/tests/testsuite/build_analysis.rs +++ b/tests/testsuite/build_analysis.rs @@ -437,7 +437,7 @@ fn log_rebuild_reason_file_changed() { "cause": { "dirty_reason": "fs-status-outdated", "fs_status": "stale-item", - "reference": "[ROOT]/foo/target/debug/.fingerprint/foo-[HASH]/dep-lib-foo", + "reference": "[ROOT]/foo/target/debug/build/foo/[HASH]/fingerprint/dep-lib-foo", "reference_mtime": "{...}", "stale": "[ROOT]/foo/src/lib.rs", "stale_item": "changed-file", diff --git a/tests/testsuite/build_dir_legacy.rs b/tests/testsuite/build_dir_legacy.rs index bd539b58bc7..691b4eff6fb 100644 --- a/tests/testsuite/build_dir_legacy.rs +++ b/tests/testsuite/build_dir_legacy.rs @@ -37,12 +37,12 @@ fn binary_with_debug() { [ROOT]/foo/build-dir/.rustc_info.json [ROOT]/foo/build-dir/CACHEDIR.TAG [ROOT]/foo/build-dir/debug/.cargo-lock -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/bin-foo -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/bin-foo.json -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/dep-bin-foo -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/invoked.timestamp -[ROOT]/foo/build-dir/debug/deps/foo[..][EXE] -[ROOT]/foo/build-dir/debug/deps/foo[..].d +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/deps/foo-[HASH] +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/deps/foo-[HASH].d +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/bin-foo +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/bin-foo.json +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/dep-bin-foo +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/invoked.timestamp "#]]); @@ -191,12 +191,12 @@ fn should_default_to_target() { [ROOT]/foo/target/.rustc_info.json [ROOT]/foo/target/CACHEDIR.TAG [ROOT]/foo/target/debug/.cargo-lock -[ROOT]/foo/target/debug/.fingerprint/foo-[HASH]/bin-foo -[ROOT]/foo/target/debug/.fingerprint/foo-[HASH]/bin-foo.json -[ROOT]/foo/target/debug/.fingerprint/foo-[HASH]/dep-bin-foo -[ROOT]/foo/target/debug/.fingerprint/foo-[HASH]/invoked.timestamp -[ROOT]/foo/target/debug/deps/foo[..][EXE] -[ROOT]/foo/target/debug/deps/foo[..].d +[ROOT]/foo/target/debug/build/foo/[HASH]/deps/foo-[HASH] +[ROOT]/foo/target/debug/build/foo/[HASH]/deps/foo-[HASH].d +[ROOT]/foo/target/debug/build/foo/[HASH]/fingerprint/bin-foo +[ROOT]/foo/target/debug/build/foo/[HASH]/fingerprint/bin-foo.json +[ROOT]/foo/target/debug/build/foo/[HASH]/fingerprint/dep-bin-foo +[ROOT]/foo/target/debug/build/foo/[HASH]/fingerprint/invoked.timestamp [ROOT]/foo/target/debug/foo[EXE] [ROOT]/foo/target/debug/foo.d @@ -218,12 +218,12 @@ fn should_respect_env_var() { [ROOT]/foo/build-dir/.rustc_info.json [ROOT]/foo/build-dir/CACHEDIR.TAG [ROOT]/foo/build-dir/debug/.cargo-lock -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/bin-foo -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/bin-foo.json -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/dep-bin-foo -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/invoked.timestamp -[ROOT]/foo/build-dir/debug/deps/foo[..][EXE] -[ROOT]/foo/build-dir/debug/deps/foo[..].d +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/deps/foo-[HASH] +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/deps/foo-[HASH].d +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/bin-foo +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/bin-foo.json +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/dep-bin-foo +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/invoked.timestamp "#]]); } @@ -258,28 +258,28 @@ fn build_script_should_output_to_build_dir() { p.root().join("build-dir").assert_build_dir_layout(str![[r#" [ROOT]/foo/build-dir/CACHEDIR.TAG -[ROOT]/foo/build-dir/debug/.cargo-lock -[ROOT]/foo/build-dir/debug/deps/foo[..].d -[ROOT]/foo/build-dir/debug/deps/foo[..][EXE] -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/invoked.timestamp -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/dep-bin-foo -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/bin-foo -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/bin-foo.json [ROOT]/foo/build-dir/.rustc_info.json -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/run-build-script-build-script-build -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/run-build-script-build-script-build.json -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/invoked.timestamp -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/dep-build-script-build-script-build -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/build-script-build-script-build -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/build-script-build-script-build.json -[ROOT]/foo/build-dir/debug/build/foo-[HASH]/build_script_build[..].d -[ROOT]/foo/build-dir/debug/build/foo-[HASH]/build_script_build[..][EXE] -[ROOT]/foo/build-dir/debug/build/foo-[HASH]/build-script-build[EXE] -[ROOT]/foo/build-dir/debug/build/foo-[HASH]/out/foo.txt -[ROOT]/foo/build-dir/debug/build/foo-[HASH]/invoked.timestamp -[ROOT]/foo/build-dir/debug/build/foo-[HASH]/output -[ROOT]/foo/build-dir/debug/build/foo-[HASH]/stderr -[ROOT]/foo/build-dir/debug/build/foo-[HASH]/root-output +[ROOT]/foo/build-dir/debug/.cargo-lock +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/build-script/build-script-build +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/build-script/build_script_build-[HASH] +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/build-script/build_script_build-[HASH].d +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/build-script-build-script-build +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/build-script-build-script-build.json +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/dep-build-script-build-script-build +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/invoked.timestamp +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/build-script-execution/invoked.timestamp +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/build-script-execution/out/foo.txt +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/build-script-execution/output +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/build-script-execution/root-output +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/build-script-execution/stderr +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/run-build-script-build-script-build +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/run-build-script-build-script-build.json +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/deps/foo-[HASH] +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/deps/foo-[HASH].d +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/bin-foo +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/bin-foo.json +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/dep-bin-foo +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/invoked.timestamp "#]]); } @@ -316,24 +316,24 @@ fn cargo_tmpdir_should_output_to_build_dir() { p.root().join("build-dir").assert_build_dir_layout(str![[r#" [ROOT]/foo/build-dir/CACHEDIR.TAG [ROOT]/foo/build-dir/debug/.cargo-lock -[ROOT]/foo/build-dir/debug/deps/foo-[HASH].d -[ROOT]/foo/build-dir/debug/deps/foo-[HASH].d -[ROOT]/foo/build-dir/debug/deps/foo[..].d -[ROOT]/foo/build-dir/debug/deps/foo-[HASH][EXE] -[ROOT]/foo/build-dir/debug/deps/foo-[HASH][EXE] -[ROOT]/foo/build-dir/debug/deps/foo[..][EXE] -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/invoked.timestamp -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/dep-test-bin-foo -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/test-bin-foo -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/test-bin-foo.json -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/invoked.timestamp -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/dep-test-integration-test-foo -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/test-integration-test-foo -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/test-integration-test-foo.json -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/invoked.timestamp -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/dep-bin-foo -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/bin-foo -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/bin-foo.json +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/deps/foo-[HASH] +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/deps/foo-[HASH].d +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/bin-foo +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/bin-foo.json +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/dep-bin-foo +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/invoked.timestamp +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/deps/foo-[HASH] +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/deps/foo-[HASH].d +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/dep-test-integration-test-foo +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/invoked.timestamp +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/test-integration-test-foo +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/test-integration-test-foo.json +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/deps/foo-[HASH] +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/deps/foo-[HASH].d +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/dep-test-bin-foo +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/invoked.timestamp +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/test-bin-foo +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/test-bin-foo.json [ROOT]/foo/build-dir/tmp/foo.txt [ROOT]/foo/build-dir/.rustc_info.json @@ -370,10 +370,10 @@ fn examples_should_output_to_build_dir_and_uplift_to_target_dir() { [ROOT]/foo/build-dir/.rustc_info.json [ROOT]/foo/build-dir/CACHEDIR.TAG [ROOT]/foo/build-dir/debug/.cargo-lock -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/dep-example-foo -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/example-foo -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/example-foo.json -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/invoked.timestamp +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/dep-example-foo +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/example-foo +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/example-foo.json +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/invoked.timestamp [ROOT]/foo/build-dir/debug/examples/foo[..][EXE] [ROOT]/foo/build-dir/debug/examples/foo[..].d @@ -409,20 +409,20 @@ fn benches_should_output_to_build_dir() { p.root().join("build-dir").assert_build_dir_layout(str![[r#" [ROOT]/foo/build-dir/CACHEDIR.TAG -[ROOT]/foo/build-dir/debug/.cargo-lock -[ROOT]/foo/build-dir/debug/deps/foo-[HASH].d -[ROOT]/foo/build-dir/debug/deps/foo[..].d -[ROOT]/foo/build-dir/debug/deps/foo-[HASH][EXE] -[ROOT]/foo/build-dir/debug/deps/foo[..][EXE] -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/invoked.timestamp -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/dep-test-bench-foo -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/test-bench-foo -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/test-bench-foo.json -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/invoked.timestamp -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/dep-bin-foo -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/bin-foo -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/bin-foo.json [ROOT]/foo/build-dir/.rustc_info.json +[ROOT]/foo/build-dir/debug/.cargo-lock +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/deps/foo-[HASH] +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/deps/foo-[HASH].d +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/bin-foo +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/bin-foo.json +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/dep-bin-foo +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/invoked.timestamp +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/deps/foo-[HASH] +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/deps/foo-[HASH].d +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/dep-test-bench-foo +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/invoked.timestamp +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/test-bench-foo +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/test-bench-foo.json "#]]); @@ -481,12 +481,6 @@ fn cargo_package_should_build_in_build_dir_and_output_to_target_dir() { p.root().join("build-dir").assert_build_dir_layout(str![[r#" [ROOT]/foo/build-dir/.rustc_info.json [ROOT]/foo/build-dir/debug/.cargo-lock -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/bin-foo -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/bin-foo.json -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/dep-bin-foo -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/invoked.timestamp -[ROOT]/foo/build-dir/debug/deps/foo[..][EXE] -[ROOT]/foo/build-dir/debug/deps/foo[..].d [ROOT]/foo/build-dir/debug/foo[EXE] [ROOT]/foo/build-dir/debug/foo.d [ROOT]/foo/build-dir/package/foo-0.0.1/Cargo.lock @@ -495,6 +489,12 @@ fn cargo_package_should_build_in_build_dir_and_output_to_target_dir() { [ROOT]/foo/build-dir/package/foo-0.0.1/src/main.rs [ROOT]/foo/build-dir/CACHEDIR.TAG [ROOT]/foo/build-dir/package/tmp-crate/foo-0.0.1.crate +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/deps/foo-[HASH] +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/deps/foo-[HASH].d +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/bin-foo +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/bin-foo.json +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/dep-bin-foo +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/invoked.timestamp "#]]); @@ -557,12 +557,12 @@ fn cargo_clean_should_clean_the_target_dir_and_build_dir() { [ROOT]/foo/build-dir/.rustc_info.json [ROOT]/foo/build-dir/CACHEDIR.TAG [ROOT]/foo/build-dir/debug/.cargo-lock -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/bin-foo -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/bin-foo.json -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/dep-bin-foo -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/invoked.timestamp -[ROOT]/foo/build-dir/debug/deps/foo[..][EXE] -[ROOT]/foo/build-dir/debug/deps/foo[..].d +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/deps/foo-[HASH] +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/deps/foo-[HASH].d +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/bin-foo +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/bin-foo.json +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/dep-bin-foo +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/invoked.timestamp "#]]); @@ -620,19 +620,19 @@ fn cargo_clean_should_remove_correct_files() { [ROOT]/foo/build-dir/.rustc_info.json [ROOT]/foo/build-dir/CACHEDIR.TAG [ROOT]/foo/build-dir/debug/.cargo-lock -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/bin-foo -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/bin-foo.json -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/dep-bin-foo -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/invoked.timestamp -[ROOT]/foo/build-dir/debug/deps/foo[..][EXE] -[ROOT]/foo/build-dir/debug/deps/foo[..].d -[ROOT]/foo/build-dir/debug/.fingerprint/bar-[HASH]/lib-bar -[ROOT]/foo/build-dir/debug/.fingerprint/bar-[HASH]/lib-bar.json -[ROOT]/foo/build-dir/debug/.fingerprint/bar-[HASH]/dep-lib-bar -[ROOT]/foo/build-dir/debug/.fingerprint/bar-[HASH]/invoked.timestamp -[ROOT]/foo/build-dir/debug/deps/bar[..].d -[ROOT]/foo/build-dir/debug/deps/libbar[..].rlib -[ROOT]/foo/build-dir/debug/deps/libbar[..].rmeta +[ROOT]/foo/build-dir/debug/build/bar/[HASH]/deps/bar-[HASH].d +[ROOT]/foo/build-dir/debug/build/bar/[HASH]/deps/libbar-[HASH].rlib +[ROOT]/foo/build-dir/debug/build/bar/[HASH]/deps/libbar-[HASH].rmeta +[ROOT]/foo/build-dir/debug/build/bar/[HASH]/fingerprint/dep-lib-bar +[ROOT]/foo/build-dir/debug/build/bar/[HASH]/fingerprint/invoked.timestamp +[ROOT]/foo/build-dir/debug/build/bar/[HASH]/fingerprint/lib-bar +[ROOT]/foo/build-dir/debug/build/bar/[HASH]/fingerprint/lib-bar.json +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/deps/foo-[HASH] +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/deps/foo-[HASH].d +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/bin-foo +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/bin-foo.json +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/dep-bin-foo +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/invoked.timestamp "#]]); @@ -642,12 +642,12 @@ fn cargo_clean_should_remove_correct_files() { [ROOT]/foo/build-dir/.rustc_info.json [ROOT]/foo/build-dir/CACHEDIR.TAG [ROOT]/foo/build-dir/debug/.cargo-lock -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/bin-foo -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/bin-foo.json -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/dep-bin-foo -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/invoked.timestamp -[ROOT]/foo/build-dir/debug/deps/foo[..][EXE] -[ROOT]/foo/build-dir/debug/deps/foo[..].d +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/deps/foo-[HASH] +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/deps/foo-[HASH].d +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/bin-foo +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/bin-foo.json +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/dep-bin-foo +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/invoked.timestamp "#]]); } @@ -768,12 +768,12 @@ fn template_workspace_root() { [ROOT]/foo/build-dir/.rustc_info.json [ROOT]/foo/build-dir/CACHEDIR.TAG [ROOT]/foo/build-dir/debug/.cargo-lock -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/bin-foo -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/bin-foo.json -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/dep-bin-foo -[ROOT]/foo/build-dir/debug/.fingerprint/foo-[HASH]/invoked.timestamp -[ROOT]/foo/build-dir/debug/deps/foo[..][EXE] -[ROOT]/foo/build-dir/debug/deps/foo[..].d +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/deps/foo-[HASH] +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/deps/foo-[HASH].d +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/bin-foo +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/bin-foo.json +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/dep-bin-foo +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/invoked.timestamp "#]]); @@ -812,12 +812,12 @@ fn template_cargo_cache_home() { [ROOT]/home/.cargo/build-dir/.rustc_info.json [ROOT]/home/.cargo/build-dir/CACHEDIR.TAG [ROOT]/home/.cargo/build-dir/debug/.cargo-lock -[ROOT]/home/.cargo/build-dir/debug/.fingerprint/foo-[HASH]/bin-foo -[ROOT]/home/.cargo/build-dir/debug/.fingerprint/foo-[HASH]/bin-foo.json -[ROOT]/home/.cargo/build-dir/debug/.fingerprint/foo-[HASH]/dep-bin-foo -[ROOT]/home/.cargo/build-dir/debug/.fingerprint/foo-[HASH]/invoked.timestamp -[ROOT]/home/.cargo/build-dir/debug/deps/foo[..][EXE] -[ROOT]/home/.cargo/build-dir/debug/deps/foo[..].d +[ROOT]/home/.cargo/build-dir/debug/build/foo/[HASH]/deps/foo-[HASH] +[ROOT]/home/.cargo/build-dir/debug/build/foo/[HASH]/deps/foo-[HASH].d +[ROOT]/home/.cargo/build-dir/debug/build/foo/[HASH]/fingerprint/bin-foo +[ROOT]/home/.cargo/build-dir/debug/build/foo/[HASH]/fingerprint/bin-foo.json +[ROOT]/home/.cargo/build-dir/debug/build/foo/[HASH]/fingerprint/dep-bin-foo +[ROOT]/home/.cargo/build-dir/debug/build/foo/[HASH]/fingerprint/invoked.timestamp "#]]); @@ -870,12 +870,12 @@ fn template_workspace_path_hash() { [ROOT]/foo/foo/[HASH]/build-dir/.rustc_info.json [ROOT]/foo/foo/[HASH]/build-dir/CACHEDIR.TAG [ROOT]/foo/foo/[HASH]/build-dir/debug/.cargo-lock -[ROOT]/foo/foo/[HASH]/build-dir/debug/.fingerprint/foo-[HASH]/bin-foo -[ROOT]/foo/foo/[HASH]/build-dir/debug/.fingerprint/foo-[HASH]/bin-foo.json -[ROOT]/foo/foo/[HASH]/build-dir/debug/.fingerprint/foo-[HASH]/dep-bin-foo -[ROOT]/foo/foo/[HASH]/build-dir/debug/.fingerprint/foo-[HASH]/invoked.timestamp -[ROOT]/foo/foo/[HASH]/build-dir/debug/deps/foo[..][EXE] -[ROOT]/foo/foo/[HASH]/build-dir/debug/deps/foo[..].d +[ROOT]/foo/foo/[HASH]/build-dir/debug/build/foo/[HASH]/deps/foo-[HASH] +[ROOT]/foo/foo/[HASH]/build-dir/debug/build/foo/[HASH]/deps/foo-[HASH].d +[ROOT]/foo/foo/[HASH]/build-dir/debug/build/foo/[HASH]/fingerprint/bin-foo +[ROOT]/foo/foo/[HASH]/build-dir/debug/build/foo/[HASH]/fingerprint/bin-foo.json +[ROOT]/foo/foo/[HASH]/build-dir/debug/build/foo/[HASH]/fingerprint/dep-bin-foo +[ROOT]/foo/foo/[HASH]/build-dir/debug/build/foo/[HASH]/fingerprint/invoked.timestamp "#]]); @@ -934,12 +934,12 @@ fn template_workspace_path_hash_should_handle_symlink() { [ROOT]/foo/foo/[HASH]/build-dir/.rustc_info.json [ROOT]/foo/foo/[HASH]/build-dir/CACHEDIR.TAG [ROOT]/foo/foo/[HASH]/build-dir/debug/.cargo-lock -[ROOT]/foo/foo/[HASH]/build-dir/debug/.fingerprint/foo-[HASH]/dep-lib-foo -[ROOT]/foo/foo/[HASH]/build-dir/debug/.fingerprint/foo-[HASH]/invoked.timestamp -[ROOT]/foo/foo/[HASH]/build-dir/debug/.fingerprint/foo-[HASH]/lib-foo -[ROOT]/foo/foo/[HASH]/build-dir/debug/.fingerprint/foo-[HASH]/lib-foo.json -[ROOT]/foo/foo/[HASH]/build-dir/debug/deps/foo-[HASH].d -[ROOT]/foo/foo/[HASH]/build-dir/debug/deps/libfoo-[HASH].rmeta +[ROOT]/foo/foo/[HASH]/build-dir/debug/build/foo/[HASH]/deps/foo-[HASH].d +[ROOT]/foo/foo/[HASH]/build-dir/debug/build/foo/[HASH]/deps/libfoo-[HASH].rmeta +[ROOT]/foo/foo/[HASH]/build-dir/debug/build/foo/[HASH]/fingerprint/dep-lib-foo +[ROOT]/foo/foo/[HASH]/build-dir/debug/build/foo/[HASH]/fingerprint/invoked.timestamp +[ROOT]/foo/foo/[HASH]/build-dir/debug/build/foo/[HASH]/fingerprint/lib-foo +[ROOT]/foo/foo/[HASH]/build-dir/debug/build/foo/[HASH]/fingerprint/lib-foo.json "#]]); @@ -968,12 +968,12 @@ fn template_workspace_path_hash_should_handle_symlink() { [ROOT]/foo/foo/[HASH]/build-dir/.rustc_info.json [ROOT]/foo/foo/[HASH]/build-dir/CACHEDIR.TAG [ROOT]/foo/foo/[HASH]/build-dir/debug/.cargo-lock -[ROOT]/foo/foo/[HASH]/build-dir/debug/.fingerprint/foo-[HASH]/dep-lib-foo -[ROOT]/foo/foo/[HASH]/build-dir/debug/.fingerprint/foo-[HASH]/invoked.timestamp -[ROOT]/foo/foo/[HASH]/build-dir/debug/.fingerprint/foo-[HASH]/lib-foo -[ROOT]/foo/foo/[HASH]/build-dir/debug/.fingerprint/foo-[HASH]/lib-foo.json -[ROOT]/foo/foo/[HASH]/build-dir/debug/deps/foo-[HASH].d -[ROOT]/foo/foo/[HASH]/build-dir/debug/deps/libfoo-[HASH].rmeta +[ROOT]/foo/foo/[HASH]/build-dir/debug/build/foo/[HASH]/deps/foo-[HASH].d +[ROOT]/foo/foo/[HASH]/build-dir/debug/build/foo/[HASH]/deps/libfoo-[HASH].rmeta +[ROOT]/foo/foo/[HASH]/build-dir/debug/build/foo/[HASH]/fingerprint/dep-lib-foo +[ROOT]/foo/foo/[HASH]/build-dir/debug/build/foo/[HASH]/fingerprint/invoked.timestamp +[ROOT]/foo/foo/[HASH]/build-dir/debug/build/foo/[HASH]/fingerprint/lib-foo +[ROOT]/foo/foo/[HASH]/build-dir/debug/build/foo/[HASH]/fingerprint/lib-foo.json "#]]); diff --git a/tests/testsuite/build_script.rs b/tests/testsuite/build_script.rs index 5da255f5fbf..eae5423c126 100644 --- a/tests/testsuite/build_script.rs +++ b/tests/testsuite/build_script.rs @@ -42,11 +42,11 @@ fn custom_build_script_failed() { .with_stderr_data(str![[r#" [COMPILING] foo v0.5.0 ([ROOT]/foo) [RUNNING] `rustc --crate-name build_script_build --edition=2015 build.rs [..]--crate-type bin [..]` -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` [ERROR] failed to run custom build command for `foo v0.5.0 ([ROOT]/foo)` Caused by: - process didn't exit successfully: `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` ([EXIT_STATUS]: 101) + process didn't exit successfully: `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` ([EXIT_STATUS]: 101) "#]]) .run(); @@ -80,12 +80,12 @@ fn custom_build_script_failed_backtraces_message() { .with_stderr_data(str![[r#" [COMPILING] foo v0.5.0 ([ROOT]/foo) [RUNNING] `rustc --crate-name build_script_build --edition=2015 build.rs [..]--crate-type bin [..]` -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` [ERROR] failed to run custom build command for `foo v0.5.0 ([ROOT]/foo)` [NOTE] To improve backtraces for build dependencies, set the CARGO_PROFILE_DEV_BUILD_OVERRIDE_DEBUG=true environment variable to enable debug information generation. Caused by: - process didn't exit successfully: `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` ([EXIT_STATUS]: 101) + process didn't exit successfully: `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` ([EXIT_STATUS]: 101) "#]]) .run(); @@ -95,12 +95,12 @@ Caused by: .with_status(101) .with_stderr_data(str![[r#" [COMPILING] foo v0.5.0 ([ROOT]/foo) -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` [ERROR] failed to run custom build command for `foo v0.5.0 ([ROOT]/foo)` [NOTE] To improve backtraces for build dependencies, set the CARGO_PROFILE_DEV_BUILD_OVERRIDE_DEBUG=true environment variable to enable debug information generation. Caused by: - process didn't exit successfully: `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` ([EXIT_STATUS]: 101) + process didn't exit successfully: `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` ([EXIT_STATUS]: 101) "#]]) .run(); @@ -134,11 +134,11 @@ fn custom_build_script_failed_backtraces_message_with_debuginfo() { .with_stderr_data(str![[r#" [COMPILING] foo v0.5.0 ([ROOT]/foo) [RUNNING] `rustc --crate-name build_script_build --edition=2015 build.rs [..]--crate-type bin [..]` -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` [ERROR] failed to run custom build command for `foo v0.5.0 ([ROOT]/foo)` Caused by: - process didn't exit successfully: `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` ([EXIT_STATUS]: 101) + process didn't exit successfully: `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` ([EXIT_STATUS]: 101) "#]]) .run(); @@ -893,10 +893,10 @@ fn custom_build_script_rustc_flags() { [LOCKING] 1 package to latest compatible version [COMPILING] foo v0.5.0 ([ROOT]/foo/foo) [RUNNING] `rustc --crate-name build_script_build --edition=2015 foo/build.rs [..]` -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` -[RUNNING] `rustc --crate-name foo --edition=2015 foo/src/lib.rs [..]-L dependency=[ROOT]/foo/target/debug/deps -L [ROOT]/foo/dummy-path1 -L [ROOT]/foo/dummy-path2 -l nonexistinglib` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` +[RUNNING] `rustc --crate-name foo --edition=2015 foo/src/lib.rs [..]-L dependency=[ROOT]/foo/target/debug/build/foo/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/foo/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/foo/[HASH]/deps -L [ROOT]/foo/dummy-path1 -L [ROOT]/foo/dummy-path2 -l nonexistinglib` [COMPILING] bar v0.5.0 ([ROOT]/foo) -[RUNNING] `rustc --crate-name bar --edition=2015 src/main.rs [..]-L dependency=[ROOT]/foo/target/debug/deps --extern foo=[ROOT]/foo/target/debug/deps/libfoo-[HASH].rlib -L [ROOT]/foo/dummy-path1 -L [ROOT]/foo/dummy-path2` +[RUNNING] `rustc --crate-name bar --edition=2015 src/main.rs [..]-L dependency=[ROOT]/foo/target/debug/build/bar/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/foo/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/foo/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/foo/[HASH]/deps --extern foo=[ROOT]/foo/target/debug/build/foo/[HASH]/deps/libfoo-[HASH].rlib -L [ROOT]/foo/dummy-path1 -L [ROOT]/foo/dummy-path2` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s "#]]).run(); @@ -952,10 +952,10 @@ fn custom_build_script_rustc_flags_no_space() { [LOCKING] 1 package to latest compatible version [COMPILING] foo v0.5.0 ([ROOT]/foo/foo) [RUNNING] `rustc --crate-name build_script_build --edition=2015 foo/build.rs [..]` -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` -[RUNNING] `rustc --crate-name foo --edition=2015 foo/src/lib.rs [..]-L dependency=[ROOT]/foo/target/debug/deps -L [ROOT]/foo/dummy-path1 -L [ROOT]/foo/dummy-path2 -l nonexistinglib` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` +[RUNNING] `rustc --crate-name foo --edition=2015 foo/src/lib.rs [..]-L dependency=[ROOT]/foo/target/debug/build/foo/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/foo/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/foo/[HASH]/deps -L [ROOT]/foo/dummy-path1 -L [ROOT]/foo/dummy-path2 -l nonexistinglib` [COMPILING] bar v0.5.0 ([ROOT]/foo) -[RUNNING] `rustc --crate-name bar --edition=2015 src/main.rs [..]-L dependency=[ROOT]/foo/target/debug/deps --extern foo=[ROOT]/foo/target/debug/deps/libfoo-[HASH].rlib -L [ROOT]/foo/dummy-path1 -L [ROOT]/foo/dummy-path2` +[RUNNING] `rustc --crate-name bar --edition=2015 src/main.rs [..]-L dependency=[ROOT]/foo/target/debug/build/bar/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/foo/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/foo/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/foo/[HASH]/deps --extern foo=[ROOT]/foo/target/debug/build/foo/[HASH]/deps/libfoo-[HASH].rlib -L [ROOT]/foo/dummy-path1 -L [ROOT]/foo/dummy-path2` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s "#]]).run(); @@ -1239,7 +1239,7 @@ fn overrides_and_links() { [COMPILING] foo v0.5.0 ([ROOT]/foo) [RUNNING] `rustc --crate-name build_script_build [..]` [RUNNING] `rustc --crate-name a [..]` -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` [RUNNING] `rustc --crate-name foo [..] -L foo -L bar` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -1371,7 +1371,7 @@ fn only_rerun_build_script() { .with_stderr_data(str![[r#" [DIRTY] foo v0.5.0 ([ROOT]/foo): the precalculated components changed [COMPILING] foo v0.5.0 ([ROOT]/foo) -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` [RUNNING] `rustc --crate-name foo [..]` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -1480,11 +1480,11 @@ fn testing_and_such() { .with_stderr_data(str![[r#" [DIRTY] foo v0.5.0 ([ROOT]/foo): the precalculated components changed [COMPILING] foo v0.5.0 ([ROOT]/foo) -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` [RUNNING] `rustc --crate-name foo [..]` [RUNNING] `rustc --crate-name foo [..]` [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] `[ROOT]/foo/target/debug/deps/foo-[HASH][EXE]` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/deps/foo-[HASH]` [DOCTEST] foo [RUNNING] `rustdoc [..]--test [..]` @@ -1715,8 +1715,8 @@ fn build_deps_simple() { [COMPILING] a v0.5.0 ([ROOT]/foo/a) [RUNNING] `rustc --crate-name a [..]` [COMPILING] foo v0.5.0 ([ROOT]/foo) -[RUNNING] `rustc --crate-name build_script_build [..] build.rs [..] --extern a=[ROOT]/foo/target/debug/deps/liba-[HASH].rlib` -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` +[RUNNING] `rustc --crate-name build_script_build [..] build.rs [..] --extern a=[ROOT]/foo/target/debug/build/a/[HASH]/deps/liba-[HASH].rlib` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` [RUNNING] `rustc --crate-name foo [..]` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -1828,13 +1828,13 @@ fn build_cmd_with_a_build_cmd() { [COMPILING] b v0.5.0 ([ROOT]/foo/b) [RUNNING] `rustc --crate-name b [..]` [COMPILING] a v0.5.0 ([ROOT]/foo/a) -[RUNNING] `rustc --crate-name build_script_build [..] a/build.rs [..] --extern b=[ROOT]/foo/target/debug/deps/libb-[HASH].rlib` -[RUNNING] `[ROOT]/foo/target/debug/build/a-[HASH]/build-script-build` -[RUNNING] `rustc --crate-name a [..]a/src/lib.rs [..]--crate-type lib --emit=[..]link[..]-C metadata=[..] --out-dir [ROOT]/foo/target/debug/deps -L dependency=[ROOT]/foo/target/debug/deps` +[RUNNING] `rustc --crate-name build_script_build [..] a/build.rs [..] --extern b=[ROOT]/foo/target/debug/build/b/[HASH]/deps/libb-[HASH].rlib` +[RUNNING] `[ROOT]/foo/target/debug/build/a/[HASH]/build-script/build-script-build` +[RUNNING] `rustc --crate-name a [..] a/src/lib.rs [..]--crate-type lib --emit=[..]link [..]-C metadata=[..] --out-dir [ROOT]/foo/target/debug/build/a/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/a/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/a/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/a/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/b/[HASH]/deps` [COMPILING] foo v0.5.0 ([ROOT]/foo) -[RUNNING] `rustc --crate-name build_script_build --edition=2015 build.rs [..]--crate-type bin --emit=[..]link[..]-C metadata=[..] --out-dir [ROOT]/foo/target/debug/build/foo-[HASH] -L dependency=[ROOT]/foo/target/debug/deps --extern a=[ROOT]/foo/target/debug/deps/liba-[HASH].rlib` -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` -[RUNNING] `rustc --crate-name foo [..]src/lib.rs [..]--crate-type lib --emit=[..]link[..]-C debuginfo=2 [..]-C metadata=[..] --out-dir [ROOT]/foo/target/debug/deps -L dependency=[ROOT]/foo/target/debug/deps` +[RUNNING] `rustc --crate-name build_script_build [..] build.rs [..] --extern a=[ROOT]/foo/target/debug/build/a/[HASH]/deps/liba-[HASH].rlib` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` +[RUNNING] `rustc --crate-name foo [..] src/lib.rs [..]--crate-type lib --emit=[..]link [..] --out-dir [ROOT]/foo/target/debug/build/foo/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/a/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/a/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/a/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/b/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/foo/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/foo/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/foo/[HASH]/deps` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s "#]]).run(); @@ -1890,7 +1890,7 @@ fn out_dir_is_preserved() { [DIRTY] foo v0.5.0 ([ROOT]/foo): the file `build.rs` has changed ([TIME_DIFF_AFTER_LAST_BUILD]) [COMPILING] foo v0.5.0 ([ROOT]/foo) [RUNNING] `rustc --crate-name build_script_build [..]` -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` [RUNNING] `rustc --crate-name foo [..]` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -1912,7 +1912,7 @@ fn out_dir_is_preserved() { .with_stderr_data(str![[r#" [DIRTY] foo v0.5.0 ([ROOT]/foo): the precalculated components changed [COMPILING] foo v0.5.0 ([ROOT]/foo) -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` [RUNNING] `rustc --crate-name foo [..]` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -1950,7 +1950,7 @@ fn output_separate_lines() { .with_stderr_data(str![[r#" [COMPILING] foo v0.5.0 ([ROOT]/foo) [RUNNING] `rustc --crate-name build_script_build [..]` -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` [RUNNING] `rustc --crate-name foo [..] -L foo -l static=foo` [ERROR] could not find native static library `foo`, perhaps an -L flag is missing? ... @@ -1991,7 +1991,7 @@ fn output_separate_lines_new() { .with_stderr_data(str![[r#" [COMPILING] foo v0.5.0 ([ROOT]/foo) [RUNNING] `rustc --crate-name build_script_build [..]` -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` [RUNNING] `rustc --crate-name foo [..] -L foo -L bar -l static=foo -l bar` [ERROR] could not find native static library `foo`, perhaps an -L flag is missing? ... @@ -2578,13 +2578,13 @@ fn cfg_test() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [RUNNING] `rustc --crate-name build_script_build [..]` -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` [RUNNING] `rustc --crate-name foo [..] --cfg foo[..]` [RUNNING] `rustc --crate-name foo [..] --cfg foo[..]` [RUNNING] `rustc --crate-name test [..] --cfg foo[..]` [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] `[ROOT]/foo/target/debug/deps/foo-[HASH][EXE]` -[RUNNING] `[ROOT]/foo/target/debug/deps/test-[HASH][EXE]` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/deps/foo-[HASH][EXE]` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/deps/test-[HASH][EXE]` [DOCTEST] foo [RUNNING] `rustdoc [..]--cfg foo[..]` @@ -2718,8 +2718,8 @@ fn cfg_override_test() { [RUNNING] `rustc --crate-name foo[..]` [RUNNING] `rustc --crate-name test[..]` [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] `[ROOT]/foo/target/debug/deps/foo-[HASH][EXE]` -[RUNNING] `[ROOT]/foo/target/debug/deps/test-[HASH][EXE]` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/deps/foo-[HASH][EXE]` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/deps/test-[HASH][EXE]` [DOCTEST] foo [RUNNING] `rustdoc [..] --cfg foo[..]` @@ -2876,13 +2876,13 @@ fn env_test() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [RUNNING] `rustc --crate-name build_script_build[..]` -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` [RUNNING] `rustc --crate-name foo[..]` [RUNNING] `rustc --crate-name foo[..]` [RUNNING] `rustc --crate-name test[..]` [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] `[ROOT]/foo/target/debug/deps/foo-[HASH][EXE]` -[RUNNING] `[ROOT]/foo/target/debug/deps/test-[HASH][EXE]` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/deps/foo-[HASH][EXE]` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/deps/test-[HASH][EXE]` [DOCTEST] foo [RUNNING] `rustdoc --edition=2015 --crate-type lib --color auto --crate-name foo[..]` @@ -2998,7 +2998,7 @@ fn flags_go_into_tests() { [LOCKING] 2 packages to latest compatible versions [COMPILING] a v0.5.0 ([ROOT]/foo/a) [RUNNING] `rustc [..] a/build.rs [..]` -[RUNNING] `[ROOT]/foo/target/debug/build/a-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/a/[HASH]/build-script/build-script-build` [RUNNING] `rustc [..] a/src/lib.rs [..] -L [ROOT]/foo/link-dir` [COMPILING] b v0.5.0 ([ROOT]/foo/b) [RUNNING] `rustc [..] b/src/lib.rs [..] -L [ROOT]/foo/link-dir` @@ -3006,7 +3006,7 @@ fn flags_go_into_tests() { [RUNNING] `rustc [..] src/lib.rs [..] -L [ROOT]/foo/link-dir` [RUNNING] `rustc [..] tests/foo.rs [..] -L [ROOT]/foo/link-dir` [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] `[ROOT]/foo/target/debug/deps/foo-[HASH][EXE]` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/deps/foo-[HASH][EXE]` "#]]) .with_stdout_data(str![[r#" @@ -3025,7 +3025,7 @@ test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; fini [COMPILING] b v0.5.0 ([ROOT]/foo/b) [RUNNING] `rustc --crate-name b [..] -L [ROOT]/foo/link-dir` [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] `[ROOT]/foo/target/debug/deps/b-[HASH][EXE]` +[RUNNING] `[ROOT]/foo/target/debug/build/b/[HASH]/deps/b-[HASH][EXE]` "#]]) .with_stdout_data(str![[r#" @@ -3112,7 +3112,7 @@ fn diamond_passes_args_only_once() { [LOCKING] 3 packages to latest compatible versions [COMPILING] c v0.5.0 ([ROOT]/foo/c) [RUNNING] `rustc --crate-name build_script_build [..]` -[RUNNING] `[ROOT]/foo/target/debug/build/c-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/c/[HASH]/build-script/build-script-build` [RUNNING] `rustc --crate-name c [..] -L native=test` [COMPILING] b v0.5.0 ([ROOT]/foo/b) [RUNNING] `rustc --crate-name b [..] -L native=test` @@ -3158,7 +3158,7 @@ fn adding_an_override_invalidates() { .with_stderr_data(str![[r#" [COMPILING] foo v0.5.0 ([ROOT]/foo) [RUNNING] `rustc --crate-name build_script_build [..]` -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` [RUNNING] `rustc --crate-name foo [..] -L native=foo` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -3536,7 +3536,7 @@ fn rebuild_only_on_explicit_paths() { .with_stderr_data(str![[r#" [DIRTY] foo v0.5.0 ([ROOT]/foo): the file `foo` is missing [COMPILING] foo v0.5.0 ([ROOT]/foo) -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` [RUNNING] `rustc [..] src/lib.rs [..]` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -3554,7 +3554,7 @@ fn rebuild_only_on_explicit_paths() { .with_stderr_data(str![[r#" [DIRTY] foo v0.5.0 ([ROOT]/foo): the file `foo` has changed ([TIME_DIFF_AFTER_LAST_BUILD]) [COMPILING] foo v0.5.0 ([ROOT]/foo) -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` [RUNNING] `rustc [..] src/lib.rs [..]` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -3590,7 +3590,7 @@ fn rebuild_only_on_explicit_paths() { .with_stderr_data(str![[r#" [DIRTY] foo v0.5.0 ([ROOT]/foo): the file `foo` has changed ([TIME_DIFF_AFTER_LAST_BUILD]) [COMPILING] foo v0.5.0 ([ROOT]/foo) -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` [RUNNING] `rustc [..] src/lib.rs [..]` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -3604,7 +3604,7 @@ fn rebuild_only_on_explicit_paths() { .with_stderr_data(str![[r#" [DIRTY] foo v0.5.0 ([ROOT]/foo): the file `bar` is missing [COMPILING] foo v0.5.0 ([ROOT]/foo) -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` [RUNNING] `rustc [..] src/lib.rs [..]` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -4032,7 +4032,7 @@ fn warnings_emitted_when_build_script_panics() { [ERROR] failed to run custom build command for `foo v0.5.0 ([ROOT]/foo)` Caused by: - process didn't exit successfully: `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` ([EXIT_STATUS]: 101) + process didn't exit successfully: `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` ([EXIT_STATUS]: 101) --- stdout cargo::warning=foo cargo::warning=bar @@ -4102,7 +4102,7 @@ fn warnings_emitted_when_dependency_panics() { [ERROR] failed to run custom build command for `published v0.1.0` Caused by: - process didn't exit successfully: `[ROOT]/foo/target/debug/build/published-[HASH]/build-script-build` ([EXIT_STATUS]: 101) + process didn't exit successfully: `[ROOT]/foo/target/debug/build/published/[HASH]/build-script/build-script-build` ([EXIT_STATUS]: 101) --- stdout cargo::warning=foo cargo::warning=bar @@ -4229,7 +4229,7 @@ fn warnings_hidden_for_upstream() { [DOWNLOADED] bar v0.1.0 (registry `dummy-registry`) [COMPILING] bar v0.1.0 [RUNNING] `rustc --crate-name build_script_build [..]` -[RUNNING] `[ROOT]/foo/target/debug/build/bar-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/bar/[HASH]/build-script/build-script-build` [RUNNING] `rustc --crate-name bar [..]` [COMPILING] foo v0.5.0 ([ROOT]/foo) [RUNNING] `rustc --crate-name foo [..]` @@ -4290,7 +4290,7 @@ fn warnings_printed_on_vv() { [DOWNLOADED] bar v0.1.0 (registry `dummy-registry`) [COMPILING] bar v0.1.0 [RUNNING] `[..] rustc --crate-name build_script_build [..]` -[RUNNING] `[..] [ROOT]/foo/target/debug/build/bar-[HASH]/build-script-build` +[RUNNING] `[..] [ROOT]/foo/target/debug/build/bar/[HASH]/build-script/build-script-build` [WARNING] bar@0.1.0: foo [WARNING] bar@0.1.0: bar [RUNNING] `[..] rustc --crate-name bar [..]` @@ -4338,7 +4338,7 @@ fn output_shows_on_vv() { .with_stderr_data(str![[r#" [COMPILING] foo v0.5.0 ([ROOT]/foo) [RUNNING] `[..] rustc --crate-name build_script_build [..]` -[RUNNING] `[..] [ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` +[RUNNING] `[..] [ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` [foo 0.5.0] stderr [RUNNING] `[..] rustc --crate-name foo [..]` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -5209,8 +5209,9 @@ fn links_interrupted_can_restart() { .env("SOMEVAR", "1") .with_stderr_data(str![[r#" ... -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` ... + "#]]) .run(); } @@ -5292,7 +5293,7 @@ fn rerun_if_directory() { dirty(str![[r#" [COMPILING] foo v0.1.0 ([ROOT]/foo) [RUNNING] `rustc --crate-name build_script_build[..]` -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` [RUNNING] `rustc --crate-name foo [..]` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -5302,7 +5303,7 @@ fn rerun_if_directory() { dirty(str![[r#" [DIRTY] foo v0.1.0 ([ROOT]/foo): the file `somedir` is missing [COMPILING] foo v0.1.0 ([ROOT]/foo) -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` [RUNNING] `rustc --crate-name foo [..]` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -5317,7 +5318,7 @@ fn rerun_if_directory() { dirty(str![[r#" [DIRTY] foo v0.1.0 ([ROOT]/foo): the file `somedir` has changed ([TIME_DIFF_AFTER_LAST_BUILD]) [COMPILING] foo v0.1.0 ([ROOT]/foo) -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` [RUNNING] `rustc --crate-name foo [..]` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -5334,7 +5335,7 @@ fn rerun_if_directory() { dirty(str![[r#" [DIRTY] foo v0.1.0 ([ROOT]/foo): the file `somedir` has changed ([TIME_DIFF_AFTER_LAST_BUILD]) [COMPILING] foo v0.1.0 ([ROOT]/foo) -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` [RUNNING] `rustc --crate-name foo [..]` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -5350,7 +5351,7 @@ fn rerun_if_directory() { dirty(str![[r#" [DIRTY] foo v0.1.0 ([ROOT]/foo): the file `somedir` has changed ([TIME_DIFF_AFTER_LAST_BUILD]) [COMPILING] foo v0.1.0 ([ROOT]/foo) -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` [RUNNING] `rustc --crate-name foo [..]` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -5367,7 +5368,7 @@ fn rerun_if_directory() { dirty(str![[r#" [DIRTY] foo v0.1.0 ([ROOT]/foo): the file `somedir` has changed ([TIME_DIFF_AFTER_LAST_BUILD]) [COMPILING] foo v0.1.0 ([ROOT]/foo) -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` [RUNNING] `rustc --crate-name foo [..]` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -5383,7 +5384,7 @@ fn rerun_if_directory() { dirty(str![[r#" [DIRTY] foo v0.1.0 ([ROOT]/foo): the file `somedir` has changed ([TIME_DIFF_AFTER_LAST_BUILD]) [COMPILING] foo v0.1.0 ([ROOT]/foo) -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` [RUNNING] `rustc --crate-name foo [..]` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -5459,7 +5460,7 @@ fn rerun_if_published_directory() { .with_stderr_data(str![[r#" [COMPILING] mylib-sys v1.0.1 [RUNNING] `rustc --crate-name build_script_build [..]` -[RUNNING] `[ROOT]/foo/target/debug/build/mylib-sys-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/mylib-sys/[HASH]/build-script/build-script-build` [RUNNING] `rustc --crate-name mylib_sys [..]` [CHECKING] foo v0.0.1 ([ROOT]/foo) [RUNNING] `rustc --crate-name foo [..]` @@ -6169,8 +6170,20 @@ fn linker_search_path_preference() { .build(); p.cargo("build -v").with_stderr_data(str![[r#" -... -[RUNNING] `rustc --crate-name foo [..] -L [ROOT]/foo/target/debug/build/foo-[HASH]/out/libs2 -L [ROOT]/foo/target/debug/build/foo-[HASH]/out/libs1 -L [ROOT]/foo/target/debug/build/a-[HASH]/out/libsA.2 -L [ROOT]/foo/target/debug/build/a-[HASH]/out/libsA.1 -L [ROOT]/foo/target/debug/build/b-[HASH]/out/libsB.1 -L [ROOT]/foo/target/debug/build/b-[HASH]/out/libsB.2 -L /usr/lib -L /lib -L /usr/lib3 -L /lib3 -L /usr/lib2 -L /lib2` -... +[LOCKING] 2 packages to latest Rust 1.93.0-nightly compatible versions +[COMPILING] a v0.1.0 ([ROOT]/foo/a) +[COMPILING] b v0.1.0 ([ROOT]/foo/b) +[COMPILING] foo v0.1.0 ([ROOT]/foo) +[RUNNING] `rustc --crate-name build_script_build --edition=2024 build.rs --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --crate-type bin --emit=dep-info,link -C embed-bitcode=no --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values())' -C metadata=fa716de0006fbd7f -C extra-filename=-7f802368a8909fca --out-dir [ROOT]/foo/target/debug/build/foo/[HASH]/build-script -L dependency=[ROOT]/foo/target/debug/build/foo/[HASH]/deps` +[RUNNING] `rustc --crate-name build_script_build --edition=2024 a/build.rs --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --crate-type bin --emit=dep-info,link -C embed-bitcode=no --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values())' -C metadata=a862b4b2d3acfba2 -C extra-filename=-0b7fe18f64da4e97 --out-dir [ROOT]/foo/target/debug/build/a/[HASH]/build-script -L dependency=[ROOT]/foo/target/debug/build/a/[HASH]/deps` +[RUNNING] `rustc --crate-name build_script_build --edition=2024 b/build.rs --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --crate-type bin --emit=dep-info,link -C embed-bitcode=no --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values())' -C metadata=e562d328802e9495 -C extra-filename=-86cd5f7292ecac5c --out-dir [ROOT]/foo/target/debug/build/b/[HASH]/build-script -L dependency=[ROOT]/foo/target/debug/build/b/[HASH]/deps` +[RUNNING] `[ROOT]/foo/target/debug/build/a/[HASH]/build-script/build-script-build` +[RUNNING] `rustc --crate-name a --edition=2024 a/src/lib.rs --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --crate-type lib --emit=dep-info,metadata,link -C embed-bitcode=no -C debuginfo=2 --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values())' -C metadata=f984c14ce580ca4d -C extra-filename=-2d75a5187058e64c --out-dir [ROOT]/foo/target/debug/build/a/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/a/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/a/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/a/[HASH]/deps -L [ROOT]/foo/target/debug/build/a/[HASH]/build-script-execution/out/libsA.2 -L [ROOT]/foo/target/debug/build/a/[HASH]/build-script-execution/out/libsA.1 -L /usr/lib3 -L /lib3` +[RUNNING] `[ROOT]/foo/target/debug/build/b/[HASH]/build-script/build-script-build` +[RUNNING] `rustc --crate-name b --edition=2024 b/src/lib.rs --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --crate-type lib --emit=dep-info,metadata,link -C embed-bitcode=no -C debuginfo=2 --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values())' -C metadata=8b83346c2a499e55 -C extra-filename=-c30cd20d6540f4cd --out-dir [ROOT]/foo/target/debug/build/b/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/b/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/b/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/b/[HASH]/deps -L [ROOT]/foo/target/debug/build/b/[HASH]/build-script-execution/out/libsB.1 -L [ROOT]/foo/target/debug/build/b/[HASH]/build-script-execution/out/libsB.2 -L /usr/lib2 -L /lib2` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` +[RUNNING] `rustc --crate-name foo --edition=2024 src/main.rs --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --crate-type bin --emit=dep-info,link -C embed-bitcode=no -C debuginfo=2 --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values())' -C metadata=a3600be2e232f7af -C extra-filename=-84e6b81a93efd71e --out-dir [ROOT]/foo/target/debug/build/foo/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/a/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/a/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/a/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/b/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/b/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/b/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/foo/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/foo/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/foo/[HASH]/deps --extern a=[ROOT]/foo/target/debug/build/a/[HASH]/deps/liba-[HASH].rlib --extern b=[ROOT]/foo/target/debug/build/b/[HASH]/deps/libb-[HASH].rlib -L [ROOT]/foo/target/debug/build/foo/[HASH]/build-script-execution/out/libs2 -L [ROOT]/foo/target/debug/build/foo/[HASH]/build-script-execution/out/libs1 -L [ROOT]/foo/target/debug/build/a/[HASH]/build-script-execution/out/libsA.2 -L [ROOT]/foo/target/debug/build/a/[HASH]/build-script-execution/out/libsA.1 -L [ROOT]/foo/target/debug/build/b/[HASH]/build-script-execution/out/libsB.1 -L [ROOT]/foo/target/debug/build/b/[HASH]/build-script-execution/out/libsB.2 -L /usr/lib -L /lib -L /usr/lib3 -L /lib3 -L /usr/lib2 -L /lib2` +[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s + "#]]).run(); } diff --git a/tests/testsuite/build_script_extra_link_arg.rs b/tests/testsuite/build_script_extra_link_arg.rs index 5273d1a081f..dfe674cc53c 100644 --- a/tests/testsuite/build_script_extra_link_arg.rs +++ b/tests/testsuite/build_script_extra_link_arg.rs @@ -219,7 +219,7 @@ fn cdylib_link_arg_transitive() { ... [COMPILING] bar v1.0.0 ([ROOT]/foo/bar) [RUNNING] `rustc --crate-name build_script_build --edition=2015 bar/build.rs [..] -[RUNNING] `[ROOT]/foo/target/debug/build/bar-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/bar/[HASH]/build-script/build-script-build` [WARNING] bar@1.0.0: cargo::rustc-link-arg-cdylib was specified in the build script of bar v1.0.0 \ ([ROOT]/foo/bar), but that package does not contain a cdylib target @@ -279,7 +279,7 @@ fn link_arg_transitive_not_allowed() { [DOWNLOADED] bar v1.0.0 (registry `dummy-registry`) [COMPILING] bar v1.0.0 [RUNNING] `rustc --crate-name build_script_build [..] -[RUNNING] `[ROOT]/foo/target/debug/build/bar-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/bar/[HASH]/build-script/build-script-build` [RUNNING] `rustc --crate-name bar [..] [COMPILING] foo v0.1.0 ([ROOT]/foo) [RUNNING] `rustc --crate-name foo --edition=2015 src/lib.rs [..] @@ -437,7 +437,7 @@ fn cdylib_both_forms() { .with_stderr_data(str![[r#" [COMPILING] foo v0.1.0 ([ROOT]/foo) [RUNNING] `rustc --crate-name build_script_build [..] -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` [RUNNING] `rustc --crate-name foo [..]--crate-type cdylib [..]-C link-arg=--bogus-flag-one -C link-arg=--bogus-flag-two[..] ... "#]]) diff --git a/tests/testsuite/build_scripts_multiple.rs b/tests/testsuite/build_scripts_multiple.rs index d3f06b111d9..21072583f96 100644 --- a/tests/testsuite/build_scripts_multiple.rs +++ b/tests/testsuite/build_scripts_multiple.rs @@ -441,7 +441,7 @@ fn custom_build_script_first_index_script_failed() { [ERROR] failed to run custom build command for `foo v0.1.0 ([ROOT]/foo)` Caused by: - process didn't exit successfully: `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build1` ([EXIT_STATUS]: 101) + process didn't exit successfully: `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build1` ([EXIT_STATUS]: 101) ... "#]]) .run(); @@ -479,7 +479,7 @@ fn custom_build_script_second_index_script_failed() { [ERROR] failed to run custom build command for `foo v0.1.0 ([ROOT]/foo)` Caused by: - process didn't exit successfully: `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build2` ([EXIT_STATUS]: 101) + process didn't exit successfully: `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build2` ([EXIT_STATUS]: 101) ... "#]]) .run(); @@ -741,7 +741,7 @@ fn bar() { .with_stderr_data(str![[r#" [DIRTY] foo v0.1.0 ([ROOT]/foo): the [..] [COMPILING] foo v0.1.0 ([ROOT]/foo) -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build1` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build1` [RUNNING] `rustc --crate-name foo --edition=2024 src/main.rs [..] --crate-type bin [..] [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -756,8 +756,8 @@ fn bar() { .with_stderr_data(str![[r#" [DIRTY] foo v0.1.0 ([ROOT]/foo): the [..] [COMPILING] foo v0.1.0 ([ROOT]/foo) -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build[..]` -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build[..]` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build2` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build1` [RUNNING] `rustc --crate-name foo --edition=2024 src/main.rs [..] --crate-type bin [..] [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s diff --git a/tests/testsuite/cargo_alias_config.rs b/tests/testsuite/cargo_alias_config.rs index 4a048b79ecb..4578a159325 100644 --- a/tests/testsuite/cargo_alias_config.rs +++ b/tests/testsuite/cargo_alias_config.rs @@ -156,7 +156,7 @@ fn builtin_alias_shadowing_external_subcommand() { .with_stderr_data(str![[r#" [COMPILING] foo v0.5.0 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/main.rs (target/debug/deps/foo-[HASH][EXE]) +[RUNNING] unittests src/main.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH][EXE]) "#]]) .run(); diff --git a/tests/testsuite/cargo_config/mod.rs b/tests/testsuite/cargo_config/mod.rs index 133342cd28a..3e0c3c74cf3 100644 --- a/tests/testsuite/cargo_config/mod.rs +++ b/tests/testsuite/cargo_config/mod.rs @@ -135,6 +135,7 @@ profile.dev.package.foo.opt-level = 1 target.'cfg(target_os = "linux")'.runner = "runme" # The following environment variables may affect the loaded values. # CARGO_ALIAS_BAR=[..]cat dog[..] +# CARGO_BUILD_DIR_LAYOUT_V2=true # CARGO_BUILD_JOBS=100 # CARGO_HOME=[ROOT]/home/.cargo @@ -231,6 +232,7 @@ nested_tables = [[{ x = "a" }, { x = "b" }], [{ x = "c" }, { x = "d" }]] strings = ["hello", "world", "test"] tables = [{ name = "first", value = 1 }, { name = "second", value = 2 }] # The following environment variables may affect the loaded values. +# CARGO_BUILD_DIR_LAYOUT_V2=true # CARGO_HOME=[ROOT]/home/.cargo "#]]) @@ -300,6 +302,7 @@ fn get_json() { .with_stderr_data(str![[r#" [NOTE] The following environment variables may affect the loaded values. CARGO_ALIAS_BAR=[..]cat dog[..] +CARGO_BUILD_DIR_LAYOUT_V2=true CARGO_BUILD_JOBS=100 CARGO_HOME=[ROOT]/home/.cargo @@ -352,6 +355,7 @@ CARGO_HOME=[ROOT]/home/.cargo ) .with_stderr_data(str![[r#" [NOTE] The following environment variables may affect the loaded values. +CARGO_BUILD_DIR_LAYOUT_V2=true CARGO_HOME=[ROOT]/home/.cargo "#]]) @@ -493,6 +497,7 @@ fn get_json_with_array_any_types() { ) .with_stderr_data(str![[r#" [NOTE] The following environment variables may affect the loaded values. +CARGO_BUILD_DIR_LAYOUT_V2=true CARGO_HOME=[ROOT]/home/.cargo "#]]) @@ -545,6 +550,7 @@ profile.dev.opt-level = 3 # [ROOT]/home/.cargo/config.toml profile.dev.package.foo.opt-level = 1 # [ROOT]/home/.cargo/config.toml target.'cfg(target_os = "linux")'.runner = "runme" # [ROOT]/home/.cargo/config.toml # The following environment variables may affect the loaded values. +# CARGO_BUILD_DIR_LAYOUT_V2=true # CARGO_HOME=[ROOT]/home/.cargo "#]]) @@ -621,6 +627,7 @@ tables = [ { name = "second", value = 2 }, # [ROOT]/home/.cargo/config.toml ] # The following environment variables may affect the loaded values. +# CARGO_BUILD_DIR_LAYOUT_V2=true # CARGO_HOME=[ROOT]/home/.cargo "#]]) @@ -702,6 +709,7 @@ fn unmerged_toml() { # Environment variables # CARGO=[..] # CARGO_ALIAS_BAR=[..]cat dog[..] +# CARGO_BUILD_DIR_LAYOUT_V2=true # CARGO_BUILD_JOBS=100 # CARGO_HOME=[ROOT]/home/.cargo @@ -852,6 +860,7 @@ build.rustflags = [ .with_stdout_data(str![[r##" # Environment variables # CARGO=[..] +# CARGO_BUILD_DIR_LAYOUT_V2=true # CARGO_HOME=[ROOT]/home/.cargo # [ROOT]/foo/.cargo/other.toml diff --git a/tests/testsuite/check.rs b/tests/testsuite/check.rs index 470b18b0a31..84ddf7cde4d 100644 --- a/tests/testsuite/check.rs +++ b/tests/testsuite/check.rs @@ -773,21 +773,33 @@ fn check_artifacts() { assert!(!p.root().join("target/debug/libfoo.rmeta").is_file()); assert!(!p.root().join("target/debug/libfoo.rlib").is_file()); assert!(!p.root().join("target/debug").join(exe("foo")).is_file()); - assert_eq!(p.glob("target/debug/deps/libfoo-*.rmeta").count(), 2); + assert_eq!( + p.glob("target/debug/build/foo/*/deps/libfoo-*.rmeta") + .count(), + 2 + ); p.root().join("target").rm_rf(); p.cargo("check --lib").run(); assert!(!p.root().join("target/debug/libfoo.rmeta").is_file()); assert!(!p.root().join("target/debug/libfoo.rlib").is_file()); assert!(!p.root().join("target/debug").join(exe("foo")).is_file()); - assert_eq!(p.glob("target/debug/deps/libfoo-*.rmeta").count(), 1); + assert_eq!( + p.glob("target/debug/build/foo/*/deps/libfoo-*.rmeta") + .count(), + 1 + ); p.root().join("target").rm_rf(); p.cargo("check --bin foo").run(); assert!(!p.root().join("target/debug/libfoo.rmeta").is_file()); assert!(!p.root().join("target/debug/libfoo.rlib").is_file()); assert!(!p.root().join("target/debug").join(exe("foo")).is_file()); - assert_eq!(p.glob("target/debug/deps/libfoo-*.rmeta").count(), 2); + assert_eq!( + p.glob("target/debug/build/foo/*/deps/libfoo-*.rmeta") + .count(), + 2 + ); p.root().join("target").rm_rf(); p.cargo("check --test t1").run(); @@ -795,8 +807,16 @@ fn check_artifacts() { assert!(!p.root().join("target/debug/libfoo.rlib").is_file()); assert!(!p.root().join("target/debug").join(exe("foo")).is_file()); assert_eq!(p.glob("target/debug/t1-*").count(), 0); - assert_eq!(p.glob("target/debug/deps/libfoo-*.rmeta").count(), 1); - assert_eq!(p.glob("target/debug/deps/libt1-*.rmeta").count(), 1); + assert_eq!( + p.glob("target/debug/build/foo/*/deps/libfoo-*.rmeta") + .count(), + 1 + ); + assert_eq!( + p.glob("target/debug/build/foo/*/deps/libt1-*.rmeta") + .count(), + 1 + ); p.root().join("target").rm_rf(); p.cargo("check --example ex1").run(); @@ -808,7 +828,11 @@ fn check_artifacts() { .join(exe("ex1")) .is_file() ); - assert_eq!(p.glob("target/debug/deps/libfoo-*.rmeta").count(), 1); + assert_eq!( + p.glob("target/debug/build/foo/*/deps/libfoo-*.rmeta") + .count(), + 1 + ); assert_eq!(p.glob("target/debug/examples/libex1-*.rmeta").count(), 1); p.root().join("target").rm_rf(); @@ -817,8 +841,16 @@ fn check_artifacts() { assert!(!p.root().join("target/debug/libfoo.rlib").is_file()); assert!(!p.root().join("target/debug").join(exe("foo")).is_file()); assert_eq!(p.glob("target/debug/b1-*").count(), 0); - assert_eq!(p.glob("target/debug/deps/libfoo-*.rmeta").count(), 1); - assert_eq!(p.glob("target/debug/deps/libb1-*.rmeta").count(), 1); + assert_eq!( + p.glob("target/debug/build/foo/*/deps/libfoo-*.rmeta") + .count(), + 1 + ); + assert_eq!( + p.glob("target/debug/build/foo/*/deps/libb1-*.rmeta") + .count(), + 1 + ); } #[cargo_test] diff --git a/tests/testsuite/check_cfg.rs b/tests/testsuite/check_cfg.rs index f2dd61c0d18..19708b119b9 100644 --- a/tests/testsuite/check_cfg.rs +++ b/tests/testsuite/check_cfg.rs @@ -397,7 +397,7 @@ fn build_script_doc() { "\ [COMPILING] foo v0.0.1 ([ROOT]/foo) [RUNNING] `rustc [..] build.rs [..]` -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` [DOCUMENTING] foo v0.0.1 ([ROOT]/foo) {running_rustdoc} [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s diff --git a/tests/testsuite/clean.rs b/tests/testsuite/clean.rs index 37cb240e107..acad21c1431 100644 --- a/tests/testsuite/clean.rs +++ b/tests/testsuite/clean.rs @@ -481,7 +481,7 @@ fn build_script() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [RUNNING] `rustc [..] build.rs [..]` -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` [RUNNING] `rustc [..] src/main.rs [..]` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -579,23 +579,12 @@ fn clean_verbose() { Package::new("bar", "0.1.0").publish(); p.cargo("build").run(); - let mut expected = String::from( - "\ -[REMOVING] [ROOT]/foo/target/debug/.fingerprint/bar-[HASH] -[REMOVING] [ROOT]/foo/target/debug/deps/libbar-[HASH].rlib -[REMOVING] [ROOT]/foo/target/debug/deps/bar-[HASH].d -[REMOVING] [ROOT]/foo/target/debug/deps/libbar-[HASH].rmeta -", - ); - if cfg!(target_os = "macos") { - // Rust 1.69 has changed so that split-debuginfo=unpacked includes unpacked for rlibs. - for _ in p.glob("target/debug/deps/bar-*.o") { - expected.push_str("[REMOVING] [ROOT]/foo/target/debug/deps/bar-[HASH][..].o\n"); - } - } - expected.push_str("[REMOVED] [FILE_NUM] files, [FILE_SIZE]B total\n"); p.cargo("clean -p bar --verbose") - .with_stderr_data(&expected.unordered()) + .with_stderr_data(str![[r#" +[REMOVING] [ROOT]/foo/target/debug/build/bar +[REMOVED] [FILE_NUM] files, [FILE_SIZE]B total + +"#]].unordered()) .run(); p.cargo("build").run(); } diff --git a/tests/testsuite/collisions.rs b/tests/testsuite/collisions.rs index 7a54f57f1cf..a68a777d3c1 100644 --- a/tests/testsuite/collisions.rs +++ b/tests/testsuite/collisions.rs @@ -55,7 +55,7 @@ fn collision_dylib() { p.cargo("build -j=1") .with_stderr_data(&format!("\ ... -[WARNING] output filename collision at [ROOT]/foo/target/debug/deps/{}a{} +[WARNING] output filename collision at [ROOT]/foo/target/debug/{}a{} | = [NOTE] the lib target `a` in package `b v1.0.0 ([ROOT]/foo/b)` has the same output filename as the lib target `a` in package `a v1.0.0 ([ROOT]/foo/a)` = [NOTE] this may become a hard error in the future; see diff --git a/tests/testsuite/cross_compile.rs b/tests/testsuite/cross_compile.rs index 40c46480508..98e44456cf7 100644 --- a/tests/testsuite/cross_compile.rs +++ b/tests/testsuite/cross_compile.rs @@ -493,7 +493,7 @@ fn linker() { [WARNING] path `src/foo.rs` was erroneously implicitly accepted for binary `foo`, please set bin.path in Cargo.toml [COMPILING] foo v0.5.0 ([ROOT]/foo) -[RUNNING] `rustc --crate-name foo --edition=2015 src/foo.rs [..]--crate-type bin --emit=[..]link[..]-C debuginfo=2 [..] -C metadata=[..] --out-dir [ROOT]/foo/target/[ALT_TARGET]/debug/deps --target [ALT_TARGET] -C linker=my-linker-tool -L dependency=[ROOT]/foo/target/[ALT_TARGET]/debug/deps -L dependency=[ROOT]/foo/target/debug/deps` +[RUNNING] `rustc --crate-name foo --edition=2015 src/foo.rs --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --crate-type bin --emit=dep-info,link -C embed-bitcode=no -C debuginfo=2 --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values())' -C metadata=1e548458c1d02455 -C extra-filename=-e4ee4d3c3259672e --out-dir [ROOT]/foo/target/[ALT_TARGET]/debug/build/foo/[HASH]/deps --target [ALT_TARGET] -C linker=my-linker-tool -L dependency=[ROOT]/foo/target/[ALT_TARGET]/debug/build/foo/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/foo/[HASH]/deps` [ERROR] linker `my-linker-tool` not found ... "#]]) @@ -559,8 +559,8 @@ fn cross_tests() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.0 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/[ALT_TARGET]/debug/deps/foo-[HASH][EXE]) -[RUNNING] unittests src/bin/bar.rs (target/[ALT_TARGET]/debug/deps/bar-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/[ALT_TARGET]/debug/build/foo/[HASH]/deps/foo-[HASH]) +[RUNNING] unittests src/bin/bar.rs (target/[ALT_TARGET]/debug/build/foo/[HASH]/deps/bar-[HASH]) [DOCTEST] foo "#]]) @@ -768,18 +768,18 @@ fn build_script_needed_for_host_and_target() { .with_stderr_data(str![[r#" [LOCKING] 2 packages to latest compatible versions [COMPILING] d1 v0.0.0 ([ROOT]/foo/d1) -[RUNNING] `rustc [..] d1/build.rs [..] --out-dir [ROOT]/foo/target/debug/build/d1-[HASH] [..] -[RUNNING] `[ROOT]/foo/target/debug/build/d1-[HASH]/build-script-build` -[RUNNING] `[ROOT]/foo/target/debug/build/d1-[HASH]/build-script-build` -[RUNNING] `rustc [..] d1/src/lib.rs [..] --out-dir [ROOT]/foo/target/debug/deps [..] -[RUNNING] `rustc [..] d1/src/lib.rs [..] --out-dir [ROOT]/foo/target/[ALT_TARGET]/debug/deps [..] [COMPILING] d2 v0.0.0 ([ROOT]/foo/d2) -[RUNNING] `rustc [..] d2/src/lib.rs [..] --out-dir [ROOT]/foo/target/debug/deps [..]-L [ROOT]/foo/link-[HOST_TARGET]` [COMPILING] foo v0.0.0 ([ROOT]/foo) -[RUNNING] `rustc [..] build.rs [..] --out-dir [ROOT]/foo/target/debug/build/foo-[HASH] [..]-L [ROOT]/foo/link-[HOST_TARGET]` -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` -[RUNNING] `rustc [..] src/main.rs [..] --out-dir [ROOT]/foo/target/[ALT_TARGET]/debug/deps --target [ALT_TARGET] [..]-L [ROOT]/foo/link-[ALT_TARGET]` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s +[RUNNING] `rustc --crate-name build_script_build --edition=2015 d1/build.rs --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --crate-type bin --emit=dep-info,link -C embed-bitcode=no -C debuginfo=2 --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values())' -C metadata=8088577cb3bb92d0 -C extra-filename=-75212929df66ed9c --out-dir [ROOT]/foo/target/debug/build/[HASH]9c/build-script -L dependency=[ROOT]/foo/target/debug/build/[HASH]9c/deps` +[RUNNING] `[ROOT]/foo/target/debug/build/[HASH]9c/build-script/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/[HASH]9c/build-script/build-script-build` +[RUNNING] `rustc --crate-name d1 --edition=2015 d1/src/lib.rs --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --crate-type lib --emit=dep-info,metadata,link -C embed-bitcode=no -C debuginfo=2 --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values())' -C metadata=62c324fc51755d3d -C extra-filename=-76e5c527a8358850 --out-dir [ROOT]/foo/target/debug/build/[HASH]50/deps -L dependency=[ROOT]/foo/target/debug/build/[HASH]9c/deps -L dependency=[ROOT]/foo/target/debug/build/[HASH]50/deps -L dependency=[ROOT]/foo/target/debug/build/[HASH]44/deps -L [ROOT]/foo/link-[HOST_TARGET]` +[RUNNING] `rustc --crate-name d1 --edition=2015 d1/src/lib.rs --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --crate-type lib --emit=dep-info,metadata,link -C embed-bitcode=no -C debuginfo=2 --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values())' -C metadata=180871302507c4b6 -C extra-filename=-609e975b793d66e5 --out-dir [ROOT]/foo/target/[ALT_TARGET]/debug/build/[HASH]e5/deps --target [ALT_TARGET] -L dependency=[ROOT]/foo/target/debug/build/[HASH]9c/deps -L dependency=[ROOT]/foo/target/[ALT_TARGET]/debug/build/[HASH]ad/deps -L dependency=[ROOT]/foo/target/[ALT_TARGET]/debug/build/[HASH]e5/deps -L dependency=[ROOT]/foo/target/debug/build/[HASH]e5/deps -L [ROOT]/foo/link-[ALT_TARGET]` +[RUNNING] `rustc --crate-name d2 --edition=2015 d2/src/lib.rs --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --crate-type lib --emit=dep-info,metadata,link -C embed-bitcode=no -C debuginfo=2 --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values())' -C metadata=4c1954c21363f341 -C extra-filename=-6afa5d4b0a807121 --out-dir [ROOT]/foo/target/debug/build/[HASH]21/deps -L dependency=[ROOT]/foo/target/debug/build/[HASH]9c/deps -L dependency=[ROOT]/foo/target/debug/build/[HASH]50/deps -L dependency=[ROOT]/foo/target/debug/build/[HASH]44/deps -L dependency=[ROOT]/foo/target/debug/build/[HASH]21/deps --extern d1=[ROOT]/foo/target/debug/build/[HASH]50/deps/libd1-[HASH].rmeta -L [ROOT]/foo/link-[HOST_TARGET]` +[RUNNING] `rustc --crate-name build_script_build --edition=2015 build.rs --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --crate-type bin --emit=dep-info,link -C embed-bitcode=no -C debuginfo=2 --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values())' -C metadata=6af612251d5b8abd -C extra-filename=-107ac0ff069a6e02 --out-dir [ROOT]/foo/target/debug/build/foo/[HASH]/build-script -L dependency=[ROOT]/foo/target/debug/build/[HASH]9c/deps -L dependency=[ROOT]/foo/target/debug/build/[HASH]50/deps -L dependency=[ROOT]/foo/target/debug/build/[HASH]44/deps -L dependency=[ROOT]/foo/target/debug/build/[HASH]21/deps -L dependency=[ROOT]/foo/target/debug/build/foo/[HASH]/deps --extern d2=[ROOT]/foo/target/debug/build/[HASH]21/deps/libd2-[HASH].rlib -L [ROOT]/foo/link-[HOST_TARGET]` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` +[RUNNING] `rustc --crate-name foo --edition=2015 src/main.rs --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --crate-type bin --emit=dep-info,link -C embed-bitcode=no -C debuginfo=2 --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values())' -C metadata=771704fd63506bbd -C extra-filename=-04135f6c0fc832dd --out-dir [ROOT]/foo/target/[ALT_TARGET]/debug/build/foo/[HASH]/deps --target [ALT_TARGET] -L dependency=[ROOT]/foo/target/debug/build/[HASH]9c/deps -L dependency=[ROOT]/foo/target/debug/build/[HASH]50/deps -L dependency=[ROOT]/foo/target/debug/build/[HASH]44/deps -L dependency=[ROOT]/foo/target/debug/build/[HASH]21/deps -L dependency=[ROOT]/foo/target/debug/build/foo/[HASH]/deps -L dependency=[ROOT]/foo/target/[ALT_TARGET]/debug/build/[HASH]ad/deps -L dependency=[ROOT]/foo/target/[ALT_TARGET]/debug/build/[HASH]e5/deps -L dependency=[ROOT]/foo/target/[ALT_TARGET]/debug/build/foo/[HASH]/deps -L dependency=[ROOT]/foo/target/[ALT_TARGET]/debug/build/foo/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/foo/[HASH]/deps --extern d1=[ROOT]/foo/target/[ALT_TARGET]/debug/build/[HASH]e5/deps/libd1-[HASH].rlib -L [ROOT]/foo/link-[ALT_TARGET]` "#]].unordered()) .run(); @@ -949,7 +949,7 @@ fn build_script_with_platform_specific_dependencies() { [RUNNING] `rustc [..] d1/src/lib.rs [..]` [COMPILING] foo v0.0.1 ([ROOT]/foo) [RUNNING] `rustc [..] build.rs [..]` -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` [RUNNING] `rustc [..] src/lib.rs [..] --target [ALT_TARGET] [..]` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -1197,8 +1197,8 @@ fn cross_test_dylib() { [COMPILING] bar v0.0.1 ([ROOT]/foo/bar) [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/[ALT_TARGET]/debug/deps/foo-[HASH][EXE]) -[RUNNING] tests/test.rs (target/[ALT_TARGET]/debug/deps/test-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/[ALT_TARGET]/debug/build/foo/[HASH]/deps/foo-[HASH]) +[RUNNING] tests/test.rs (target/[ALT_TARGET]/debug/build/foo/[HASH]/deps/test-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -1255,7 +1255,7 @@ fn doctest_xcompile_linker() { .with_status(101) .with_stderr_data(str![[r#" [COMPILING] foo v0.1.0 ([ROOT]/foo) -[RUNNING] `rustc --crate-name foo --edition=2015 src/lib.rs [..] --out-dir [ROOT]/foo/target/[ALT_TARGET]/debug/deps --target [ALT_TARGET] [..] +[RUNNING] `rustc --crate-name foo --edition=2015 src/lib.rs --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --crate-type lib --emit=dep-info,metadata,link -C embed-bitcode=no -C debuginfo=2 --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values())' -C metadata=8fca04f0bae80a8c -C extra-filename=-2642309d734a26d7 --out-dir [ROOT]/foo/target/[ALT_TARGET]/debug/build/foo/[HASH]/deps --target [ALT_TARGET] -C linker=my-linker-tool -L dependency=[ROOT]/foo/target/[ALT_TARGET]/debug/build/foo/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/foo/[HASH]/deps` [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s [DOCTEST] foo [RUNNING] `rustdoc [..] src/lib.rs [..] diff --git a/tests/testsuite/doc.rs b/tests/testsuite/doc.rs index 5193cbe8da1..0f944d14561 100644 --- a/tests/testsuite/doc.rs +++ b/tests/testsuite/doc.rs @@ -1914,7 +1914,7 @@ fn doc_json_artifacts() { "executable": null, "features": [], "filenames": [ - "[ROOT]/foo/target/debug/deps/libfoo-[HASH].rmeta" + "[ROOT]/foo/target/doc/foo/index.html" ], "fresh": false, "manifest_path": "[ROOT]/foo/Cargo.toml", @@ -1940,7 +1940,7 @@ fn doc_json_artifacts() { "executable": null, "features": [], "filenames": [ - "[ROOT]/foo/target/doc/foo/index.html" + "[ROOT]/foo/target/doc/somebin/index.html" ], "fresh": false, "manifest_path": "[ROOT]/foo/Cargo.toml", @@ -1949,48 +1949,54 @@ fn doc_json_artifacts() { "reason": "compiler-artifact", "target": { "crate_types": [ - "lib" + "bin" ], "doc": true, - "doctest": true, + "doctest": false, "edition": "2015", "kind": [ - "lib" + "bin" ], - "name": "foo", - "src_path": "[ROOT]/foo/src/lib.rs", + "name": "somebin", + "src_path": "[ROOT]/foo/src/bin/somebin.rs", "test": true } }, + { + "reason": "build-finished", + "success": true + }, { "executable": null, "features": [], "filenames": [ - "[ROOT]/foo/target/doc/somebin/index.html" + "[ROOT]/foo/target/debug/build/foo/[HASH]/deps/libfoo-[HASH].rmeta" ], "fresh": false, "manifest_path": "[ROOT]/foo/Cargo.toml", "package_id": "path+[ROOTURL]/foo#0.0.1", - "profile": "{...}", + "profile": { + "debug_assertions": true, + "debuginfo": 2, + "opt_level": "0", + "overflow_checks": true, + "test": false + }, "reason": "compiler-artifact", "target": { "crate_types": [ - "bin" + "lib" ], "doc": true, - "doctest": false, + "doctest": true, "edition": "2015", "kind": [ - "bin" + "lib" ], - "name": "somebin", - "src_path": "[ROOT]/foo/src/bin/somebin.rs", + "name": "foo", + "src_path": "[ROOT]/foo/src/lib.rs", "test": true } - }, - { - "reason": "build-finished", - "success": true } ] "#]] @@ -3249,15 +3255,15 @@ fn mergeable_info_with_deps() { [LOCKING] 1 package to latest compatible version [DOCUMENTING] dep v0.0.0 ([ROOT]/foo/dep) [CHECKING] dep v0.0.0 ([ROOT]/foo/dep) -[RUNNING] `rustdoc [..]--crate-name dep [..]--merge=none --parts-out-dir=[ROOT]/foo/target/debug/build/dep-[HASH]/deps [..]` [RUNNING] `rustc --crate-name dep [..]` [DOCUMENTING] foo v0.0.0 ([ROOT]/foo) -[RUNNING] `rustdoc [..]--crate-name foo [..]--merge=none --parts-out-dir=[ROOT]/foo/target/debug/build/foo-[HASH]/deps[..]` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s [MERGING] 2 docs for host -[RUNNING] `rustdoc -o [ROOT]/foo/target/doc -Zunstable-options --merge=finalize --include-parts-dir=[ROOT]/foo/target/debug/build/dep-[HASH]/deps --include-parts-dir=[ROOT]/foo/target/debug/build/foo-[HASH]/deps` [FINISHED] documentation merge in [ELAPSED]s [GENERATED] [ROOT]/foo/target/doc/foo/index.html +[RUNNING] `rustdoc --edition=2015 --crate-type lib --crate-name dep dep/src/lib.rs -o [ROOT]/foo/target/doc --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values())' --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --emit=invocation-specific -Zunstable-options --merge=none --parts-out-dir=[ROOT]/foo/target/debug/build/dep/[HASH]/deps -C metadata=490974557c2b920a -L dependency=[ROOT]/foo/target/debug/build/dep/[HASH]/deps --crate-version 0.0.0` +[RUNNING] `rustdoc --edition=2015 --crate-type lib --crate-name foo src/lib.rs -o [ROOT]/foo/target/doc --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values())' --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --emit=invocation-specific -Zunstable-options --merge=none --parts-out-dir=[ROOT]/foo/target/debug/build/foo/[HASH]/deps -C metadata=b0d2a34f9957e913 -L dependency=[ROOT]/foo/target/debug/build/dep/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/dep/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/foo/[HASH]/deps --extern dep=[ROOT]/foo/target/debug/build/dep/[HASH]/deps/libdep-[HASH].rmeta --crate-version 0.0.0` +[RUNNING] `rustdoc -o [ROOT]/foo/target/doc -Zunstable-options --merge=finalize --include-parts-dir=[ROOT]/foo/target/debug/build/dep/[HASH]/deps --include-parts-dir=[ROOT]/foo/target/debug/build/foo/[HASH]/deps` "#]].unordered() ) @@ -3310,10 +3316,10 @@ fn mergeable_info_no_deps() { [CHECKING] dep v0.0.0 ([ROOT]/foo/dep) [RUNNING] `rustc --crate-name dep --edition=2015 [..]` [DOCUMENTING] foo v0.0.0 ([ROOT]/foo) -[RUNNING] `rustdoc [..]--crate-name foo [..]--merge=none --parts-out-dir=[ROOT]/foo/target/debug/build/foo-[HASH]/deps [..]` +[RUNNING] `rustdoc --edition=2015 --crate-type lib --crate-name foo src/lib.rs -o [ROOT]/foo/target/doc --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values())' --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --emit=invocation-specific -Zunstable-options --merge=none --parts-out-dir=[ROOT]/foo/target/debug/build/foo/[HASH]/deps -C metadata=b3d350f47e153711 -L dependency=[ROOT]/foo/target/debug/build/dep/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/foo/[HASH]/deps --extern dep=[ROOT]/foo/target/debug/build/dep/[HASH]/deps/libdep-[HASH].rmeta --crate-version 0.0.0` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s [MERGING] 1 doc for host -[RUNNING] `rustdoc -o [ROOT]/foo/target/doc -Zunstable-options --merge=finalize --include-parts-dir=[ROOT]/foo/target/debug/build/foo-[HASH]/deps` +[RUNNING] `rustdoc -o [ROOT]/foo/target/doc -Zunstable-options --merge=finalize --include-parts-dir=[ROOT]/foo/target/debug/build/foo/[HASH]/deps` [FINISHED] documentation merge in [ELAPSED]s [GENERATED] [ROOT]/foo/target/doc/foo/index.html @@ -3376,18 +3382,18 @@ fn mergeable_info_workspace() { [DOCUMENTING] dep v0.0.0 ([ROOT]/foo/dep) [CHECKING] dep v0.0.0 ([ROOT]/foo/dep) [DOCUMENTING] bar v0.0.0 ([ROOT]/foo/bar) -[RUNNING] `rustdoc [..]--crate-name dep [..]--merge=none --parts-out-dir=[ROOT]/foo/target/debug/build/dep-[HASH]/deps [..]` -[RUNNING] `rustdoc [..]--crate-name bar [..]--merge=none --parts-out-dir=[ROOT]/foo/target/debug/build/bar-[HASH]/deps [..]` [RUNNING] `rustc --crate-name dep [..]` [DOCUMENTING] foo v0.0.0 ([ROOT]/foo/foo) -[RUNNING] `rustdoc [..]--crate-name foo [..]--merge=none --parts-out-dir=[ROOT]/foo/target/debug/build/foo-[HASH]/deps [..]` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s [MERGING] 3 docs for host -[RUNNING] `rustdoc -o [ROOT]/foo/target/doc -Zunstable-options --merge=finalize --include-parts-dir=[ROOT]/foo/target/debug/build/bar-[HASH]/deps --include-parts-dir=[ROOT]/foo/target/debug/build/dep-[HASH]/deps --include-parts-dir=[ROOT]/foo/target/debug/build/foo-[HASH]/deps` [FINISHED] documentation merge in [ELAPSED]s [GENERATED] [ROOT]/foo/target/doc/bar/index.html [GENERATED] [ROOT]/foo/target/doc/dep/index.html [GENERATED] [ROOT]/foo/target/doc/foo/index.html +[RUNNING] `rustdoc --edition=2015 --crate-type lib --crate-name dep dep/src/lib.rs -o [ROOT]/foo/target/doc --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values())' --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --emit=invocation-specific -Zunstable-options --merge=none --parts-out-dir=[ROOT]/foo/target/debug/build/dep/[HASH]/deps -C metadata=490974557c2b920a -L dependency=[ROOT]/foo/target/debug/build/dep/[HASH]/deps --crate-version 0.0.0` +[RUNNING] `rustdoc --edition=2015 --crate-type lib --crate-name bar bar/src/lib.rs -o [ROOT]/foo/target/doc --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values())' --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --emit=invocation-specific -Zunstable-options --merge=none --parts-out-dir=[ROOT]/foo/target/debug/build/bar/[HASH]/deps -C metadata=3d8178679190f702 -L dependency=[ROOT]/foo/target/debug/build/bar/[HASH]/deps --crate-version 0.0.0` +[RUNNING] `rustdoc --edition=2015 --crate-type lib --crate-name foo foo/src/lib.rs -o [ROOT]/foo/target/doc --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values())' --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --emit=invocation-specific -Zunstable-options --merge=none --parts-out-dir=[ROOT]/foo/target/debug/build/foo/[HASH]/deps -C metadata=989353e352d1c02d -L dependency=[ROOT]/foo/target/debug/build/dep/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/dep/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/foo/[HASH]/deps --extern dep=[ROOT]/foo/target/debug/build/dep/[HASH]/deps/libdep-[HASH].rmeta --crate-version 0.0.0` +[RUNNING] `rustdoc -o [ROOT]/foo/target/doc -Zunstable-options --merge=finalize --include-parts-dir=[ROOT]/foo/target/debug/build/bar/[HASH]/deps --include-parts-dir=[ROOT]/foo/target/debug/build/dep/[HASH]/deps --include-parts-dir=[ROOT]/foo/target/debug/build/foo/[HASH]/deps` "#]].unordered() ) @@ -3515,10 +3521,10 @@ fn mergeable_info_rebuild_detection() { .with_stderr_data( str![[r#" [DOCUMENTING] foo v0.0.0 ([ROOT]/foo) -[RUNNING] `rustdoc [..]--crate-name foo [..]--merge=none --parts-out-dir=[ROOT]/foo/target/debug/build/foo-[HASH]/deps [..]` +[RUNNING] `rustdoc --edition=2015 --crate-type lib --crate-name foo src/lib.rs -o [ROOT]/foo/target/doc --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values())' --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --emit=invocation-specific -Zunstable-options --merge=none --parts-out-dir=[ROOT]/foo/target/debug/build/foo/[HASH]/deps -C metadata=2d2b3c6c086047e5 -L dependency=[ROOT]/foo/target/debug/build/foo/[HASH]/deps --crate-version 0.0.0` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s [MERGING] 1 doc for host -[RUNNING] `rustdoc -o [ROOT]/foo/target/doc -Zunstable-options --merge=finalize --include-parts-dir=[ROOT]/foo/target/debug/build/foo-[HASH]/deps` +[RUNNING] `rustdoc -o [ROOT]/foo/target/doc -Zunstable-options --merge=finalize --include-parts-dir=[ROOT]/foo/target/debug/build/foo/[HASH]/deps` [FINISHED] documentation merge in [ELAPSED]s [GENERATED] [ROOT]/foo/target/doc/foo/index.html @@ -3653,10 +3659,10 @@ fn mergeable_info_rebuild_with_depinfo() { .with_stderr_data( str![[r#" [DOCUMENTING] foo v0.0.0 ([ROOT]/foo) -[RUNNING] `rustdoc [..]--crate-name foo [..]--emit=invocation-specific,dep-info=[..] --merge=none --parts-out-dir=[ROOT]/foo/target/debug/build/foo-[HASH]/deps [..]` +[RUNNING] `rustdoc --edition=2015 --crate-type lib --crate-name foo src/lib.rs -o [ROOT]/foo/target/doc --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values())' --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --emit=invocation-specific,dep-info=[ROOT]/foo/target/debug/build/foo/[HASH]/fingerprint/doc-lib-foo.d -Zunstable-options --merge=none --parts-out-dir=[ROOT]/foo/target/debug/build/foo/[HASH]/deps -C metadata=2d2b3c6c086047e5 -L dependency=[ROOT]/foo/target/debug/build/foo/[HASH]/deps --crate-version 0.0.0` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s [MERGING] 1 doc for host -[RUNNING] `rustdoc -o [ROOT]/foo/target/doc -Zunstable-options --merge=finalize --include-parts-dir=[ROOT]/foo/target/debug/build/foo-[HASH]/deps` +[RUNNING] `rustdoc -o [ROOT]/foo/target/doc -Zunstable-options --merge=finalize --include-parts-dir=[ROOT]/foo/target/debug/build/foo/[HASH]/deps` [FINISHED] documentation merge in [ELAPSED]s [GENERATED] [ROOT]/foo/target/doc/foo/index.html @@ -3805,10 +3811,10 @@ fn mergeable_info_additive() { [CHECKING] dep v0.0.0 ([ROOT]/foo/dep) [RUNNING] `rustc --crate-name dep [..]` [DOCUMENTING] foo v0.0.0 ([ROOT]/foo/foo) -[RUNNING] `rustdoc [..]--crate-name foo [..]--merge=none --parts-out-dir=[ROOT]/foo/target/debug/build/foo-[HASH]/deps [..]` +[RUNNING] `rustdoc --edition=2015 --crate-type lib --crate-name foo foo/src/lib.rs -o [ROOT]/foo/target/doc --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values())' --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --emit=invocation-specific -Zunstable-options --merge=none --parts-out-dir=[ROOT]/foo/target/debug/build/foo/[HASH]/deps -C metadata=fa8565d3f4595489 -L dependency=[ROOT]/foo/target/debug/build/dep/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/foo/[HASH]/deps --extern dep=[ROOT]/foo/target/debug/build/dep/[HASH]/deps/libdep-[HASH].rmeta --crate-version 0.0.0` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s [MERGING] 1 doc for host -[RUNNING] `rustdoc -o [ROOT]/foo/target/doc -Zunstable-options --merge=finalize --include-parts-dir=[ROOT]/foo/target/debug/build/foo-[HASH]/deps` +[RUNNING] `rustdoc -o [ROOT]/foo/target/doc -Zunstable-options --merge=finalize --include-parts-dir=[ROOT]/foo/target/debug/build/foo/[HASH]/deps` [FINISHED] documentation merge in [ELAPSED]s [GENERATED] [ROOT]/foo/target/doc/foo/index.html @@ -3954,10 +3960,10 @@ fn mergeable_info_dep_collision() { [DOWNLOADED] dep v0.2.0 (registry `dummy-registry`) [DOWNLOADED] dep v0.1.0 (registry `dummy-registry`) [DOCUMENTING] dep v0.1.0 -[RUNNING] `rustdoc [..]--crate-name dep [..]--merge=none --parts-out-dir=[ROOT]/foo/target/debug/build/dep-[HASH]/deps [..]--crate-version 0.1.0` +[RUNNING] `rustdoc --edition=2015 --crate-type lib --crate-name dep [ROOT]/home/.cargo/registry/src/-[HASH]/dep-0.1.0/src/lib.rs --cap-lints allow -o [ROOT]/foo/target/doc --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values())' --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --emit=invocation-specific -Zunstable-options --merge=none --parts-out-dir=[ROOT]/foo/target/debug/build/dep/[HASH]/deps -C metadata=cb9d3c5ae10a21bd -L dependency=[ROOT]/foo/target/debug/build/dep/[HASH]/deps --crate-version 0.1.0` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s [MERGING] 1 doc for host -[RUNNING] `rustdoc -o [ROOT]/foo/target/doc -Zunstable-options --merge=finalize --include-parts-dir=[ROOT]/foo/target/debug/build/dep-[HASH]/deps` +[RUNNING] `rustdoc -o [ROOT]/foo/target/doc -Zunstable-options --merge=finalize --include-parts-dir=[ROOT]/foo/target/debug/build/dep/[HASH]/deps` [FINISHED] documentation merge in [ELAPSED]s [GENERATED] [ROOT]/foo/target/doc/dep/index.html diff --git a/tests/testsuite/features2.rs b/tests/testsuite/features2.rs index 6e5344d737d..eda27b4995b 100644 --- a/tests/testsuite/features2.rs +++ b/tests/testsuite/features2.rs @@ -2292,7 +2292,7 @@ fn minimal_download() { [COMPILING] dev_dep_pm v1.0.0 [COMPILING] foo v0.1.0 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[EXECUTABLE] unittests src/lib.rs (target/debug/deps/foo-[HASH][EXE]) +[EXECUTABLE] unittests src/lib.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) "#]] .unordered(), diff --git a/tests/testsuite/freshness.rs b/tests/testsuite/freshness.rs index 7d626bbb559..8800328bad1 100644 --- a/tests/testsuite/freshness.rs +++ b/tests/testsuite/freshness.rs @@ -280,7 +280,7 @@ fn changing_profiles_caches_targets() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/debug/deps/foo-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) [DOCTEST] foo "#]]) @@ -298,7 +298,7 @@ fn changing_profiles_caches_targets() { p.cargo("test foo") .with_stderr_data(str![[r#" [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/debug/deps/foo-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) "#]]) .run(); @@ -617,7 +617,7 @@ fn rebuild_tests_if_lib_changes() { [COMPILING] foo v0.0.1 ([ROOT]/foo) [RUNNING] `rustc --crate-name foo_test [..]` [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] `[ROOT]/foo/target/debug/deps/foo_test-[HASH][EXE]` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/deps/foo_test-[HASH]` "#]]) .run(); @@ -682,8 +682,8 @@ fn no_rebuild_transitive_target_deps() { [COMPILING] b v0.0.1 ([ROOT]/foo/b) [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[EXECUTABLE] unittests src/lib.rs (target/debug/deps/foo-[HASH][EXE]) -[EXECUTABLE] tests/foo.rs (target/debug/deps/foo-[HASH][EXE]) +[EXECUTABLE] unittests src/lib.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) +[EXECUTABLE] tests/foo.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) "#]]) .run(); @@ -1267,7 +1267,7 @@ fn reuse_workspace_lib() { [COMPILING] baz v0.1.1 ([ROOT]/foo/baz) [RUNNING] `rustc --crate-name baz [..] [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[EXECUTABLE] `[ROOT]/foo/target/debug/deps/baz-[HASH][EXE]` +[EXECUTABLE] `[ROOT]/foo/target/debug/build/baz/[HASH]/deps/baz-[HASH]` "#]]) .run(); @@ -1458,7 +1458,7 @@ fn fingerprint_cleaner(mut dir: PathBuf, timestamp: filetime::FileTime) { // if all the files in the fingerprint's folder are older then a time stamp without // effecting any builds that happened since that time stamp. let mut cleaned = false; - dir.push(".fingerprint"); + dir.push("fingerprint"); for fingerprint in fs::read_dir(&dir).unwrap() { let fingerprint = fingerprint.unwrap(); @@ -1585,10 +1585,10 @@ fn reuse_panic_build_dep_test() { [RUNNING] `rustc --crate-name bar [..] [COMPILING] foo v0.0.1 ([ROOT]/foo) [RUNNING] `rustc --crate-name build_script_build [..] -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` [RUNNING] `rustc --crate-name foo [..] src/lib.rs [..]--test[..] [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[EXECUTABLE] `[ROOT]/foo/target/debug/deps/foo-[HASH][EXE]` +[EXECUTABLE] `[ROOT]/foo/target/debug/build/foo/[HASH]/deps/foo-[HASH]` "#]]) .run(); @@ -2100,9 +2100,9 @@ fn simulated_docker_deps_stay_cached() { [COMPILING] foo v0.1.0 ([ROOT]/foo) [FRESH] regdep_rerun [..] [FRESH] regdep_old_style [..] -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` [RUNNING] `rustc --crate-name foo [..]` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` "#]] .unordered(), @@ -2269,7 +2269,11 @@ fn edition_change_invalidates() { "#]]) .run(); - assert_eq!(p.glob("target/debug/deps/libfoo-*.rlib").count(), 1); + assert_eq!( + p.glob("target/debug/build/foo/*/deps/libfoo-*.rlib") + .count(), + 1 + ); } #[cargo_test] @@ -2437,7 +2441,7 @@ fn rerun_if_changes() { .with_stderr_data(str![[r#" [DIRTY] foo v0.0.1 ([ROOT]/foo): the env variable FOO changed [COMPILING] foo v0.0.1 ([ROOT]/foo) -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` [RUNNING] `rustc [..] [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -2457,7 +2461,7 @@ fn rerun_if_changes() { .with_stderr_data(str![[r#" [DIRTY] foo v0.0.1 ([ROOT]/foo): the env variable BAR changed [COMPILING] foo v0.0.1 ([ROOT]/foo) -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` [RUNNING] `rustc [..] [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -2477,7 +2481,7 @@ fn rerun_if_changes() { .with_stderr_data(str![[r#" [DIRTY] foo v0.0.1 ([ROOT]/foo): the env variable FOO changed [COMPILING] foo v0.0.1 ([ROOT]/foo) -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` [RUNNING] `rustc [..] [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -2782,7 +2786,7 @@ fn linking_interrupted() { [RUNNING] `rustc --crate-name foo [..] [RUNNING] `rustc --crate-name t1 [..] [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] `[ROOT]/foo/target/debug/deps/t1-[HASH][EXE]` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/deps/t1-[HASH]` "#]]) .run(); @@ -3218,7 +3222,7 @@ fn incremental_build_script_execution_got_new_mtime_and_cargo_check() { .with_stderr_data(str![[r#" [DIRTY] foo v0.0.1 ([ROOT]/foo): the file `touch-me` has changed ([TIME_DIFF_AFTER_LAST_BUILD]) [COMPILING] foo v0.0.1 ([ROOT]/foo) -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` [RUNNING] `rustc --crate-name foo [..]` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s diff --git a/tests/testsuite/freshness_checksum.rs b/tests/testsuite/freshness_checksum.rs index eedc1f43de9..f6144314c1e 100644 --- a/tests/testsuite/freshness_checksum.rs +++ b/tests/testsuite/freshness_checksum.rs @@ -181,11 +181,14 @@ fn binary_depinfo_correctly_encoded() { assert_deps_contains( &p, - &format!("target/{}/debug/.fingerprint/foo-*/dep-bin-foo", host), + &format!("target/{}/debug/build/foo/*/fingerprint/dep-bin-foo", host), &[ (0, "src/main.rs"), - (1, &format!("{}/debug/deps/libbar-*.rlib", host)), - (1, &format!("{}/debug/deps/libregdep-*.rlib", host)), + (1, &format!("{}/debug/build/bar/*/deps/libbar-*.rlib", host)), + ( + 1, + &format!("{}/debug/build/regdep/*/deps/libregdep-*.rlib", host), + ), ], ); @@ -432,7 +435,7 @@ fn changing_profiles_caches_targets() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/debug/deps/foo-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) [DOCTEST] foo "#]]) @@ -452,7 +455,7 @@ fn changing_profiles_caches_targets() { .masquerade_as_nightly_cargo(&["checksum-freshness"]) .with_stderr_data(str![[r#" [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/debug/deps/foo-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) "#]]) .run(); @@ -787,7 +790,7 @@ fn rebuild_tests_if_lib_changes() { [COMPILING] foo v0.0.1 ([ROOT]/foo) [RUNNING] `rustc --crate-name foo_test [..]` [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] `[ROOT]/foo/target/debug/deps/foo_test-[HASH][EXE]` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/deps/foo_test-[HASH]` "#]]) .run(); @@ -855,8 +858,8 @@ fn no_rebuild_transitive_target_deps() { [COMPILING] b v0.0.1 ([ROOT]/foo/b) [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[EXECUTABLE] unittests src/lib.rs (target/debug/deps/foo-[HASH][EXE]) -[EXECUTABLE] tests/foo.rs (target/debug/deps/foo-[HASH][EXE]) +[EXECUTABLE] unittests src/lib.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) +[EXECUTABLE] tests/foo.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) "#]]) .run(); @@ -1434,7 +1437,7 @@ fn reuse_workspace_lib() { [COMPILING] baz v0.1.1 ([ROOT]/foo/baz) [RUNNING] `rustc --crate-name baz [..] [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[EXECUTABLE] `[ROOT]/foo/target/debug/deps/baz-[HASH][EXE]` +[EXECUTABLE] `[ROOT]/foo/target/debug/build/baz/[HASH]/deps/baz-[HASH]` "#]]) .run(); @@ -1612,10 +1615,10 @@ fn reuse_panic_build_dep_test() { [RUNNING] `rustc --crate-name bar [..] [COMPILING] foo v0.0.1 ([ROOT]/foo) [RUNNING] `rustc --crate-name build_script_build [..] -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` [RUNNING] `rustc --crate-name foo [..] src/lib.rs [..]--test[..] [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[EXECUTABLE] `[ROOT]/foo/target/debug/deps/foo-[HASH][EXE]` +[EXECUTABLE] `[ROOT]/foo/target/debug/build/foo/[HASH]/deps/foo-[HASH]` "#]]) .run(); @@ -2045,7 +2048,11 @@ fn edition_change_invalidates() { "#]]) .run(); - assert_eq!(p.glob("target/debug/deps/libfoo-*.rlib").count(), 1); + assert_eq!( + p.glob("target/debug/build/foo/*/deps/libfoo-*.rlib") + .count(), + 1 + ); } #[cargo_test(nightly, reason = "requires -Zchecksum-hash-algorithm")] @@ -2223,7 +2230,7 @@ fn rerun_if_changes() { .with_stderr_data(str![[r#" [DIRTY] foo v0.0.1 ([ROOT]/foo): the env variable FOO changed [COMPILING] foo v0.0.1 ([ROOT]/foo) -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` [RUNNING] `rustc [..] [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -2245,7 +2252,7 @@ fn rerun_if_changes() { .with_stderr_data(str![[r#" [DIRTY] foo v0.0.1 ([ROOT]/foo): the env variable BAR changed [COMPILING] foo v0.0.1 ([ROOT]/foo) -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` [RUNNING] `rustc [..] [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -2267,7 +2274,7 @@ fn rerun_if_changes() { .with_stderr_data(str![[r#" [DIRTY] foo v0.0.1 ([ROOT]/foo): the env variable FOO changed [COMPILING] foo v0.0.1 ([ROOT]/foo) -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` [RUNNING] `rustc [..] [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -2588,7 +2595,7 @@ fn linking_interrupted() { [RUNNING] `rustc --crate-name foo [..] [RUNNING] `rustc --crate-name t1 [..] [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] `[ROOT]/foo/target/debug/deps/t1-[HASH][EXE]` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/deps/t1-[HASH]` "#]]) .run(); @@ -2995,7 +3002,7 @@ fn incremental_build_script_execution_got_new_mtime_and_cargo_check() { .with_stderr_data(str![[r#" [DIRTY] foo v0.0.1 ([ROOT]/foo): the file `touch-me` has changed ([TIME_DIFF_AFTER_LAST_BUILD]) [COMPILING] foo v0.0.1 ([ROOT]/foo) -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` [RUNNING] `rustc --crate-name foo [..]` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s diff --git a/tests/testsuite/git.rs b/tests/testsuite/git.rs index 502a709d530..79b6720b2e5 100644 --- a/tests/testsuite/git.rs +++ b/tests/testsuite/git.rs @@ -1641,7 +1641,7 @@ fn dev_deps_with_testing() { [COMPILING] bar v0.5.0 ([ROOTURL]/bar#[..]) [COMPILING] foo v0.5.0 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/main.rs (target/debug/deps/foo-[HASH][EXE]) +[RUNNING] unittests src/main.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -2726,7 +2726,7 @@ fn include_overrides_gitignore() { .with_stderr_data(str![[r#" [DIRTY] foo v0.5.0 ([ROOT]/foo): the precalculated components changed [COMPILING] foo v0.5.0 ([ROOT]/foo) -[RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` [RUNNING] `rustc --crate-name foo --edition=2015 src/lib.rs [..] [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s diff --git a/tests/testsuite/glob_targets.rs b/tests/testsuite/glob_targets.rs index 4166f2f3478..d27f7f20cd5 100644 --- a/tests/testsuite/glob_targets.rs +++ b/tests/testsuite/glob_targets.rs @@ -231,7 +231,7 @@ fn test_bin() { [COMPILING] foo v0.0.1 ([ROOT]/foo) [RUNNING] `rustc --crate-name bin1 [..]` [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] `[ROOT]/foo/target/debug/deps/bin1-[HASH][EXE]` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/deps/bin1-[HASH]` "#]]) .run(); @@ -249,7 +249,7 @@ fn test_bench() { [RUNNING] `rustc --crate-name bench1 [..]` [RUNNING] `rustc --crate-name bin1 [..]` [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] `[ROOT]/foo/target/debug/deps/bench1-[HASH][EXE]` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/deps/bench1-[HASH]` "#]] .unordered(), @@ -269,7 +269,7 @@ fn test_test() { [RUNNING] `rustc --crate-name foo [..]` [RUNNING] `rustc --crate-name bin2 [..]` [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] `[ROOT]/foo/target/debug/deps/test1-[HASH][EXE]` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/deps/test1-[HASH]` "#]] .unordered(), @@ -299,7 +299,7 @@ fn bench_bin() { [COMPILING] foo v0.0.1 ([ROOT]/foo) [RUNNING] `rustc --crate-name bin1 [..]` [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] `[ROOT]/foo/target/release/deps/bin1-[HASH][EXE] --bench` +[RUNNING] `[ROOT]/foo/target/release/build/foo/[HASH]/deps/bin1-[HASH] --bench` "#]]) .run(); @@ -317,7 +317,7 @@ fn bench_bench() { [RUNNING] `rustc --crate-name foo [..]` [RUNNING] `rustc --crate-name bench1 [..]` [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] `[ROOT]/foo/target/release/deps/bench1-[HASH][EXE] --bench` +[RUNNING] `[ROOT]/foo/target/release/build/foo/[HASH]/deps/bench1-[HASH] --bench` "#]] .unordered(), @@ -337,7 +337,7 @@ fn bench_test() { [RUNNING] `rustc --crate-name test1 [..]` [RUNNING] `rustc --crate-name bin1 [..]` [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] `[ROOT]/foo/target/release/deps/test1-[HASH][EXE] --bench` +[RUNNING] `[ROOT]/foo/target/release/build/foo/[HASH]/deps/test1-[HASH] --bench` "#]] .unordered(), diff --git a/tests/testsuite/install.rs b/tests/testsuite/install.rs index 5791b9aa9b8..e197f71a02f 100644 --- a/tests/testsuite/install.rs +++ b/tests/testsuite/install.rs @@ -2580,7 +2580,7 @@ To reuse those artifacts with a future compilation, set the environment variable let end = stderr.find('.').unwrap() - 1; let path = Path::new(&stderr[..end]); assert!(path.exists()); - assert!(path.join("release/deps").exists()); + assert!(path.join("release/build").exists()); } #[cargo_test] diff --git a/tests/testsuite/jobserver.rs b/tests/testsuite/jobserver.rs index f66c017404f..73510db1c9e 100644 --- a/tests/testsuite/jobserver.rs +++ b/tests/testsuite/jobserver.rs @@ -220,7 +220,7 @@ this is a runner .arg("-j2") .with_stderr_data(str![[r#" [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/debug/deps/cargo_jobserver_check-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/debug/build/cargo-jobserver-check/[HASH]/deps/cargo_jobserver_check-[HASH]) this is a runner "#]]) @@ -264,7 +264,7 @@ this is a runner .with_status(101) .with_stderr_data(str![[r#" [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/debug/deps/cargo_jobserver_check-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/debug/build/cargo-jobserver-check/[HASH]/deps/cargo_jobserver_check-[HASH]) this is a runner ... diff --git a/tests/testsuite/lto.rs b/tests/testsuite/lto.rs index 072de9cc083..928c7211e61 100644 --- a/tests/testsuite/lto.rs +++ b/tests/testsuite/lto.rs @@ -80,9 +80,9 @@ fn shared_deps() { [RUNNING] `rustc --crate-name bar [..]-C embed-bitcode=no [..]` [COMPILING] test v0.0.0 ([ROOT]/foo) [RUNNING] `rustc --crate-name build_script_build [..]` -[RUNNING] `[ROOT]/foo/target/release/build/test-[HASH]/build-script-build` [RUNNING] `rustc --crate-name test [..]-C lto [..]` [FINISHED] `release` profile [optimized] target(s) in [ELAPSED]s +[RUNNING] `[ROOT]/foo/target/release/build/test/[HASH]/build-script/build-script-build` "#]] .unordered(), @@ -123,7 +123,7 @@ fn build_dep_not_ltod() { [RUNNING] `rustc --crate-name bar [..]-C embed-bitcode=no [..]` [COMPILING] test v0.0.0 ([ROOT]/foo) [RUNNING] `rustc --crate-name build_script_build [..]` -[RUNNING] `[ROOT]/foo/target/release/build/test-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/release/build/test/[HASH]/build-script/build-script-build` [RUNNING] `rustc --crate-name test [..]-C lto [..]` [FINISHED] `release` profile [optimized] target(s) in [ELAPSED]s @@ -375,9 +375,9 @@ fn test_all() { [RUNNING] `rustc --crate-name foo [..]-C lto [..]--test [..]` [RUNNING] `rustc --crate-name foo [..]--crate-type bin [..]-C lto [..]` [FINISHED] `release` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] `[ROOT]/foo/target/release/deps/foo-[HASH][EXE]` -[RUNNING] `[ROOT]/foo/target/release/deps/a-[HASH][EXE]` -[RUNNING] `[ROOT]/foo/target/release/deps/b-[HASH][EXE]` +[RUNNING] `[ROOT]/foo/target/release/build/foo/[HASH]/deps/foo-[HASH]` +[RUNNING] `[ROOT]/foo/target/release/build/foo/[HASH]/deps/a-[HASH]` +[RUNNING] `[ROOT]/foo/target/release/build/foo/[HASH]/deps/b-[HASH]` "#]] .unordered(), @@ -415,9 +415,9 @@ fn test_all_and_bench() { [RUNNING] `rustc --crate-name foo [..]-C lto [..]--test [..]` [RUNNING] `rustc --crate-name foo [..]--crate-type bin [..]-C lto [..]` [FINISHED] `release` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] `[ROOT]/foo/target/release/deps/foo-[HASH][EXE]` -[RUNNING] `[ROOT]/foo/target/release/deps/a-[HASH][EXE]` -[RUNNING] `[ROOT]/foo/target/release/deps/b-[HASH][EXE]` +[RUNNING] `[ROOT]/foo/target/release/build/foo/[HASH]/deps/foo-[HASH]` +[RUNNING] `[ROOT]/foo/target/release/build/foo/[HASH]/deps/a-[HASH]` +[RUNNING] `[ROOT]/foo/target/release/build/foo/[HASH]/deps/b-[HASH]` "#]] .unordered(), @@ -587,8 +587,8 @@ fn cdylib_and_rlib() { [RUNNING] `rustc --crate-name foo [..]-C lto [..]--test [..]` [RUNNING] `rustc --crate-name a [..]-C lto [..]--test [..]` [FINISHED] `release` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] `[ROOT]/foo/target/release/deps/foo-[HASH][EXE]` -[RUNNING] `[ROOT]/foo/target/release/deps/a-[HASH][EXE]` +[RUNNING] `[ROOT]/foo/target/release/build/foo/[HASH]/deps/foo-[HASH]` +[RUNNING] `[ROOT]/foo/target/release/build/foo/[HASH]/deps/a-[HASH]` "#]] .unordered(), @@ -614,10 +614,10 @@ fn cdylib_and_rlib() { [RUNNING] `rustc --crate-name bar [..]-C lto [..]--test [..]` [RUNNING] `rustc --crate-name b [..]-C lto [..]--test [..]` [FINISHED] `release` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] `[ROOT]/foo/target/release/deps/bar-[HASH][EXE]` -[RUNNING] `[ROOT]/foo/target/release/deps/b-[HASH][EXE]` [DOCTEST] bar [RUNNING] `rustdoc --edition=2015 --crate-type cdylib --crate-type rlib --color auto --crate-name bar --test [..]-C lto [..] +[RUNNING] `[ROOT]/foo/target/release/build/bar/[HASH]/deps/bar-[HASH]` +[RUNNING] `[ROOT]/foo/target/release/build/bar/[HASH]/deps/b-[HASH]` "#]].unordered()) .run(); @@ -654,8 +654,8 @@ fn dylib() { [RUNNING] `rustc --crate-name foo [..]-C lto [..]--test [..]` [RUNNING] `rustc --crate-name a [..]-C lto [..]--test [..]` [FINISHED] `release` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] `[ROOT]/foo/target/release/deps/foo-[HASH][EXE]` -[RUNNING] `[ROOT]/foo/target/release/deps/a-[HASH][EXE]` +[RUNNING] `[ROOT]/foo/target/release/build/foo/[HASH]/deps/foo-[HASH]` +[RUNNING] `[ROOT]/foo/target/release/build/foo/[HASH]/deps/a-[HASH]` "#]] .unordered(), @@ -698,8 +698,8 @@ fn dylib() { [RUNNING] `rustc --crate-name bar [..]-C lto [..]--test [..]` [RUNNING] `rustc --crate-name b [..]-C lto [..]--test [..]` [FINISHED] `release` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] `[ROOT]/foo/target/release/deps/bar-[HASH][EXE]` -[RUNNING] `[ROOT]/foo/target/release/deps/b-[HASH][EXE]` +[RUNNING] `[ROOT]/foo/target/release/build/bar/[HASH]/deps/bar-[HASH]` +[RUNNING] `[ROOT]/foo/target/release/build/bar/[HASH]/deps/b-[HASH]` "#]] .unordered(), @@ -758,9 +758,9 @@ fn test_profile() { [RUNNING] `rustc --crate-name foo [..]--crate-type lib --emit=dep-info,metadata,link -C linker-plugin-lto [..]` [RUNNING] `rustc --crate-name foo [..]--emit=dep-info,link -C lto=thin [..]--test [..]` [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] `[ROOT]/foo/target/debug/deps/foo-[HASH][EXE]` [DOCTEST] foo [RUNNING] `rustdoc [..] +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/deps/foo-[HASH]` "#]].unordered()) .run(); @@ -916,9 +916,9 @@ fn fresh_swapping_commands() { [COMPILING] foo v0.1.0 ([ROOT]/foo) [RUNNING] `rustc --crate-name foo --edition=2015 src/lib.rs [..]-C lto [..]--test [..]` [FINISHED] `release` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] `[ROOT]/foo/target/release/deps/foo-[HASH][EXE]` [DOCTEST] foo [RUNNING] `rustdoc [..]-C lto [..]` +[RUNNING] `[ROOT]/foo/target/release/build/foo/[HASH]/deps/foo-[HASH]` "#]] .unordered(), @@ -938,7 +938,7 @@ fn fresh_swapping_commands() { [FRESH] bar v1.0.0 [FRESH] foo v0.1.0 ([ROOT]/foo) [FINISHED] `release` profile [optimized] target(s) in [ELAPSED]s -[EXECUTABLE] `[ROOT]/foo/target/release/deps/foo-[HASH][EXE]` +[EXECUTABLE] `[ROOT]/foo/target/release/build/foo/[HASH]/deps/foo-[HASH]` "#]]) .run(); diff --git a/tests/testsuite/messages.rs b/tests/testsuite/messages.rs index 60a265cfcfe..b3ac40dd663 100644 --- a/tests/testsuite/messages.rs +++ b/tests/testsuite/messages.rs @@ -73,7 +73,7 @@ fn deduplicate_messages_basic() { [WARNING] `foo` (lib) generated 1 warning[..] [WARNING] `foo` (lib test) generated 1 warning (1 duplicate) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[EXECUTABLE] unittests src/lib.rs (target/debug/deps/foo-[HASH][EXE]) +[EXECUTABLE] unittests src/lib.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH][EXE]) ", rustc_message ); @@ -122,7 +122,7 @@ fn deduplicate_messages_mismatched_warnings() { {}\ [WARNING] `foo` (lib test) generated 2 warnings (1 duplicate) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[EXECUTABLE] unittests src/lib.rs (target/debug/deps/foo-[HASH][EXE]) +[EXECUTABLE] unittests src/lib.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH][EXE]) ", lib_output, lib_test_output ); diff --git a/tests/testsuite/metabuild.rs b/tests/testsuite/metabuild.rs index 3af8eff4163..17251b58fa5 100644 --- a/tests/testsuite/metabuild.rs +++ b/tests/testsuite/metabuild.rs @@ -649,7 +649,7 @@ fn metabuild_json_artifact() { "env": [], "linked_libs": [], "linked_paths": [], - "out_dir": "[ROOT]/foo/target/debug/build/foo-[HASH]/out", + "out_dir": "[ROOT]/foo/target/debug/build/foo/[HASH]/build-script-execution/out", "package_id": "path+[ROOTURL]/foo#0.0.1", "reason": "build-script-executed" }, diff --git a/tests/testsuite/multitarget.rs b/tests/testsuite/multitarget.rs index 9b4a91dd151..7e805350242 100644 --- a/tests/testsuite/multitarget.rs +++ b/tests/testsuite/multitarget.rs @@ -75,8 +75,6 @@ fn simple_test() { .arg(&t2) .with_stderr_data( str![[r#" -[RUNNING] unittests src/lib.rs (target/[ALT_TARGET]/debug/deps/foo-[HASH][EXE]) -[RUNNING] unittests src/lib.rs (target/[HOST_TARGET]/debug/deps/foo-[HASH][EXE]) ... "#]] diff --git a/tests/testsuite/path.rs b/tests/testsuite/path.rs index 118c55409fc..1a25b6b14c2 100644 --- a/tests/testsuite/path.rs +++ b/tests/testsuite/path.rs @@ -211,7 +211,7 @@ fn cargo_compile_with_root_dev_deps_with_testing() { [COMPILING] bar v0.5.0 ([ROOT]/bar) [COMPILING] foo v0.5.0 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/main.rs (target/debug/deps/foo-[HASH][EXE]) +[RUNNING] unittests src/main.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -1466,7 +1466,7 @@ fn dev_deps_no_rebuild_lib() { [COMPILING] bar v0.5.0 ([ROOT]/foo/bar) [COMPILING] foo v0.5.0 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/debug/deps/foo-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) "#]]) .with_stdout_data(str![[r#" diff --git a/tests/testsuite/proc_macro.rs b/tests/testsuite/proc_macro.rs index ab754459c32..56c0bbc6920 100644 --- a/tests/testsuite/proc_macro.rs +++ b/tests/testsuite/proc_macro.rs @@ -559,9 +559,9 @@ fn proc_macro_built_once() { [RUNNING] `rustc --crate-name b [..]` [COMPILING] a v0.1.0 ([ROOT]/foo/a) [RUNNING] `rustc --crate-name build_script_build [..]` -[RUNNING] `[ROOT]/foo/target/debug/build/a-[HASH]/build-script-build` [RUNNING] `rustc --crate-name a [..]` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s +[RUNNING] `[ROOT]/foo/target/debug/build/a/[HASH]/build-script/build-script-build` "#]] .unordered(), diff --git a/tests/testsuite/profile_config.rs b/tests/testsuite/profile_config.rs index f9c4f0dd0ef..180d4e2fe5e 100644 --- a/tests/testsuite/profile_config.rs +++ b/tests/testsuite/profile_config.rs @@ -262,7 +262,7 @@ fn profile_config_all_options() { .env_remove("CARGO_INCREMENTAL") .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) -[RUNNING] `rustc --crate-name foo [..] -C opt-level=1 -C panic=abort -C lto[..]-C codegen-units=2 -C debuginfo=2 [..]-C debug-assertions=on -C overflow-checks=off [..]-C rpath --out-dir [ROOT]/foo/target/release/deps -C incremental=[ROOT]/foo/target/release/incremental[..]` +[RUNNING] `rustc --crate-name foo --edition=2015 src/main.rs --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --crate-type bin --emit=dep-info,link -C opt-level=1 -C panic=abort -C lto -C codegen-units=2 -C debuginfo=2 -C debug-assertions=on -C overflow-checks=off --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values())' -C metadata=10f9e92ac323988c -C extra-filename=-dd29b71f8d9a0013 -C rpath --out-dir [ROOT]/foo/target/release/build/foo/[HASH]/deps -C incremental=[ROOT]/foo/target/release/incremental -L dependency=[ROOT]/foo/target/release/build/foo/[HASH]/deps` [FINISHED] `release` profile [optimized + debuginfo] target(s) in [ELAPSED]s "#]]) @@ -517,7 +517,7 @@ fn test_with_dev_profile() { [COMPILING] foo v0.1.0 ([ROOT]/foo) [RUNNING] `rustc --crate-name foo [..]` [FINISHED] `test` profile [unoptimized] target(s) in [ELAPSED]s -[EXECUTABLE] `[ROOT]/foo/target/debug/deps/foo-[HASH][EXE]` +[EXECUTABLE] `[ROOT]/foo/target/debug/build/foo/[HASH]/deps/foo-[HASH]` "#]]) .with_stdout_does_not_contain("[..] -C debuginfo=0[..]") diff --git a/tests/testsuite/profile_overrides.rs b/tests/testsuite/profile_overrides.rs index 650d040d7d7..ede9f93dee4 100644 --- a/tests/testsuite/profile_overrides.rs +++ b/tests/testsuite/profile_overrides.rs @@ -235,12 +235,12 @@ fn profile_override_hierarchy() { [RUNNING] `rustc --crate-name build_script_build --edition=2015 m1/build.rs [..] --crate-type bin --emit=[..]link[..]-C codegen-units=4 [..]` [COMPILING] m2 v0.0.1 ([ROOT]/foo/m2) [RUNNING] `rustc --crate-name build_script_build --edition=2015 m2/build.rs [..] --crate-type bin --emit=[..]link[..]-C codegen-units=2 [..]` -[RUNNING] `[ROOT]/foo/target/debug/build/m1-[HASH]/build-script-build` -[RUNNING] `[ROOT]/foo/target/debug/build/m2-[HASH]/build-script-build` [RUNNING] `rustc --crate-name m2 --edition=2015 m2/src/lib.rs [..] --crate-type lib --emit=[..]link[..]-C codegen-units=2 [..]` [COMPILING] m1 v0.0.1 ([ROOT]/foo/m1) [RUNNING] `rustc --crate-name m1 --edition=2015 m1/src/lib.rs [..] --crate-type lib --emit=[..]link[..]-C codegen-units=1 [..]` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s +[RUNNING] `[ROOT]/foo/target/debug/build/m2/[HASH]/build-script/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/m1/[HASH]/build-script/build-script-build` "#]].unordered()) .run(); diff --git a/tests/testsuite/profile_targets.rs b/tests/testsuite/profile_targets.rs index bac4504a614..448b9245515 100644 --- a/tests/testsuite/profile_targets.rs +++ b/tests/testsuite/profile_targets.rs @@ -97,11 +97,11 @@ fn profile_selection_build() { [RUNNING] `[..] rustc --crate-name bdep --edition=2015 bdep/src/lib.rs [..]--crate-type lib --emit=[..]link[..]-C codegen-units=5 [..] [COMPILING] foo v0.0.1 ([ROOT]/foo) [RUNNING] `[..] rustc --crate-name build_script_build --edition=2015 build.rs [..]--crate-type bin --emit=[..]link[..]-C codegen-units=5 [..] -[RUNNING] `[..][ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` [foo 0.0.1] foo custom build PROFILE=debug DEBUG=true OPT_LEVEL=0 [RUNNING] `[..] rustc --crate-name foo --edition=2015 src/lib.rs [..]--crate-type lib --emit=[..]link -C panic=abort[..]-C codegen-units=1 -C debuginfo=2 [..] [RUNNING] `[..] rustc --crate-name foo --edition=2015 src/main.rs [..]--crate-type bin --emit=[..]link -C panic=abort[..]-C codegen-units=1 -C debuginfo=2 [..] [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s +[RUNNING] `CARGO=/home/epage/src/personal/cargo/target/debug/cargo CARGO_CFG_DEBUG_ASSERTIONS='' CARGO_CFG_FEATURE='' CARGO_CFG_FMT_DEBUG=full CARGO_CFG_OVERFLOW_CHECKS='' CARGO_CFG_PANIC=unwind CARGO_CFG_RELOCATION_MODEL=pic CARGO_CFG_TARGET_ABI='' CARGO_CFG_TARGET_ARCH=x86_64 CARGO_CFG_TARGET_ENDIAN=little CARGO_CFG_TARGET_ENV=gnu CARGO_CFG_TARGET_FAMILY=unix CARGO_CFG_TARGET_FEATURE=fxsr,sse,sse2,x87 CARGO_CFG_TARGET_HAS_ATOMIC=16,32,64,8,ptr CARGO_CFG_TARGET_HAS_ATOMIC_EQUAL_ALIGNMENT=16,32,64,8,ptr CARGO_CFG_TARGET_HAS_ATOMIC_LOAD_STORE=16,32,64,8,ptr CARGO_CFG_TARGET_HAS_RELIABLE_F128='' CARGO_CFG_TARGET_HAS_RELIABLE_F16='' CARGO_CFG_TARGET_HAS_RELIABLE_F16_MATH='' CARGO_CFG_TARGET_OS=linux CARGO_CFG_TARGET_POINTER_WIDTH=64 CARGO_CFG_TARGET_THREAD_LOCAL='' CARGO_CFG_TARGET_VENDOR=unknown CARGO_CFG_UB_CHECKS='' CARGO_CFG_UNIX='' CARGO_ENCODED_RUSTFLAGS='' CARGO_MANIFEST_DIR=[ROOT]/foo CARGO_MANIFEST_PATH=[ROOT]/foo/Cargo.toml CARGO_PKG_AUTHORS='' CARGO_PKG_DESCRIPTION='' CARGO_PKG_HOMEPAGE='' CARGO_PKG_LICENSE='' CARGO_PKG_LICENSE_FILE='' CARGO_PKG_NAME=foo CARGO_PKG_README='' CARGO_PKG_REPOSITORY='' CARGO_PKG_RUST_VERSION='' CARGO_PKG_VERSION=0.0.1 CARGO_PKG_VERSION_MAJOR=0 CARGO_PKG_VERSION_MINOR=0 CARGO_PKG_VERSION_PATCH=1 CARGO_PKG_VERSION_PRE='' DEBUG=true HOST=[HOST_TARGET] LD_LIBRARY_PATH='[ROOT]/foo/target/debug:[ROOT]/foo/target/debug/build/bar/[HASH]/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/src/personal/cargo/target/debug:/home/epage/.cargo/build/[HASH]/debug/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib' NUM_JOBS=20 OPT_LEVEL=0 OUT_DIR=[ROOT]/foo/target/debug/build/foo/[HASH]/build-script-execution/out PROFILE=debug RUSTC=rustc RUSTDOC=rustdoc TARGET=[HOST_TARGET] [ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` "#]].unordered()) .with_stderr_does_not_contain("[..] -C debuginfo=0[..]") @@ -135,11 +135,11 @@ fn profile_selection_build_release() { [RUNNING] `[..] rustc --crate-name bdep --edition=2015 bdep/src/lib.rs [..]--crate-type lib --emit=[..]link[..]-C codegen-units=6 [..] [COMPILING] foo v0.0.1 ([ROOT]/foo) [RUNNING] `[..] rustc --crate-name build_script_build --edition=2015 build.rs [..]--crate-type bin --emit=[..]link[..]-C codegen-units=6 [..] -[RUNNING] `[..][ROOT]/foo/target/release/build/foo-[HASH]/build-script-build` [foo 0.0.1] foo custom build PROFILE=release DEBUG=false OPT_LEVEL=3 [RUNNING] `[..] rustc --crate-name foo --edition=2015 src/lib.rs [..]--crate-type lib --emit=[..]link -C opt-level=3 -C panic=abort[..]-C codegen-units=2 [..] [RUNNING] `[..] rustc --crate-name foo --edition=2015 src/main.rs [..]--crate-type bin --emit=[..]link -C opt-level=3 -C panic=abort[..]-C codegen-units=2 [..] [FINISHED] `release` profile [optimized] target(s) in [ELAPSED]s +[RUNNING] `CARGO=/home/epage/src/personal/cargo/target/debug/cargo CARGO_CFG_FEATURE='' CARGO_CFG_FMT_DEBUG=full CARGO_CFG_OVERFLOW_CHECKS='' CARGO_CFG_PANIC=unwind CARGO_CFG_RELOCATION_MODEL=pic CARGO_CFG_TARGET_ABI='' CARGO_CFG_TARGET_ARCH=x86_64 CARGO_CFG_TARGET_ENDIAN=little CARGO_CFG_TARGET_ENV=gnu CARGO_CFG_TARGET_FAMILY=unix CARGO_CFG_TARGET_FEATURE=fxsr,sse,sse2,x87 CARGO_CFG_TARGET_HAS_ATOMIC=16,32,64,8,ptr CARGO_CFG_TARGET_HAS_ATOMIC_EQUAL_ALIGNMENT=16,32,64,8,ptr CARGO_CFG_TARGET_HAS_ATOMIC_LOAD_STORE=16,32,64,8,ptr CARGO_CFG_TARGET_HAS_RELIABLE_F128='' CARGO_CFG_TARGET_HAS_RELIABLE_F16='' CARGO_CFG_TARGET_HAS_RELIABLE_F16_MATH='' CARGO_CFG_TARGET_OS=linux CARGO_CFG_TARGET_POINTER_WIDTH=64 CARGO_CFG_TARGET_THREAD_LOCAL='' CARGO_CFG_TARGET_VENDOR=unknown CARGO_CFG_UB_CHECKS='' CARGO_CFG_UNIX='' CARGO_ENCODED_RUSTFLAGS='' CARGO_MANIFEST_DIR=[ROOT]/foo CARGO_MANIFEST_PATH=[ROOT]/foo/Cargo.toml CARGO_PKG_AUTHORS='' CARGO_PKG_DESCRIPTION='' CARGO_PKG_HOMEPAGE='' CARGO_PKG_LICENSE='' CARGO_PKG_LICENSE_FILE='' CARGO_PKG_NAME=foo CARGO_PKG_README='' CARGO_PKG_REPOSITORY='' CARGO_PKG_RUST_VERSION='' CARGO_PKG_VERSION=0.0.1 CARGO_PKG_VERSION_MAJOR=0 CARGO_PKG_VERSION_MINOR=0 CARGO_PKG_VERSION_PATCH=1 CARGO_PKG_VERSION_PRE='' DEBUG=false HOST=[HOST_TARGET] LD_LIBRARY_PATH='[ROOT]/foo/target/release:[ROOT]/foo/target/release/build/bdep/[HASH]/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/src/personal/cargo/target/debug:/home/epage/.cargo/build/[HASH]/debug/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib' NUM_JOBS=20 OPT_LEVEL=3 OUT_DIR=[ROOT]/foo/target/release/build/foo/[HASH]/build-script-execution/out PROFILE=release RUSTC=rustc RUSTDOC=rustdoc TARGET=[HOST_TARGET] [ROOT]/foo/target/release/build/foo/[HASH]/build-script/build-script-build` "#]].unordered()) .run(); @@ -201,7 +201,6 @@ fn profile_selection_build_all_targets() { [RUNNING] `[..] rustc --crate-name bdep --edition=2015 bdep/src/lib.rs [..]--crate-type lib --emit=[..]link[..]-C codegen-units=5 [..]` [COMPILING] foo v0.0.1 ([ROOT]/foo) [RUNNING] `[..] rustc --crate-name build_script_build --edition=2015 build.rs [..]--crate-type bin --emit=[..]link[..]-C codegen-units=5 [..]` -[RUNNING] `[..][ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` [foo 0.0.1] foo custom build PROFILE=debug DEBUG=true OPT_LEVEL=0 [RUNNING] `[..] rustc --crate-name foo --edition=2015 src/lib.rs [..]--crate-type lib --emit=[..]link -C panic=abort[..]-C codegen-units=1 -C debuginfo=2 [..]` [RUNNING] `[..] rustc --crate-name foo --edition=2015 src/lib.rs [..]--emit=[..]link[..]-C codegen-units=1 -C debuginfo=2 [..]--test [..]` @@ -212,6 +211,7 @@ fn profile_selection_build_all_targets() { [RUNNING] `[..] rustc --crate-name foo --edition=2015 src/main.rs [..]--crate-type bin --emit=[..]link -C panic=abort[..]-C codegen-units=1 -C debuginfo=2 [..]` [RUNNING] `[..] rustc --crate-name ex1 --edition=2015 examples/ex1.rs [..]--crate-type bin --emit=[..]link -C panic=abort[..]-C codegen-units=1 -C debuginfo=2 [..]` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s +[RUNNING] `CARGO=/home/epage/src/personal/cargo/target/debug/cargo CARGO_CFG_DEBUG_ASSERTIONS='' CARGO_CFG_FEATURE='' CARGO_CFG_FMT_DEBUG=full CARGO_CFG_OVERFLOW_CHECKS='' CARGO_CFG_PANIC=unwind CARGO_CFG_RELOCATION_MODEL=pic CARGO_CFG_TARGET_ABI='' CARGO_CFG_TARGET_ARCH=x86_64 CARGO_CFG_TARGET_ENDIAN=little CARGO_CFG_TARGET_ENV=gnu CARGO_CFG_TARGET_FAMILY=unix CARGO_CFG_TARGET_FEATURE=fxsr,sse,sse2,x87 CARGO_CFG_TARGET_HAS_ATOMIC=16,32,64,8,ptr CARGO_CFG_TARGET_HAS_ATOMIC_EQUAL_ALIGNMENT=16,32,64,8,ptr CARGO_CFG_TARGET_HAS_ATOMIC_LOAD_STORE=16,32,64,8,ptr CARGO_CFG_TARGET_HAS_RELIABLE_F128='' CARGO_CFG_TARGET_HAS_RELIABLE_F16='' CARGO_CFG_TARGET_HAS_RELIABLE_F16_MATH='' CARGO_CFG_TARGET_OS=linux CARGO_CFG_TARGET_POINTER_WIDTH=64 CARGO_CFG_TARGET_THREAD_LOCAL='' CARGO_CFG_TARGET_VENDOR=unknown CARGO_CFG_UB_CHECKS='' CARGO_CFG_UNIX='' CARGO_ENCODED_RUSTFLAGS='' CARGO_MANIFEST_DIR=[ROOT]/foo CARGO_MANIFEST_PATH=[ROOT]/foo/Cargo.toml CARGO_PKG_AUTHORS='' CARGO_PKG_DESCRIPTION='' CARGO_PKG_HOMEPAGE='' CARGO_PKG_LICENSE='' CARGO_PKG_LICENSE_FILE='' CARGO_PKG_NAME=foo CARGO_PKG_README='' CARGO_PKG_REPOSITORY='' CARGO_PKG_RUST_VERSION='' CARGO_PKG_VERSION=0.0.1 CARGO_PKG_VERSION_MAJOR=0 CARGO_PKG_VERSION_MINOR=0 CARGO_PKG_VERSION_PATCH=1 CARGO_PKG_VERSION_PRE='' DEBUG=true HOST=[HOST_TARGET] LD_LIBRARY_PATH='[ROOT]/foo/target/debug:[ROOT]/foo/target/debug/build/foo/[HASH]/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/src/personal/cargo/target/debug:/home/epage/.cargo/build/[HASH]/debug/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib' NUM_JOBS=20 OPT_LEVEL=0 OUT_DIR=[ROOT]/foo/target/debug/build/foo/[HASH]/build-script-execution/out PROFILE=debug RUSTC=rustc RUSTDOC=rustdoc TARGET=[HOST_TARGET] [ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` "#]].unordered()) .with_stderr_does_not_contain("[..] -C debuginfo=0[..]") @@ -274,7 +274,6 @@ fn profile_selection_build_all_targets_release() { [RUNNING] `[..] rustc --crate-name bdep --edition=2015 bdep/src/lib.rs [..]--crate-type lib --emit=[..]link[..]-C codegen-units=6 [..]` [COMPILING] foo v0.0.1 ([ROOT]/foo) [RUNNING] `[..] rustc --crate-name build_script_build --edition=2015 build.rs [..]--crate-type bin --emit=[..]link[..]-C codegen-units=6 [..]` -[RUNNING] `[..][ROOT]/foo/target/release/build/foo-[HASH]/build-script-build` [foo 0.0.1] foo custom build PROFILE=release DEBUG=false OPT_LEVEL=3 [RUNNING] `[..] rustc --crate-name foo --edition=2015 src/lib.rs [..]--crate-type lib --emit=[..]link -C opt-level=3 -C panic=abort[..]-C codegen-units=2 [..]` [RUNNING] `[..] rustc --crate-name foo --edition=2015 src/lib.rs [..]--emit=[..]link -C opt-level=3[..]-C codegen-units=2 --test [..]` @@ -285,6 +284,7 @@ fn profile_selection_build_all_targets_release() { [RUNNING] `[..] rustc --crate-name foo --edition=2015 src/main.rs [..]--crate-type bin --emit=[..]link -C opt-level=3 -C panic=abort[..]-C codegen-units=2 [..]` [RUNNING] `[..] rustc --crate-name ex1 --edition=2015 examples/ex1.rs [..]--crate-type bin --emit=[..]link -C opt-level=3 -C panic=abort[..]-C codegen-units=2 [..]` [FINISHED] `release` profile [optimized] target(s) in [ELAPSED]s +[RUNNING] `CARGO=/home/epage/src/personal/cargo/target/debug/cargo CARGO_CFG_FEATURE='' CARGO_CFG_FMT_DEBUG=full CARGO_CFG_OVERFLOW_CHECKS='' CARGO_CFG_PANIC=unwind CARGO_CFG_RELOCATION_MODEL=pic CARGO_CFG_TARGET_ABI='' CARGO_CFG_TARGET_ARCH=x86_64 CARGO_CFG_TARGET_ENDIAN=little CARGO_CFG_TARGET_ENV=gnu CARGO_CFG_TARGET_FAMILY=unix CARGO_CFG_TARGET_FEATURE=fxsr,sse,sse2,x87 CARGO_CFG_TARGET_HAS_ATOMIC=16,32,64,8,ptr CARGO_CFG_TARGET_HAS_ATOMIC_EQUAL_ALIGNMENT=16,32,64,8,ptr CARGO_CFG_TARGET_HAS_ATOMIC_LOAD_STORE=16,32,64,8,ptr CARGO_CFG_TARGET_HAS_RELIABLE_F128='' CARGO_CFG_TARGET_HAS_RELIABLE_F16='' CARGO_CFG_TARGET_HAS_RELIABLE_F16_MATH='' CARGO_CFG_TARGET_OS=linux CARGO_CFG_TARGET_POINTER_WIDTH=64 CARGO_CFG_TARGET_THREAD_LOCAL='' CARGO_CFG_TARGET_VENDOR=unknown CARGO_CFG_UB_CHECKS='' CARGO_CFG_UNIX='' CARGO_ENCODED_RUSTFLAGS='' CARGO_MANIFEST_DIR=[ROOT]/foo CARGO_MANIFEST_PATH=[ROOT]/foo/Cargo.toml CARGO_PKG_AUTHORS='' CARGO_PKG_DESCRIPTION='' CARGO_PKG_HOMEPAGE='' CARGO_PKG_LICENSE='' CARGO_PKG_LICENSE_FILE='' CARGO_PKG_NAME=foo CARGO_PKG_README='' CARGO_PKG_REPOSITORY='' CARGO_PKG_RUST_VERSION='' CARGO_PKG_VERSION=0.0.1 CARGO_PKG_VERSION_MAJOR=0 CARGO_PKG_VERSION_MINOR=0 CARGO_PKG_VERSION_PATCH=1 CARGO_PKG_VERSION_PRE='' DEBUG=false HOST=[HOST_TARGET] LD_LIBRARY_PATH='[ROOT]/foo/target/release:[ROOT]/foo/target/release/build/foo/[HASH]/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/src/personal/cargo/target/debug:/home/epage/.cargo/build/[HASH]/debug/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib' NUM_JOBS=20 OPT_LEVEL=3 OUT_DIR=[ROOT]/foo/target/release/build/foo/[HASH]/build-script-execution/out PROFILE=release RUSTC=rustc RUSTDOC=rustdoc TARGET=[HOST_TARGET] [ROOT]/foo/target/release/build/foo/[HASH]/build-script/build-script-build` "#]].unordered()) .run(); @@ -337,7 +337,6 @@ fn profile_selection_test() { [RUNNING] `[..] rustc --crate-name bdep --edition=2015 bdep/src/lib.rs [..]--crate-type lib --emit=[..]link[..]-C codegen-units=5 [..]` [COMPILING] foo v0.0.1 ([ROOT]/foo) [RUNNING] `[..] rustc --crate-name build_script_build --edition=2015 build.rs [..]--crate-type bin --emit=[..]link[..]-C codegen-units=5 [..]` -[RUNNING] `[..][ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` [foo 0.0.1] foo custom build PROFILE=debug DEBUG=true OPT_LEVEL=0 [RUNNING] `[..] rustc --crate-name foo --edition=2015 src/lib.rs [..]--crate-type lib --emit=[..]link -C panic=abort[..]-C codegen-units=3 -C debuginfo=2 [..]` [RUNNING] `[..] rustc --crate-name foo --edition=2015 src/lib.rs [..]--crate-type lib --emit=[..]link[..]-C codegen-units=3 -C debuginfo=2 [..]` @@ -347,11 +346,12 @@ fn profile_selection_test() { [RUNNING] `[..] rustc --crate-name foo --edition=2015 src/main.rs [..]--emit=[..]link[..]-C codegen-units=3 -C debuginfo=2 [..]--test [..]` [RUNNING] `[..] rustc --crate-name foo --edition=2015 src/main.rs [..]--crate-type bin --emit=[..]link -C panic=abort[..]-C codegen-units=3 -C debuginfo=2 [..]` [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] `[..][ROOT]/foo/target/debug/deps/foo-[HASH][EXE]` -[RUNNING] `[..][ROOT]/foo/target/debug/deps/foo-[HASH][EXE]` -[RUNNING] `[..][ROOT]/foo/target/debug/deps/test1-[HASH][EXE]` [DOCTEST] foo [RUNNING] `[..] rustdoc [..]--test [..] +[RUNNING] `CARGO=/home/epage/src/personal/cargo/target/debug/cargo CARGO_CFG_DEBUG_ASSERTIONS='' CARGO_CFG_FEATURE='' CARGO_CFG_FMT_DEBUG=full CARGO_CFG_OVERFLOW_CHECKS='' CARGO_CFG_PANIC=unwind CARGO_CFG_RELOCATION_MODEL=pic CARGO_CFG_TARGET_ABI='' CARGO_CFG_TARGET_ARCH=x86_64 CARGO_CFG_TARGET_ENDIAN=little CARGO_CFG_TARGET_ENV=gnu CARGO_CFG_TARGET_FAMILY=unix CARGO_CFG_TARGET_FEATURE=fxsr,sse,sse2,x87 CARGO_CFG_TARGET_HAS_ATOMIC=16,32,64,8,ptr CARGO_CFG_TARGET_HAS_ATOMIC_EQUAL_ALIGNMENT=16,32,64,8,ptr CARGO_CFG_TARGET_HAS_ATOMIC_LOAD_STORE=16,32,64,8,ptr CARGO_CFG_TARGET_HAS_RELIABLE_F128='' CARGO_CFG_TARGET_HAS_RELIABLE_F16='' CARGO_CFG_TARGET_HAS_RELIABLE_F16_MATH='' CARGO_CFG_TARGET_OS=linux CARGO_CFG_TARGET_POINTER_WIDTH=64 CARGO_CFG_TARGET_THREAD_LOCAL='' CARGO_CFG_TARGET_VENDOR=unknown CARGO_CFG_UB_CHECKS='' CARGO_CFG_UNIX='' CARGO_ENCODED_RUSTFLAGS='' CARGO_MANIFEST_DIR=[ROOT]/foo CARGO_MANIFEST_PATH=[ROOT]/foo/Cargo.toml CARGO_PKG_AUTHORS='' CARGO_PKG_DESCRIPTION='' CARGO_PKG_HOMEPAGE='' CARGO_PKG_LICENSE='' CARGO_PKG_LICENSE_FILE='' CARGO_PKG_NAME=foo CARGO_PKG_README='' CARGO_PKG_REPOSITORY='' CARGO_PKG_RUST_VERSION='' CARGO_PKG_VERSION=0.0.1 CARGO_PKG_VERSION_MAJOR=0 CARGO_PKG_VERSION_MINOR=0 CARGO_PKG_VERSION_PATCH=1 CARGO_PKG_VERSION_PRE='' DEBUG=true HOST=[HOST_TARGET] LD_LIBRARY_PATH='[ROOT]/foo/target/debug:[ROOT]/foo/target/debug/build/foo/[HASH]/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/src/personal/cargo/target/debug:/home/epage/.cargo/build/[HASH]/debug/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib' NUM_JOBS=20 OPT_LEVEL=0 OUT_DIR=[ROOT]/foo/target/debug/build/foo/[HASH]/build-script-execution/out PROFILE=debug RUSTC=rustc RUSTDOC=rustdoc TARGET=[HOST_TARGET] [ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` +[RUNNING] `CARGO=/home/epage/src/personal/cargo/target/debug/cargo CARGO_MANIFEST_DIR=[ROOT]/foo CARGO_MANIFEST_PATH=[ROOT]/foo/Cargo.toml CARGO_PKG_AUTHORS='' CARGO_PKG_DESCRIPTION='' CARGO_PKG_HOMEPAGE='' CARGO_PKG_LICENSE='' CARGO_PKG_LICENSE_FILE='' CARGO_PKG_NAME=foo CARGO_PKG_README='' CARGO_PKG_REPOSITORY='' CARGO_PKG_RUST_VERSION='' CARGO_PKG_VERSION=0.0.1 CARGO_PKG_VERSION_MAJOR=0 CARGO_PKG_VERSION_MINOR=0 CARGO_PKG_VERSION_PATCH=1 CARGO_PKG_VERSION_PRE='' LD_LIBRARY_PATH='[ROOT]/foo/target/debug:[ROOT]/foo/target/debug/build/foo/[HASH]/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/src/personal/cargo/target/debug:/home/epage/.cargo/build/[HASH]/debug/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib' OUT_DIR=[ROOT]/foo/target/debug/build/foo/[HASH]/build-script-execution/out [ROOT]/foo/target/debug/build/foo/[HASH]/deps/foo-[HASH]` +[RUNNING] `CARGO=/home/epage/src/personal/cargo/target/debug/cargo CARGO_MANIFEST_DIR=[ROOT]/foo CARGO_MANIFEST_PATH=[ROOT]/foo/Cargo.toml CARGO_PKG_AUTHORS='' CARGO_PKG_DESCRIPTION='' CARGO_PKG_HOMEPAGE='' CARGO_PKG_LICENSE='' CARGO_PKG_LICENSE_FILE='' CARGO_PKG_NAME=foo CARGO_PKG_README='' CARGO_PKG_REPOSITORY='' CARGO_PKG_RUST_VERSION='' CARGO_PKG_VERSION=0.0.1 CARGO_PKG_VERSION_MAJOR=0 CARGO_PKG_VERSION_MINOR=0 CARGO_PKG_VERSION_PATCH=1 CARGO_PKG_VERSION_PRE='' LD_LIBRARY_PATH='[ROOT]/foo/target/debug:[ROOT]/foo/target/debug/build/foo/[HASH]/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/src/personal/cargo/target/debug:/home/epage/.cargo/build/[HASH]/debug/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib' OUT_DIR=[ROOT]/foo/target/debug/build/foo/[HASH]/build-script-execution/out [ROOT]/foo/target/debug/build/foo/[HASH]/deps/foo-[HASH]` +[RUNNING] `CARGO=/home/epage/src/personal/cargo/target/debug/cargo CARGO_MANIFEST_DIR=[ROOT]/foo CARGO_MANIFEST_PATH=[ROOT]/foo/Cargo.toml CARGO_PKG_AUTHORS='' CARGO_PKG_DESCRIPTION='' CARGO_PKG_HOMEPAGE='' CARGO_PKG_LICENSE='' CARGO_PKG_LICENSE_FILE='' CARGO_PKG_NAME=foo CARGO_PKG_README='' CARGO_PKG_REPOSITORY='' CARGO_PKG_RUST_VERSION='' CARGO_PKG_VERSION=0.0.1 CARGO_PKG_VERSION_MAJOR=0 CARGO_PKG_VERSION_MINOR=0 CARGO_PKG_VERSION_PATCH=1 CARGO_PKG_VERSION_PRE='' LD_LIBRARY_PATH='[ROOT]/foo/target/debug:[ROOT]/foo/target/debug/build/foo/[HASH]/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/src/personal/cargo/target/debug:/home/epage/.cargo/build/[HASH]/debug/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib' OUT_DIR=[ROOT]/foo/target/debug/build/foo/[HASH]/build-script-execution/out [ROOT]/foo/target/debug/build/foo/[HASH]/deps/test1-[HASH]` "#]].unordered()) .run(); @@ -362,11 +362,11 @@ fn profile_selection_test() { [FRESH] bar v0.0.1 ([ROOT]/foo/bar) [FRESH] foo v0.0.1 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] `[..][ROOT]/foo/target/debug/deps/foo-[HASH][EXE]` -[RUNNING] `[..][ROOT]/foo/target/debug/deps/foo-[HASH][EXE]` -[RUNNING] `[..][ROOT]/foo/target/debug/deps/test1-[HASH][EXE]` [DOCTEST] foo [RUNNING] `[..] rustdoc [..]--test [..] +[RUNNING] `CARGO=/home/epage/src/personal/cargo/target/debug/cargo CARGO_MANIFEST_DIR=[ROOT]/foo CARGO_MANIFEST_PATH=[ROOT]/foo/Cargo.toml CARGO_PKG_AUTHORS='' CARGO_PKG_DESCRIPTION='' CARGO_PKG_HOMEPAGE='' CARGO_PKG_LICENSE='' CARGO_PKG_LICENSE_FILE='' CARGO_PKG_NAME=foo CARGO_PKG_README='' CARGO_PKG_REPOSITORY='' CARGO_PKG_RUST_VERSION='' CARGO_PKG_VERSION=0.0.1 CARGO_PKG_VERSION_MAJOR=0 CARGO_PKG_VERSION_MINOR=0 CARGO_PKG_VERSION_PATCH=1 CARGO_PKG_VERSION_PRE='' LD_LIBRARY_PATH='[ROOT]/foo/target/debug:[ROOT]/foo/target/debug/build/foo/[HASH]/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/src/personal/cargo/target/debug:/home/epage/.cargo/build/[HASH]/debug/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib' OUT_DIR=[ROOT]/foo/target/debug/build/foo/[HASH]/build-script-execution/out [ROOT]/foo/target/debug/build/foo/[HASH]/deps/foo-[HASH]` +[RUNNING] `CARGO=/home/epage/src/personal/cargo/target/debug/cargo CARGO_MANIFEST_DIR=[ROOT]/foo CARGO_MANIFEST_PATH=[ROOT]/foo/Cargo.toml CARGO_PKG_AUTHORS='' CARGO_PKG_DESCRIPTION='' CARGO_PKG_HOMEPAGE='' CARGO_PKG_LICENSE='' CARGO_PKG_LICENSE_FILE='' CARGO_PKG_NAME=foo CARGO_PKG_README='' CARGO_PKG_REPOSITORY='' CARGO_PKG_RUST_VERSION='' CARGO_PKG_VERSION=0.0.1 CARGO_PKG_VERSION_MAJOR=0 CARGO_PKG_VERSION_MINOR=0 CARGO_PKG_VERSION_PATCH=1 CARGO_PKG_VERSION_PRE='' LD_LIBRARY_PATH='[ROOT]/foo/target/debug:[ROOT]/foo/target/debug/build/foo/[HASH]/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/src/personal/cargo/target/debug:/home/epage/.cargo/build/[HASH]/debug/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib' OUT_DIR=[ROOT]/foo/target/debug/build/foo/[HASH]/build-script-execution/out [ROOT]/foo/target/debug/build/foo/[HASH]/deps/foo-[HASH]` +[RUNNING] `CARGO=/home/epage/src/personal/cargo/target/debug/cargo CARGO_MANIFEST_DIR=[ROOT]/foo CARGO_MANIFEST_PATH=[ROOT]/foo/Cargo.toml CARGO_PKG_AUTHORS='' CARGO_PKG_DESCRIPTION='' CARGO_PKG_HOMEPAGE='' CARGO_PKG_LICENSE='' CARGO_PKG_LICENSE_FILE='' CARGO_PKG_NAME=foo CARGO_PKG_README='' CARGO_PKG_REPOSITORY='' CARGO_PKG_RUST_VERSION='' CARGO_PKG_VERSION=0.0.1 CARGO_PKG_VERSION_MAJOR=0 CARGO_PKG_VERSION_MINOR=0 CARGO_PKG_VERSION_PATCH=1 CARGO_PKG_VERSION_PRE='' LD_LIBRARY_PATH='[ROOT]/foo/target/debug:[ROOT]/foo/target/debug/build/foo/[HASH]/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/src/personal/cargo/target/debug:/home/epage/.cargo/build/[HASH]/debug/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib' OUT_DIR=[ROOT]/foo/target/debug/build/foo/[HASH]/build-script-execution/out [ROOT]/foo/target/debug/build/foo/[HASH]/deps/test1-[HASH]` "#]] .unordered(), @@ -410,7 +410,6 @@ fn profile_selection_test_release() { [RUNNING] `[..] rustc --crate-name bdep --edition=2015 bdep/src/lib.rs [..]--crate-type lib --emit=[..]link[..]-C codegen-units=6 [..]` [COMPILING] foo v0.0.1 ([ROOT]/foo) [RUNNING] `[..] rustc --crate-name build_script_build --edition=2015 build.rs [..]--crate-type bin --emit=[..]link[..]-C codegen-units=6 [..]` -[RUNNING] `[..][ROOT]/foo/target/release/build/foo-[HASH]/build-script-build` [foo 0.0.1] foo custom build PROFILE=release DEBUG=false OPT_LEVEL=3 [RUNNING] `[..] rustc --crate-name foo --edition=2015 src/lib.rs [..]--crate-type lib --emit=[..]link -C opt-level=3 -C panic=abort[..]-C codegen-units=2 [..]` [RUNNING] `[..] rustc --crate-name foo --edition=2015 src/lib.rs [..]--crate-type lib --emit=[..]link -C opt-level=3[..]-C codegen-units=2 [..]` @@ -420,11 +419,12 @@ fn profile_selection_test_release() { [RUNNING] `[..] rustc --crate-name ex1 --edition=2015 examples/ex1.rs [..]--crate-type bin --emit=[..]link -C opt-level=3[..]-C codegen-units=2 [..]` [RUNNING] `[..] rustc --crate-name foo --edition=2015 src/main.rs [..]--crate-type bin --emit=[..]link -C opt-level=3 -C panic=abort[..]-C codegen-units=2 [..]` [FINISHED] `release` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] `[..][ROOT]/foo/target/release/deps/foo-[HASH][EXE]` -[RUNNING] `[..][ROOT]/foo/target/release/deps/foo-[HASH][EXE]` -[RUNNING] `[..][ROOT]/foo/target/release/deps/test1-[HASH][EXE]` [DOCTEST] foo [RUNNING] `[..] rustdoc [..]--test [..]` +[RUNNING] `CARGO=/home/epage/src/personal/cargo/target/debug/cargo CARGO_CFG_FEATURE='' CARGO_CFG_FMT_DEBUG=full CARGO_CFG_OVERFLOW_CHECKS='' CARGO_CFG_PANIC=unwind CARGO_CFG_RELOCATION_MODEL=pic CARGO_CFG_TARGET_ABI='' CARGO_CFG_TARGET_ARCH=x86_64 CARGO_CFG_TARGET_ENDIAN=little CARGO_CFG_TARGET_ENV=gnu CARGO_CFG_TARGET_FAMILY=unix CARGO_CFG_TARGET_FEATURE=fxsr,sse,sse2,x87 CARGO_CFG_TARGET_HAS_ATOMIC=16,32,64,8,ptr CARGO_CFG_TARGET_HAS_ATOMIC_EQUAL_ALIGNMENT=16,32,64,8,ptr CARGO_CFG_TARGET_HAS_ATOMIC_LOAD_STORE=16,32,64,8,ptr CARGO_CFG_TARGET_HAS_RELIABLE_F128='' CARGO_CFG_TARGET_HAS_RELIABLE_F16='' CARGO_CFG_TARGET_HAS_RELIABLE_F16_MATH='' CARGO_CFG_TARGET_OS=linux CARGO_CFG_TARGET_POINTER_WIDTH=64 CARGO_CFG_TARGET_THREAD_LOCAL='' CARGO_CFG_TARGET_VENDOR=unknown CARGO_CFG_UB_CHECKS='' CARGO_CFG_UNIX='' CARGO_ENCODED_RUSTFLAGS='' CARGO_MANIFEST_DIR=[ROOT]/foo CARGO_MANIFEST_PATH=[ROOT]/foo/Cargo.toml CARGO_PKG_AUTHORS='' CARGO_PKG_DESCRIPTION='' CARGO_PKG_HOMEPAGE='' CARGO_PKG_LICENSE='' CARGO_PKG_LICENSE_FILE='' CARGO_PKG_NAME=foo CARGO_PKG_README='' CARGO_PKG_REPOSITORY='' CARGO_PKG_RUST_VERSION='' CARGO_PKG_VERSION=0.0.1 CARGO_PKG_VERSION_MAJOR=0 CARGO_PKG_VERSION_MINOR=0 CARGO_PKG_VERSION_PATCH=1 CARGO_PKG_VERSION_PRE='' DEBUG=false HOST=[HOST_TARGET] LD_LIBRARY_PATH='[ROOT]/foo/target/release:[ROOT]/foo/target/release/build/bar/[HASH]/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/src/personal/cargo/target/debug:/home/epage/.cargo/build/[HASH]/debug/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib' NUM_JOBS=20 OPT_LEVEL=3 OUT_DIR=[ROOT]/foo/target/release/build/foo/[HASH]/build-script-execution/out PROFILE=release RUSTC=rustc RUSTDOC=rustdoc TARGET=[HOST_TARGET] [ROOT]/foo/target/release/build/foo/[HASH]/build-script/build-script-build` +[RUNNING] `CARGO=/home/epage/src/personal/cargo/target/debug/cargo CARGO_MANIFEST_DIR=[ROOT]/foo CARGO_MANIFEST_PATH=[ROOT]/foo/Cargo.toml CARGO_PKG_AUTHORS='' CARGO_PKG_DESCRIPTION='' CARGO_PKG_HOMEPAGE='' CARGO_PKG_LICENSE='' CARGO_PKG_LICENSE_FILE='' CARGO_PKG_NAME=foo CARGO_PKG_README='' CARGO_PKG_REPOSITORY='' CARGO_PKG_RUST_VERSION='' CARGO_PKG_VERSION=0.0.1 CARGO_PKG_VERSION_MAJOR=0 CARGO_PKG_VERSION_MINOR=0 CARGO_PKG_VERSION_PATCH=1 CARGO_PKG_VERSION_PRE='' LD_LIBRARY_PATH='[ROOT]/foo/target/release:[ROOT]/foo/target/release/build/bar/[HASH]/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/src/personal/cargo/target/debug:/home/epage/.cargo/build/[HASH]/debug/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib' OUT_DIR=[ROOT]/foo/target/release/build/foo/[HASH]/build-script-execution/out [ROOT]/foo/target/release/build/foo/[HASH]/deps/foo-[HASH]` +[RUNNING] `CARGO=/home/epage/src/personal/cargo/target/debug/cargo CARGO_MANIFEST_DIR=[ROOT]/foo CARGO_MANIFEST_PATH=[ROOT]/foo/Cargo.toml CARGO_PKG_AUTHORS='' CARGO_PKG_DESCRIPTION='' CARGO_PKG_HOMEPAGE='' CARGO_PKG_LICENSE='' CARGO_PKG_LICENSE_FILE='' CARGO_PKG_NAME=foo CARGO_PKG_README='' CARGO_PKG_REPOSITORY='' CARGO_PKG_RUST_VERSION='' CARGO_PKG_VERSION=0.0.1 CARGO_PKG_VERSION_MAJOR=0 CARGO_PKG_VERSION_MINOR=0 CARGO_PKG_VERSION_PATCH=1 CARGO_PKG_VERSION_PRE='' LD_LIBRARY_PATH='[ROOT]/foo/target/release:[ROOT]/foo/target/release/build/bar/[HASH]/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/src/personal/cargo/target/debug:/home/epage/.cargo/build/[HASH]/debug/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib' OUT_DIR=[ROOT]/foo/target/release/build/foo/[HASH]/build-script-execution/out [ROOT]/foo/target/release/build/foo/[HASH]/deps/foo-[HASH]` +[RUNNING] `CARGO=/home/epage/src/personal/cargo/target/debug/cargo CARGO_MANIFEST_DIR=[ROOT]/foo CARGO_MANIFEST_PATH=[ROOT]/foo/Cargo.toml CARGO_PKG_AUTHORS='' CARGO_PKG_DESCRIPTION='' CARGO_PKG_HOMEPAGE='' CARGO_PKG_LICENSE='' CARGO_PKG_LICENSE_FILE='' CARGO_PKG_NAME=foo CARGO_PKG_README='' CARGO_PKG_REPOSITORY='' CARGO_PKG_RUST_VERSION='' CARGO_PKG_VERSION=0.0.1 CARGO_PKG_VERSION_MAJOR=0 CARGO_PKG_VERSION_MINOR=0 CARGO_PKG_VERSION_PATCH=1 CARGO_PKG_VERSION_PRE='' LD_LIBRARY_PATH='[ROOT]/foo/target/release:[ROOT]/foo/target/release/build/bar/[HASH]/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/src/personal/cargo/target/debug:/home/epage/.cargo/build/[HASH]/debug/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib' OUT_DIR=[ROOT]/foo/target/release/build/foo/[HASH]/build-script-execution/out [ROOT]/foo/target/release/build/foo/[HASH]/deps/test1-[HASH]` "#]].unordered()) .run(); @@ -435,11 +435,11 @@ fn profile_selection_test_release() { [FRESH] bar v0.0.1 ([ROOT]/foo/bar) [FRESH] foo v0.0.1 ([ROOT]/foo) [FINISHED] `release` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] `[..][ROOT]/foo/target/release/deps/foo-[HASH][EXE]` -[RUNNING] `[..][ROOT]/foo/target/release/deps/foo-[HASH][EXE]` -[RUNNING] `[..][ROOT]/foo/target/release/deps/test1-[HASH][EXE]` [DOCTEST] foo [RUNNING] `[..] rustdoc [..]--test [..] +[RUNNING] `CARGO=/home/epage/src/personal/cargo/target/debug/cargo CARGO_MANIFEST_DIR=[ROOT]/foo CARGO_MANIFEST_PATH=[ROOT]/foo/Cargo.toml CARGO_PKG_AUTHORS='' CARGO_PKG_DESCRIPTION='' CARGO_PKG_HOMEPAGE='' CARGO_PKG_LICENSE='' CARGO_PKG_LICENSE_FILE='' CARGO_PKG_NAME=foo CARGO_PKG_README='' CARGO_PKG_REPOSITORY='' CARGO_PKG_RUST_VERSION='' CARGO_PKG_VERSION=0.0.1 CARGO_PKG_VERSION_MAJOR=0 CARGO_PKG_VERSION_MINOR=0 CARGO_PKG_VERSION_PATCH=1 CARGO_PKG_VERSION_PRE='' LD_LIBRARY_PATH='[ROOT]/foo/target/release:[ROOT]/foo/target/release/build/foo/[HASH]/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/src/personal/cargo/target/debug:/home/epage/.cargo/build/[HASH]/debug/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib' OUT_DIR=[ROOT]/foo/target/release/build/foo/[HASH]/build-script-execution/out [ROOT]/foo/target/release/build/foo/[HASH]/deps/foo-[HASH]` +[RUNNING] `CARGO=/home/epage/src/personal/cargo/target/debug/cargo CARGO_MANIFEST_DIR=[ROOT]/foo CARGO_MANIFEST_PATH=[ROOT]/foo/Cargo.toml CARGO_PKG_AUTHORS='' CARGO_PKG_DESCRIPTION='' CARGO_PKG_HOMEPAGE='' CARGO_PKG_LICENSE='' CARGO_PKG_LICENSE_FILE='' CARGO_PKG_NAME=foo CARGO_PKG_README='' CARGO_PKG_REPOSITORY='' CARGO_PKG_RUST_VERSION='' CARGO_PKG_VERSION=0.0.1 CARGO_PKG_VERSION_MAJOR=0 CARGO_PKG_VERSION_MINOR=0 CARGO_PKG_VERSION_PATCH=1 CARGO_PKG_VERSION_PRE='' LD_LIBRARY_PATH='[ROOT]/foo/target/release:[ROOT]/foo/target/release/build/foo/[HASH]/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/src/personal/cargo/target/debug:/home/epage/.cargo/build/[HASH]/debug/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib' OUT_DIR=[ROOT]/foo/target/release/build/foo/[HASH]/build-script-execution/out [ROOT]/foo/target/release/build/foo/[HASH]/deps/foo-[HASH]` +[RUNNING] `CARGO=/home/epage/src/personal/cargo/target/debug/cargo CARGO_MANIFEST_DIR=[ROOT]/foo CARGO_MANIFEST_PATH=[ROOT]/foo/Cargo.toml CARGO_PKG_AUTHORS='' CARGO_PKG_DESCRIPTION='' CARGO_PKG_HOMEPAGE='' CARGO_PKG_LICENSE='' CARGO_PKG_LICENSE_FILE='' CARGO_PKG_NAME=foo CARGO_PKG_README='' CARGO_PKG_REPOSITORY='' CARGO_PKG_RUST_VERSION='' CARGO_PKG_VERSION=0.0.1 CARGO_PKG_VERSION_MAJOR=0 CARGO_PKG_VERSION_MINOR=0 CARGO_PKG_VERSION_PATCH=1 CARGO_PKG_VERSION_PRE='' LD_LIBRARY_PATH='[ROOT]/foo/target/release:[ROOT]/foo/target/release/build/foo/[HASH]/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/src/personal/cargo/target/debug:/home/epage/.cargo/build/[HASH]/debug/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib' OUT_DIR=[ROOT]/foo/target/release/build/foo/[HASH]/build-script-execution/out [ROOT]/foo/target/release/build/foo/[HASH]/deps/test1-[HASH]` "#]] .unordered(), @@ -482,7 +482,6 @@ fn profile_selection_bench() { [RUNNING] `[..] rustc --crate-name bdep --edition=2015 bdep/src/lib.rs [..]--crate-type lib --emit=[..]link[..]-C codegen-units=6 [..]` [COMPILING] foo v0.0.1 ([ROOT]/foo) [RUNNING] `[..] rustc --crate-name build_script_build --edition=2015 build.rs [..]--crate-type bin --emit=[..]link[..]-C codegen-units=6 [..]` -[RUNNING] `[..][ROOT]/foo/target/release/build/foo-[HASH]/build-script-build` [foo 0.0.1] foo custom build PROFILE=release DEBUG=false OPT_LEVEL=3 [RUNNING] `[..] rustc --crate-name foo --edition=2015 src/lib.rs [..]--crate-type lib --emit=[..]link -C opt-level=3 -C panic=abort[..]-C codegen-units=4 [..]` [RUNNING] `[..] rustc --crate-name foo --edition=2015 src/lib.rs [..]--crate-type lib --emit=[..]link -C opt-level=3[..]-C codegen-units=4 [..]` @@ -491,9 +490,10 @@ fn profile_selection_bench() { [RUNNING] `[..] rustc --crate-name foo --edition=2015 src/main.rs [..]--emit=[..]link -C opt-level=3[..]-C codegen-units=4 --test [..]` [RUNNING] `[..] rustc --crate-name foo --edition=2015 src/main.rs [..]--crate-type bin --emit=[..]link -C opt-level=3 -C panic=abort[..]-C codegen-units=4 [..]` [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] `[..][ROOT]/foo/target/release/deps/foo-[HASH][EXE] --bench` -[RUNNING] `[..][ROOT]/foo/target/release/deps/foo-[HASH][EXE] --bench` -[RUNNING] `[..][ROOT]/foo/target/release/deps/bench1-[HASH][EXE] --bench` +[RUNNING] `CARGO=/home/epage/src/personal/cargo/target/debug/cargo CARGO_CFG_FEATURE='' CARGO_CFG_FMT_DEBUG=full CARGO_CFG_OVERFLOW_CHECKS='' CARGO_CFG_PANIC=unwind CARGO_CFG_RELOCATION_MODEL=pic CARGO_CFG_TARGET_ABI='' CARGO_CFG_TARGET_ARCH=x86_64 CARGO_CFG_TARGET_ENDIAN=little CARGO_CFG_TARGET_ENV=gnu CARGO_CFG_TARGET_FAMILY=unix CARGO_CFG_TARGET_FEATURE=fxsr,sse,sse2,x87 CARGO_CFG_TARGET_HAS_ATOMIC=16,32,64,8,ptr CARGO_CFG_TARGET_HAS_ATOMIC_EQUAL_ALIGNMENT=16,32,64,8,ptr CARGO_CFG_TARGET_HAS_ATOMIC_LOAD_STORE=16,32,64,8,ptr CARGO_CFG_TARGET_HAS_RELIABLE_F128='' CARGO_CFG_TARGET_HAS_RELIABLE_F16='' CARGO_CFG_TARGET_HAS_RELIABLE_F16_MATH='' CARGO_CFG_TARGET_OS=linux CARGO_CFG_TARGET_POINTER_WIDTH=64 CARGO_CFG_TARGET_THREAD_LOCAL='' CARGO_CFG_TARGET_VENDOR=unknown CARGO_CFG_UB_CHECKS='' CARGO_CFG_UNIX='' CARGO_ENCODED_RUSTFLAGS='' CARGO_MANIFEST_DIR=[ROOT]/foo CARGO_MANIFEST_PATH=[ROOT]/foo/Cargo.toml CARGO_PKG_AUTHORS='' CARGO_PKG_DESCRIPTION='' CARGO_PKG_HOMEPAGE='' CARGO_PKG_LICENSE='' CARGO_PKG_LICENSE_FILE='' CARGO_PKG_NAME=foo CARGO_PKG_README='' CARGO_PKG_REPOSITORY='' CARGO_PKG_RUST_VERSION='' CARGO_PKG_VERSION=0.0.1 CARGO_PKG_VERSION_MAJOR=0 CARGO_PKG_VERSION_MINOR=0 CARGO_PKG_VERSION_PATCH=1 CARGO_PKG_VERSION_PRE='' DEBUG=false HOST=[HOST_TARGET] LD_LIBRARY_PATH='[ROOT]/foo/target/release:[ROOT]/foo/target/release/build/foo/[HASH]/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/src/personal/cargo/target/debug:/home/epage/.cargo/build/[HASH]/debug/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib' NUM_JOBS=20 OPT_LEVEL=3 OUT_DIR=[ROOT]/foo/target/release/build/foo/[HASH]/build-script-execution/out PROFILE=release RUSTC=rustc RUSTDOC=rustdoc TARGET=[HOST_TARGET] [ROOT]/foo/target/release/build/foo/[HASH]/build-script/build-script-build` +[RUNNING] `CARGO=/home/epage/src/personal/cargo/target/debug/cargo CARGO_MANIFEST_DIR=[ROOT]/foo CARGO_MANIFEST_PATH=[ROOT]/foo/Cargo.toml CARGO_PKG_AUTHORS='' CARGO_PKG_DESCRIPTION='' CARGO_PKG_HOMEPAGE='' CARGO_PKG_LICENSE='' CARGO_PKG_LICENSE_FILE='' CARGO_PKG_NAME=foo CARGO_PKG_README='' CARGO_PKG_REPOSITORY='' CARGO_PKG_RUST_VERSION='' CARGO_PKG_VERSION=0.0.1 CARGO_PKG_VERSION_MAJOR=0 CARGO_PKG_VERSION_MINOR=0 CARGO_PKG_VERSION_PATCH=1 CARGO_PKG_VERSION_PRE='' LD_LIBRARY_PATH='[ROOT]/foo/target/release:[ROOT]/foo/target/release/build/foo/[HASH]/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/src/personal/cargo/target/debug:/home/epage/.cargo/build/[HASH]/debug/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib' OUT_DIR=[ROOT]/foo/target/release/build/foo/[HASH]/build-script-execution/out [ROOT]/foo/target/release/build/foo/[HASH]/deps/foo-[HASH] --bench` +[RUNNING] `CARGO=/home/epage/src/personal/cargo/target/debug/cargo CARGO_MANIFEST_DIR=[ROOT]/foo CARGO_MANIFEST_PATH=[ROOT]/foo/Cargo.toml CARGO_PKG_AUTHORS='' CARGO_PKG_DESCRIPTION='' CARGO_PKG_HOMEPAGE='' CARGO_PKG_LICENSE='' CARGO_PKG_LICENSE_FILE='' CARGO_PKG_NAME=foo CARGO_PKG_README='' CARGO_PKG_REPOSITORY='' CARGO_PKG_RUST_VERSION='' CARGO_PKG_VERSION=0.0.1 CARGO_PKG_VERSION_MAJOR=0 CARGO_PKG_VERSION_MINOR=0 CARGO_PKG_VERSION_PATCH=1 CARGO_PKG_VERSION_PRE='' LD_LIBRARY_PATH='[ROOT]/foo/target/release:[ROOT]/foo/target/release/build/foo/[HASH]/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/src/personal/cargo/target/debug:/home/epage/.cargo/build/[HASH]/debug/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib' OUT_DIR=[ROOT]/foo/target/release/build/foo/[HASH]/build-script-execution/out [ROOT]/foo/target/release/build/foo/[HASH]/deps/foo-[HASH] --bench` +[RUNNING] `CARGO=/home/epage/src/personal/cargo/target/debug/cargo CARGO_MANIFEST_DIR=[ROOT]/foo CARGO_MANIFEST_PATH=[ROOT]/foo/Cargo.toml CARGO_PKG_AUTHORS='' CARGO_PKG_DESCRIPTION='' CARGO_PKG_HOMEPAGE='' CARGO_PKG_LICENSE='' CARGO_PKG_LICENSE_FILE='' CARGO_PKG_NAME=foo CARGO_PKG_README='' CARGO_PKG_REPOSITORY='' CARGO_PKG_RUST_VERSION='' CARGO_PKG_VERSION=0.0.1 CARGO_PKG_VERSION_MAJOR=0 CARGO_PKG_VERSION_MINOR=0 CARGO_PKG_VERSION_PATCH=1 CARGO_PKG_VERSION_PRE='' LD_LIBRARY_PATH='[ROOT]/foo/target/release:[ROOT]/foo/target/release/build/foo/[HASH]/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/src/personal/cargo/target/debug:/home/epage/.cargo/build/[HASH]/debug/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib' OUT_DIR=[ROOT]/foo/target/release/build/foo/[HASH]/build-script-execution/out [ROOT]/foo/target/release/build/foo/[HASH]/deps/bench1-[HASH] --bench` "#]].unordered()) .run(); @@ -504,9 +504,9 @@ fn profile_selection_bench() { [FRESH] bar v0.0.1 ([ROOT]/foo/bar) [FRESH] foo v0.0.1 ([ROOT]/foo) [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] `[..][ROOT]/foo/target/release/deps/foo-[HASH][EXE] --bench` -[RUNNING] `[..][ROOT]/foo/target/release/deps/foo-[HASH][EXE] --bench` -[RUNNING] `[..][ROOT]/foo/target/release/deps/bench1-[HASH][EXE] --bench` +[RUNNING] `CARGO=/home/epage/src/personal/cargo/target/debug/cargo CARGO_MANIFEST_DIR=[ROOT]/foo CARGO_MANIFEST_PATH=[ROOT]/foo/Cargo.toml CARGO_PKG_AUTHORS='' CARGO_PKG_DESCRIPTION='' CARGO_PKG_HOMEPAGE='' CARGO_PKG_LICENSE='' CARGO_PKG_LICENSE_FILE='' CARGO_PKG_NAME=foo CARGO_PKG_README='' CARGO_PKG_REPOSITORY='' CARGO_PKG_RUST_VERSION='' CARGO_PKG_VERSION=0.0.1 CARGO_PKG_VERSION_MAJOR=0 CARGO_PKG_VERSION_MINOR=0 CARGO_PKG_VERSION_PATCH=1 CARGO_PKG_VERSION_PRE='' LD_LIBRARY_PATH='[ROOT]/foo/target/release:[ROOT]/foo/target/release/build/bdep/[HASH]/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/src/personal/cargo/target/debug:/home/epage/.cargo/build/[HASH]/debug/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib' OUT_DIR=[ROOT]/foo/target/release/build/foo/[HASH]/build-script-execution/out [ROOT]/foo/target/release/build/foo/[HASH]/deps/foo-[HASH] --bench` +[RUNNING] `CARGO=/home/epage/src/personal/cargo/target/debug/cargo CARGO_MANIFEST_DIR=[ROOT]/foo CARGO_MANIFEST_PATH=[ROOT]/foo/Cargo.toml CARGO_PKG_AUTHORS='' CARGO_PKG_DESCRIPTION='' CARGO_PKG_HOMEPAGE='' CARGO_PKG_LICENSE='' CARGO_PKG_LICENSE_FILE='' CARGO_PKG_NAME=foo CARGO_PKG_README='' CARGO_PKG_REPOSITORY='' CARGO_PKG_RUST_VERSION='' CARGO_PKG_VERSION=0.0.1 CARGO_PKG_VERSION_MAJOR=0 CARGO_PKG_VERSION_MINOR=0 CARGO_PKG_VERSION_PATCH=1 CARGO_PKG_VERSION_PRE='' LD_LIBRARY_PATH='[ROOT]/foo/target/release:[ROOT]/foo/target/release/build/bdep/[HASH]/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/src/personal/cargo/target/debug:/home/epage/.cargo/build/[HASH]/debug/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib' OUT_DIR=[ROOT]/foo/target/release/build/foo/[HASH]/build-script-execution/out [ROOT]/foo/target/release/build/foo/[HASH]/deps/foo-[HASH] --bench` +[RUNNING] `CARGO=/home/epage/src/personal/cargo/target/debug/cargo CARGO_MANIFEST_DIR=[ROOT]/foo CARGO_MANIFEST_PATH=[ROOT]/foo/Cargo.toml CARGO_PKG_AUTHORS='' CARGO_PKG_DESCRIPTION='' CARGO_PKG_HOMEPAGE='' CARGO_PKG_LICENSE='' CARGO_PKG_LICENSE_FILE='' CARGO_PKG_NAME=foo CARGO_PKG_README='' CARGO_PKG_REPOSITORY='' CARGO_PKG_RUST_VERSION='' CARGO_PKG_VERSION=0.0.1 CARGO_PKG_VERSION_MAJOR=0 CARGO_PKG_VERSION_MINOR=0 CARGO_PKG_VERSION_PATCH=1 CARGO_PKG_VERSION_PRE='' LD_LIBRARY_PATH='[ROOT]/foo/target/release:[ROOT]/foo/target/release/build/bdep/[HASH]/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/src/personal/cargo/target/debug:/home/epage/.cargo/build/[HASH]/debug/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib' OUT_DIR=[ROOT]/foo/target/release/build/foo/[HASH]/build-script-execution/out [ROOT]/foo/target/release/build/foo/[HASH]/deps/bench1-[HASH] --bench` "#]] .unordered(), @@ -553,7 +553,6 @@ fn profile_selection_check_all_targets() { [RUNNING] `[..] rustc --crate-name bdep --edition=2015 bdep/src/lib.rs [..]--crate-type lib --emit=[..]link[..]-C codegen-units=5 [..]` [COMPILING] foo v0.0.1 ([ROOT]/foo) [RUNNING] `[..] rustc --crate-name build_script_build --edition=2015 build.rs [..]--crate-type bin --emit=[..]link[..]-C codegen-units=5 [..]` -[RUNNING] `[..][ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` [foo 0.0.1] foo custom build PROFILE=debug DEBUG=true OPT_LEVEL=0 [RUNNING] `[..] rustc --crate-name foo --edition=2015 src/lib.rs [..]--crate-type lib --emit=[..]metadata -C panic=abort[..]-C codegen-units=1 -C debuginfo=2 [..]` [RUNNING] `[..] rustc --crate-name foo --edition=2015 src/lib.rs [..]--crate-type lib --emit=[..]metadata[..]-C codegen-units=1 -C debuginfo=2 [..]` @@ -564,6 +563,7 @@ fn profile_selection_check_all_targets() { [RUNNING] `[..] rustc --crate-name ex1 --edition=2015 examples/ex1.rs [..]--crate-type bin --emit=[..]metadata -C panic=abort[..]-C codegen-units=1 -C debuginfo=2 [..]` [RUNNING] `[..] rustc --crate-name foo --edition=2015 src/main.rs [..]--crate-type bin --emit=[..]metadata -C panic=abort[..]-C codegen-units=1 -C debuginfo=2 [..]` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s +[RUNNING] `CARGO=/home/epage/src/personal/cargo/target/debug/cargo CARGO_CFG_DEBUG_ASSERTIONS='' CARGO_CFG_FEATURE='' CARGO_CFG_FMT_DEBUG=full CARGO_CFG_OVERFLOW_CHECKS='' CARGO_CFG_PANIC=unwind CARGO_CFG_RELOCATION_MODEL=pic CARGO_CFG_TARGET_ABI='' CARGO_CFG_TARGET_ARCH=x86_64 CARGO_CFG_TARGET_ENDIAN=little CARGO_CFG_TARGET_ENV=gnu CARGO_CFG_TARGET_FAMILY=unix CARGO_CFG_TARGET_FEATURE=fxsr,sse,sse2,x87 CARGO_CFG_TARGET_HAS_ATOMIC=16,32,64,8,ptr CARGO_CFG_TARGET_HAS_ATOMIC_EQUAL_ALIGNMENT=16,32,64,8,ptr CARGO_CFG_TARGET_HAS_ATOMIC_LOAD_STORE=16,32,64,8,ptr CARGO_CFG_TARGET_HAS_RELIABLE_F128='' CARGO_CFG_TARGET_HAS_RELIABLE_F16='' CARGO_CFG_TARGET_HAS_RELIABLE_F16_MATH='' CARGO_CFG_TARGET_OS=linux CARGO_CFG_TARGET_POINTER_WIDTH=64 CARGO_CFG_TARGET_THREAD_LOCAL='' CARGO_CFG_TARGET_VENDOR=unknown CARGO_CFG_UB_CHECKS='' CARGO_CFG_UNIX='' CARGO_ENCODED_RUSTFLAGS='' CARGO_MANIFEST_DIR=[ROOT]/foo CARGO_MANIFEST_PATH=[ROOT]/foo/Cargo.toml CARGO_PKG_AUTHORS='' CARGO_PKG_DESCRIPTION='' CARGO_PKG_HOMEPAGE='' CARGO_PKG_LICENSE='' CARGO_PKG_LICENSE_FILE='' CARGO_PKG_NAME=foo CARGO_PKG_README='' CARGO_PKG_REPOSITORY='' CARGO_PKG_RUST_VERSION='' CARGO_PKG_VERSION=0.0.1 CARGO_PKG_VERSION_MAJOR=0 CARGO_PKG_VERSION_MINOR=0 CARGO_PKG_VERSION_PATCH=1 CARGO_PKG_VERSION_PRE='' DEBUG=true HOST=[HOST_TARGET] LD_LIBRARY_PATH='[ROOT]/foo/target/debug/build/foo/[HASH]/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/src/personal/cargo/target/debug:/home/epage/.cargo/build/[HASH]/debug/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib' NUM_JOBS=20 OPT_LEVEL=0 OUT_DIR=[ROOT]/foo/target/debug/build/foo/[HASH]/build-script-execution/out PROFILE=debug RUSTC=rustc RUSTDOC=rustdoc TARGET=[HOST_TARGET] [ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` "#]].unordered()) .run(); @@ -604,7 +604,6 @@ fn profile_selection_check_all_targets_release() { [RUNNING] `[..] rustc --crate-name bdep --edition=2015 bdep/src/lib.rs [..]--crate-type lib --emit=[..]link [..]-C codegen-units=6 [..] [COMPILING] foo v0.0.1 ([ROOT]/foo) [RUNNING] `[..] rustc --crate-name build_script_build --edition=2015 build.rs [..]--crate-type bin --emit=[..]link[..]-C codegen-units=6 [..] -[RUNNING] `[..][ROOT]/foo/target/release/build/foo-[HASH]/build-script-build` [foo 0.0.1] foo custom build PROFILE=release DEBUG=false OPT_LEVEL=3 [RUNNING] `[..] rustc --crate-name foo --edition=2015 src/lib.rs [..]--crate-type lib --emit=[..]metadata -C opt-level=3 -C panic=abort[..]-C codegen-units=2 [..] [RUNNING] `[..] rustc --crate-name foo --edition=2015 src/lib.rs [..]--crate-type lib --emit=[..]metadata -C opt-level=3[..]-C codegen-units=2 [..] @@ -615,6 +614,7 @@ fn profile_selection_check_all_targets_release() { [RUNNING] `[..] rustc --crate-name ex1 --edition=2015 examples/ex1.rs [..]--crate-type bin --emit=[..]metadata -C opt-level=3 -C panic=abort[..]-C codegen-units=2 [..] [RUNNING] `[..] rustc --crate-name foo --edition=2015 src/main.rs [..]--crate-type bin --emit=[..]metadata -C opt-level=3 -C panic=abort[..]-C codegen-units=2 [..] [FINISHED] `release` profile [optimized] target(s) in [ELAPSED]s +[RUNNING] `CARGO=/home/epage/src/personal/cargo/target/debug/cargo CARGO_CFG_FEATURE='' CARGO_CFG_FMT_DEBUG=full CARGO_CFG_OVERFLOW_CHECKS='' CARGO_CFG_PANIC=unwind CARGO_CFG_RELOCATION_MODEL=pic CARGO_CFG_TARGET_ABI='' CARGO_CFG_TARGET_ARCH=x86_64 CARGO_CFG_TARGET_ENDIAN=little CARGO_CFG_TARGET_ENV=gnu CARGO_CFG_TARGET_FAMILY=unix CARGO_CFG_TARGET_FEATURE=fxsr,sse,sse2,x87 CARGO_CFG_TARGET_HAS_ATOMIC=16,32,64,8,ptr CARGO_CFG_TARGET_HAS_ATOMIC_EQUAL_ALIGNMENT=16,32,64,8,ptr CARGO_CFG_TARGET_HAS_ATOMIC_LOAD_STORE=16,32,64,8,ptr CARGO_CFG_TARGET_HAS_RELIABLE_F128='' CARGO_CFG_TARGET_HAS_RELIABLE_F16='' CARGO_CFG_TARGET_HAS_RELIABLE_F16_MATH='' CARGO_CFG_TARGET_OS=linux CARGO_CFG_TARGET_POINTER_WIDTH=64 CARGO_CFG_TARGET_THREAD_LOCAL='' CARGO_CFG_TARGET_VENDOR=unknown CARGO_CFG_UB_CHECKS='' CARGO_CFG_UNIX='' CARGO_ENCODED_RUSTFLAGS='' CARGO_MANIFEST_DIR=[ROOT]/foo CARGO_MANIFEST_PATH=[ROOT]/foo/Cargo.toml CARGO_PKG_AUTHORS='' CARGO_PKG_DESCRIPTION='' CARGO_PKG_HOMEPAGE='' CARGO_PKG_LICENSE='' CARGO_PKG_LICENSE_FILE='' CARGO_PKG_NAME=foo CARGO_PKG_README='' CARGO_PKG_REPOSITORY='' CARGO_PKG_RUST_VERSION='' CARGO_PKG_VERSION=0.0.1 CARGO_PKG_VERSION_MAJOR=0 CARGO_PKG_VERSION_MINOR=0 CARGO_PKG_VERSION_PATCH=1 CARGO_PKG_VERSION_PRE='' DEBUG=false HOST=[HOST_TARGET] LD_LIBRARY_PATH='[ROOT]/foo/target/release/build/bar/[HASH]/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/src/personal/cargo/target/debug:/home/epage/.cargo/build/[HASH]/debug/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib' NUM_JOBS=20 OPT_LEVEL=3 OUT_DIR=[ROOT]/foo/target/release/build/foo/[HASH]/build-script-execution/out PROFILE=release RUSTC=rustc RUSTDOC=rustdoc TARGET=[HOST_TARGET] [ROOT]/foo/target/release/build/foo/[HASH]/build-script/build-script-build` "#]].unordered()) .run(); @@ -668,7 +668,6 @@ fn profile_selection_check_all_targets_test() { [RUNNING] `[..] rustc --crate-name bdep --edition=2015 bdep/src/lib.rs [..]--crate-type lib --emit=[..]link[..]-C codegen-units=5 [..]` [COMPILING] foo v0.0.1 ([ROOT]/foo) [RUNNING] `[..] rustc --crate-name build_script_build --edition=2015 build.rs [..]--crate-type bin --emit=[..]link[..]-C codegen-units=5 [..]` -[RUNNING] `[..][ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` [foo 0.0.1] foo custom build PROFILE=debug DEBUG=true OPT_LEVEL=0 [RUNNING] `[..] rustc --crate-name foo --edition=2015 src/lib.rs [..]--crate-type lib --emit=[..]metadata[..]-C codegen-units=3 -C debuginfo=2 [..]` [RUNNING] `[..] rustc --crate-name foo --edition=2015 src/lib.rs [..]--emit=[..]metadata[..]-C codegen-units=3 -C debuginfo=2 [..]--test [..]` @@ -677,6 +676,7 @@ fn profile_selection_check_all_targets_test() { [RUNNING] `[..] rustc --crate-name bench1 --edition=2015 benches/bench1.rs [..]--emit=[..]metadata[..]-C codegen-units=3 -C debuginfo=2 [..]--test [..]` [RUNNING] `[..] rustc --crate-name ex1 --edition=2015 examples/ex1.rs [..]--emit=[..]metadata[..]-C codegen-units=3 -C debuginfo=2 [..]--test [..]` [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s +[RUNNING] `CARGO=/home/epage/src/personal/cargo/target/debug/cargo CARGO_CFG_DEBUG_ASSERTIONS='' CARGO_CFG_FEATURE='' CARGO_CFG_FMT_DEBUG=full CARGO_CFG_OVERFLOW_CHECKS='' CARGO_CFG_PANIC=unwind CARGO_CFG_RELOCATION_MODEL=pic CARGO_CFG_TARGET_ABI='' CARGO_CFG_TARGET_ARCH=x86_64 CARGO_CFG_TARGET_ENDIAN=little CARGO_CFG_TARGET_ENV=gnu CARGO_CFG_TARGET_FAMILY=unix CARGO_CFG_TARGET_FEATURE=fxsr,sse,sse2,x87 CARGO_CFG_TARGET_HAS_ATOMIC=16,32,64,8,ptr CARGO_CFG_TARGET_HAS_ATOMIC_EQUAL_ALIGNMENT=16,32,64,8,ptr CARGO_CFG_TARGET_HAS_ATOMIC_LOAD_STORE=16,32,64,8,ptr CARGO_CFG_TARGET_HAS_RELIABLE_F128='' CARGO_CFG_TARGET_HAS_RELIABLE_F16='' CARGO_CFG_TARGET_HAS_RELIABLE_F16_MATH='' CARGO_CFG_TARGET_OS=linux CARGO_CFG_TARGET_POINTER_WIDTH=64 CARGO_CFG_TARGET_THREAD_LOCAL='' CARGO_CFG_TARGET_VENDOR=unknown CARGO_CFG_UB_CHECKS='' CARGO_CFG_UNIX='' CARGO_ENCODED_RUSTFLAGS='' CARGO_MANIFEST_DIR=[ROOT]/foo CARGO_MANIFEST_PATH=[ROOT]/foo/Cargo.toml CARGO_PKG_AUTHORS='' CARGO_PKG_DESCRIPTION='' CARGO_PKG_HOMEPAGE='' CARGO_PKG_LICENSE='' CARGO_PKG_LICENSE_FILE='' CARGO_PKG_NAME=foo CARGO_PKG_README='' CARGO_PKG_REPOSITORY='' CARGO_PKG_RUST_VERSION='' CARGO_PKG_VERSION=0.0.1 CARGO_PKG_VERSION_MAJOR=0 CARGO_PKG_VERSION_MINOR=0 CARGO_PKG_VERSION_PATCH=1 CARGO_PKG_VERSION_PRE='' DEBUG=true HOST=[HOST_TARGET] LD_LIBRARY_PATH='[ROOT]/foo/target/debug/build/bar/[HASH]/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/src/personal/cargo/target/debug:/home/epage/.cargo/build/[HASH]/debug/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib' NUM_JOBS=20 OPT_LEVEL=0 OUT_DIR=[ROOT]/foo/target/debug/build/foo/[HASH]/build-script-execution/out PROFILE=debug RUSTC=rustc RUSTDOC=rustdoc TARGET=[HOST_TARGET] [ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` "#]].unordered()) .run(); @@ -721,12 +721,12 @@ fn profile_selection_doc() { [RUNNING] `[..] rustc --crate-name bdep --edition=2015 bdep/src/lib.rs [..]--crate-type lib --emit=[..]link[..]-C codegen-units=5 [..]` [COMPILING] foo v0.0.1 ([ROOT]/foo) [RUNNING] `[..] rustc --crate-name build_script_build --edition=2015 build.rs [..]--crate-type bin --emit=[..]link[..]-C codegen-units=5 [..]` -[RUNNING] `[..][ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` [foo 0.0.1] foo custom build PROFILE=debug DEBUG=true OPT_LEVEL=0 [DOCUMENTING] foo v0.0.1 ([ROOT]/foo) [RUNNING] `[..] rustdoc [..]--crate-name foo src/lib.rs [..] [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s [GENERATED] [ROOT]/foo/target/doc/foo/index.html +[RUNNING] `CARGO=/home/epage/src/personal/cargo/target/debug/cargo CARGO_CFG_DEBUG_ASSERTIONS='' CARGO_CFG_FEATURE='' CARGO_CFG_FMT_DEBUG=full CARGO_CFG_OVERFLOW_CHECKS='' CARGO_CFG_PANIC=unwind CARGO_CFG_RELOCATION_MODEL=pic CARGO_CFG_TARGET_ABI='' CARGO_CFG_TARGET_ARCH=x86_64 CARGO_CFG_TARGET_ENDIAN=little CARGO_CFG_TARGET_ENV=gnu CARGO_CFG_TARGET_FAMILY=unix CARGO_CFG_TARGET_FEATURE=fxsr,sse,sse2,x87 CARGO_CFG_TARGET_HAS_ATOMIC=16,32,64,8,ptr CARGO_CFG_TARGET_HAS_ATOMIC_EQUAL_ALIGNMENT=16,32,64,8,ptr CARGO_CFG_TARGET_HAS_ATOMIC_LOAD_STORE=16,32,64,8,ptr CARGO_CFG_TARGET_HAS_RELIABLE_F128='' CARGO_CFG_TARGET_HAS_RELIABLE_F16='' CARGO_CFG_TARGET_HAS_RELIABLE_F16_MATH='' CARGO_CFG_TARGET_OS=linux CARGO_CFG_TARGET_POINTER_WIDTH=64 CARGO_CFG_TARGET_THREAD_LOCAL='' CARGO_CFG_TARGET_VENDOR=unknown CARGO_CFG_UB_CHECKS='' CARGO_CFG_UNIX='' CARGO_ENCODED_RUSTFLAGS='' CARGO_MANIFEST_DIR=[ROOT]/foo CARGO_MANIFEST_PATH=[ROOT]/foo/Cargo.toml CARGO_PKG_AUTHORS='' CARGO_PKG_DESCRIPTION='' CARGO_PKG_HOMEPAGE='' CARGO_PKG_LICENSE='' CARGO_PKG_LICENSE_FILE='' CARGO_PKG_NAME=foo CARGO_PKG_README='' CARGO_PKG_REPOSITORY='' CARGO_PKG_RUST_VERSION='' CARGO_PKG_VERSION=0.0.1 CARGO_PKG_VERSION_MAJOR=0 CARGO_PKG_VERSION_MINOR=0 CARGO_PKG_VERSION_PATCH=1 CARGO_PKG_VERSION_PRE='' DEBUG=true HOST=[HOST_TARGET] LD_LIBRARY_PATH='[ROOT]/foo/target/debug:[ROOT]/foo/target/debug/build/bar/[HASH]/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/src/personal/cargo/target/debug:/home/epage/.cargo/build/[HASH]/debug/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib' NUM_JOBS=20 OPT_LEVEL=0 OUT_DIR=[ROOT]/foo/target/debug/build/foo/[HASH]/build-script-execution/out PROFILE=debug RUSTC=rustc RUSTDOC=rustdoc TARGET=[HOST_TARGET] [ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` "#]].unordered()) .run(); diff --git a/tests/testsuite/profile_trim_paths.rs b/tests/testsuite/profile_trim_paths.rs index dfe1d98dc12..2753049916b 100644 --- a/tests/testsuite/profile_trim_paths.rs +++ b/tests/testsuite/profile_trim_paths.rs @@ -297,7 +297,7 @@ fn registry_dependency_with_build_script_codegen() { .masquerade_as_nightly_cargo(&["-Ztrim-paths"]) // Macros should be sanitized .with_stdout_data(str![[r#" -/cargo/build-dir/debug/build/bar-[HASH]/out/bindings.rs +/cargo/build-dir/debug/build/bar/[HASH]/build-script-execution/out/bindings.rs "#]]) // Omit the hash of Source URL .with_stderr_data(str![[r#" @@ -307,7 +307,7 @@ fn registry_dependency_with_build_script_codegen() { [DOWNLOADED] bar v0.0.1 (registry `dummy-registry`) [COMPILING] bar v0.0.1 [RUNNING] `rustc --crate-name build_script_build [..]-Zremap-path-scope=object --remap-path-prefix=[ROOT]/home/.cargo/registry/src= --remap-path-prefix=[..]/lib/rustlib/src/rust=/rustc/[..]` -[RUNNING] `[ROOT]/foo/target/debug/build/bar-[HASH]/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/bar/[HASH]/build-script/build-script-build` [RUNNING] `rustc --crate-name bar [..]-Zremap-path-scope=object --remap-path-prefix=[ROOT]/home/.cargo/registry/src= --remap-path-prefix=[ROOT]/foo/target=/cargo/build-dir --remap-path-prefix=[..]/lib/rustlib/src/rust=/rustc/[..] [COMPILING] foo v0.0.1 ([ROOT]/foo) [RUNNING] `rustc --crate-name foo [..]-Zremap-path-scope=object --remap-path-prefix=[ROOT]/foo=. --remap-path-prefix=[..]/lib/rustlib/src/rust=/rustc/[..]` diff --git a/tests/testsuite/profiles.rs b/tests/testsuite/profiles.rs index 61cc8d2187a..234a67a08b9 100644 --- a/tests/testsuite/profiles.rs +++ b/tests/testsuite/profiles.rs @@ -29,7 +29,7 @@ fn profile_overrides() { .build(); p.cargo("build -v").with_stderr_data(str![[r#" [COMPILING] test v0.0.0 ([ROOT]/foo) -[RUNNING] `rustc --crate-name test --edition=2015 src/lib.rs [..]--crate-type lib --emit=[..]link[..] -C opt-level=1[..] -C debug-assertions=on[..] -C metadata=[..] -C rpath --out-dir [ROOT]/foo/target/debug/deps [..] -L dependency=[ROOT]/foo/target/debug/deps` +[RUNNING] `rustc --crate-name test --edition=2015 src/lib.rs --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --crate-type lib --emit=dep-info,metadata,link -C opt-level=1 -C embed-bitcode=no -C debug-assertions=on --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values())' -C metadata=bc3160ac06762596 -C extra-filename=-c64095d62d92d01e -C rpath --out-dir [ROOT]/foo/target/debug/build/test/[HASH]/deps -C strip=debuginfo -L dependency=[ROOT]/foo/target/debug/build/test/[HASH]/deps` [FINISHED] `dev` profile [optimized] target(s) in [ELAPSED]s "#]]).run(); @@ -56,7 +56,7 @@ fn opt_level_override_0() { .build(); p.cargo("build -v").with_stderr_data(str![[r#" [COMPILING] test v0.0.0 ([ROOT]/foo) -[RUNNING] `rustc --crate-name test --edition=2015 src/lib.rs [..]--crate-type lib --emit=[..]link[..]-C debuginfo=2 [..] -C metadata=[..] --out-dir [ROOT]/foo/target/debug/deps -L dependency=[ROOT]/foo/target/debug/deps` +[RUNNING] `rustc --crate-name test --edition=2015 src/lib.rs --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --crate-type lib --emit=dep-info,metadata,link -C embed-bitcode=no -C debuginfo=2 --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values())' -C metadata=f0cd33584831c5ef -C extra-filename=-40839eaf8deeb2be --out-dir [ROOT]/foo/target/debug/build/test/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/test/[HASH]/deps` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s "#]]).run(); @@ -82,7 +82,7 @@ fn debug_override_1() { .build(); p.cargo("build -v").with_stderr_data(str![[r#" [COMPILING] test v0.0.0 ([ROOT]/foo) -[RUNNING] `rustc --crate-name test --edition=2015 src/lib.rs [..]--crate-type lib --emit=[..]link[..]-C debuginfo=1 [..]-C metadata=[..] --out-dir [ROOT]/foo/target/debug/deps -L dependency=[ROOT]/foo/target/debug/deps` +[RUNNING] `rustc --crate-name test --edition=2015 src/lib.rs --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --crate-type lib --emit=dep-info,metadata,link -C embed-bitcode=no -C debuginfo=1 --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values())' -C metadata=e76852758b67cebb -C extra-filename=-f5629bcd274da08b --out-dir [ROOT]/foo/target/debug/build/test/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/test/[HASH]/deps` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s "#]]).run(); @@ -120,7 +120,7 @@ fn check_opt_level_override(profile_level: &str, rustc_level: &str) { -C debug-assertions=on[..] \ -C metadata=[..] \ --out-dir [..] \ - -L dependency=[ROOT]/foo/target/debug/deps` + [..] [FINISHED] `dev` profile [..]+ debuginfo] target(s) in [ELAPSED]s ", level = rustc_level @@ -196,8 +196,8 @@ fn top_level_overrides_deps() { -C opt-level=1[..]\ -C debuginfo=2 [..]\ -C metadata=[..] \ - --out-dir [ROOT]/foo/target/release/deps \ - -L dependency=[ROOT]/foo/target/release/deps` + --out-dir [ROOT]/foo/target/release/build/foo/[HASH]/deps \ + [..] [COMPILING] test v0.0.0 ([ROOT]/foo) [RUNNING] `rustc --crate-name test --edition=2015 src/lib.rs [..]--crate-type lib \ --emit=[..]link \ @@ -205,14 +205,9 @@ fn top_level_overrides_deps() { -C debuginfo=2 [..]\ -C metadata=[..] \ --out-dir [..] \ - -L dependency=[ROOT]/foo/target/release/deps \ - --extern foo=[ROOT]/foo/target/release/deps/\ - {prefix}foo[..]{suffix} \ - --extern foo=[ROOT]/foo/target/release/deps/libfoo.rlib` + [..] [FINISHED] `release` profile [optimized + debuginfo] target(s) in [ELAPSED]s ", - prefix = env::consts::DLL_PREFIX, - suffix = env::consts::DLL_SUFFIX )) .run(); } @@ -429,9 +424,9 @@ fn panic_unwind_does_not_build_twice() { [RUNNING] `rustc --crate-name foo --edition=2015 src/main.rs [..] --test [..]` [RUNNING] `rustc --crate-name t1 --edition=2015 tests/t1.rs [..]` [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[EXECUTABLE] `[ROOT]/foo/target/debug/deps/foo-[HASH][EXE]` -[EXECUTABLE] `[ROOT]/foo/target/debug/deps/foo-[HASH][EXE]` -[EXECUTABLE] `[ROOT]/foo/target/debug/deps/t1-[HASH][EXE]` +[EXECUTABLE] `[ROOT]/foo/target/debug/build/foo/[HASH]/deps/foo-[HASH]` +[EXECUTABLE] `[ROOT]/foo/target/debug/build/foo/[HASH]/deps/foo-[HASH]` +[EXECUTABLE] `[ROOT]/foo/target/debug/build/foo/[HASH]/deps/t1-[HASH]` "#]] .unordered(), diff --git a/tests/testsuite/rename_deps.rs b/tests/testsuite/rename_deps.rs index 94d5698a87a..33f641b1f8f 100644 --- a/tests/testsuite/rename_deps.rs +++ b/tests/testsuite/rename_deps.rs @@ -282,7 +282,7 @@ fn can_run_doc_tests() { foo.cargo("test -v").with_stderr_data(str![[r#" ... [DOCTEST] foo -[RUNNING] `rustdoc [..]--test src/lib.rs [..] --extern bar=[ROOT]/foo/target/debug/deps/libbar-[HASH].rlib --extern baz=[ROOT]/foo/target/debug/deps/libbar-[HASH].rlib [..]` +[RUNNING] `rustdoc --edition=2015 --crate-type lib --color auto --crate-name foo --test src/lib.rs --test-run-directory [ROOT]/foo --extern bar=[ROOT]/foo/target/debug/build/bar/[HASH]/deps/libbar-[HASH].rlib --extern baz=[ROOT]/foo/target/debug/build/bar/[HASH]/deps/libbar-[HASH].rlib --extern foo=[ROOT]/foo/target/debug/build/foo/[HASH]/deps/libfoo-[HASH].rlib -L dependency=[ROOT]/foo/target/debug/build/bar/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/bar/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/foo/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/foo/[HASH]/deps -C embed-bitcode=no --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values())' --error-format human` "#]]).run(); } diff --git a/tests/testsuite/required_features.rs b/tests/testsuite/required_features.rs index 8cab2a9a2a1..b6932806d88 100644 --- a/tests/testsuite/required_features.rs +++ b/tests/testsuite/required_features.rs @@ -295,7 +295,7 @@ fn test_default_features() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] tests/foo.rs (target/debug/deps/foo-[HASH][EXE]) +[RUNNING] tests/foo.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -320,7 +320,7 @@ test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; fini p.cargo("test --test=foo") .with_stderr_data(str![[r#" [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] tests/foo.rs (target/debug/deps/foo-[HASH][EXE]) +[RUNNING] tests/foo.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -371,7 +371,7 @@ fn test_arg_features() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] tests/foo.rs (target/debug/deps/foo-[HASH][EXE]) +[RUNNING] tests/foo.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -421,7 +421,7 @@ fn test_multiple_required_features() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] tests/foo_2.rs (target/debug/deps/foo_2-[HASH][EXE]) +[RUNNING] tests/foo_2.rs (target/debug/build/foo/[HASH]/deps/foo_2-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -439,8 +439,8 @@ test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; fini .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] tests/foo_1.rs (target/debug/deps/foo_1-[HASH][EXE]) -[RUNNING] tests/foo_2.rs (target/debug/deps/foo_2-[HASH][EXE]) +[RUNNING] tests/foo_1.rs (target/debug/build/foo/[HASH]/deps/foo_1-[HASH]) +[RUNNING] tests/foo_2.rs (target/debug/build/foo/[HASH]/deps/foo_2-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -507,7 +507,7 @@ fn bench_default_features() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] benches/foo.rs (target/release/deps/foo-[HASH][EXE]) +[RUNNING] benches/foo.rs (target/release/build/foo/[HASH]/deps/foo-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -532,7 +532,7 @@ test result: ok. 0 passed; 0 failed; 0 ignored; 1 measured; 0 filtered out; fini p.cargo("bench --bench=foo") .with_stderr_data(str![[r#" [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] benches/foo.rs (target/release/deps/foo-[HASH][EXE]) +[RUNNING] benches/foo.rs (target/release/build/foo/[HASH]/deps/foo-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -593,7 +593,7 @@ fn bench_arg_features() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] benches/foo.rs (target/release/deps/foo-[HASH][EXE]) +[RUNNING] benches/foo.rs (target/release/build/foo/[HASH]/deps/foo-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -663,7 +663,7 @@ fn bench_multiple_required_features() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] benches/foo_2.rs (target/release/deps/foo_2-[HASH][EXE]) +[RUNNING] benches/foo_2.rs (target/release/build/foo/[HASH]/deps/foo_2-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -681,8 +681,8 @@ test result: ok. 0 passed; 0 failed; 0 ignored; 1 measured; 0 filtered out; fini .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] benches/foo_1.rs (target/release/deps/foo_1-[HASH][EXE]) -[RUNNING] benches/foo_2.rs (target/release/deps/foo_2-[HASH][EXE]) +[RUNNING] benches/foo_1.rs (target/release/build/foo/[HASH]/deps/foo_1-[HASH]) +[RUNNING] benches/foo_2.rs (target/release/build/foo/[HASH]/deps/foo_2-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -1036,7 +1036,7 @@ fn dep_feature_in_toml() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] tests/foo.rs (target/debug/deps/foo-[HASH][EXE]) +[RUNNING] tests/foo.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -1057,7 +1057,7 @@ test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; fini [COMPILING] bar v0.0.1 ([ROOT]/foo/bar) [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] benches/foo.rs (target/release/deps/foo-[HASH][EXE]) +[RUNNING] benches/foo.rs (target/release/build/foo/[HASH]/deps/foo-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -1203,7 +1203,7 @@ Consider enabling them by passing, e.g., `--features="bar/a"` [COMPILING] bar v0.0.1 ([ROOT]/foo/bar) [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] tests/foo.rs (target/debug/deps/foo-[HASH][EXE]) +[RUNNING] tests/foo.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -1232,7 +1232,7 @@ test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; fini [COMPILING] bar v0.0.1 ([ROOT]/foo/bar) [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] benches/foo.rs (target/release/deps/foo-[HASH][EXE]) +[RUNNING] benches/foo.rs (target/release/build/foo/[HASH]/deps/foo-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -1297,7 +1297,7 @@ fn test_skips_compiling_bin_with_missing_required_features() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] tests/foo.rs (target/debug/deps/foo-[HASH][EXE]) +[RUNNING] tests/foo.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -1324,7 +1324,7 @@ error[E0463]: can't find crate for `bar` .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] benches/foo.rs (target/release/deps/foo-[HASH][EXE]) +[RUNNING] benches/foo.rs (target/release/build/foo/[HASH]/deps/foo-[HASH]) "#]]) .with_stdout_data(str![[r#" diff --git a/tests/testsuite/run.rs b/tests/testsuite/run.rs index 3ab373bd53b..a9d33166550 100644 --- a/tests/testsuite/run.rs +++ b/tests/testsuite/run.rs @@ -1104,9 +1104,9 @@ fn example_with_release_flag() { .with_stderr_data(str![[r#" [LOCKING] 1 package to latest compatible version [COMPILING] bar v0.5.0 ([ROOT]/foo/bar) -[RUNNING] `rustc --crate-name bar --edition=2015 bar/src/bar.rs [..]--crate-type lib --emit=[..]link -C opt-level=3[..] -C metadata=[..] --out-dir [ROOT]/foo/target/release/deps -C strip=debuginfo -L dependency=[ROOT]/foo/target/release/deps` +[RUNNING] `rustc --crate-name bar --edition=2015 bar/src/bar.rs --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --crate-type lib --emit=dep-info,metadata,link -C opt-level=3 -C embed-bitcode=no --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values())' -C metadata=4b4c41484ba13dd7 -C extra-filename=-eb0b6d9cce2c8f14 --out-dir [ROOT]/foo/target/release/build/bar/[HASH]/deps -C strip=debuginfo -L dependency=[ROOT]/foo/target/release/build/bar/[HASH]/deps` [COMPILING] foo v0.0.1 ([ROOT]/foo) -[RUNNING] `rustc --crate-name a --edition=2015 examples/a.rs [..]--crate-type bin --emit=[..]link -C opt-level=3[..] -C metadata=[..] --out-dir [ROOT]/foo/target/release/examples -C strip=debuginfo -L dependency=[ROOT]/foo/target/release/deps --extern bar=[ROOT]/foo/target/release/deps/libbar-[HASH].rlib` +[RUNNING] `rustc --crate-name a --edition=2015 examples/a.rs --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --crate-type bin --emit=dep-info,link -C opt-level=3 -C embed-bitcode=no --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values())' -C metadata=a310b6002f34a2b4 -C extra-filename=-9a6ff14d1ab1cf39 --out-dir [ROOT]/foo/target/release/examples -C strip=debuginfo -L dependency=[ROOT]/foo/target/release/build/bar/[HASH]/deps -L dependency=[ROOT]/foo/target/release/build/foo/[HASH]/deps --extern bar=[ROOT]/foo/target/release/build/bar/[HASH]/deps/libbar-[HASH].rlib` [FINISHED] `release` profile [optimized] target(s) in [ELAPSED]s [RUNNING] `target/release/examples/a[EXE]` @@ -1121,9 +1121,9 @@ fast2 p.cargo("run -v --example a") .with_stderr_data(str![[r#" [COMPILING] bar v0.5.0 ([ROOT]/foo/bar) -[RUNNING] `rustc --crate-name bar --edition=2015 bar/src/bar.rs [..]--crate-type lib --emit=[..]link [..]-C debuginfo=2 [..]-C metadata=[..] --out-dir [ROOT]/foo/target/debug/deps -L dependency=[ROOT]/foo/target/debug/deps` +[RUNNING] `rustc --crate-name bar --edition=2015 bar/src/bar.rs --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --crate-type lib --emit=dep-info,metadata,link -C embed-bitcode=no -C debuginfo=2 --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values())' -C metadata=3d09d03f37f16b23 -C extra-filename=-f9efe902b82a1225 --out-dir [ROOT]/foo/target/debug/build/bar/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/bar/[HASH]/deps` [COMPILING] foo v0.0.1 ([ROOT]/foo) -[RUNNING] `rustc --crate-name a --edition=2015 examples/a.rs [..]--crate-type bin --emit=[..]link [..]-C debuginfo=2 [..]-C metadata=[..] --out-dir [ROOT]/foo/target/debug/examples -L dependency=[ROOT]/foo/target/debug/deps --extern bar=[ROOT]/foo/target/debug/deps/libbar-[HASH].rlib` +[RUNNING] `rustc --crate-name a --edition=2015 examples/a.rs --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --crate-type bin --emit=dep-info,link -C embed-bitcode=no -C debuginfo=2 --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values())' -C metadata=d824871c888463da -C extra-filename=-9474d1c993490d29 --out-dir [ROOT]/foo/target/debug/examples -L dependency=[ROOT]/foo/target/debug/build/bar/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/foo/[HASH]/deps --extern bar=[ROOT]/foo/target/debug/build/bar/[HASH]/deps/libbar-[HASH].rlib` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s [RUNNING] `target/debug/examples/a[EXE]` diff --git a/tests/testsuite/rustc.rs b/tests/testsuite/rustc.rs index bf36936f640..38ff476cfe2 100644 --- a/tests/testsuite/rustc.rs +++ b/tests/testsuite/rustc.rs @@ -17,7 +17,7 @@ fn build_lib_for_foo() { p.cargo("rustc --lib -v").with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) -[RUNNING] `rustc --crate-name foo --edition=2015 src/lib.rs [..]--crate-type lib --emit=[..]link[..]-C debuginfo=2 [..]-C metadata=[..] [..]--out-dir [ROOT]/foo/target/debug/deps -L dependency=[ROOT]/foo/target/debug/deps` +[RUNNING] `rustc --crate-name foo --edition=2015 src/lib.rs --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --crate-type lib --emit=dep-info,metadata,link -C embed-bitcode=no -C debuginfo=2 --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values())' -C metadata=88f4df7e68c96ebb -C extra-filename=-5ac581d057822bf6 --out-dir [ROOT]/foo/target/debug/build/foo/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/foo/[HASH]/deps` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s "#]]).run(); @@ -33,7 +33,7 @@ fn lib() { p.cargo("rustc --lib -v -- -C debug-assertions=off") .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) -[RUNNING] `rustc --crate-name foo --edition=2015 src/lib.rs [..]--crate-type lib --emit=[..]link[..]-C debuginfo=2 [..]-C metadata=[..] [..]--out-dir [ROOT]/foo/target/debug/deps -L dependency=[ROOT]/foo/target/debug/deps[..]-C debug-assertions=off[..]` +[RUNNING] `rustc --crate-name foo --edition=2015 src/lib.rs --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --crate-type lib --emit=dep-info,metadata,link -C embed-bitcode=no -C debuginfo=2 --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values())' -C metadata=88f4df7e68c96ebb -C extra-filename=-12c82b2f07b93f96 --out-dir [ROOT]/foo/target/debug/build/foo/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/foo/[HASH]/deps -C debug-assertions=off` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s "#]]) @@ -50,8 +50,8 @@ fn build_main_and_allow_unstable_options() { p.cargo("rustc -v --bin foo -- -C debug-assertions") .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) -[RUNNING] `rustc --crate-name foo --edition=2015 src/lib.rs [..]--crate-type lib --emit=[..]link[..]-C debuginfo=2 [..]-C metadata=[..] --out-dir [ROOT]/foo/target/debug/deps -L dependency=[ROOT]/foo/target/debug/deps` -[RUNNING] `rustc --crate-name foo --edition=2015 src/main.rs [..]--crate-type bin --emit=[..]link[..]-C debuginfo=2 [..]-C metadata=[..] --out-dir [ROOT]/foo/target/debug/deps -L dependency=[ROOT]/foo/target/debug/deps --extern foo=[ROOT]/foo/target/debug/deps/libfoo-[HASH].rlib[..]-C debug-assertions[..]` +[RUNNING] `rustc --crate-name foo --edition=2015 src/lib.rs --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --crate-type lib --emit=dep-info,metadata,link -C embed-bitcode=no -C debuginfo=2 --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values())' -C metadata=88f4df7e68c96ebb -C extra-filename=-5ac581d057822bf6 --out-dir [ROOT]/foo/target/debug/build/foo/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/foo/[HASH]/deps` +[RUNNING] `rustc --crate-name foo --edition=2015 src/main.rs --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --crate-type bin --emit=dep-info,link -C embed-bitcode=no -C debuginfo=2 --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values())' -C metadata=1374f75dd0349bd8 -C extra-filename=-a557799b8a131d91 --out-dir [ROOT]/foo/target/debug/build/foo/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/foo/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/foo/[HASH]/deps --extern foo=[ROOT]/foo/target/debug/build/foo/[HASH]/deps/libfoo-[HASH].rlib -C debug-assertions` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s "#]]) diff --git a/tests/testsuite/rustdoc.rs b/tests/testsuite/rustdoc.rs index be24516e1b0..2dd6455ae72 100644 --- a/tests/testsuite/rustdoc.rs +++ b/tests/testsuite/rustdoc.rs @@ -13,7 +13,7 @@ fn rustdoc_simple() { p.cargo("rustdoc -v") .with_stderr_data(str![[r#" [DOCUMENTING] foo v0.0.1 ([ROOT]/foo) -[RUNNING] `rustdoc [..] --crate-name foo src/lib.rs -o [ROOT]/foo/target/doc [..] -L dependency=[ROOT]/foo/target/debug/deps [..]` +[RUNNING] `rustdoc --edition=2015 --crate-type lib --crate-name foo src/lib.rs -o [ROOT]/foo/target/doc --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values())' --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat -C metadata=abed4ffdd90a31bc -L dependency=[ROOT]/foo/target/debug/build/foo/[HASH]/deps --crate-version 0.0.1` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s [GENERATED] [ROOT]/foo/target/doc/foo/index.html @@ -108,7 +108,7 @@ fn rustdoc_args() { p.cargo("rustdoc -v -- --cfg=foo") .with_stderr_data(str![[r#" [DOCUMENTING] foo v0.0.1 ([ROOT]/foo) -[RUNNING] `rustdoc [..] --crate-name foo src/lib.rs -o [ROOT]/foo/target/doc [..]-C metadata=[..] -L dependency=[ROOT]/foo/target/debug/deps [..]--cfg=foo[..]` +[RUNNING] `rustdoc --edition=2015 --crate-type lib --crate-name foo src/lib.rs -o [ROOT]/foo/target/doc --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values())' --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat -C metadata=abed4ffdd90a31bc -L dependency=[ROOT]/foo/target/debug/build/foo/[HASH]/deps --cfg=foo --crate-version 0.0.1` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s [GENERATED] [ROOT]/foo/target/doc/foo/index.html @@ -161,7 +161,7 @@ fn rustdoc_foo_with_bar_dependency() { [CHECKING] bar v0.0.1 ([ROOT]/bar) [RUNNING] `rustc [..] [ROOT]/bar/src/lib.rs [..]` [DOCUMENTING] foo v0.0.1 ([ROOT]/foo) -[RUNNING] `rustdoc [..] --crate-name foo src/lib.rs -o [ROOT]/foo/target/doc [..]-C metadata=[..] -L dependency=[ROOT]/foo/target/debug/deps --extern [..]--cfg=foo[..]` +[RUNNING] `rustdoc --edition=2015 --crate-type lib --crate-name foo src/lib.rs -o [ROOT]/foo/target/doc --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values())' --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat -C metadata=51580e9609955257 -L dependency=[ROOT]/foo/target/debug/build/bar/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/foo/[HASH]/deps --extern bar=[ROOT]/foo/target/debug/build/bar/[HASH]/deps/libbar-[HASH].rmeta --cfg=foo --crate-version 0.0.1` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s [GENERATED] [ROOT]/foo/target/doc/foo/index.html @@ -197,7 +197,7 @@ fn rustdoc_only_bar_dependency() { .with_stderr_data(str![[r#" [LOCKING] 1 package to latest compatible version [DOCUMENTING] bar v0.0.1 ([ROOT]/bar) -[RUNNING] `rustdoc [..] --crate-name bar [ROOT]/bar/src/lib.rs -o [ROOT]/foo/target/doc [..]-C metadata=[..] -L dependency=[ROOT]/foo/target/debug/deps [..]--cfg=foo[..]` +[RUNNING] `rustdoc --edition=2015 --crate-type lib --crate-name bar [ROOT]/bar/src/lib.rs -o [ROOT]/foo/target/doc --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values())' --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat -C metadata=9404fbabedfd5f48 -L dependency=[ROOT]/foo/target/debug/build/bar/[HASH]/deps --cfg=foo --crate-version 0.0.1` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s [GENERATED] [ROOT]/foo/target/doc/bar/index.html @@ -215,7 +215,7 @@ fn rustdoc_same_name_documents_lib() { p.cargo("rustdoc -v -- --cfg=foo") .with_stderr_data(str![[r#" [DOCUMENTING] foo v0.0.1 ([ROOT]/foo) -[RUNNING] `rustdoc [..] --crate-name foo src/lib.rs -o [ROOT]/foo/target/doc [..]-C metadata=[..] -L dependency=[ROOT]/foo/target/debug/deps [..]--cfg=foo[..]` +[RUNNING] `rustdoc --edition=2015 --crate-type lib --crate-name foo src/lib.rs -o [ROOT]/foo/target/doc --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values())' --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat -C metadata=abed4ffdd90a31bc -L dependency=[ROOT]/foo/target/debug/build/foo/[HASH]/deps --cfg=foo --crate-version 0.0.1` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s [GENERATED] [ROOT]/foo/target/doc/foo/index.html @@ -292,7 +292,7 @@ fn rustdoc_target() { .arg(cross_compile::alternate()) .with_stderr_data(str![[r#" [DOCUMENTING] foo v0.0.1 ([ROOT]/foo) -[RUNNING] `rustdoc [..]--crate-name foo src/lib.rs [..]--target [ALT_TARGET] -o [ROOT]/foo/target/[ALT_TARGET]/doc [..] -L dependency=[ROOT]/foo/target/[ALT_TARGET]/debug/deps -L dependency=[ROOT]/foo/target/debug/deps[..]` +[RUNNING] `rustdoc --edition=2015 --crate-type lib --crate-name foo src/lib.rs --target [ALT_TARGET] -o [ROOT]/foo/target/[ALT_TARGET]/doc --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values())' --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat -C metadata=d06f108cf9f288d7 -L dependency=[ROOT]/foo/target/[ALT_TARGET]/debug/build/foo/[HASH]/deps -L dependency=[ROOT]/foo/target/debug/build/foo/[HASH]/deps --crate-version 0.0.1` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s [GENERATED] [ROOT]/foo/target/[..]/doc/foo/index.html diff --git a/tests/testsuite/rustflags.rs b/tests/testsuite/rustflags.rs index 6d7c68f9e42..c049ebfb6fb 100644 --- a/tests/testsuite/rustflags.rs +++ b/tests/testsuite/rustflags.rs @@ -1197,9 +1197,9 @@ fn cfg_rustflags_normal_source() { [RUNNING] `rustc [..] --cfg bar` [RUNNING] `rustc [..] --cfg bar` [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[EXECUTABLE] `[ROOT]/foo/target/debug/deps/foo-[HASH][EXE]` -[EXECUTABLE] `[ROOT]/foo/target/debug/deps/a-[HASH][EXE]` -[EXECUTABLE] `[ROOT]/foo/target/debug/deps/c-[HASH][EXE]` +[EXECUTABLE] `[ROOT]/foo/target/debug/build/foo/[HASH]/deps/foo-[HASH]` +[EXECUTABLE] `[ROOT]/foo/target/debug/build/foo/[HASH]/deps/a-[HASH]` +[EXECUTABLE] `[ROOT]/foo/target/debug/build/foo/[HASH]/deps/c-[HASH]` "#]]) .run(); @@ -1211,8 +1211,8 @@ fn cfg_rustflags_normal_source() { [RUNNING] `rustc [..] --cfg bar` [RUNNING] `rustc [..] --cfg bar` [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s -[EXECUTABLE] `[ROOT]/foo/target/release/deps/foo-[HASH][EXE]` -[EXECUTABLE] `[ROOT]/foo/target/release/deps/a-[HASH][EXE]` +[EXECUTABLE] `[ROOT]/foo/target/release/build/foo/[HASH]/deps/foo-[HASH]` +[EXECUTABLE] `[ROOT]/foo/target/release/build/foo/[HASH]/deps/a-[HASH]` "#]]) .run(); @@ -1279,9 +1279,9 @@ fn cfg_rustflags_precedence() { [RUNNING] `rustc [..] --cfg bar` [RUNNING] `rustc [..] --cfg bar` [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[EXECUTABLE] `[ROOT]/foo/target/debug/deps/foo-[HASH][EXE]` -[EXECUTABLE] `[ROOT]/foo/target/debug/deps/a-[HASH][EXE]` -[EXECUTABLE] `[ROOT]/foo/target/debug/deps/c-[HASH][EXE]` +[EXECUTABLE] `[ROOT]/foo/target/debug/build/foo/[HASH]/deps/foo-[HASH]` +[EXECUTABLE] `[ROOT]/foo/target/debug/build/foo/[HASH]/deps/a-[HASH]` +[EXECUTABLE] `[ROOT]/foo/target/debug/build/foo/[HASH]/deps/c-[HASH]` "#]]) .run(); @@ -1293,8 +1293,8 @@ fn cfg_rustflags_precedence() { [RUNNING] `rustc [..] --cfg bar` [RUNNING] `rustc [..] --cfg bar` [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s -[EXECUTABLE] `[ROOT]/foo/target/release/deps/foo-[HASH][EXE]` -[EXECUTABLE] `[ROOT]/foo/target/release/deps/a-[HASH][EXE]` +[EXECUTABLE] `[ROOT]/foo/target/release/build/foo/[HASH]/deps/foo-[HASH]` +[EXECUTABLE] `[ROOT]/foo/target/release/build/foo/[HASH]/deps/a-[HASH]` "#]]) .run(); @@ -1783,9 +1783,9 @@ fn host_config_shared_build_dep() { [RUNNING] `rustc --crate-name cc [..]--cfg from_target[..]` [COMPILING] bootstrap v0.0.0 ([ROOT]/foo) [RUNNING] `rustc --crate-name build_script_build [..]--cfg from_host[..]` -[RUNNING] `[ROOT]/foo/target/debug/build/bootstrap-[HASH]/build-script-build` [RUNNING] `rustc --crate-name bootstrap[..]--cfg from_target[..]` [FINISHED] `dev` profile [unoptimized] target(s) in [ELAPSED]s +[RUNNING] `[ROOT]/foo/target/debug/build/bootstrap/[HASH]/build-script/build-script-build` "#]] .unordered(), diff --git a/tests/testsuite/script/cargo.rs b/tests/testsuite/script/cargo.rs index 6d8a2e96b89..220bb0a20cd 100644 --- a/tests/testsuite/script/cargo.rs +++ b/tests/testsuite/script/cargo.rs @@ -1654,7 +1654,7 @@ test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; fini [WARNING] `package.edition` is unspecified, defaulting to `2024` [COMPILING] script v0.0.0 ([ROOT]/foo/script.rs) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests script.rs ([ROOT]/home/.cargo/build/[HASH]/debug/deps/script-[HASH][EXE]) +[RUNNING] unittests script.rs ([ROOT]/home/.cargo/build/[HASH]/debug/build/script/[HASH]/deps/script-[HASH]) "#]]) .run(); diff --git a/tests/testsuite/test.rs b/tests/testsuite/test.rs index dacff7631b7..169f593c9e5 100644 --- a/tests/testsuite/test.rs +++ b/tests/testsuite/test.rs @@ -49,7 +49,7 @@ hello .with_stderr_data(str![[r#" [COMPILING] foo v0.5.0 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/main.rs (target/debug/deps/foo-[HASH][EXE]) +[RUNNING] unittests src/main.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -109,8 +109,8 @@ fn cargo_test_release() { [RUNNING] `rustc [..]-C opt-level=3 [..]` [RUNNING] `rustc [..]-C opt-level=3 [..]` [FINISHED] `release` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] `[ROOT]/foo/target/release/deps/foo-[HASH][EXE]` -[RUNNING] `[ROOT]/foo/target/release/deps/test-[HASH][EXE]` +[RUNNING] `[ROOT]/foo/target/release/build/foo/[HASH]/deps/foo-[HASH]` +[RUNNING] `[ROOT]/foo/target/release/build/foo/[HASH]/deps/test-[HASH]` [DOCTEST] foo [RUNNING] `rustdoc [..]--test src/lib.rs[..]` @@ -329,7 +329,7 @@ fn cargo_test_verbose() { [COMPILING] foo v0.5.0 ([ROOT]/foo) [RUNNING] `rustc [..] src/main.rs [..]` [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] `[ROOT]/foo/target/debug/deps/foo-[HASH][EXE] hello` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/deps/foo-[HASH] hello` "#]]) .with_stdout_data(str![[r#" @@ -417,7 +417,7 @@ hello .with_stderr_data(str![[r#" [COMPILING] foo v0.5.0 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/main.rs (target/debug/deps/foo-[HASH][EXE]) +[RUNNING] unittests src/main.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) [ERROR] test failed, to rerun pass `--bin foo` "#]]) @@ -451,8 +451,8 @@ hello .with_stderr_data(str![[r#" [COMPILING] foo v0.5.0 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/main.rs (target/debug/deps/foo-[HASH][EXE]) -[RUNNING] tests/footest.rs (target/debug/deps/footest-[HASH][EXE]) +[RUNNING] unittests src/main.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) +[RUNNING] tests/footest.rs (target/debug/build/foo/[HASH]/deps/footest-[HASH]) [ERROR] test failed, to rerun pass `--test footest` "#]]) @@ -488,7 +488,7 @@ fn cargo_test_failing_test_in_lib() { .with_stderr_data(str![[r#" [COMPILING] foo v0.5.0 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/debug/deps/foo-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) [ERROR] test failed, to rerun pass `--lib` "#]]) @@ -553,8 +553,8 @@ fn test_with_lib_dep() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/debug/deps/foo-[HASH][EXE]) -[RUNNING] unittests src/main.rs (target/debug/deps/baz-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) +[RUNNING] unittests src/main.rs (target/debug/build/foo/[HASH]/deps/baz-[HASH]) [DOCTEST] foo "#]]) @@ -615,7 +615,7 @@ fn test_with_deep_lib_dep() { [COMPILING] bar v0.0.1 ([ROOT]/bar) [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/debug/deps/foo-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) [DOCTEST] foo "#]]) @@ -671,8 +671,8 @@ fn external_test_explicit() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/debug/deps/foo-[HASH][EXE]) -[RUNNING] src/test.rs (target/debug/deps/test-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) +[RUNNING] src/test.rs (target/debug/build/foo/[HASH]/deps/test-[HASH]) [DOCTEST] foo "#]]) @@ -738,8 +738,8 @@ fn external_test_implicit() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/debug/deps/foo-[HASH][EXE]) -[RUNNING] tests/external.rs (target/debug/deps/external-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) +[RUNNING] tests/external.rs (target/debug/build/foo/[HASH]/deps/external-[HASH]) [DOCTEST] foo "#]]) @@ -803,7 +803,7 @@ fn pass_through_escaped() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/debug/deps/foo-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) [DOCTEST] foo "#]]) @@ -818,7 +818,7 @@ test test_bar ... ok p.cargo("test -- foo") .with_stderr_data(str![[r#" [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/debug/deps/foo-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) [DOCTEST] foo "#]]) @@ -833,7 +833,7 @@ test test_foo ... ok p.cargo("test -- foo bar") .with_stderr_data(str![[r#" [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/debug/deps/foo-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) [DOCTEST] foo "#]]) @@ -884,7 +884,7 @@ fn pass_through_testname() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/debug/deps/foo-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -898,7 +898,7 @@ test test_bar ... ok p.cargo("test foo") .with_stderr_data(str![[r#" [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/debug/deps/foo-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -912,7 +912,7 @@ test test_foo ... ok p.cargo("test foo -- bar") .with_stderr_data(str![[r#" [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/debug/deps/foo-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) "#]]) .with_stdout_data( @@ -984,8 +984,8 @@ fn lib_bin_same_name() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/debug/deps/foo-[HASH][EXE]) -[RUNNING] unittests src/main.rs (target/debug/deps/foo-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) +[RUNNING] unittests src/main.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) [DOCTEST] foo "#]]) @@ -1032,8 +1032,8 @@ fn lib_with_standard_name() { .with_stderr_data(str![[r#" [COMPILING] syntax v0.0.1 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/debug/deps/syntax-[HASH][EXE]) -[RUNNING] tests/test.rs (target/debug/deps/test-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/debug/build/syntax/[HASH]/deps/syntax-[HASH]) +[RUNNING] tests/test.rs (target/debug/build/syntax/[HASH]/deps/test-[HASH]) [DOCTEST] syntax "#]]) @@ -1085,7 +1085,7 @@ fn lib_with_standard_name2() { .with_stderr_data(str![[r#" [COMPILING] syntax v0.0.1 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/main.rs (target/debug/deps/syntax-[HASH][EXE]) +[RUNNING] unittests src/main.rs (target/debug/build/syntax/[HASH]/deps/syntax-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -1131,7 +1131,7 @@ fn lib_without_name() { .with_stderr_data(str![[r#" [COMPILING] syntax v0.0.1 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/main.rs (target/debug/deps/syntax-[HASH][EXE]) +[RUNNING] unittests src/main.rs (target/debug/build/syntax/[HASH]/deps/syntax-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -1460,8 +1460,8 @@ fn test_dylib() { [COMPILING] bar v0.0.1 ([ROOT]/foo/bar) [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/debug/deps/foo-[HASH][EXE]) -[RUNNING] tests/test.rs (target/debug/deps/test-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) +[RUNNING] tests/test.rs (target/debug/build/foo/[HASH]/deps/test-[HASH]) "#]]) .with_stdout_data( @@ -1478,8 +1478,8 @@ test foo ... ok p.cargo("test") .with_stderr_data(str![[r#" [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/debug/deps/foo-[HASH][EXE]) -[RUNNING] tests/test.rs (target/debug/deps/test-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) +[RUNNING] tests/test.rs (target/debug/build/foo/[HASH]/deps/test-[HASH]) "#]]) .with_stdout_data( @@ -1515,7 +1515,7 @@ fn test_twice_with_build_cmd() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/debug/deps/foo-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) [DOCTEST] foo "#]]) @@ -1532,7 +1532,7 @@ running 0 tests p.cargo("test") .with_stderr_data(str![[r#" [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/debug/deps/foo-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) [DOCTEST] foo "#]]) @@ -1555,7 +1555,7 @@ fn test_then_build() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/debug/deps/foo-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) [DOCTEST] foo "#]]) @@ -1587,7 +1587,7 @@ fn test_no_run() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[EXECUTABLE] unittests src/lib.rs (target/debug/deps/foo-[HASH][EXE]) +[EXECUTABLE] unittests src/lib.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) "#]]) .run(); @@ -1637,7 +1637,7 @@ fn test_run_specific_bin_target() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/bin2.rs (target/debug/deps/bin2-[HASH][EXE]) +[RUNNING] unittests src/bin2.rs (target/debug/build/foo/[HASH]/deps/bin2-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -1683,7 +1683,7 @@ fn test_run_implicit_bin_target() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/mybin.rs (target/debug/deps/mybin-[HASH][EXE]) +[RUNNING] unittests src/mybin.rs (target/debug/build/foo/[HASH]/deps/mybin-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -1707,7 +1707,7 @@ fn test_run_specific_test_target() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] tests/b.rs (target/debug/deps/b-[HASH][EXE]) +[RUNNING] tests/b.rs (target/debug/build/foo/[HASH]/deps/b-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -1752,8 +1752,8 @@ fn test_run_implicit_test_target() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/mybin.rs (target/debug/deps/mybin-[HASH][EXE]) -[RUNNING] tests/mytest.rs (target/debug/deps/mytest-[HASH][EXE]) +[RUNNING] unittests src/mybin.rs (target/debug/build/foo/[HASH]/deps/mybin-[HASH]) +[RUNNING] tests/mytest.rs (target/debug/build/foo/[HASH]/deps/mytest-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -1798,8 +1798,8 @@ fn test_run_implicit_bench_target() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/mybin.rs (target/debug/deps/mybin-[HASH][EXE]) -[RUNNING] benches/mybench.rs (target/debug/deps/mybench-[HASH][EXE]) +[RUNNING] unittests src/mybin.rs (target/debug/build/foo/[HASH]/deps/mybin-[HASH]) +[RUNNING] benches/mybench.rs (target/debug/build/foo/[HASH]/deps/mybench-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -1964,8 +1964,8 @@ test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; fini [RUNNING] `rustc --crate-name mybin --edition=2015 src/bin/mybin.rs [..] --crate-type bin [..]` [RUNNING] `rustc --crate-name mytest --edition=2015 tests/mytest.rs [..] --test [..]` [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] `[ROOT]/foo/target/debug/deps/foo-[HASH][EXE] test_in_` -[RUNNING] `[ROOT]/foo/target/debug/deps/mytest-[HASH][EXE] test_in_` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/deps/foo-[HASH] test_in_` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/deps/mytest-[HASH] test_in_` "#]] .unordered(), @@ -2005,7 +2005,7 @@ fn test_no_harness() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] foo.rs (target/debug/deps/bar-[HASH][EXE]) +[RUNNING] foo.rs (target/debug/build/foo/[HASH]/deps/bar-[HASH]) "#]]) .run(); @@ -2080,8 +2080,8 @@ fn selective_testing() { [LOCKING] 2 packages to latest compatible versions [COMPILING] d1 v0.0.1 ([ROOT]/foo/d1) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/debug/deps/d1-[HASH][EXE]) -[RUNNING] unittests src/main.rs (target/debug/deps/d1-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/debug/build/[HASH]63/deps/d1-[HASH]) +[RUNNING] unittests src/main.rs (target/debug/build/[HASH]d5/deps/d1-[HASH]) "#]]) .with_stdout_data( @@ -2099,8 +2099,8 @@ running 0 tests .with_stderr_data(str![[r#" [COMPILING] d2 v0.0.1 ([ROOT]/foo/d2) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/debug/deps/d2-[HASH][EXE]) -[RUNNING] unittests src/main.rs (target/debug/deps/d2-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/debug/build/[HASH]e0/deps/d2-[HASH]) +[RUNNING] unittests src/main.rs (target/debug/build/[HASH]3c/deps/d2-[HASH]) "#]]) .with_stdout_data( @@ -2118,7 +2118,7 @@ running 0 tests .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/debug/deps/foo-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -2310,7 +2310,7 @@ fn selective_testing_with_docs() { [LOCKING] 1 package to latest compatible version [COMPILING] d1 v0.0.1 ([ROOT]/foo/d1) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests d1.rs (target/debug/deps/d1-[HASH][EXE]) +[RUNNING] unittests d1.rs (target/debug/build/[HASH]63/deps/d1-[HASH]) [DOCTEST] d1 "#]]) @@ -2338,7 +2338,7 @@ fn example_bin_same_name() { [RUNNING] `rustc [..]` [RUNNING] `rustc [..]` [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[EXECUTABLE] `[ROOT]/foo/target/debug/deps/foo-[HASH][EXE]` +[EXECUTABLE] `[ROOT]/foo/target/debug/build/foo/[HASH]/deps/foo-[HASH]` "#]]) .run(); @@ -2497,7 +2497,7 @@ fn doctest_feature() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/debug/deps/foo-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) [DOCTEST] foo "#]]) @@ -2651,7 +2651,7 @@ fn filter_no_doc_tests() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] tests/foo.rs (target/debug/deps/foo-[HASH][EXE]) +[RUNNING] tests/foo.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -2795,7 +2795,7 @@ fn cyclic_dev_dep_doc_test() { [COMPILING] foo v0.0.1 ([ROOT]/foo) [COMPILING] bar v0.0.1 ([ROOT]/foo/bar) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/debug/deps/foo-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) [DOCTEST] foo "#]]) @@ -2899,10 +2899,10 @@ fn no_fail_fast() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/debug/deps/foo-[HASH][EXE]) -[RUNNING] tests/test_add_one.rs (target/debug/deps/test_add_one-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) +[RUNNING] tests/test_add_one.rs (target/debug/build/foo/[HASH]/deps/test_add_one-[HASH]) [ERROR] test failed, to rerun pass `--test test_add_one` -[RUNNING] tests/test_sub_one.rs (target/debug/deps/test_sub_one-[HASH][EXE]) +[RUNNING] tests/test_sub_one.rs (target/debug/build/foo/[HASH]/deps/test_sub_one-[HASH]) [DOCTEST] foo [ERROR] 1 target failed: `--test test_add_one` @@ -2976,10 +2976,13 @@ fn test_multiple_packages() { p.cargo("test -p d1 -p d2") .with_stderr_data(str![[r#" -... -[RUNNING] unittests src/lib.rs (target/debug/deps/d1-[HASH][EXE]) -[RUNNING] unittests src/lib.rs (target/debug/deps/d2-[HASH][EXE]) -... +[LOCKING] 2 packages to latest compatible versions +[COMPILING] d1 v0.0.1 ([ROOT]/foo/d1) +[COMPILING] d2 v0.0.1 ([ROOT]/foo/d2) +[FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s +[RUNNING] unittests src/lib.rs (target/debug/build/[HASH]63/deps/d1-[HASH]) +[RUNNING] unittests src/lib.rs (target/debug/build/[HASH]e0/deps/d2-[HASH]) + "#]]) .with_stdout_data( str![[r#" @@ -3012,9 +3015,9 @@ fn bin_does_not_rebuild_tests() { [RUNNING] `rustc [..] src/main.rs [..]` [RUNNING] `rustc [..] src/main.rs [..]` [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[EXECUTABLE] `[ROOT]/foo/target/debug/deps/foo-[HASH][EXE]` -[EXECUTABLE] `[ROOT]/foo/target/debug/deps/foo-[HASH][EXE]` -[EXECUTABLE] `[ROOT]/foo/target/debug/deps/foo-[HASH][EXE]` +[EXECUTABLE] `[ROOT]/foo/target/debug/build/foo/[HASH]/deps/foo-[HASH]` +[EXECUTABLE] `[ROOT]/foo/target/debug/build/foo/[HASH]/deps/foo-[HASH]` +[EXECUTABLE] `[ROOT]/foo/target/debug/build/foo/[HASH]/deps/foo-[HASH]` "#]]) .run(); @@ -3075,7 +3078,7 @@ fn selective_test_optional_dep() { [RUNNING] `rustc [..] a/src/lib.rs [..]` [RUNNING] `rustc [..] a/src/lib.rs [..]` [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[EXECUTABLE] `[ROOT]/foo/target/debug/deps/a-[HASH][EXE]` +[EXECUTABLE] `[ROOT]/foo/target/debug/build/a/[HASH]/deps/a-[HASH]` "#]]) .run(); @@ -3230,7 +3233,7 @@ hello! [COMPILING] foo v0.0.1 ([ROOT]/foo) [RUNNING] `rustc [..]` [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] `[ROOT]/foo/target/debug/deps/foo-[HASH][EXE]` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/deps/foo-[HASH]` "#]]) .run(); @@ -4315,9 +4318,9 @@ fn test_hint_workspace_virtual() { [COMPILING] a v0.1.0 ([ROOT]/foo/a) [COMPILING] b v0.1.0 ([ROOT]/foo/b) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/debug/deps/a-[HASH][EXE]) -[RUNNING] unittests src/lib.rs (target/debug/deps/b-[HASH][EXE]) [ERROR] test failed, to rerun pass `-p b --lib` +[RUNNING] unittests src/lib.rs (target/debug/build/a/[HASH]/deps/a-[HASH]) +[RUNNING] unittests src/lib.rs (target/debug/build/b/[HASH]/deps/b-[HASH]) "#]] .unordered(), @@ -4328,7 +4331,7 @@ fn test_hint_workspace_virtual() { .cwd("b") .with_stderr_data(str![[r#" [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs ([ROOT]/foo/target/debug/deps/b-[HASH][EXE]) +[RUNNING] unittests src/lib.rs ([ROOT]/foo/target/debug/build/b/[HASH]/deps/b-[HASH]) [ERROR] test failed, to rerun pass `--lib` "#]]) @@ -4337,13 +4340,13 @@ fn test_hint_workspace_virtual() { p.cargo("test --no-fail-fast") .with_stderr_data(str![[r#" [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/debug/deps/a-[HASH][EXE]) -[RUNNING] unittests src/lib.rs (target/debug/deps/b-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/debug/build/a/[HASH]/deps/a-[HASH]) +[RUNNING] unittests src/lib.rs (target/debug/build/b/[HASH]/deps/b-[HASH]) [ERROR] test failed, to rerun pass `-p b --lib` -[RUNNING] unittests src/lib.rs (target/debug/deps/c-[HASH][EXE]) -[RUNNING] unittests src/main.rs (target/debug/deps/c-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/debug/build/c/[HASH]/deps/c-[HASH]) +[RUNNING] unittests src/main.rs (target/debug/build/c/[HASH]/deps/c-[HASH]) [ERROR] test failed, to rerun pass `-p c --bin c` -[RUNNING] tests/t1.rs (target/debug/deps/t1-[HASH][EXE]) +[RUNNING] tests/t1.rs (target/debug/build/c/[HASH]/deps/t1-[HASH]) [ERROR] test failed, to rerun pass `-p c --test t1` [DOCTEST] a [DOCTEST] b @@ -4363,10 +4366,10 @@ fn test_hint_workspace_virtual() { .with_stderr_data(str![[r#" [COMPILING] c v0.1.0 ([ROOT]/foo/c) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/debug/deps/c-[HASH][EXE]) -[RUNNING] unittests src/main.rs (target/debug/deps/c-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/debug/build/c/[HASH]/deps/c-[HASH]) +[RUNNING] unittests src/main.rs (target/debug/build/c/[HASH]/deps/c-[HASH]) [ERROR] test failed, to rerun pass `-p c --bin c` -[RUNNING] benches/b1.rs (target/debug/deps/b1-[HASH][EXE]) +[RUNNING] benches/b1.rs (target/debug/build/c/[HASH]/deps/b1-[HASH]) [ERROR] test failed, to rerun pass `-p c --bench b1` [RUNNING] unittests examples/ex1.rs (target/debug/examples/ex1-[HASH][EXE]) [ERROR] test failed, to rerun pass `-p c --example ex1` @@ -4443,7 +4446,7 @@ fn json_artifact_includes_test_flag() { str![[r#" [ { - "executable": "[ROOT]/foo/target/debug/deps/foo-[HASH][EXE]", + "executable": "[ROOT]/foo/target/debug/build/foo/[HASH]/deps/foo-[HASH]", "features": [], "filenames": "{...}", "fresh": false, @@ -4490,7 +4493,7 @@ fn json_artifact_includes_executable_for_library_tests() { str![[r#" [ { - "executable": "[ROOT]/foo/target/debug/deps/foo-[HASH][EXE]", + "executable": "[ROOT]/foo/target/debug/build/foo/[HASH]/deps/foo-[HASH]", "features": [], "filenames": "{...}", "fresh": false, @@ -4580,7 +4583,7 @@ fn json_artifact_includes_executable_for_integration_tests() { str![[r#" [ { - "executable": "[ROOT]/foo/target/debug/deps/integration_test-[HASH][EXE]", + "executable": "[ROOT]/foo/target/debug/build/foo/[HASH]/deps/integration_test-[HASH]", "features": [], "filenames": "{...}", "fresh": false, @@ -4676,7 +4679,7 @@ fn doctest_skip_staticlib() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/debug/deps/foo-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) "#]]) .run(); @@ -4704,7 +4707,7 @@ pub fn foo() -> u8 { 1 } .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/debug/deps/foo-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) [DOCTEST] foo "#]]) @@ -4728,7 +4731,7 @@ test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; fini p.cargo("test --lib") .with_stderr_data(str![[r#" [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/debug/deps/foo-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) "#]]) .with_stdout_data(str![[r#" @@ -4805,7 +4808,7 @@ fn test_all_targets_lib() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] unittests src/lib.rs (target/debug/deps/foo-[HASH][EXE]) +[RUNNING] unittests src/lib.rs (target/debug/build/foo/[HASH]/deps/foo-[HASH]) "#]]) .run(); @@ -5450,11 +5453,11 @@ fn execution_error() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] tests/t1.rs (target/debug/deps/t1-[HASH][EXE]) +[RUNNING] tests/t1.rs (target/debug/build/foo/[HASH]/deps/t1-[HASH]) [ERROR] test failed, to rerun pass `--test t1` Caused by: - could not execute process `does_not_exist [ROOT]/foo/target/debug/deps/t1-[HASH][EXE]` (never executed) + could not execute process `does_not_exist [ROOT]/foo/target/debug/build/foo/[HASH]/deps/t1-[HASH]` (never executed) Caused by: [NOT_FOUND] @@ -5488,7 +5491,7 @@ fn nonzero_exit_status() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] tests/t1.rs (target/debug/deps/t1-[HASH][EXE]) +[RUNNING] tests/t1.rs (target/debug/build/foo/[HASH]/deps/t1-[HASH]) [ERROR] test failed, to rerun pass `--test t1` "#]]) @@ -5504,11 +5507,11 @@ this is a normal error .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] tests/t2.rs (target/debug/deps/t2-[HASH][EXE]) +[RUNNING] tests/t2.rs (target/debug/build/foo/[HASH]/deps/t2-[HASH]) [ERROR] test failed, to rerun pass `--test t2` Caused by: - process didn't exit successfully: `[ROOT]/foo/target/debug/deps/t2-[HASH][EXE]` ([EXIT_STATUS]: 4) + process didn't exit successfully: `[ROOT]/foo/target/debug/build/foo/[HASH]/deps/t2-[HASH]` ([EXIT_STATUS]: 4) [NOTE] test exited abnormally; to see the full output pass --no-capture to the harness. "#]]) @@ -5518,11 +5521,11 @@ Caused by: p.cargo("test --test t2 -- --no-capture") .with_stderr_data(str![[r#" [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] tests/t2.rs (target/debug/deps/t2-[HASH][EXE]) +[RUNNING] tests/t2.rs (target/debug/build/foo/[HASH]/deps/t2-[HASH]) [ERROR] test failed, to rerun pass `--test t2` Caused by: - process didn't exit successfully: `[ROOT]/foo/target/debug/deps/t2-[HASH][EXE] --no-capture` ([EXIT_STATUS]: 4) + process didn't exit successfully: `[ROOT]/foo/target/debug/build/foo/[HASH]/deps/t2-[HASH] --no-capture` ([EXIT_STATUS]: 4) "#]]) .with_status(4) @@ -5532,13 +5535,13 @@ Caused by: p.cargo("test --no-fail-fast") .with_stderr_data(str![[r#" [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] tests/t1.rs (target/debug/deps/t1-[HASH][EXE]) +[RUNNING] tests/t1.rs (target/debug/build/foo/[HASH]/deps/t1-[HASH]) [ERROR] test failed, to rerun pass `--test t1` -[RUNNING] tests/t2.rs (target/debug/deps/t2-[HASH][EXE]) +[RUNNING] tests/t2.rs (target/debug/build/foo/[HASH]/deps/t2-[HASH]) [ERROR] test failed, to rerun pass `--test t2` Caused by: - process didn't exit successfully: `[ROOT]/foo/target/debug/deps/t2-[HASH][EXE]` ([EXIT_STATUS]: 4) + process didn't exit successfully: `[ROOT]/foo/target/debug/build/foo/[HASH]/deps/t2-[HASH]` ([EXIT_STATUS]: 4) [NOTE] test exited abnormally; to see the full output pass --no-capture to the harness. [ERROR] 2 targets failed: `--test t1` @@ -5552,13 +5555,15 @@ Caused by: .with_stderr_does_not_contain( "test exited abnormally; to see the full output pass --no-capture to the harness.", ) - .with_stderr_data(str![[r#" + .with_stderr_data( + str![[r#" [..]thread [..]panicked [..] tests/t1.rs[..] [NOTE] run with `RUST_BACKTRACE=1` environment variable to display a backtrace Caused by: - process didn't exit successfully: `[ROOT]/foo/target/debug/deps/t2-[HASH][EXE] --no-capture` ([EXIT_STATUS]: 4) ... -"#]].unordered()) +"#]] + .unordered(), + ) .with_status(101) .run(); } @@ -5575,7 +5580,7 @@ fn cargo_test_print_env_verbose() { [RUNNING] `[..]CARGO_MANIFEST_DIR=[ROOT]/foo[..] rustc --crate-name foo[..]` [RUNNING] `[..]CARGO_MANIFEST_DIR=[ROOT]/foo[..] rustc --crate-name foo[..]` [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] `[..]CARGO_MANIFEST_DIR=[ROOT]/foo[..] [ROOT]/foo/target/debug/deps/foo-[HASH][EXE]` +[RUNNING] `CARGO=/home/epage/src/personal/cargo/target/debug/cargo CARGO_MANIFEST_DIR=[ROOT]/foo CARGO_MANIFEST_PATH=[ROOT]/foo/Cargo.toml CARGO_PKG_AUTHORS='' CARGO_PKG_DESCRIPTION='' CARGO_PKG_HOMEPAGE='' CARGO_PKG_LICENSE='' CARGO_PKG_LICENSE_FILE='' CARGO_PKG_NAME=foo CARGO_PKG_README='' CARGO_PKG_REPOSITORY='' CARGO_PKG_RUST_VERSION='' CARGO_PKG_VERSION=0.0.1 CARGO_PKG_VERSION_MAJOR=0 CARGO_PKG_VERSION_MINOR=0 CARGO_PKG_VERSION_PATCH=1 CARGO_PKG_VERSION_PRE='' LD_LIBRARY_PATH='[ROOT]/foo/target/debug:[ROOT]/foo/target/debug/build/foo/[HASH]/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/src/personal/cargo/target/debug:/home/epage/.cargo/build/[HASH]/debug/deps:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib/rustlib/[HOST_TARGET]/lib:/home/epage/.rustup/toolchains/nightly-[HOST_TARGET]/lib' [ROOT]/foo/target/debug/build/foo/[HASH]/deps/foo-[HASH]` [DOCTEST] foo [RUNNING] `[..]CARGO_MANIFEST_DIR=[ROOT]/foo[..] rustdoc --edition=2015 --crate-type lib --color auto --crate-name foo[..]` diff --git a/tests/testsuite/tool_paths.rs b/tests/testsuite/tool_paths.rs index 0849f6375c6..8b849ae749f 100644 --- a/tests/testsuite/tool_paths.rs +++ b/tests/testsuite/tool_paths.rs @@ -230,7 +230,7 @@ fn custom_runner() { [COMPILING] foo v0.0.1 ([ROOT]/foo) [RUNNING] `rustc [..]` [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -[RUNNING] `nonexistent-runner -r [ROOT]/foo/target/debug/deps/test-[HASH][EXE] --param` +[RUNNING] `nonexistent-runner -r [ROOT]/foo/target/debug/build/foo/[HASH]/deps/test-[HASH] --param` ... "#]]) .run(); @@ -242,7 +242,7 @@ fn custom_runner() { [RUNNING] `rustc [..]` [RUNNING] `rustc [..]` [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s -[RUNNING] `nonexistent-runner -r [ROOT]/foo/target/release/deps/bench-[HASH][EXE] --param --bench` +[RUNNING] `nonexistent-runner -r [ROOT]/foo/target/release/build/foo/[HASH]/deps/bench-[HASH] --param --bench` ... "#]]) .run();