[testsuite] Simplify dg-final

2018-07-05  Tom de Vries  <tdevries@suse.de>

	* lib/gcc-dg.exp (dg-final): Simplify tcl code.

From-SVN: r262431

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 61fdea9f95c69fe2cdf748d31b93b8fdebe7719f..d685d81867bffb691ed6a1fd06d93b56e835be74 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2018-07-05  Tom de Vries  <tdevries@suse.de>
+
+       * lib/gcc-dg.exp (dg-final): Simplify tcl code.
+
 2018-07-04  Martin Sebor  <msebor@redhat.com>
 
        PR tree-optimization/86274

diff --git a/gcc/testsuite/lib/gcc-dg.exp b/gcc/testsuite/lib/gcc-dg.exp
index 9e0b3f4ef959eb1b5892fd7bd0e0e03cacb8dce2..f5e6bef5dd97ad2e0ea7683577eb8894564593ba 100644 (file)
--- a/gcc/testsuite/lib/gcc-dg.exp
+++ b/gcc/testsuite/lib/gcc-dg.exp
@@ -123,13 +123,10 @@ proc dg-final { args } {
     set line [lindex $args 0]
     set code [lindex $args 1]
     set directive [lindex $code 0]
-    set withline \
-       [switch $directive {
-           gdb-test {expr {1}}
-           default  {expr {0}}
-       }]
-    if { $withline == 1 } {
-       set code [linsert $code 1 $line]
+    switch $directive {
+       gdb-test {
+           set code [linsert $code 1 $line]
+       }
     }
     append final-code "$code\n"
 }