[testsuite, guality] Use absolute line number in pass/fail line

2018-08-04  Tom de Vries  <tdevries@suse.de>

	* lib/gcc-gdb-test.exp: Use absolute line number in pass/fail line.

From-SVN: r263311

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8bf5eaf9919150a41903bb09151c827772c2ffca..a1f3b5bdcadc31326a6506cab6c3f67311e4ff45 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2018-08-04  Tom de Vries  <tdevries@suse.de>
+
+       * lib/gcc-gdb-test.exp: Use absolute line number in pass/fail line.
+
 2018-08-04  Andreas Schwab  <schwab@linux-m68k.org>
 
        * gcc.dg/guality/const-volatile.c: Remove duplicate test

diff --git a/gcc/testsuite/lib/gcc-gdb-test.exp b/gcc/testsuite/lib/gcc-gdb-test.exp
index b13d3ec7f85e6a936a5b4ef17184fba0dbe11a45..0066e157b4290d86f7a466332aa36b72e96c257b 100644 (file)
--- a/gcc/testsuite/lib/gcc-gdb-test.exp
+++ b/gcc/testsuite/lib/gcc-gdb-test.exp
@@ -54,18 +54,19 @@ proc gdb-test { useline args } {
        set var $arg1
     }
 
-    set gdb_name $::env(GUALITY_GDB_NAME)
-    set testname "$testcase line [lindex $args 0] [lindex $args 1] == [lindex $args 2]"
-    set output_file "[file rootname [file tail $prog]].exe"
-    set cmd_file "[file rootname [file tail $prog]].gdb"
-
-    set fd [open $cmd_file "w"]
     set line [lindex $args 0]
     if { [string range $line 0 0] == "@" } {
        set line [string range $line 1 end]
     } else {
        set line [get-absolute-line $useline $line]
     }
+
+    set gdb_name $::env(GUALITY_GDB_NAME)
+    set testname "$testcase line $line [lindex $args 1] == [lindex $args 2]"
+    set output_file "[file rootname [file tail $prog]].exe"
+    set cmd_file "[file rootname [file tail $prog]].gdb"
+
+    set fd [open $cmd_file "w"]
     puts $fd "break $line"
     puts $fd "run"
     puts $fd "$command $var"