From: Tom Tromey <tromey@cygnus.com>
Date: Tue, 7 Mar 2000 22:44:22 +0000 (+0000)
Subject: libjava.exp (test_libjava_from_javac): Removed hack for interfaces.
X-Git-Tag: prereleases/libstdc++-2.92~7820
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c7ce272aa5edb86c08f65466802793093c4eea8e;p=thirdparty%2Fgcc.git

libjava.exp (test_libjava_from_javac): Removed hack for interfaces.

	* lib/libjava.exp (test_libjava_from_javac): Removed hack for
	interfaces.  Fail if jv-scan reports a parse error.

From-SVN: r32392
---

diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog
index a3082b867a6d..fbf93e66d5f1 100644
--- a/libjava/testsuite/ChangeLog
+++ b/libjava/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2000-03-07  Tom Tromey  <tromey@cygnus.com>
 
+	* lib/libjava.exp (test_libjava_from_javac): Removed hack for
+	interfaces.  Fail if jv-scan reports a parse error.
+
 	Test for PR gcj/162:
 	* libjava.lang/PR162.out: New file.
 	* libjava.lang/PR162.java: New file.
diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp
index 8f047ae359a3..c561a3a7d70b 100644
--- a/libjava/testsuite/lib/libjava.exp
+++ b/libjava/testsuite/lib/libjava.exp
@@ -495,20 +495,27 @@ proc test_libjava_from_javac { options srcfile compile_args inpfile resultfile e
 		     [target_compile $srcfile "" none \
 			"compiler=$jvscan additional_flags=--list-class"]]
     verbose "class list is $class_out"
-    # FIXME: As of Wed Feb 24 1999, `jv-scan --list-class' prints
-    # nothing if the file contains an interface and not a class.  I
-    # believe this is a jv-scan bug.
-    if {$class_out == ""} then {
-	set class_files \
-	  [list $objdir/[file rootname [file tail $srcfile]].class]
-    } else {
-	# Turn "a b" into "a.class b.class".
-	# Also, turn "foo.bar" into "foo/bar.class".
-	set class_files {}
-        foreach file [split [string trim $class_out]] {
-	    set file [join [split $file .] /]
-	    lappend class_files $objdir/$file.class
+
+    if {[string match "*parse error*" $main_name]
+	|| [string match "*parse error*" $class_out]} {
+	# Do the remaining fails.
+	setup_xfail "*-*-*"
+	fail "$errname compilation from bytecode"
+	if {! [info exists opts(no-exec)]} {
+	    setup_xfail "*-*-*"
+	    fail "$errname execution from bytecode->native test"
+	    setup_xfail "*-*-*"
+	    fail "$errname output from bytecode->native test"
 	}
+	return
+    }
+
+    # Turn "a b" into "a.class b.class".
+    # Also, turn "foo.bar" into "foo/bar.class".
+    set class_files {}
+    foreach file [split [string trim $class_out]] {
+	set file [join [split $file .] /]
+	lappend class_files $objdir/$file.class
     }
 
     # Usually it is an error for a test program not to have a `main'