aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Savoye <rob@cygnus>1994-01-21 00:35:57 +0000
committerRob Savoye <rob@cygnus>1994-01-21 00:35:57 +0000
commit23c6150b6f30dd0e09426652bdf459dfc351e8f8 (patch)
tree003973fc78d93b52de64cb8bd9b3b55506f00f40
parentdbb0fae2def093da35c5aac13d30296ff15d7daf (diff)
downloadgdb-23c6150b6f30dd0e09426652bdf459dfc351e8f8.zip
gdb-23c6150b6f30dd0e09426652bdf459dfc351e8f8.tar.gz
gdb-23c6150b6f30dd0e09426652bdf459dfc351e8f8.tar.bz2
Fix gas_version.
-rw-r--r--gas/testsuite/lib/gas-defs.exp8
1 files changed, 5 insertions, 3 deletions
diff --git a/gas/testsuite/lib/gas-defs.exp b/gas/testsuite/lib/gas-defs.exp
index ad04a99..d666f05 100644
--- a/gas/testsuite/lib/gas-defs.exp
+++ b/gas/testsuite/lib/gas-defs.exp
@@ -24,10 +24,9 @@ proc gas_version {} {
catch "exec $AS -version < /dev/null" tmp
# Should find a way to discard constant parts, keep whatever's
# left, so the version string could be almost anything at all...
- regexp " \[0-9\]\[0-9\.a-zA-Z-\]+" $tmp version
+ regexp "version (cygnus-|)\[-0-9.a-zA-Z-\]+" $tmp version
set tmp $version
- regexp "\[0-9\.a-zA-Z-\]+" $tmp version
- clone_output "[which $AS] version $version\n"
+ clone_output "[which $AS] $version\n"
unset tmp
unset version
}
@@ -123,6 +122,9 @@ proc gas_test { file as_opts var_opts testname } {
want_no_output "$testname ($extra_opts)"
}
}
+ if [info exists errorInfo] then {
+ unset errorInfo
+ }
}
proc gas_test_ignore_stdout { file as_opts testname } {