Skip to content

Commit 049d897

Browse files
authored
Rollup merge of rust-lang#139528 - Zalathar:no-logfile, r=jieyouxu
compiletest: Remove the `--logfile` flag This flag is deprecated in libtest (rust-lang#134283), and there's no evidence in-tree of this flag actually being passed to compiletest. For detailed information about test results, bootstrap parses JSON output from compiletest instead (rust-lang#108659). As part of my experimental work on removing the libtest dependency from compiletest, it's useful to be able to disconnect libtest functionality that isn't needed.
2 parents 51bc376 + 63fcd24 commit 049d897

File tree

3 files changed

+1
-6
lines changed

3 files changed

+1
-6
lines changed

Diff for: src/tools/compiletest/src/common.rs

-3
Original file line numberDiff line numberDiff line change
@@ -275,9 +275,6 @@ pub struct Config {
275275
/// Explicitly enable or disable running.
276276
pub run: Option<bool>,
277277

278-
/// Write out a parseable log of tests that were run
279-
pub logfile: Option<PathBuf>,
280-
281278
/// A command line to prefix program execution with,
282279
/// for running under valgrind for example.
283280
///

Diff for: src/tools/compiletest/src/executor.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ fn test_opts(config: &Config) -> test::TestOpts {
138138
filter_exact: config.filter_exact,
139139
run_ignored: if config.run_ignored { test::RunIgnored::Yes } else { test::RunIgnored::No },
140140
format: config.format.to_libtest(),
141-
logfile: config.logfile.clone(),
141+
logfile: None,
142142
run_tests: true,
143143
bench_benchmarks: true,
144144
nocapture: config.nocapture,

Diff for: src/tools/compiletest/src/lib.rs

-2
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@ pub fn parse_config(args: Vec<String>) -> Config {
139139
.optflag("", "quiet", "print one character per test instead of one line")
140140
.optopt("", "color", "coloring: auto, always, never", "WHEN")
141141
.optflag("", "json", "emit json output instead of plaintext output")
142-
.optopt("", "logfile", "file to log test execution to", "FILE")
143142
.optopt("", "target", "the target to build for", "TARGET")
144143
.optopt("", "host", "the host to build for", "HOST")
145144
.optopt("", "cdb", "path to CDB to use for CDB debuginfo tests", "PATH")
@@ -378,7 +377,6 @@ pub fn parse_config(args: Vec<String>) -> Config {
378377
"never" => Some(false),
379378
_ => panic!("unknown `--run` option `{}` given", mode),
380379
}),
381-
logfile: matches.opt_str("logfile").map(|s| PathBuf::from(&s)),
382380
runner: matches.opt_str("runner"),
383381
host_rustcflags: matches.opt_strs("host-rustcflags"),
384382
target_rustcflags: matches.opt_strs("target-rustcflags"),

0 commit comments

Comments
 (0)