MIPS/GAS: Correct tab-after-space formatting mistakes

[deliverable/binutils-gdb.git] / gas / testsuite / lib / gas-dg.exp

diff --git a/gas/testsuite/lib/gas-dg.exp b/gas/testsuite/lib/gas-dg.exp
index 031ca342aa50cb3ca52fe8a89b937bc39cb13c46..23968096324f8652200c88aa2c9fb47d76fb7da2 100644 (file)
--- a/gas/testsuite/lib/gas-dg.exp
+++ b/gas/testsuite/lib/gas-dg.exp
@@ -1,4 +1,19 @@
 # Define gas callbacks for dg.exp.
+# Copyright (C) 2012-2016 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  
 
 load_lib dg.exp
 
@@ -7,7 +22,10 @@ load_lib dg.exp
 # but we currently don't support that.  Assembler testcases aren't usually
 # that elaborate anyway.  :-)
 
-proc gas-dg-test { prog do_what tool_flags default_tool_flags libs } {
+proc gas-dg-test { prog do_what tool_flags } {
+    # FIXME: the gas testsuite doesn't define tmpdir.  Use outdir?
+    set output_file "./a.out"
+
     switch $do_what {
        "preprocess" {
        }
@@ -16,10 +34,13 @@ proc gas-dg-test { prog do_what tool_flags default_tool_flags libs } {
        "link" {
        }
        "run" {
+           # This is the only place where we care if an executable was
+           # created or not.  If it was, dg.exp will try to run it.
+           remote_file host delete "$output_file"
        }
        default {
            perror "$do_what: not a valid dg-do keyword"
-           return
+           return ""
        }
     }
 
@@ -30,11 +51,12 @@ proc gas-dg-test { prog do_what tool_flags default_tool_flags libs } {
     regsub -all "//" $dir "/" dir
     regsub -all "//" $prog "/" prog
     if [string match "$dir/*" $prog] {
-       regsub "$dir" $prog "" prog
+       # We use (?q) to treat $dir as a literal.
+       regsub "(?q)$dir" $prog "" prog
     }
 
     # FIXME: This should be gas_start but it doesn't set comp_output.
-    gas_run $prog $tool_flags ""
+    return [gas_run $prog $tool_flags ""]
 }
 
 proc gas-dg-prune { system text } {