testsuite: Handle --save-temps in schedule-cleanups

Some tests use --save-temps, but schedule-cleanups strictly matches
-save-temps, so we leave many temporary files after validation.
Instead of fixing every offending testcase, it's simpler and
future-proof to make schedule-cleanups handle both --save-temps and
-save-temps.

2020-04-22  Christophe Lyon  <christophe.lyon@linaro.org>

	gcc/testsuite/
	* lib/gcc-dg.exp (schedule-cleanups): Accept --save-temps.

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 921f81e9a8872d26693fde80b45d4c8f918ae350..0689f202f646fdda29d3e1201cc83ed4bf3871ba 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2020-04-22  Christophe Lyon  <christophe.lyon@linaro.org>
+
+       * lib/gcc-dg.exp (schedule-cleanups): Accept --save-temps.
+
 2020-04-22  Martin Sebor  <msebor@redhat.com>
 
        PR c++/94510

diff --git a/gcc/testsuite/lib/gcc-dg.exp b/gcc/testsuite/lib/gcc-dg.exp
index cccd3ce4742cde28bdfd14e038d222b64be441f8..27cc7c19625d8bff12268de16ec0c20d558394b7 100644 (file)
--- a/gcc/testsuite/lib/gcc-dg.exp
+++ b/gcc/testsuite/lib/gcc-dg.exp
@@ -171,7 +171,7 @@ proc schedule-cleanups { opts } {
        verbose "dg-keep-saved-temps ${keep_saved_temps_suffixes}" 2
     }
     # -save-temps -> cleanup-saved-temps()
-    if [regexp -- {(^|\s+)-save-temps(\s+|$)} $opts] {
+    if [regexp -- {(^|\s+)-?-save-temps(\s+|$)} $opts] {
        verbose "Cleanup -save-temps seen" 4
        if [info exists keep_saved_temps_suffixes] {
            append finalcode "cleanup-saved-temps ${keep_saved_temps_suffixes}\n"