aboutsummaryrefslogtreecommitdiff
path: root/testsuite
diff options
context:
space:
mode:
authorBen Elliston <bje@gnu.org>2018-12-09 16:42:08 +1100
committerBen Elliston <bje@gnu.org>2018-12-09 16:42:08 +1100
commita24950c4be7972da53f1eefbe5e942e83b00a3f6 (patch)
treeb72deb94ead960a04e46491b6d482b1645e2710b /testsuite
parentd5f3788c0634ca5a42419d9d2e153e1887d34cf2 (diff)
downloaddejagnu-a24950c4be7972da53f1eefbe5e942e83b00a3f6.zip
dejagnu-a24950c4be7972da53f1eefbe5e942e83b00a3f6.tar.gz
dejagnu-a24950c4be7972da53f1eefbe5e942e83b00a3f6.tar.bz2
* testsuite/lib/libsup.exp: Remove unnecessary quotes around
variable expansions. * testsuite/lib/util-defs.exp: Likewise.
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/lib/libsup.exp12
-rw-r--r--testsuite/lib/util-defs.exp2
2 files changed, 7 insertions, 7 deletions
diff --git a/testsuite/lib/libsup.exp b/testsuite/lib/libsup.exp
index 5691bfd..88ecbcb 100644
--- a/testsuite/lib/libsup.exp
+++ b/testsuite/lib/libsup.exp
@@ -87,7 +87,7 @@ proc start_expect { } {
# catch wait
# Start expect runing
- spawn "$EXPECT"
+ spawn $EXPECT
expect {
-re "expect.*> " {
verbose "Started the child expect shell" 2
@@ -169,11 +169,11 @@ proc exp_test { cmd pattern msg } {
warning "$msg, 0 was returned"
exp_continue
}
- "$pattern" {
- pass "$msg"
+ $pattern {
+ pass $msg
}
timeout {
- fail "$msg"
+ fail $msg
}
}
}
@@ -200,10 +200,10 @@ proc config_test { cmd true false msg } {
exp_continue
}
-re "\r\n1\r\n" {
- $true "$msg"
+ $true $msg
}
-re "\r\n0\r\n" {
- $false "$msg"
+ $false $msg
}
timeout {
perror "$msg (timed out)"
diff --git a/testsuite/lib/util-defs.exp b/testsuite/lib/util-defs.exp
index fd89648..d03c1fd 100644
--- a/testsuite/lib/util-defs.exp
+++ b/testsuite/lib/util-defs.exp
@@ -61,7 +61,7 @@ proc util_test { args } {
verbose "Output is \"$comp_output\"" 2
verbose "Pattern is \"$pattern\"" 2
- if [regexp "$pattern" $comp_output] {
+ if [regexp $pattern $comp_output] {
verbose "Pattern matches." 2
return 0
}