Skip to content

Commit 6dae7de

Browse files
Make the fulldeps modes independent of their respective non-fulldeps mode.
This is a change needed for #27937, so that `-L $(llvm-config --libdir)` is only added to RUSTFLAGS for fulldeps based compiletest modes.
1 parent 14b7591 commit 6dae7de

File tree

3 files changed

+21
-15
lines changed

3 files changed

+21
-15
lines changed

mk/tests.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -516,17 +516,17 @@ CTEST_RUNTOOL_rpass-valgrind = $(CTEST_RUNTOOL)
516516

517517
CTEST_SRC_BASE_rpass-full = run-pass-fulldeps
518518
CTEST_BUILD_BASE_rpass-full = run-pass-fulldeps
519-
CTEST_MODE_rpass-full = run-pass
519+
CTEST_MODE_rpass-full = run-pass-fulldeps
520520
CTEST_RUNTOOL_rpass-full = $(CTEST_RUNTOOL)
521521

522522
CTEST_SRC_BASE_rfail-full = run-fail-fulldeps
523523
CTEST_BUILD_BASE_rfail-full = run-fail-fulldeps
524-
CTEST_MODE_rfail-full = run-fail
524+
CTEST_MODE_rfail-full = run-fail-fulldeps
525525
CTEST_RUNTOOL_rfail-full = $(CTEST_RUNTOOL)
526526

527527
CTEST_SRC_BASE_cfail-full = compile-fail-fulldeps
528528
CTEST_BUILD_BASE_cfail-full = compile-fail-fulldeps
529-
CTEST_MODE_cfail-full = compile-fail
529+
CTEST_MODE_cfail-full = compile-fail-fulldeps
530530
CTEST_RUNTOOL_cfail-full = $(CTEST_RUNTOOL)
531531

532532
CTEST_SRC_BASE_rfail = run-fail

src/compiletest/common.rs

+15-9
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ use std::path::PathBuf;
1515

1616
#[derive(Clone, Copy, PartialEq, Debug)]
1717
pub enum Mode {
18-
CompileFail,
18+
CompileFail { fulldeps: bool },
1919
ParseFail,
20-
RunFail,
21-
RunPass,
20+
RunFail { fulldeps: bool },
21+
RunPass { fulldeps: bool },
2222
RunPassValgrind,
2323
Pretty,
2424
DebugInfoGdb,
@@ -31,10 +31,13 @@ impl FromStr for Mode {
3131
type Err = ();
3232
fn from_str(s: &str) -> Result<Mode, ()> {
3333
match s {
34-
"compile-fail" => Ok(CompileFail),
34+
"compile-fail" => Ok(CompileFail { fulldeps: false }),
35+
"compile-fail-fulldeps" => Ok(CompileFail { fulldeps: true }),
3536
"parse-fail" => Ok(ParseFail),
36-
"run-fail" => Ok(RunFail),
37-
"run-pass" => Ok(RunPass),
37+
"run-fail" => Ok(RunFail { fulldeps: false, }),
38+
"run-fail-fulldeps" => Ok(RunFail { fulldeps: true, }),
39+
"run-pass" => Ok(RunPass { fulldeps: false, }),
40+
"run-pass-fulldeps" => Ok(RunPass { fulldeps: true, }),
3841
"run-pass-valgrind" => Ok(RunPassValgrind),
3942
"pretty" => Ok(Pretty),
4043
"debuginfo-lldb" => Ok(DebugInfoLldb),
@@ -49,10 +52,13 @@ impl FromStr for Mode {
4952
impl fmt::Display for Mode {
5053
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
5154
fmt::Display::fmt(match *self {
52-
CompileFail => "compile-fail",
55+
CompileFail { fulldeps: false } => "compile-fail",
56+
CompileFail { fulldeps: true } => "compile-fail-fulldeps",
5357
ParseFail => "parse-fail",
54-
RunFail => "run-fail",
55-
RunPass => "run-pass",
58+
RunFail { fulldeps: false, } => "run-fail",
59+
RunFail { fulldeps: true, } => "run-fail-fulldeps",
60+
RunPass { fulldeps: false, } => "run-pass",
61+
RunPass { fulldeps: true, } => "run-pass-fulldeps",
5662
RunPassValgrind => "run-pass-valgrind",
5763
Pretty => "pretty",
5864
DebugInfoGdb => "debuginfo-gdb",

src/compiletest/runtest.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ pub fn run(config: Config, testfile: &Path) {
4848
let props = header::load_props(&testfile);
4949
debug!("loaded props");
5050
match config.mode {
51-
CompileFail => run_cfail_test(&config, &props, &testfile),
51+
CompileFail { .. } => run_cfail_test(&config, &props, &testfile),
5252
ParseFail => run_cfail_test(&config, &props, &testfile),
53-
RunFail => run_rfail_test(&config, &props, &testfile),
54-
RunPass => run_rpass_test(&config, &props, &testfile),
53+
RunFail { .. } => run_rfail_test(&config, &props, &testfile),
54+
RunPass { .. } => run_rpass_test(&config, &props, &testfile),
5555
RunPassValgrind => run_valgrind_test(&config, &props, &testfile),
5656
Pretty => run_pretty_test(&config, &props, &testfile),
5757
DebugInfoGdb => run_debuginfo_gdb_test(&config, &props, &testfile),

0 commit comments

Comments
 (0)