File tree Expand file tree Collapse file tree 1 file changed +0
-14
lines changed Expand file tree Collapse file tree 1 file changed +0
-14
lines changed Original file line number Diff line number Diff line change @@ -151,20 +151,6 @@ rm tests/ui/process/process-panic-after-fork.rs # same
151151cp ../dist/bin/rustdoc-clif ../dist/bin/rustdoc # some tests expect bin/rustdoc to exist
152152
153153cat << EOF | git apply -
154- diff --git a/tests/run-make/linker-warning/rmake.rs b/tests/run-make/linker-warning/rmake.rs
155- index 30387af428c..f7895b12961 100644
156- --- a/tests/run-make/linker-warning/rmake.rs
157- +++ b/tests/run-make/linker-warning/rmake.rs
158- @@ -57,7 +57,8 @@ fn main() {
159- .actual_text("(linker error)", out.stderr())
160- - .normalize(r#"/rustc[^/]*/"#, "/rustc/")
161- + .normalize(r#"/tmp/rustc[^/]*/"#, "/tmp/rustc/")
162- + .normalize("libpanic_abort", "libpanic_unwind")
163- .normalize(
164- regex::escape(run_make_support::build_root().to_str().unwrap()),
165- "/build-root",
166- )
167- .normalize(r#""[^"]*\/symbols.o""#, "\\ "/symbols.o\\ "")
168154diff --git a/src/tools/compiletest/src/runtest/run_make.rs b/src/tools/compiletest/src/runtest/run_make.rs
169155index 073116933bd..c3e4578204d 100644
170156--- a/src/tools/compiletest/src/runtest/run_make.rs
You can’t perform that action at this time.
0 commit comments