aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2021-04-21 18:03:15 +0000
committerGitHub <noreply@github.com>2021-04-21 18:03:15 +0000
commitdd194669e3a43bcfba7183540c77fb1ce56212c0 (patch)
tree7505f454ffc29bf33f3b317f5be2fd63f66acb76
parentee5afc03f94e8a76c1b1b9306849cd932d5d9090 (diff)
parentde5d648043cb545cdc61b4a594feb5f879f89b6b (diff)
downloadgcc-dd194669e3a43bcfba7183540c77fb1ce56212c0.zip
gcc-dd194669e3a43bcfba7183540c77fb1ce56212c0.tar.gz
gcc-dd194669e3a43bcfba7183540c77fb1ce56212c0.tar.bz2
Merge #384
384: Fix dg-ice handling in rust testsuite r=tschwinge a=dkm Fix the pruning regex to also match ICE message and allow for dg-ice use. Add the test from #382 as a sample example. Should help #308 Co-authored-by: Marc Poulhiès <dkm@kataplop.net>
-rw-r--r--gcc/testsuite/lib/rust.exp2
-rw-r--r--gcc/testsuite/rust.test/xfail_compile/unsafe.rs4
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/testsuite/lib/rust.exp b/gcc/testsuite/lib/rust.exp
index 7d2896b..528380b3 100644
--- a/gcc/testsuite/lib/rust.exp
+++ b/gcc/testsuite/lib/rust.exp
@@ -181,7 +181,7 @@ proc rust_target_compile { source dest type options } {
## FIXME: until the compiler is made less verbose, we need to prune its output almost completely.
# Only keep lines containing certain diagnostics so that we can check these.
global additional_prunes
- lappend additional_prunes "^((?!(error: |warning: )).)*$"
+ lappend additional_prunes "^((?!(error: |warning: |\[Ii\]nternal compiler error: )).)*$"
return [target_compile $source $dest $type $options]
}
diff --git a/gcc/testsuite/rust.test/xfail_compile/unsafe.rs b/gcc/testsuite/rust.test/xfail_compile/unsafe.rs
new file mode 100644
index 0000000..632be94
--- /dev/null
+++ b/gcc/testsuite/rust.test/xfail_compile/unsafe.rs
@@ -0,0 +1,4 @@
+fn main() { // { dg-ice "#382" }
+ unsafe {
+ }
+}