Skip to content

Commit c6ddfe5

Browse files
committed
feat(rr): Print run/test command when --verbose is set
1 parent 498c82c commit c6ddfe5

File tree

3 files changed

+17
-1
lines changed

3 files changed

+17
-1
lines changed

crates/moon/src/cli/run.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -714,6 +714,9 @@ fn rr_run_from_plan(
714714
return Ok(build_result.return_code_for_success());
715715
}
716716
let run_cmd = get_run_cmd(build_meta, &cmd.args)?;
717+
if cli.verbose {
718+
rr_build::dry_print_command(run_cmd.command.as_std(), source_dir);
719+
}
717720

718721
// Release the lock before spawning the subprocess
719722
drop(_lock);

crates/moon/src/cli/test.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1449,10 +1449,12 @@ fn rr_test_from_plan(
14491449

14501450
let mut test_result = crate::run::run_tests(
14511451
build_meta,
1452+
source_dir,
14521453
target_dir,
14531454
&filter,
14541455
cmd.include_skipped,
14551456
cmd.run_mode == RunMode::Bench,
1457+
cli.verbose,
14561458
)?;
14571459
let _initial_summary = test_result.summary();
14581460

@@ -1537,10 +1539,12 @@ fn rr_test_from_plan(
15371539
};
15381540
let new_test_result = crate::run::run_tests(
15391541
build_meta,
1542+
source_dir,
15401543
target_dir,
15411544
&rerun_filter,
15421545
cmd.include_skipped,
15431546
cmd.run_mode == RunMode::Bench,
1547+
cli.verbose,
15441548
)?;
15451549
let _rerun_summary = new_test_result.summary();
15461550

crates/moon/src/run/runtest.rs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,10 +138,12 @@ impl TestIndex {
138138
#[instrument(level = "debug", skip(build_meta, filter))]
139139
pub fn run_tests(
140140
build_meta: &BuildMeta,
141+
source_dir: &Path,
141142
target_dir: &Path,
142143
filter: &TestFilter,
143144
include_skipped: bool,
144145
bench: bool,
146+
verbose: bool,
145147
) -> anyhow::Result<ReplaceableTestResults> {
146148
// Gathering artifacts
147149
let executables = gather_tests(build_meta);
@@ -155,11 +157,13 @@ pub fn run_tests(
155157
let res = run_one_test_executable(
156158
build_meta,
157159
&rt,
160+
source_dir,
158161
target_dir,
159162
&r,
160163
filter,
161164
include_skipped,
162165
bench,
166+
verbose,
163167
)?;
164168
let cases_for_target = res.map.values().map(IndexMap::len).sum::<usize>();
165169
trace!(target = ?r.target, cases = cases_for_target, "merging test results");
@@ -331,15 +335,17 @@ fn gather_tests(build_meta: &BuildMeta) -> Vec<TestExecutableToRun<'_>> {
331335
results
332336
}
333337

334-
#[instrument(level = "debug", skip(build_meta, rt, target_dir, filter))]
338+
#[instrument(level = "debug", skip(build_meta, rt, source_dir, target_dir, filter))]
335339
fn run_one_test_executable(
336340
build_meta: &BuildMeta,
337341
rt: &Runtime, // FIXME: parallel execution
342+
source_dir: &Path,
338343
target_dir: &Path,
339344
test: &TestExecutableToRun,
340345
filter: &TestFilter,
341346
include_skipped: bool,
342347
bench: bool,
348+
verbose: bool,
343349
) -> Result<TargetTestResult, anyhow::Error> {
344350
let (included, file_filt) = filter.check_package(test.target);
345351
if !included {
@@ -377,6 +383,9 @@ fn run_one_test_executable(
377383
crate::run::command_for(build_meta.target_backend, test.executable, Some(&test_args))?;
378384
let mut cov_cap = mk_coverage_capture();
379385
let mut test_cap = make_test_capture();
386+
if verbose {
387+
crate::rr_build::dry_print_command(cmd.command.as_std(), source_dir);
388+
}
380389
info!(package = %test_args.package, executable = %test.executable.display(), "launching test executable");
381390

382391
let exit_status = rt

0 commit comments

Comments
 (0)