"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "runtest.exp" between
dejagnu-1.6.tar.gz and dejagnu-1.6.1.tar.gz

About: DejaGnu is a framework for testing other programs.

runtest.exp  (dejagnu-1.6):runtest.exp  (dejagnu-1.6.1)
# runtest.exp -- Test framework driver # runtest.exp -- Test framework driver
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, # Copyright (C) 1992-2016 Free Software Foundation, Inc.
# 2001, 2002, 2003, 2012 Free Software Foundation, Inc.
# #
# This file is part of DejaGnu. # This file is part of DejaGnu.
# #
# DejaGnu is free software; you can redistribute it and/or modify it # DejaGnu is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by # under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or # the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version. # (at your option) any later version.
# #
# DejaGnu is distributed in the hope that it will be useful, but # DejaGnu is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of # WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details. # General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with DejaGnu; if not, write to the Free Software Foundation, # along with DejaGnu; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. # Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
# This file was written by Rob Savoye <rob@welcomehome.org>. # This file was written by Rob Savoye <rob@welcomehome.org>.
set frame_version 1.6 set frame_version 1.6.1
if {![info exists argv0]} { if {![info exists argv0]} {
send_error "Must use a version of Expect greater than 5.0\n" send_error "Must use a version of Expect greater than 5.0\n"
exit 1 exit 1
} }
# trap some signals so we know whats happening. These definitions are only # trap some signals so we know whats happening. These definitions are only
# temporary until we read in the library stuff # temporary until we read in the library stuff
# #
trap { send_user "\ninterrupted by user\n"; exit 130 } SIGINT trap { send_user "\ninterrupted by user\n"; exit 130 } SIGINT
trap { send_user "\nquit\n"; exit 131 } SIGQUIT trap { send_user "\nquit\n"; exit 131 } SIGQUIT
skipping to change at line 57 skipping to change at line 56
set psum_file "latest" ;# file name of previous summary to diff against set psum_file "latest" ;# file name of previous summary to diff against
set exit_status 0 ;# exit code returned by this program set exit_status 0 ;# exit code returned by this program
set xfail_flag 0 ;# indicates that a failure is expected set xfail_flag 0 ;# indicates that a failure is expected
set xfail_prms 0 ;# GNATS prms id number for this expected failure set xfail_prms 0 ;# GNATS prms id number for this expected failure
set kfail_flag 0 ;# indicates that it is a known failure set kfail_flag 0 ;# indicates that it is a known failure
set kfail_prms 0 ;# bug id for the description of the known failur e set kfail_prms 0 ;# bug id for the description of the known failur e
set sum_file "" ;# name of the file that contains the summary log set sum_file "" ;# name of the file that contains the summary log
set base_dir "" ;# the current working directory set base_dir "" ;# the current working directory
set xml_file_name "" ;# name of the xml output if requested set xml_file "" ;# handle on the XML file if requested
set xml_file "" ;# handle on the xml file if requested
set xml 0 ;# flag for requesting xml set xml 0 ;# flag for requesting xml
set logname "" ;# the users login name set logname "" ;# the users login name
set prms_id 0 ;# GNATS prms id number set prms_id 0 ;# GNATS prms id number
set bug_id 0 ;# optional bug id number set bug_id 0 ;# optional bug id number
set dir "" ;# temp variable for directory names set dir "" ;# temp variable for directory names
set srcdir "." ;# source directory containing the test suite set srcdir "." ;# source directory containing the test suite
set ignoretests "" ;# list of tests to not execute set ignoretests "" ;# list of tests to not execute
set objdir "." ;# directory where test case binaries live set objdir "." ;# directory where test case binaries live
set reboot 0 set reboot 0
set configfile site.exp ;# (local to this file) set configfile site.exp ;# (local to this file)
skipping to change at line 91 skipping to change at line 89
set host_os "" ;# type of os the tests are running on set host_os "" ;# type of os the tests are running on
set host_vendor "" ;# vendor name of the OS or workstation the test are running on set host_vendor "" ;# vendor name of the OS or workstation the test are running on
set host_cpu "" ;# type of the cpu tests are running on set host_cpu "" ;# type of the cpu tests are running on
set target_triplet "" ;# type of architecture to run tests on, final re mote set target_triplet "" ;# type of architecture to run tests on, final re mote
set target_os "" ;# type of os the tests are running on set target_os "" ;# type of os the tests are running on
set target_vendor "" ;# vendor name of the OS or workstation the test are running on set target_vendor "" ;# vendor name of the OS or workstation the test are running on
set target_cpu "" ;# type of the cpu tests are running on set target_cpu "" ;# type of the cpu tests are running on
set target_alias "" ;# standard abbreviation of target set target_alias "" ;# standard abbreviation of target
set compiler_flags "" ;# the flags used by the compiler set compiler_flags "" ;# the flags used by the compiler
# Various ccache versions provide incorrect debug info such as ignoring
# different current directory, breaking GDB testsuite.
set env(CCACHE_DISABLE) 1
unset -nocomplain env(CCACHE_NODISABLE)
# #
# some convenience abbreviations # some convenience abbreviations
# #
if {![info exists hex]} { if {![info exists hex]} {
set hex "0x\[0-9A-Fa-f\]+" set hex "0x\[0-9A-Fa-f\]+"
} }
if {![info exists decimal]} { if {![info exists decimal]} {
set decimal "\[0-9\]+" set decimal "\[0-9\]+"
} }
skipping to change at line 386 skipping to change at line 389
send_user "\t--debug\t\t\tSet expect debugging ON\n" send_user "\t--debug\t\t\tSet expect debugging ON\n"
send_user "\t--directory name\tRun only the tests in directory 'name'\n" send_user "\t--directory name\tRun only the tests in directory 'name'\n"
send_user "\t--help\t\t\tPrint help text\n" send_user "\t--help\t\t\tPrint help text\n"
send_user "\t--host \[triplet\]\tThe canonical triplet of the host machine\n " send_user "\t--host \[triplet\]\tThe canonical triplet of the host machine\n "
send_user "\t--host_board \[name\]\tThe host board to use\n" send_user "\t--host_board \[name\]\tThe host board to use\n"
send_user "\t--ignore \[name(s)\]\tThe names of specific tests to ignore\n" send_user "\t--ignore \[name(s)\]\tThe names of specific tests to ignore\n"
send_user "\t--log_dialog\t\t\Emit Expect output on stdout\n" send_user "\t--log_dialog\t\t\Emit Expect output on stdout\n"
send_user "\t--mail \[name(s)\]\tWhom to mail the results to\n" send_user "\t--mail \[name(s)\]\tWhom to mail the results to\n"
send_user "\t--objdir \[name\]\t\tThe test suite binary directory\n" send_user "\t--objdir \[name\]\t\tThe test suite binary directory\n"
send_user "\t--outdir \[name\]\t\tThe directory to put logs in\n" send_user "\t--outdir \[name\]\t\tThe directory to put logs in\n"
send_user "\t--reboot \[name\]\t\tReboot the target (if supported)\n" send_user "\t--reboot\t\tReboot the target (if supported)\n"
send_user "\t--srcdir \[name\]\t\tThe test suite source code directory\n" send_user "\t--srcdir \[name\]\t\tThe test suite source code directory\n"
send_user "\t--status\t\tSet the exit status to fail on Tcl errors\n" send_user "\t--status\t\tSet the exit status to fail on Tcl errors\n"
send_user "\t--strace \[number\]\tSet expect tracing ON\n" send_user "\t--strace \[number\]\tTurn on Expect tracing\n"
send_user "\t--target \[triplet\]\tThe canonical triplet of the target board \n" send_user "\t--target \[triplet\]\tThe canonical triplet of the target board \n"
send_user "\t--target_board \[name(s)\] The list of target boards to run tes ts on\n" send_user "\t--target_board \[name(s)\] The list of target boards to run tes ts on\n"
send_user "\t--tool \[name(s)\]\tRun tests on these tools\n" send_user "\t--tool \[name(s)\]\tRun tests on these tools\n"
send_user "\t--tool_exec \[name\]\tThe path to the tool executable to test\n " send_user "\t--tool_exec \[name\]\tThe path to the tool executable to test\n "
send_user "\t--tool_opts \[options\]\tA list of additional options to pass t o the tool\n" send_user "\t--tool_opts \[options\]\tA list of additional options to pass t o the tool\n"
send_user "\t--verbose, -v\t\tProduce verbose output\n" send_user "\t--verbose, -v\t\tProduce verbose output\n"
send_user "\t--version, -V\t\tPrint all relevant version numbers\n" send_user "\t--version, -V\t\tPrint all relevant version numbers\n"
send_user "\t--xml\[=name\], -x\tTurn on XML output generation\n" send_user "\t--xml, -x\t\tWrite out an XML results file\n"
send_user "\t--D\[0-1\]\t\tTcl debugger\n" send_user "\t--D\[0-1\]\t\tTcl debugger\n"
send_user "\tscript.exp\[=arg(s)\]\tRun these tests only\n" send_user "\tscript.exp\[=arg(s)\]\tRun these tests only\n"
if { [info exists tool] } { if { [info exists tool] } {
if { [info procs ${tool}_option_help] != "" } { if { [info procs ${tool}_option_help] != "" } {
${tool}_option_help ${tool}_option_help
} }
} }
} }
# #
skipping to change at line 1168 skipping to change at line 1171
continue continue
} }
"--to*" { # (--tool) specify tool name "--to*" { # (--tool) specify tool name
set tool $optarg set tool $optarg
verbose "Testing $tool" verbose "Testing $tool"
continue continue
} }
"--x*" { "--x*" {
set xml_file_name $optarg
set xml 1 set xml 1
verbose "XML logging turned on" verbose "XML logging turned on"
continue continue
} }
"--he*" { # (--help) help text "--he*" { # (--help) help text
usage usage
exit 0 exit 0
} }
skipping to change at line 1826 skipping to change at line 1828
# Run the test if cmdline_dir_to_run was specified # Run the test if cmdline_dir_to_run was specified
# by the user using --directory and the test # by the user using --directory and the test
# directory matches that directory # directory matches that directory
if {[info exists cmdline_dir_to_run] \ if {[info exists cmdline_dir_to_run] \
&& $cmdline_dir_to_run != ""} { && $cmdline_dir_to_run != ""} {
# JYG: cmdline_dir_to_run might be a space delimited # JYG: cmdline_dir_to_run might be a space delimited
# list of directories. Look for match on each item. # list of directories. Look for match on each item.
set found 0 set found 0
foreach directory $cmdline_dir_to_run { foreach directory $cmdline_dir_to_run {
if {[string match $directory $dir]} { # Look for a directory that ends with the
# provided --directory name.
if {[string match "$directory" $dir]
|| [string match "*/$directory" $dir]} {
set found 1 set found 1
break break
} }
} }
if {!$found} { if {!$found} {
continue continue
} }
} }
foreach test_name [lsort [find ${dir} *.exp]] { foreach test_name [lsort [find ${dir} *.exp]] {
 End of changes. 9 change blocks. 
10 lines changed or deleted 15 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)