From: Jeffrey A Law <law@cygnus.com>
Date: Sun, 18 Jan 1998 00:32:36 +0000 (+0000)
Subject: c-torture.exp: Look for .x files instead of .cexp files.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a04a1bea948572735b610a9a01670ac90e13261a;p=gcc.git

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

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8f6a051de40..48c4d76b739 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.cexp
deleted file mode 100644
index dad1a21aaae..00000000000
--- a/gcc/testsuite/gcc.c-torture/compile/961203-1.cexp
+++ /dev/null
@@ -1,7 +0,0 @@
-# This doesn't work on any host with 32 bit int or smaller.
-
-# Because this test tends to consume lots of system resources and doesn't
-# currently work, don't actually run it.  Just report a failure.
-setup_xfail "*-*-*"
-fail "gcc.c-torture/compile/961203-1.c"
-return 1 ;# `1' says we handled the testcase ourselves
diff --git a/gcc/testsuite/gcc.c-torture/compile/961203-1.x b/gcc/testsuite/gcc.c-torture/compile/961203-1.x
new file mode 100644
index 00000000000..dad1a21aaae
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/961203-1.x
@@ -0,0 +1,7 @@
+# This doesn't work on any host with 32 bit int or smaller.
+
+# Because this test tends to consume lots of system resources and doesn't
+# currently work, don't actually run it.  Just report a failure.
+setup_xfail "*-*-*"
+fail "gcc.c-torture/compile/961203-1.c"
+return 1 ;# `1' says we handled the testcase ourselves
diff --git a/gcc/testsuite/gcc.c-torture/execute/920428-2.cexp b/gcc/testsuite/gcc.c-torture/execute/920428-2.cexp
deleted file mode 100644
index c7d9f030049..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/920428-2.cexp
+++ /dev/null
@@ -1,6 +0,0 @@
-# This doesn't work on sparc's with -mflat.
-
-if { [istarget "sparc-*-*"] && [string match "*mflat*" $CFLAGS] } {
-	set torture_execute_xfail "sparc-*-*"
-}
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/920428-2.x b/gcc/testsuite/gcc.c-torture/execute/920428-2.x
new file mode 100644
index 00000000000..c7d9f030049
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/920428-2.x
@@ -0,0 +1,6 @@
+# This doesn't work on sparc's with -mflat.
+
+if { [istarget "sparc-*-*"] && [string match "*mflat*" $CFLAGS] } {
+	set torture_execute_xfail "sparc-*-*"
+}
+return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/920501-7.cexp b/gcc/testsuite/gcc.c-torture/execute/920501-7.cexp
deleted file mode 100644
index c7d9f030049..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/920501-7.cexp
+++ /dev/null
@@ -1,6 +0,0 @@
-# This doesn't work on sparc's with -mflat.
-
-if { [istarget "sparc-*-*"] && [string match "*mflat*" $CFLAGS] } {
-	set torture_execute_xfail "sparc-*-*"
-}
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/920501-7.x b/gcc/testsuite/gcc.c-torture/execute/920501-7.x
new file mode 100644
index 00000000000..c7d9f030049
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/920501-7.x
@@ -0,0 +1,6 @@
+# This doesn't work on sparc's with -mflat.
+
+if { [istarget "sparc-*-*"] && [string match "*mflat*" $CFLAGS] } {
+	set torture_execute_xfail "sparc-*-*"
+}
+return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/920715-1.cexp b/gcc/testsuite/gcc.c-torture/execute/920715-1.cexp
deleted file mode 100644
index 28da30bbcd3..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/920715-1.cexp
+++ /dev/null
@@ -1,13 +0,0 @@
-# This doesn't work on h8300s
-# It also doesn't work on d10v if doubles are not 64 bits
-
-if { [istarget "h8300*-*-*"] || [istarget "mn10200*-*-*"] } {
-	set torture_execute_xfail "h8300*-*-*"
-	set torture_execute_xfail "mn10200*-*-*"
-}
-
-if { [istarget "d10v-*-*"] && ! [string-match "*-mdouble64*" $CFLAGS] } {
-	set torture_execute_xfail "d10v-*-*"
-}
-
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/920715-1.x b/gcc/testsuite/gcc.c-torture/execute/920715-1.x
new file mode 100644
index 00000000000..28da30bbcd3
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/920715-1.x
@@ -0,0 +1,13 @@
+# This doesn't work on h8300s
+# It also doesn't work on d10v if doubles are not 64 bits
+
+if { [istarget "h8300*-*-*"] || [istarget "mn10200*-*-*"] } {
+	set torture_execute_xfail "h8300*-*-*"
+	set torture_execute_xfail "mn10200*-*-*"
+}
+
+if { [istarget "d10v-*-*"] && ! [string-match "*-mdouble64*" $CFLAGS] } {
+	set torture_execute_xfail "d10v-*-*"
+}
+
+return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/cvt-1.cexp b/gcc/testsuite/gcc.c-torture/execute/cvt-1.cexp
deleted file mode 100644
index 997c8650c00..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/cvt-1.cexp
+++ /dev/null
@@ -1,7 +0,0 @@
-# This doesn't work on d10v if ints are not 32 bits
-
-if { [istarget "d10v-*-*"] && ! [string-match "*-mint32*" $CFLAGS] } {
-	set torture_execute_xfail "d10v-*-*"
-}
-
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/cvt-1.x b/gcc/testsuite/gcc.c-torture/execute/cvt-1.x
new file mode 100644
index 00000000000..997c8650c00
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/cvt-1.x
@@ -0,0 +1,7 @@
+# This doesn't work on d10v if ints are not 32 bits
+
+if { [istarget "d10v-*-*"] && ! [string-match "*-mint32*" $CFLAGS] } {
+	set torture_execute_xfail "d10v-*-*"
+}
+
+return 0
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 00000000000..0ae0a35d315
--- /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.cexp
deleted file mode 100644
index e68b8fbb8d2..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/loop-2e.cexp
+++ /dev/null
@@ -1,9 +0,0 @@
-# This doesn't work on m68k-motorola-sysv
-# It also doesn't work on m88k-motorola-sysv3
-
-global target_triplet
-if { [istarget "m68k-motorola-sysv"] || [istarget "m88k-motorola-sysv3"] } {
-      set torture_compile_xfail "$target_triplet"
-}
-
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/loop-2e.x b/gcc/testsuite/gcc.c-torture/execute/loop-2e.x
new file mode 100644
index 00000000000..e68b8fbb8d2
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/loop-2e.x
@@ -0,0 +1,9 @@
+# This doesn't work on m68k-motorola-sysv
+# It also doesn't work on m88k-motorola-sysv3
+
+global target_triplet
+if { [istarget "m68k-motorola-sysv"] || [istarget "m88k-motorola-sysv3"] } {
+      set torture_compile_xfail "$target_triplet"
+}
+
+return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/loop-2f.cexp b/gcc/testsuite/gcc.c-torture/execute/loop-2f.cexp
deleted file mode 100644
index e68b8fbb8d2..00000000000
--- a/gcc/testsuite/gcc.c-torture/execute/loop-2f.cexp
+++ /dev/null
@@ -1,9 +0,0 @@
-# This doesn't work on m68k-motorola-sysv
-# It also doesn't work on m88k-motorola-sysv3
-
-global target_triplet
-if { [istarget "m68k-motorola-sysv"] || [istarget "m88k-motorola-sysv3"] } {
-      set torture_compile_xfail "$target_triplet"
-}
-
-return 0
diff --git a/gcc/testsuite/gcc.c-torture/execute/loop-2f.x b/gcc/testsuite/gcc.c-torture/execute/loop-2f.x
new file mode 100644
index 00000000000..e68b8fbb8d2
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/loop-2f.x
@@ -0,0 +1,9 @@
+# This doesn't work on m68k-motorola-sysv
+# It also doesn't work on m88k-motorola-sysv3
+
+global target_triplet
+if { [istarget "m68k-motorola-sysv"] || [istarget "m88k-motorola-sysv3"] } {
+      set torture_compile_xfail "$target_triplet"
+}
+
+return 0
diff --git a/gcc/testsuite/lib/c-torture.exp b/gcc/testsuite/lib/c-torture.exp
index 3e77d6c419e..ce6ce3cfd69 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 5bd6027576c..43f6e0ff23f 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
 	}