/[dejagnu]/dejagnu/runtest.exp
ViewVC logotype

Diff of /dejagnu/runtest.exp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.3 by rsavoye, Sun May 6 16:22:20 2001 UTC revision 1.4 by rsavoye, Wed May 9 18:19:43 2001 UTC
# Line 20  Line 20 
20    
21  # This file was written by Rob Savoye. (rob@welcomehome.org)  # This file was written by Rob Savoye. (rob@welcomehome.org)
22    
23  set frame_version       1.4.0  set frame_version       1.4.1.x
24  if ![info exists argv0] {  if ![info exists argv0] {
25      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"
26      exit 1      exit 1
# Line 64  set reboot      0 Line 64  set reboot      0
64  set configfile  site.exp        ;# (local to this file)  set configfile  site.exp        ;# (local to this file)
65  set multipass   ""              ;# list of passes and var settings  set multipass   ""              ;# list of passes and var settings
66  set errno       "";             ;#  set errno       "";             ;#
67    set exit_error  0               ;# Toggle for whether to set the exit status
68                                    ;# on Tcl bugs in test case drivers.
69  #  #
70  # These describe the host and target environments.  # These describe the host and target environments.
71  #  #
# Line 370  proc usage { } { Line 372  proc usage { } {
372      send_user "\t--host \[string\]\t\tThe canonical config name of the host machine\n"      send_user "\t--host \[string\]\t\tThe canonical config name of the host machine\n"
373      send_user "\t--host_board \[name\]\tThe host board to use\n"      send_user "\t--host_board \[name\]\tThe host board to use\n"
374      send_user "\t--target \[string\]\tThe canonical config name of the target board\n"      send_user "\t--target \[string\]\tThe canonical config name of the target board\n"
375        send_user "\t--status (-st)\t\tSet the exit status to fail on Tcl errors\n"
376      send_user "\t--debug (-de)\t\tSet expect debugging ON\n"      send_user "\t--debug (-de)\t\tSet expect debugging ON\n"
377      send_user "\t--help (-he)\t\tPrint help text\n"      send_user "\t--help (-he)\t\tPrint help text\n"
378      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"
# Line 466  for { set i 0 } { $i < $argc } { incr i Line 469  for { set i 0 } { $i < $argc } { incr i
469              continue              continue
470          }          }
471    
472            "--st*" {
473                set exit_error 1
474                continue
475            }
476            
477          "--sr*" {                       # (--srcdir) where the testsuite source code lives          "--sr*" {                       # (--srcdir) where the testsuite source code lives
478              set srcdir $optarg              set srcdir $optarg
479              continue              continue
# Line 575  proc load_lib { file } { Line 583  proc load_lib { file } {
583    
584      set loaded_libs($file) "";      set loaded_libs($file) "";
585    
586      if { [search_and_load_file "library file" $file [list $libdir $libdir/lib [file dirname [file dirname $srcdir]]/dejagnu/lib $srcdir/lib . [file dirname [file dirname [file dirname $srcdir]]]/dejagnu/lib]] == 0 } {      if { [search_and_load_file "library file" $file [list ../lib $libdir $libdir/lib [file dirname [file dirname $srcdir]]/dejagnu/lib $srcdir/lib $execpath/lib . [file dirname [file dirname [file dirname $srcdir]]]/dejagnu/lib]] == 0 } {
587          send_error "ERROR: Couldn't find library file $file.\n"          send_error "ERROR: Couldn't find library file $file.\n"
588          exit 1          exit 1
589      }      }
# Line 661  unset arg_host_triplet arg_build_triplet Line 669  unset arg_host_triplet arg_build_triplet
669    
670  if [expr  { $build_triplet == ""  &&  $host_triplet == ""} ] {  if [expr  { $build_triplet == ""  &&  $host_triplet == ""} ] {
671      # find config.guess      # find config.guess
672      foreach dir "$libdir $libdir/libexec $libdir/.. $srcdir/.. $srcdir/../.." {      foreach dir "$libdir $libdir/libexec $libdir/.. $execpath $srcdir $srcdir/.. $srcdir/../.." {
673          verbose "Looking for ${dir}/config.guess" 2          verbose "Looking for ${dir}/config.guess" 2
674          if [file exists ${dir}/config.guess] {          if [file exists ${dir}/config.guess] {
675              set config_guess ${dir}/config.guess              set config_guess ${dir}/config.guess
# Line 1430  proc runtest { test_file_name } { Line 1438  proc runtest { test_file_name } {
1438          }          }
1439    
1440          if { [catch "uplevel #0 source $test_file_name"] == 1 } {          if { [catch "uplevel #0 source $test_file_name"] == 1 } {
1441                # If we have a Tcl error, propogate the exit status do make
1442                # notices the error.
1443                global exit_status exit_error
1444                # exit error is set by a command line option
1445                set exit_status $exit_error
1446              # We can't call `perror' here, it resets `errorInfo'              # We can't call `perror' here, it resets `errorInfo'
1447              # before we want to look at it.  Also remember that perror              # before we want to look at it.  Also remember that perror
1448              # increments `errcnt'.  If we do call perror we'd have to              # increments `errcnt'.  If we do call perror we'd have to

Legend:
Removed from v.1.3  
changed lines
  Added in v.1.4

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26