From: Anthony Green <green@cygnus.com>
Date: Mon, 4 Oct 1999 03:30:54 +0000 (+0000)
Subject: A little clean up.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0d9cd062a095fa004363dccaceda82c806e966f9;p=gcc.git

A little clean up.

From-SVN: r29790
---

diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog
index 6f8637cab5b..bfc71f70678 100644
--- a/libjava/testsuite/ChangeLog
+++ b/libjava/testsuite/ChangeLog
@@ -1,3 +1,16 @@
+1999-10-02  Anthony Green  <green@cygnus.com>
+
+	* libjava.compile/Case.xfail: Removed.  This test should pass now.
+
+	* libjava.compile/compile.exp: Copied from test.exp.
+	* libjava.compile/test.exp: Removed.
+
+	* libjava.lang/lang.exp: Copied from test.exp.
+	* libjava.lang/test.exp: Removed.
+
+	* libjava.mauve/mauve.exp: Copied from test.exp.
+	* libjava.mauve/test.exp: Removed.
+
 1999-10-01  Tom Tromey  <tromey@cygnus.com>
 
 	* libjava.lang/PR56.out: New file.
diff --git a/libjava/testsuite/libjava.compile/Case.xfail b/libjava/testsuite/libjava.compile/Case.xfail
deleted file mode 100644
index 755ab8794df..00000000000
--- a/libjava/testsuite/libjava.compile/Case.xfail
+++ /dev/null
@@ -1 +0,0 @@
-xfail-gcj
diff --git a/libjava/testsuite/libjava.compile/compile.exp b/libjava/testsuite/libjava.compile/compile.exp
new file mode 100644
index 00000000000..3d9c13b78b6
--- /dev/null
+++ b/libjava/testsuite/libjava.compile/compile.exp
@@ -0,0 +1,20 @@
+global srcdir subdir
+
+catch "glob -nocomplain ${srcdir}/${subdir}/*.java" srcfiles
+verbose "srcfiles are $srcfiles"
+
+set prefix ""
+foreach x $srcfiles {
+    set args [libjava_read_xfail [file rootname $x].xfail]
+    if {[file exists [file rootname $x].no-link]} {
+	lappend args no-link
+    }
+    lappend args no-exec
+
+    test_libjava $options "$x" "" "" "" $args
+    test_libjava $options "$x" "-O" "" "" $args
+}
+
+# Local Variables:
+# tcl-indent-level:4
+# End:
diff --git a/libjava/testsuite/libjava.compile/test.exp b/libjava/testsuite/libjava.compile/test.exp
deleted file mode 100644
index 3d9c13b78b6..00000000000
--- a/libjava/testsuite/libjava.compile/test.exp
+++ /dev/null
@@ -1,20 +0,0 @@
-global srcdir subdir
-
-catch "glob -nocomplain ${srcdir}/${subdir}/*.java" srcfiles
-verbose "srcfiles are $srcfiles"
-
-set prefix ""
-foreach x $srcfiles {
-    set args [libjava_read_xfail [file rootname $x].xfail]
-    if {[file exists [file rootname $x].no-link]} {
-	lappend args no-link
-    }
-    lappend args no-exec
-
-    test_libjava $options "$x" "" "" "" $args
-    test_libjava $options "$x" "-O" "" "" $args
-}
-
-# Local Variables:
-# tcl-indent-level:4
-# End:
diff --git a/libjava/testsuite/libjava.lang/lang.exp b/libjava/testsuite/libjava.lang/lang.exp
new file mode 100644
index 00000000000..c0b8570403f
--- /dev/null
+++ b/libjava/testsuite/libjava.lang/lang.exp
@@ -0,0 +1,35 @@
+global srcdir subdir
+
+catch "glob -nocomplain ${srcdir}/${subdir}/*.out" srcfiles
+verbose "srcfiles are $srcfiles"
+
+set prefix ""
+foreach x $srcfiles {
+    regsub "\\.out$" $x "" prefix
+    set bname [file tail $prefix]
+
+    if [file exists $srcdir/$subdir/${bname}.xpo] {
+	set resfile "$srcdir/$subdir/${bname}.xpo"
+	set options "regexp_match"
+    } else {
+	set resfile "${prefix}.out"
+	set options ""
+    }
+
+    if [file exists ${prefix}.inp] {
+	set inpfile ${prefix}.inp
+    } else {
+	set inpfile ""
+    }
+
+    set args [libjava_read_xfail $srcdir/$subdir/$bname.xfail]
+
+    verbose "inpfile is $inpfile"
+
+    test_libjava $options "${prefix}.java" "" $inpfile $resfile $args
+    test_libjava $options "${prefix}.java" "-O" $inpfile $resfile $args
+}
+
+# Local Variables:
+# tcl-indent-level:4
+# End:
diff --git a/libjava/testsuite/libjava.lang/test.exp b/libjava/testsuite/libjava.lang/test.exp
deleted file mode 100644
index c0b8570403f..00000000000
--- a/libjava/testsuite/libjava.lang/test.exp
+++ /dev/null
@@ -1,35 +0,0 @@
-global srcdir subdir
-
-catch "glob -nocomplain ${srcdir}/${subdir}/*.out" srcfiles
-verbose "srcfiles are $srcfiles"
-
-set prefix ""
-foreach x $srcfiles {
-    regsub "\\.out$" $x "" prefix
-    set bname [file tail $prefix]
-
-    if [file exists $srcdir/$subdir/${bname}.xpo] {
-	set resfile "$srcdir/$subdir/${bname}.xpo"
-	set options "regexp_match"
-    } else {
-	set resfile "${prefix}.out"
-	set options ""
-    }
-
-    if [file exists ${prefix}.inp] {
-	set inpfile ${prefix}.inp
-    } else {
-	set inpfile ""
-    }
-
-    set args [libjava_read_xfail $srcdir/$subdir/$bname.xfail]
-
-    verbose "inpfile is $inpfile"
-
-    test_libjava $options "${prefix}.java" "" $inpfile $resfile $args
-    test_libjava $options "${prefix}.java" "-O" $inpfile $resfile $args
-}
-
-# Local Variables:
-# tcl-indent-level:4
-# End: