[WIP] option for store dir relative to the target dir

Still to figure out:

- [ ] Write tests for parsing configuration.
- [ ] Write tests which set configuration and ensure that output gets written to the right spot.
- [ ] How should remapped archive directories be handled? Archive target directories are typically temporary directories which will be deleted at the end of the run. Using that as the store directory seems wrong. In that case, we may wish to use another location instead.

Author: sunshowers

cargo-nextest/src/dispatch.rs

@@ -24,15 +24,15 @@ use nextest_runner::{
     errors::{TargetTripleError, WriteTestListError},
     input::InputHandlerKind,
     list::{
-        BinaryList, OutputFormat, RustTestArtifact, SerializableFormat, TestExecuteContext,
-        TestList,
+        BinaryList, OutputFormat, RustBuildMeta, RustTestArtifact, SerializableFormat,
+        TestExecuteContext, TestList, TestListState,
     },
     partition::PartitionerBuilder,
     platform::{BuildPlatforms, HostPlatform, PlatformLibdir, TargetPlatform},
     redact::Redactor,
     reporter::{
         events::{FinalRunStats, RunStatsFailureKind},
-        highlight_end, structured, FinalStatusLevel, ReporterBuilder, StatusLevel,
+        highlight_end, structured, EventAggregator, FinalStatusLevel, ReporterBuilder, StatusLevel,
         TestOutputDisplay, TestOutputErrorSlice,
     },
     reuse_build::{archive_to_file, ArchiveReporter, PathMapper, ReuseBuildInfo},
@@ -611,20 +611,14 @@ impl TestBuildFilter {
         test_filter_builder: TestFilterBuilder,
         env: EnvironmentMap,
         ecx: &EvalContext<'_>,
-        reuse_build: &ReuseBuildInfo,
+        rust_build_meta: RustBuildMeta<TestListState>,
+        path_mapper: &PathMapper,
     ) -> Result<TestList<'g>> {
-        let path_mapper = make_path_mapper(
-            reuse_build,
-            graph,
-            &binary_list.rust_build_meta.target_directory,
-        )?;
-
-        let rust_build_meta = binary_list.rust_build_meta.map_paths(&path_mapper);
         let test_artifacts = RustTestArtifact::from_binary_list(
             graph,
             binary_list,
             &rust_build_meta,
-            &path_mapper,
+            path_mapper,
             self.platform_filter.into(),
         )?;
         TestList::new(
@@ -1420,12 +1414,11 @@ impl BaseApp {
         let binary_list = self.build_binary_list()?;
         let path_mapper = PathMapper::noop();
 
-        let build_platforms = binary_list.rust_build_meta.build_platforms.clone();
         let pcx = ParseContext::new(self.graph());
         let (_, config) = self.load_config(&pcx)?;
         let profile = self
             .load_profile(&config)?
-            .apply_build_platforms(&build_platforms);
+            .into_evaluatable(&binary_list.rust_build_meta.build_platforms);
 
         let redactor = if should_redact() {
             Redactor::build_active(&binary_list.rust_build_meta)
@@ -1502,11 +1495,6 @@ impl BaseApp {
         let profile = config
             .profile(profile_name)
             .map_err(ExpectedError::profile_not_found)?;
-        let store_dir = profile.store_dir();
-        std::fs::create_dir_all(store_dir).map_err(|err| ExpectedError::StoreDirCreateError {
-            store_dir: store_dir.to_owned(),
-            err,
-        })?;
         Ok(profile)
     }
 }
@@ -1569,6 +1557,8 @@ impl App {
         binary_list: Arc<BinaryList>,
         test_filter_builder: TestFilterBuilder,
         ecx: &EvalContext<'_>,
+        rust_build_meta: RustBuildMeta<TestListState>,
+        path_mapper: &PathMapper,
     ) -> Result<TestList> {
         let env = EnvironmentMap::new(&self.base.cargo_configs);
         self.build_filter.compute_test_list(
@@ -1579,7 +1569,8 @@ impl App {
             test_filter_builder,
             env,
             ecx,
-            &self.base.reuse_build,
+            rust_build_meta,
+            path_mapper,
         )
     }
 
@@ -1617,16 +1608,29 @@ impl App {
                     .base
                     .load_runner(&binary_list.rust_build_meta.build_platforms);
                 let profile =
-                    profile.apply_build_platforms(&binary_list.rust_build_meta.build_platforms);
+                    profile.into_evaluatable(&binary_list.rust_build_meta.build_platforms);
                 let ctx = TestExecuteContext {
                     profile_name: profile.name(),
                     double_spawn,
                     target_runner,
                 };
                 let ecx = profile.filterset_ecx();
 
-                let test_list =
-                    self.build_test_list(&ctx, binary_list, test_filter_builder, &ecx)?;
+                let path_mapper = make_path_mapper(
+                    &self.base.reuse_build,
+                    self.base.graph(),
+                    &binary_list.rust_build_meta.target_directory,
+                )?;
+                let rust_build_meta = binary_list.rust_build_meta.map_paths(&path_mapper);
+
+                let test_list = self.build_test_list(
+                    &ctx,
+                    binary_list,
+                    test_filter_builder,
+                    &ecx,
+                    rust_build_meta,
+                    &path_mapper,
+                )?;
 
                 let mut writer = output_writer.stdout_writer();
                 test_list.write(
@@ -1673,15 +1677,29 @@ impl App {
 
         let double_spawn = self.base.load_double_spawn();
         let target_runner = self.base.load_runner(&build_platforms);
-        let profile = profile.apply_build_platforms(&build_platforms);
+        let profile = profile.into_evaluatable(&build_platforms);
         let ctx = TestExecuteContext {
             profile_name: profile.name(),
             double_spawn,
             target_runner,
         };
         let ecx = profile.filterset_ecx();
 
-        let test_list = self.build_test_list(&ctx, binary_list, test_filter_builder, &ecx)?;
+        let path_mapper = make_path_mapper(
+            &self.base.reuse_build,
+            self.base.graph(),
+            &binary_list.rust_build_meta.target_directory,
+        )?;
+        let rust_build_meta = binary_list.rust_build_meta.map_paths(&path_mapper);
+
+        let test_list = self.build_test_list(
+            &ctx,
+            binary_list,
+            test_filter_builder,
+            &ecx,
+            rust_build_meta,
+            &path_mapper,
+        )?;
 
         let mut writer = output_writer.stdout_writer();
 
@@ -1712,7 +1730,8 @@ impl App {
         let (version_only_config, config) = self.base.load_config(&pcx)?;
         let profile = self.base.load_profile(&config)?;
 
-        // Construct this here so that errors are reported before the build step.
+        // Construct this here so that errors are reported before the build
+        // step.
         let mut structured_reporter = structured::StructuredReporter::new();
         match reporter_opts.message_format {
             MessageFormat::Human => {}
@@ -1752,19 +1771,40 @@ impl App {
         let test_filter_builder = self.build_filter.make_test_filter_builder(filter_exprs)?;
 
         let binary_list = self.base.build_binary_list()?;
-        let build_platforms = &binary_list.rust_build_meta.build_platforms.clone();
+        let path_mapper = make_path_mapper(
+            &self.base.reuse_build,
+            self.base.graph(),
+            &binary_list.rust_build_meta.target_directory,
+        )?;
+        let rust_build_meta = binary_list.rust_build_meta.map_paths(&path_mapper);
+
+        let profile = profile.into_evaluatable(&binary_list.rust_build_meta.build_platforms);
+
+        // This is the earliest point where we can create the aggregator, since
+        // we need the remapped target directory which is only available after
+        // the test list is built.
+        let aggregator = EventAggregator::new(&profile, &rust_build_meta.target_directory)?;
+
         let double_spawn = self.base.load_double_spawn();
-        let target_runner = self.base.load_runner(build_platforms);
+        let target_runner = self
+            .base
+            .load_runner(&binary_list.rust_build_meta.build_platforms);
 
-        let profile = profile.apply_build_platforms(build_platforms);
         let ctx = TestExecuteContext {
             profile_name: profile.name(),
             double_spawn,
             target_runner,
         };
         let ecx = profile.filterset_ecx();
 
-        let test_list = self.build_test_list(&ctx, binary_list, test_filter_builder, &ecx)?;
+        let test_list = self.build_test_list(
+            &ctx,
+            binary_list,
+            test_filter_builder,
+            &ecx,
+            rust_build_meta,
+            &path_mapper,
+        )?;
 
         let output = output_writer.reporter_output();
         let should_colorize = self
@@ -1805,7 +1845,13 @@ impl App {
         let mut reporter = reporter_opts
             .to_builder(no_capture, should_colorize)
             .set_verbose(self.base.output.verbose)
-            .build(&test_list, &profile, output, structured_reporter);
+            .build(
+                &test_list,
+                &profile,
+                output,
+                aggregator,
+                structured_reporter,
+            );
 
         configure_handle_inheritance(no_capture)?;
         let run_stats = runner.try_execute(|event| {

cargo-nextest/src/errors.rs

@@ -69,11 +69,10 @@ pub enum ExpectedError {
         #[from]
         err: ProfileNotFound,
     },
-    #[error("failed to create store directory")]
-    StoreDirCreateError {
-        store_dir: Utf8PathBuf,
-        #[source]
-        err: std::io::Error,
+    #[error("junit setup error")]
+    JunitSetupError {
+        #[from]
+        err: JunitSetupError,
     },
     #[error("cargo config error")]
     CargoConfigError {
@@ -395,7 +394,7 @@ impl ExpectedError {
             | Self::SetCurrentDirFailed { .. }
             | Self::GetCurrentExeFailed { .. }
             | Self::ProfileNotFound { .. }
-            | Self::StoreDirCreateError { .. }
+            | Self::JunitSetupError { .. }
             | Self::RootManifestNotFound { .. }
             | Self::CargoConfigError { .. }
             | Self::TestFilterBuilderError { .. }
@@ -521,12 +520,9 @@ impl ExpectedError {
                 );
                 None
             }
-            Self::StoreDirCreateError { store_dir, err } => {
-                error!(
-                    "failed to create store dir at `{}`",
-                    store_dir.style(styles.bold)
-                );
-                Some(err as &dyn Error)
+            Self::JunitSetupError { err } => {
+                error!("{}", err);
+                err.source()
             }
             Self::CargoConfigError { err } => {
                 error!("{}", err);

nextest-runner/src/config/archive.rs

@@ -307,7 +307,7 @@ mod tests {
             config
                 .profile("default")
                 .expect("default profile exists")
-                .apply_build_platforms(&build_platforms())
+                .into_evaluatable(&build_platforms())
                 .archive_config(),
             &default_config,
             "default matches"
@@ -317,7 +317,7 @@ mod tests {
             config
                 .profile("profile1")
                 .expect("profile exists")
-                .apply_build_platforms(&build_platforms())
+                .into_evaluatable(&build_platforms())
                 .archive_config(),
             &ArchiveConfig {
                 include: vec![ArchiveInclude {
@@ -334,7 +334,7 @@ mod tests {
             config
                 .profile("profile2")
                 .expect("default profile exists")
-                .apply_build_platforms(&build_platforms())
+                .into_evaluatable(&build_platforms())
                 .archive_config(),
             &ArchiveConfig { include: vec![] },
             "profile2 matches"
@@ -344,7 +344,7 @@ mod tests {
             config
                 .profile("profile3")
                 .expect("default profile exists")
-                .apply_build_platforms(&build_platforms())
+                .into_evaluatable(&build_platforms())
                 .archive_config(),
             &default_config,
             "profile3 matches"