aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Elliston <bje@gnu.org>2018-12-08 17:36:31 +1100
committerBen Elliston <bje@gnu.org>2018-12-08 17:36:31 +1100
commitc7f104fec6220a7c71043acf32d7ee4e90111d2d (patch)
treec07eae679e2a4336909f88d9e98e4f94b10f403f
parent01599a0570d858b0ad6e00a32cc7f7e70154059d (diff)
downloaddejagnu-c7f104fec6220a7c71043acf32d7ee4e90111d2d.zip
dejagnu-c7f104fec6220a7c71043acf32d7ee4e90111d2d.tar.gz
dejagnu-c7f104fec6220a7c71043acf32d7ee4e90111d2d.tar.bz2
* lib/dejagnu.exp (host_execute): Remove unnecessary quotes around
variable expansions. * testsuite/runtest.all/clone_output.test: Likewise. * testsuite/runtest.all/target.test: Likewise. * testsuite/runtest.all/stats.exp: Likewise. * testsuite/runtest.all/remote.test: Likewise. * testsuite/runtest.all/config.test: Likewise. * testsuite/runtest.all/default_procs.tcl: Likewise. * testsuite/runtest.all/libs.exp: Likewise. * testsuite/runtest.all/options.exp: Likewise.
-rw-r--r--ChangeLog13
-rw-r--r--lib/dejagnu.exp12
-rw-r--r--testsuite/runtest.all/clone_output.test2
-rw-r--r--testsuite/runtest.all/config.test2
-rw-r--r--testsuite/runtest.all/default_procs.tcl6
-rw-r--r--testsuite/runtest.all/libs.exp4
-rw-r--r--testsuite/runtest.all/options.exp2
-rw-r--r--testsuite/runtest.all/remote.test4
-rw-r--r--testsuite/runtest.all/stats.exp2
-rw-r--r--testsuite/runtest.all/target.test4
-rw-r--r--testsuite/runtest.all/utils.test2
11 files changed, 33 insertions, 20 deletions
diff --git a/ChangeLog b/ChangeLog
index 4be9490..8c52dde 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2018-12-08 Ben Elliston <bje@gnu.org>
+
+ * lib/dejagnu.exp (host_execute): Remove unnecessary quotes around
+ variable expansions.
+ * testsuite/runtest.all/clone_output.test: Likewise.
+ * testsuite/runtest.all/target.test: Likewise.
+ * testsuite/runtest.all/stats.exp: Likewise.
+ * testsuite/runtest.all/remote.test: Likewise.
+ * testsuite/runtest.all/config.test: Likewise.
+ * testsuite/runtest.all/default_procs.tcl: Likewise.
+ * testsuite/runtest.all/libs.exp: Likewise.
+ * testsuite/runtest.all/options.exp: Likewise.
+
2018-12-08 Jacob Bachmeyer <jcb62281@gmail.com>
* NEWS: Document 'testsuite' command.
diff --git a/lib/dejagnu.exp b/lib/dejagnu.exp
index d0766e6..46870f3 100644
--- a/lib/dejagnu.exp
+++ b/lib/dejagnu.exp
@@ -134,42 +134,42 @@ proc host_execute {args} {
expect {
-re "^$prefix\[0-9\]\[0-9\]:..:..:${text}*\r\n" {
regsub "\[\n\r\t\]*NOTE: $text\r\n" $expect_out(0,string) "" output
- verbose "$output" 3
+ verbose $output 3
set timetol 0
exp_continue
}
-re "^$prefix\tNOTE:${text}*" {
regsub "\[\n\r\t\]*NOTE: $text\r\n" $expect_out(0,string) "" output
set output [string range $output 6 end]
- verbose "$output" 2
+ verbose $output 2
set timetol 0
exp_continue
}
-re "^$prefix\tPASSED:${text}*" {
regsub "\[\n\r\t\]*PASSED: $text\r\n" $expect_out(0,string) "" output
set output [string range $output 8 end]
- pass "$output"
+ pass $output
set timetol 0
exp_continue
}
-re "^$prefix\tFAILED:${text}*" {
regsub "\[\n\r\t\]*FAILED: $text\r\n" $expect_out(0,string) "" output
set output [string range $output 8 end]
- fail "$output"
+ fail $output
set timetol 0
exp_continue
}
-re "^$prefix\tUNTESTED:${text}*" {
regsub "\[\n\r\t\]*TESTED: $text\r\n" $expect_out(0,string) "" output
set output [string range $output 8 end]
- untested "$output"
+ untested $output
set timetol 0
exp_continue
}
-re "^$prefix\tUNRESOLVED:${text}*" {
regsub "\[\n\r\t\]*UNRESOLVED: $text\r\n" $expect_out(0,string) "" output
set output [string range $output 8 end]
- unresolved "$output"
+ unresolved $output
set timetol 0
exp_continue
}
diff --git a/testsuite/runtest.all/clone_output.test b/testsuite/runtest.all/clone_output.test
index b643726..35cfc31 100644
--- a/testsuite/runtest.all/clone_output.test
+++ b/testsuite/runtest.all/clone_output.test
@@ -10,7 +10,7 @@ if [ file exists $objdir/setval.tmp ] {
puts "ERROR: $objdir/setval.tmp doesn't exist"
}
if [ file exists $srcdir/$subdir/default_procs.tcl ] {
- source "$srcdir/$subdir/default_procs.tcl"
+ source $srcdir/$subdir/default_procs.tcl
} else {
puts "ERROR: $srcdir/$subdir/default_procs.tcl doesn't exist"
}
diff --git a/testsuite/runtest.all/config.test b/testsuite/runtest.all/config.test
index 6443cb4..fa959f4 100644
--- a/testsuite/runtest.all/config.test
+++ b/testsuite/runtest.all/config.test
@@ -10,7 +10,7 @@ if [ file exists $objdir/setval.tmp ] {
puts "ERROR: $objdir/setval.tmp doesn't exist"
}
if [ file exists $srcdir/$subdir/default_procs.tcl ] {
- source "$srcdir/$subdir/default_procs.tcl"
+ source $srcdir/$subdir/default_procs.tcl
} else {
puts "ERROR: $srcdir/$subdir/default_procs.tcl doesn't exist"
}
diff --git a/testsuite/runtest.all/default_procs.tcl b/testsuite/runtest.all/default_procs.tcl
index 076c645..6537496 100644
--- a/testsuite/runtest.all/default_procs.tcl
+++ b/testsuite/runtest.all/default_procs.tcl
@@ -8,7 +8,7 @@ proc lib_pat_test { cmd arglist pattern } {
if { [catch { eval [list $cmd] [lrange $arglist 0 end] } result] == 0 } {
puts "RESULT(lib_pat_test) was: \"${result}\"\
for pattern \"$pattern\"."
- return [string match "$pattern" $result]
+ return [string match $pattern $result]
} else {
puts "RESULT(lib_pat_test) was error \"${result}\""
return -1
@@ -160,13 +160,13 @@ proc fail { msg } {
proc perror { msg } {
global errno
puts "ERRORED: $msg"
- set errno "$msg"
+ set errno $msg
}
proc warning { msg } {
global errno
puts "WARNED: $msg"
- set errno "$msg"
+ set errno $msg
}
proc untested { msg } {
diff --git a/testsuite/runtest.all/libs.exp b/testsuite/runtest.all/libs.exp
index 7865c47..e09cd9b 100644
--- a/testsuite/runtest.all/libs.exp
+++ b/testsuite/runtest.all/libs.exp
@@ -72,11 +72,11 @@ proc process_test { test } {
exp_continue
}
-re "\[\r\n\]*WARNED: $text\[\r\n\]*" {
- verbose "$expect_out(0,string)" 2
+ verbose $expect_out(0,string) 2
exp_continue
}
-re "\[\r\n\]*ERRORED: $text\[\r\n\]*" {
- verbose "$expect_out(0,string)" 2
+ verbose $expect_out(0,string) 2
exp_continue
}
timeout {
diff --git a/testsuite/runtest.all/options.exp b/testsuite/runtest.all/options.exp
index 53621a9..da344a4 100644
--- a/testsuite/runtest.all/options.exp
+++ b/testsuite/runtest.all/options.exp
@@ -65,7 +65,7 @@ set tests {
}
foreach t $tests {
- if [util_test "$RUNTEST" "[lindex $t 0] -srcdir ${srcdir}/runtest.all" "" "[lindex $t 1]"] {
+ if [util_test $RUNTEST "[lindex $t 0] -srcdir ${srcdir}/runtest.all" "" "[lindex $t 1]"] {
fail "[lindex $t 2]"
} else {
pass "[lindex $t 2]"
diff --git a/testsuite/runtest.all/remote.test b/testsuite/runtest.all/remote.test
index 4f10ee1..86f3241 100644
--- a/testsuite/runtest.all/remote.test
+++ b/testsuite/runtest.all/remote.test
@@ -10,14 +10,14 @@ if [ file exists $objdir/setval.tmp ] {
puts "ERROR: $objdir/setval.tmp doesn't exist"
}
if [ file exists $srcdir/$subdir/default_procs.tcl ] {
- source "$srcdir/$subdir/default_procs.tcl"
+ source $srcdir/$subdir/default_procs.tcl
} else {
puts "ERROR: $srcdir/$subdir/default_procs.tcl doesn't exist"
}
proc load_lib { lib } {
global srcdir
- source "$srcdir/../lib/$lib"
+ source $srcdir/../lib/$lib
}
set file $srcdir/../lib/remote.exp
diff --git a/testsuite/runtest.all/stats.exp b/testsuite/runtest.all/stats.exp
index fc895f8..dea5894 100644
--- a/testsuite/runtest.all/stats.exp
+++ b/testsuite/runtest.all/stats.exp
@@ -43,7 +43,7 @@ set tests {
}
foreach t $tests {
- if [util_test "$RUNTEST" \
+ if [util_test $RUNTEST \
"--outdir $tmpdir STATS_TEST=[lindex $t 0] stats-sub.exp" \
"" \
[lindex $t 1]] {
diff --git a/testsuite/runtest.all/target.test b/testsuite/runtest.all/target.test
index 6729eda..bd645d2 100644
--- a/testsuite/runtest.all/target.test
+++ b/testsuite/runtest.all/target.test
@@ -10,14 +10,14 @@ if [ file exists $objdir/setval.tmp ] {
puts "ERROR: $objdir/setval.tmp doesn't exist"
}
if [ file exists $srcdir/$subdir/default_procs.tcl ] {
- source "$srcdir/$subdir/default_procs.tcl"
+ source $srcdir/$subdir/default_procs.tcl
} else {
puts "ERROR: $srcdir/$subdir/default_procs.tcl doesn't exist"
}
proc load_lib { lib } {
global srcdir
- source "$srcdir/../lib/$lib"
+ source $srcdir/../lib/$lib
}
set file $srcdir/../lib/target.exp
diff --git a/testsuite/runtest.all/utils.test b/testsuite/runtest.all/utils.test
index b5310ca..107e907 100644
--- a/testsuite/runtest.all/utils.test
+++ b/testsuite/runtest.all/utils.test
@@ -10,7 +10,7 @@ if [ file exists $objdir/setval.tmp ] {
puts "ERROR: $objdir/setval.tmp doesn't exist"
}
if [ file exists $srcdir/$subdir/default_procs.tcl ] {
- source "$srcdir/$subdir/default_procs.tcl"
+ source $srcdir/$subdir/default_procs.tcl
} else {
puts "ERROR: $srcdir$subdir/default_procs.tcl doesn't exist"
}