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

11 files changed, 41 insertions, 36 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8f6a051..48c4d76 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+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.
diff --git a/gcc/testsuite/gcc.c-torture/compile/961203-1.cexp b/gcc/testsuite/gcc.c-torture/compile/961203-1.x
index dad1a21..dad1a21 100644
--- a/gcc/testsuite/gcc.c-torture/compile/961203-1.cexp
+++ b/gcc/testsuite/gcc.c-torture/compile/961203-1.x
diff --git a/gcc/testsuite/gcc.c-torture/execute/920428-2.cexp b/gcc/testsuite/gcc.c-torture/execute/920428-2.x
index c7d9f03..c7d9f03 100644
--- a/gcc/testsuite/gcc.c-torture/execute/920428-2.cexp
+++ b/gcc/testsuite/gcc.c-torture/execute/920428-2.x
diff --git a/gcc/testsuite/gcc.c-torture/execute/920501-7.cexp b/gcc/testsuite/gcc.c-torture/execute/920501-7.x
index c7d9f03..c7d9f03 100644
--- a/gcc/testsuite/gcc.c-torture/execute/920501-7.cexp
+++ b/gcc/testsuite/gcc.c-torture/execute/920501-7.x
diff --git a/gcc/testsuite/gcc.c-torture/execute/920715-1.cexp b/gcc/testsuite/gcc.c-torture/execute/920715-1.x
index 28da30b..28da30b 100644
--- a/gcc/testsuite/gcc.c-torture/execute/920715-1.cexp
+++ b/gcc/testsuite/gcc.c-torture/execute/920715-1.x
diff --git a/gcc/testsuite/gcc.c-torture/execute/cvt-1.cexp b/gcc/testsuite/gcc.c-torture/execute/cvt-1.x
index 997c865..997c865 100644
--- a/gcc/testsuite/gcc.c-torture/execute/cvt-1.cexp
+++ b/gcc/testsuite/gcc.c-torture/execute/cvt-1.x
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/rbug.x b/gcc/testsuite/gcc.c-torture/execute/ieee/rbug.x
new file mode 100644
index 0000000..0ae0a35
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/rbug.x
@@ -0,0 +1,7 @@
+# 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
diff --git a/gcc/testsuite/gcc.c-torture/execute/loop-2e.cexp b/gcc/testsuite/gcc.c-torture/execute/loop-2e.x
index e68b8fb..e68b8fb 100644
--- a/gcc/testsuite/gcc.c-torture/execute/loop-2e.cexp
+++ b/gcc/testsuite/gcc.c-torture/execute/loop-2e.x
diff --git a/gcc/testsuite/gcc.c-torture/execute/loop-2f.cexp b/gcc/testsuite/gcc.c-torture/execute/loop-2f.x
index e68b8fb..e68b8fb 100644
--- a/gcc/testsuite/gcc.c-torture/execute/loop-2f.cexp
+++ b/gcc/testsuite/gcc.c-torture/execute/loop-2f.x
diff --git a/gcc/testsuite/lib/c-torture.exp b/gcc/testsuite/lib/c-torture.exp
index 3e77d6c..ce6ce3c 100644
--- a/gcc/testsuite/lib/c-torture.exp
+++ b/gcc/testsuite/lib/c-torture.exp
@@ -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
 	}
diff --git a/gcc/testsuite/lib/f-torture.exp b/gcc/testsuite/lib/f-torture.exp
index 5bd6027..43f6e0f 100644
--- a/gcc/testsuite/lib/f-torture.exp
+++ b/gcc/testsuite/lib/f-torture.exp
@@ -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
 	}