Commit a04a1bea by Jeffrey A Law Committed by Jeff Law

c-torture.exp: Look for .x files instead of .cexp files.

        * lib/c-torture.exp: Look for .x files instead of .cexp files.
        * lib/f-torture.exp: Similarly.
        * gcc.c-torture: Rename all .cexp files to .x files.

From-SVN: r17411
parent 70372764
Sun Jan 18 01:33:59 1998 Jeffrey A Law (law@cygnus.com)
* lib/c-torture.exp: Look for .x files instead of .cexp files.
* lib/f-torture.exp: Similarly.
* gcc.c-torture: Rename all .cexp files to .x files.
Tue Nov 25 16:18:51 1997 Kate Hedstrom (kate@ahab.rutgers.edu)
* lib/f-torture.exp: Improve error and loop detection.
......
# This doesn't work on d10v if doubles are not 64 bits
if { [istarget "d10v-*-*"] && ! [string-match "*-mdouble64*" $CFLAGS] } {
set torture_execute_xfail "d10v-*-*"
}
return 0
......@@ -128,11 +128,9 @@ proc c-torture-compile { src option } {
#
# SRC is the full pathname of the testcase.
#
# If the testcase has an associated .cexp file, we source that to run the
# test instead. We use .cexp instead of .exp so that the testcase is still
# controlled by the main .exp driver (this is useful when one wants to only
# run the compile.exp tests for example - one need only pass compile.exp to
# dejagnu, and not compile.exp, foo1.exp, foo2.exp, etc.).
# If the testcase has an associated .x file, we source that to run the
# test instead. We use .x so that we don't lengthen the existing filename
# to more than 14 chars.
#
proc c-torture-execute { src args } {
global tmpdir tool srcdir output
......@@ -143,10 +141,10 @@ proc c-torture-execute { src args } {
set additional_flags "";
}
# Check for alternate driver.
if [file exists [file rootname $src].cexp] {
verbose "Using alternate driver [file rootname [file tail $src]].cexp" 2
if [file exists [file rootname $src].x] {
verbose "Using alternate driver [file rootname [file tail $src]].x" 2
set done_p 0
catch "set done_p \[source [file rootname $src].cexp\]"
catch "set done_p \[source [file rootname $src].x\]"
if { $done_p } {
return
}
......@@ -181,7 +179,7 @@ proc c-torture-execute { src args } {
set execname "${executable}${count}";
incr count;
# torture_{compile,execute}_xfail are set by the .cexp script
# torture_{compile,execute}_xfail are set by the .x script
# (if present)
if [info exists torture_compile_xfail] {
setup_xfail $torture_compile_xfail
......@@ -300,11 +298,9 @@ proc search_for { file pattern } {
# SRC is the full pathname of the testcase, or just a file name in which case
# we prepend $srcdir/$subdir.
#
# If the testcase has an associated .cexp file, we source that to run the
# test instead. We use .cexp instead of .exp so that the testcase is still
# controlled by the main .exp driver (this is useful when one wants to only
# run the compile.exp tests for example - one need only pass compile.exp to
# dejagnu, and not compile.exp, foo1.exp, foo2.exp, etc.).
# If the testcase has an associated .x file, we source that to run the
# test instead. We use .x so that we don't lengthen the existing filename
# to more than 14 chars.
#
proc c-torture { args } {
global srcdir subdir
......@@ -322,10 +318,10 @@ proc c-torture { args } {
}
# Check for alternate driver.
if [file exists [file rootname $src].cexp] {
verbose "Using alternate driver [file rootname [file tail $src]].cexp" 2
if [file exists [file rootname $src].x] {
verbose "Using alternate driver [file rootname [file tail $src]].x" 2
set done_p 0
catch "set done_p \[source [file rootname $src].cexp\]"
catch "set done_p \[source [file rootname $src].x\]"
if { $done_p } {
return
}
......@@ -342,7 +338,7 @@ proc c-torture { args } {
# loop through all the options
foreach option $option_list {
# torture_compile_xfail is set by the .cexp script (if present)
# torture_compile_xfail is set by the .x script (if present)
if [info exists torture_compile_xfail] {
setup_xfail $torture_compile_xfail
}
......
......@@ -124,20 +124,18 @@ proc f-torture-compile { src option } {
#
# SRC is the full pathname of the testcase.
#
# If the testcase has an associated .cexp file, we source that to run the
# test instead. We use .cexp instead of .exp so that the testcase is still
# controlled by the main .exp driver (this is useful when one wants to only
# run the compile.exp tests for example - one need only pass compile.exp to
# dejagnu, and not compile.exp, foo1.exp, foo2.exp, etc.).
# If the testcase has an associated .x file, we source that to run the
# test instead. We use .x so that we don't lengthen the existing filename
# to more than 14 chars.
#
proc f-torture-execute { src } {
global tmpdir tool srcdir output
# Check for alternate driver.
if [file exists [file rootname $src].cexp] {
verbose "Using alternate driver [file rootname [file tail $src]].cexp" 2
if [file exists [file rootname $src].x] {
verbose "Using alternate driver [file rootname [file tail $src]].x" 2
set done_p 0
catch "set done_p \[source [file rootname $src].cexp\]"
catch "set done_p \[source [file rootname $src].x\]"
if { $done_p } {
return
}
......@@ -164,7 +162,7 @@ proc f-torture-execute { src } {
}
foreach option $option_list {
# torture_{compile,execute}_xfail are set by the .cexp script
# torture_{compile,execute}_xfail are set by the .x script
# (if present)
if [info exists torture_compile_xfail] {
setup_xfail $torture_compile_xfail
......@@ -268,11 +266,9 @@ proc search_for { file pattern } {
# SRC is the full pathname of the testcase, or just a file name in which case
# we prepend $srcdir/$subdir.
#
# If the testcase has an associated .cexp file, we source that to run the
# test instead. We use .cexp instead of .exp so that the testcase is still
# controlled by the main .exp driver (this is useful when one wants to only
# run the compile.exp tests for example - one need only pass compile.exp to
# dejagnu, and not compile.exp, foo1.exp, foo2.exp, etc.).
# If the testcase has an associated .x file, we source that to run the
# test instead. We use .x so that we don't lengthen the existing filename
# to more than 14 chars.
#
proc f-torture { args } {
global srcdir subdir
......@@ -290,10 +286,10 @@ proc f-torture { args } {
}
# Check for alternate driver.
if [file exists [file rootname $src].cexp] {
verbose "Using alternate driver [file rootname [file tail $src]].cexp" 2
if [file exists [file rootname $src].x] {
verbose "Using alternate driver [file rootname [file tail $src]].x" 2
set done_p 0
catch "set done_p \[source [file rootname $src].cexp\]"
catch "set done_p \[source [file rootname $src].x\]"
if { $done_p } {
return
}
......@@ -310,7 +306,7 @@ proc f-torture { args } {
# loop through all the options
foreach option $option_list {
# torture_compile_xfail is set by the .cexp script (if present)
# torture_compile_xfail is set by the .x script (if present)
if [info exists torture_compile_xfail] {
setup_xfail $torture_compile_xfail
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment