diff options
| author | bjorn3 <bjorn3@users.noreply.github.com> | 2022-03-08 12:13:33 +0100 |
|---|---|---|
| committer | bjorn3 <bjorn3@users.noreply.github.com> | 2022-03-08 12:13:33 +0100 |
| commit | 5841caa6ef290c6a6dd8ace37df574ae1464cbb3 (patch) | |
| tree | 072ca3269420afd5d34765907711607760aa9a7e | |
| parent | 1b75d1146f91b84f40f052f04251654b8f3affbe (diff) | |
| download | rust-5841caa6ef290c6a6dd8ace37df574ae1464cbb3.tar.gz rust-5841caa6ef290c6a6dd8ace37df574ae1464cbb3.zip | |
Fix compiletest compilation
| -rw-r--r-- | scripts/setup_rust_fork.sh | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/scripts/setup_rust_fork.sh b/scripts/setup_rust_fork.sh index 73600faa1e9..18eb3fb5692 100644 --- a/scripts/setup_rust_fork.sh +++ b/scripts/setup_rust_fork.sh @@ -38,6 +38,21 @@ index d95b5b7f17f..00b6f0e3635 100644 [dev-dependencies] rand = "0.7" rand_xorshift = "0.2" +diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs +index 887d27fd6dca4..2c2239f2b83d1 100644 +--- a/src/tools/compiletest/src/header.rs ++++ b/src/tools/compiletest/src/header.rs +@@ -806,8 +806,8 @@ pub fn make_test_description<R: Read>( + cfg: Option<&str>, + ) -> test::TestDesc { + let mut ignore = false; + #[cfg(not(bootstrap))] +- let ignore_message: Option<String> = None; ++ let ignore_message: Option<&str> = None; + let mut should_fail = false; + + let rustc_has_profiler_support = env::var_os("RUSTC_PROFILER_SUPPORT").is_some(); + EOF cat > config.toml <<EOF |