This is the mail archive of the java-patches@gcc.gnu.org mailing list for the Java project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[ecj] Patch: FYI: test suite cleanups


I'm checking this in on the gcj-eclipse branch.

This fixes some problems in the test suite.  It removes some
incorrect tests, fixes another, and adds '-w' to a couple places
where we invoke gcj.

Tom

Index: ChangeLog
from  Tom Tromey  <tromey@redhat.com>

	* testsuite/libjava.loader/TestLeak.java (MyLoader): Now static.
	* testsuite/libjava.jacks/jacks.exp (gcj_jacks_write): Use -w.
	* testsuite/lib/libjava.exp (libjava_arguments): Add -w.
	* testsuite/libjava.compile/G19990210_2.java: Removed.
	* testsuite/libjava.compile/PR208.java: Removed.
	* testsuite/libjava.compile/PR208.xfail: Removed.
	* testsuite/libjava.compile/support/Case.java: Removed.
	* testsuite/libjava.compile/Case.java: Removed.

Index: testsuite/libjava.compile/PR208.xfail
===================================================================
--- testsuite/libjava.compile/PR208.xfail	(revision 114362)
+++ testsuite/libjava.compile/PR208.xfail	(working copy)
@@ -1 +0,0 @@
-no-link
Index: testsuite/libjava.compile/G19990210_2.java
===================================================================
--- testsuite/libjava.compile/G19990210_2.java	(revision 114362)
+++ testsuite/libjava.compile/G19990210_2.java	(working copy)
@@ -1,18 +0,0 @@
-/*-------------------------------------------------------------------------*/
-/* File name : G19990210_2                                                 */
-/*           :                                                             */
-/* Cause     :                                                             */
-/*           :                                                             */
-/* Message   : G19990210_2.java: In class `G19990210_2':                   */
-/*           : G19990210_2.java: In method `foo()':                        */
-/*           : G19990210_2.java:5: Missing return statement.               */
-/*           :         }                                                   */
-/*           :         ^                                                   */
-/*           : 1 error                                                     */
-/*-------------------------------------------------------------------------*/
-public class G19990210_2  {
-  public int foo () {
-	return 1;
-	;
-  }
-}
Index: testsuite/libjava.compile/Case.java
===================================================================
--- testsuite/libjava.compile/Case.java	(revision 114362)
+++ testsuite/libjava.compile/Case.java	(working copy)
@@ -1,15 +0,0 @@
-// Simple compiler test.
-
-public class Case 
-{
-  public static int foo (int i, support.Case x)
-    {
-      switch (i)
-	{
-	case x.A:
-	  return 1;
-	default:
-	  return 0;
-	}
-    }
-}
Index: testsuite/libjava.compile/support/Case.java
===================================================================
--- testsuite/libjava.compile/support/Case.java	(revision 114362)
+++ testsuite/libjava.compile/support/Case.java	(working copy)
@@ -1,6 +0,0 @@
-package support;
-
-public class Case
-{
-  public static final int A = 9;
-}
Index: testsuite/libjava.compile/PR208.java
===================================================================
--- testsuite/libjava.compile/PR208.java	(revision 114362)
+++ testsuite/libjava.compile/PR208.java	(working copy)
@@ -1,16 +0,0 @@
-public class PR208
-{
-  public String toString () 
-  {
-    StringBuffer sb = new StringBuffer("");
-    
-    sb.append (new java.util.Date().getTime() / 1000);
-    
-    try {
-    }
-    catch (java.io.IOException e) {
-    }
-
-    return sb.toString();
-  }
-}
Index: testsuite/libjava.jacks/jacks.exp
===================================================================
--- testsuite/libjava.jacks/jacks.exp	(revision 114362)
+++ testsuite/libjava.jacks/jacks.exp	(working copy)
@@ -28,7 +28,7 @@
   set gcjl [split $GCJ_UNDER_TEST]
   set gcj_cmd [lindex $gcjl 0]
   set rest [join [lreplace $gcjl 0 0]]
-  append rest " -C"
+  append rest " -C -w"
 
   set fd [open $filename w]
   puts $fd "set JAVAC $gcj_cmd"
Index: testsuite/lib/libjava.exp
===================================================================
--- testsuite/lib/libjava.exp	(revision 114362)
+++ testsuite/lib/libjava.exp	(working copy)
@@ -371,6 +371,9 @@
 	[join [list . $srcdir/$subdir $objdir $libgcj_jar] $sep]
     verbose "CLASSPATH is $env(CLASSPATH)"
 
+    # Disable all warnings, as ecj is rather chatty.
+    lappend args "additional_flags=-w"
+
     if {$mode == "link"} {
 	global wrapper_file wrap_compile_flags
 	lappend args "additional_flags=$wrap_compile_flags"
Index: testsuite/libjava.loader/TestLeak.java
===================================================================
--- testsuite/libjava.loader/TestLeak.java	(revision 114362)
+++ testsuite/libjava.loader/TestLeak.java	(working copy)
@@ -3,7 +3,7 @@
 
 public class TestLeak
 {
-  class MyLoader extends URLClassLoader
+  static class MyLoader extends URLClassLoader
   {
     public MyLoader (URL urls[])
     {


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]