Fix compiletest compilation

This commit is contained in:
bjorn3 2022-03-26 16:14:39 +01:00
parent edf33fe0a2
commit 724473b330

18
test.sh
View File

@ -165,6 +165,24 @@ function test_rustc() {
git checkout $(rustc -V | cut -d' ' -f3 | tr -d '(') git checkout $(rustc -V | cut -d' ' -f3 | tr -d '(')
export RUSTFLAGS= export RUSTFLAGS=
git apply - <<EOF
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
rm config.toml || true rm config.toml || true
cat > config.toml <<EOF cat > config.toml <<EOF