use `-Cstrip=debuginfo` with ui tests to reduce disk space usage

diff --git a/src/test/ui/backtrace-apple-no-dsymutil.rs b/src/test/ui/backtrace-apple-no-dsymutil.rs
index 492ff6356bcaf1f207934228432846cb20a385b1..d32ad11a122df215aab23727fd1899911016ad80 100644 (file)
--- a/src/test/ui/backtrace-apple-no-dsymutil.rs
+++ b/src/test/ui/backtrace-apple-no-dsymutil.rs
@@ -1,5 +1,6 @@
 // run-pass
 
+// compile-flags:-Cstrip=none
 // compile-flags:-g -Csplit-debuginfo=unpacked
 // only-macos
 

diff --git a/src/test/ui/backtrace.rs b/src/test/ui/backtrace.rs
index c2d9e222b84a44e6788f92f5d10be80464e8343d..05ccfcb5060cb9226c2127c565128164c57fbac3 100644 (file)
--- a/src/test/ui/backtrace.rs
+++ b/src/test/ui/backtrace.rs
@@ -5,6 +5,7 @@
 // ignore-sgx no processes
 // ignore-msvc see #62897 and `backtrace-debuginfo.rs` test
 // compile-flags:-g
+// compile-flags:-Cstrip=none
 
 use std::env;
 use std::process::{Command, Stdio};

diff --git a/src/test/ui/numbers-arithmetic/promoted_overflow.rs b/src/test/ui/numbers-arithmetic/promoted_overflow.rs
index da59e81ed6bf702595c2629a644e180fdcf6e4a5..ba168f773d856c2fe4544955ad26f5daf504c10c 100644 (file)
--- a/src/test/ui/numbers-arithmetic/promoted_overflow.rs
+++ b/src/test/ui/numbers-arithmetic/promoted_overflow.rs
@@ -3,6 +3,10 @@
 // run-fail
 // error-pattern: overflow
 // compile-flags: -C overflow-checks=yes
+// for some reason, fails to match error string on
+// wasm32-unknown-unknown with stripped debuginfo and symbols,
+// so don't strip it
+// compile-flags:-Cstrip=none
 
 fn main() {
     let x: &'static u32 = &(0u32 - 1);

diff --git a/src/test/ui/panics/issue-47429-short-backtraces.legacy.run.stderr b/src/test/ui/panics/issue-47429-short-backtraces.legacy.run.stderr
index fcdc070a4c39e40e9001251ed8ab814439f6f9f7..b6223b93764f4f7ff0fd8272dab8ce57c2b25f22 100644 (file)
--- a/src/test/ui/panics/issue-47429-short-backtraces.legacy.run.stderr
+++ b/src/test/ui/panics/issue-47429-short-backtraces.legacy.run.stderr
@@ -1,4 +1,4 @@
-thread 'main' panicked at 'explicit panic', $DIR/issue-47429-short-backtraces.rs:21:5
+thread 'main' panicked at 'explicit panic', $DIR/issue-47429-short-backtraces.rs:22:5
 stack backtrace:
    0: std::panicking::begin_panic
    1: issue_47429_short_backtraces::main

diff --git a/src/test/ui/panics/issue-47429-short-backtraces.rs b/src/test/ui/panics/issue-47429-short-backtraces.rs
index c34e00bab7cdd8ec23bf823e16d416822a0a16a5..f338ace6bb0d1c8dbe004b288ef2178f06292375 100644 (file)
--- a/src/test/ui/panics/issue-47429-short-backtraces.rs
+++ b/src/test/ui/panics/issue-47429-short-backtraces.rs
@@ -1,6 +1,7 @@
 // Regression test for #47429: short backtraces were not terminating correctly
 
 // compile-flags: -O
+// compile-flags:-Cstrip=none
 // run-fail
 // check-run-results
 // exec-env:RUST_BACKTRACE=1

diff --git a/src/test/ui/panics/issue-47429-short-backtraces.v0.run.stderr b/src/test/ui/panics/issue-47429-short-backtraces.v0.run.stderr
index 1cbf11739bfc629f7796282ad6e706486a4b90d0..c2bea449249833c1952511cac63eae5dcb6e713c 100644 (file)
--- a/src/test/ui/panics/issue-47429-short-backtraces.v0.run.stderr
+++ b/src/test/ui/panics/issue-47429-short-backtraces.v0.run.stderr
@@ -1,4 +1,4 @@
-thread 'main' panicked at 'explicit panic', $DIR/issue-47429-short-backtraces.rs:21:5
+thread 'main' panicked at 'explicit panic', $DIR/issue-47429-short-backtraces.rs:22:5
 stack backtrace:
    0: std::panicking::begin_panic::<&str>
    1: issue_47429_short_backtraces::main

diff --git a/src/test/ui/panics/runtime-switch.legacy.run.stderr b/src/test/ui/panics/runtime-switch.legacy.run.stderr
index 979cc56b8312ea94d6146dcc1a1fe5751371407b..f282f18839c64e389e5c9bfc339e96478ea4c5fd 100644 (file)
--- a/src/test/ui/panics/runtime-switch.legacy.run.stderr
+++ b/src/test/ui/panics/runtime-switch.legacy.run.stderr
@@ -1,4 +1,4 @@
-thread 'main' panicked at 'explicit panic', $DIR/runtime-switch.rs:24:5
+thread 'main' panicked at 'explicit panic', $DIR/runtime-switch.rs:25:5
 stack backtrace:
    0: std::panicking::begin_panic
    1: runtime_switch::main

diff --git a/src/test/ui/panics/runtime-switch.rs b/src/test/ui/panics/runtime-switch.rs
index c1634811406666c17223b391b45359f73b7b1b2d..37ef961e2d019d6846101f9f6da78f50a932b642 100644 (file)
--- a/src/test/ui/panics/runtime-switch.rs
+++ b/src/test/ui/panics/runtime-switch.rs
@@ -1,6 +1,7 @@
 // Test for std::panic::set_backtrace_style.
 
 // compile-flags: -O
+// compile-flags:-Cstrip=none
 // run-fail
 // check-run-results
 // exec-env:RUST_BACKTRACE=0

diff --git a/src/test/ui/panics/runtime-switch.v0.run.stderr b/src/test/ui/panics/runtime-switch.v0.run.stderr
index 48f829c26d4453e9d31b3e3c561b56bd1f6b633c..7ce9722e5edf184d0ba01c3af17c8d9f9f1b38a8 100644 (file)
--- a/src/test/ui/panics/runtime-switch.v0.run.stderr
+++ b/src/test/ui/panics/runtime-switch.v0.run.stderr
@@ -1,4 +1,4 @@
-thread 'main' panicked at 'explicit panic', $DIR/runtime-switch.rs:24:5
+thread 'main' panicked at 'explicit panic', $DIR/runtime-switch.rs:25:5
 stack backtrace:
    0: std::panicking::begin_panic::<&str>
    1: runtime_switch::main

diff --git a/src/test/ui/panics/unique-panic.rs b/src/test/ui/panics/unique-panic.rs
index 22e0d63d5946f6edaef0c5884ff729eacf4587dd..ae7911e5943891df6cea34c1e82a8f31c5ddf5d6 100644 (file)
--- a/src/test/ui/panics/unique-panic.rs
+++ b/src/test/ui/panics/unique-panic.rs
@@ -1,5 +1,9 @@
 // run-fail
 // error-pattern: panic
+// for some reason, fails to match error string on
+// wasm32-unknown-unknown with stripped debuginfo and symbols,
+// so don't strip it
+// compile-flags:-Cstrip=none
 
 fn main() {
     Box::new(panic!());

diff --git a/src/test/ui/runtime/backtrace-debuginfo.rs b/src/test/ui/runtime/backtrace-debuginfo.rs
index b976c3a13bd5927f37ab09a2d72c5dd5a5176b7c..7c9f1a7f2f49b1200d1e05a150e09e05a0759c2f 100644 (file)
--- a/src/test/ui/runtime/backtrace-debuginfo.rs
+++ b/src/test/ui/runtime/backtrace-debuginfo.rs
@@ -8,6 +8,7 @@
 
 // compile-flags:-g -Copt-level=0 -Cllvm-args=-enable-tail-merge=0
 // compile-flags:-Cforce-frame-pointers=yes
+// compile-flags:-Cstrip=none
 // ignore-pretty issue #37195
 // ignore-emscripten spawning processes is not supported
 // ignore-sgx no processes

diff --git a/src/test/ui/std-backtrace.rs b/src/test/ui/std-backtrace.rs
index b5e76666af1f8eb65c6ad2c89c5bc6ce83c9c7ba..07de066b5586382cc676b5e8b02dbc3490657cf9 100644 (file)
--- a/src/test/ui/std-backtrace.rs
+++ b/src/test/ui/std-backtrace.rs
@@ -5,6 +5,7 @@
 // ignore-sgx no processes
 // ignore-msvc see #62897 and `backtrace-debuginfo.rs` test
 // compile-flags:-g
+// compile-flags:-Cstrip=none
 
 #![feature(backtrace)]
 

diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index b758bb9cf6790a5882ae74cf816d080aabea7b20..160b9785d975f771a706315f7582e88dff032d8d 100644 (file)
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -1882,6 +1882,8 @@ fn make_compile_args(
                 rustc.arg("-Ccodegen-units=1");
                 rustc.arg("-Zui-testing");
                 rustc.arg("-Zdeduplicate-diagnostics=no");
+                // FIXME: use this for other modes too, for perf?
+                rustc.arg("-Cstrip=debuginfo");
             }
             MirOpt => {
                 rustc.args(&[