Browse Source

* 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.
psql
Ben Elliston 8 years ago
parent
commit
c7f104fec6
  1. 13
      ChangeLog
  2. 12
      lib/dejagnu.exp
  3. 2
      testsuite/runtest.all/clone_output.test
  4. 2
      testsuite/runtest.all/config.test
  5. 6
      testsuite/runtest.all/default_procs.tcl
  6. 4
      testsuite/runtest.all/libs.exp
  7. 2
      testsuite/runtest.all/options.exp
  8. 4
      testsuite/runtest.all/remote.test
  9. 2
      testsuite/runtest.all/stats.exp
  10. 4
      testsuite/runtest.all/target.test
  11. 2
      testsuite/runtest.all/utils.test

13
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.

12
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
}

2
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"
}

2
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"
}

6
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 } {

4
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 {

2
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]"

4
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

2
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]] {

4
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

2
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"
}

Loading…
Cancel
Save