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: don't run Jacks


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

We don't need to run Jacks any more.  There's no real point in running
front end tests since the front end is maintained elsewhere.

Tom

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

	* doc/sourcebuild.texi (libgcj Tests): Don't mention jacks.
	* doc/install.texi (Testing): Don't mention jacks.

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

	* testsuite/libjava.jacks/jacks.exp: Removed.
	* testsuite/libjava.jacks/jacks.xfail: Removed.

Index: gcc/doc/sourcebuild.texi
===================================================================
--- gcc/doc/sourcebuild.texi	(revision 120056)
+++ gcc/doc/sourcebuild.texi	(working copy)
@@ -1,4 +1,4 @@
-@c Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+@c Copyright (C) 2002, 2003, 2004, 2005, 2007 Free Software Foundation, Inc.
 @c This is part of the GCC manual.
 @c For copying conditions, see the file gcc.texi.
 
@@ -1299,14 +1299,8 @@
 Update this file when adding new failing tests to Mauve, or when fixing
 bugs in libgcj that had caused Mauve test failures.
 
-The @uref{http://sources.redhat.com/mauve/jacks.html,,
-Jacks} project provides a testsuite for Java compilers that can be used
-to test changes that affect the GCJ front end.  This testsuite is run as
-part of Java testing by placing the Jacks tree within the libjava
-testsuite sources at @file{libjava/testsuite/libjava.jacks/jacks}.
+We encourage developers to contribute test cases to Mauve.
 
-We encourage developers to contribute test cases to Mauve and Jacks.
-
 @node gcov Testing
 @subsection Support for testing @command{gcov}
 
Index: gcc/doc/install.texi
===================================================================
--- gcc/doc/install.texi	(revision 120057)
+++ gcc/doc/install.texi	(working copy)
@@ -43,7 +43,7 @@
 @end ifset
 
 @c Copyright (C) 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-@c 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@c 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c *** Converted to texinfo by Dean Wakerley, dean@wakerley.com
 
 @c IMPORTANT: whenever you modify this file, run `install.texi2html' to
@@ -2020,11 +2020,6 @@
 specifying the location of that tree when invoking @samp{make}, as in
 @samp{make MAUVEDIR=~/mauve check}.
 
-@uref{http://sources.redhat.com/mauve/jacks.html,,Jacks}
-is a free testsuite that tests Java compiler front ends.  This suite
-can be run as part of libgcj testing by placing the Jacks tree within
-the libjava testsuite at @file{libjava/testsuite/libjava.jacks/jacks}.
-
 @section How to interpret test results
 
 The result of running the testsuite are various @file{*.sum} and @file{*.log}
Index: libjava/testsuite/libjava.jacks/jacks.exp
===================================================================
--- libjava/testsuite/libjava.jacks/jacks.exp	(revision 120082)
+++ libjava/testsuite/libjava.jacks/jacks.exp	(working copy)
@@ -1,122 +0,0 @@
-# Run the Jacks test suite.
-# See http://www-124.ibm.com/developerworks/oss/cvs/jikes/~checkout~/jacks/jacks.html
-
-load_gcc_lib target-libpath.exp
-
-proc gcj_jacks_setup_xfail {ary} {
-  upvar $ary array
-  global srcdir
-
-  set fd [open $srcdir/libjava.jacks/jacks.xfail]
-  while {! [eof $fd]} {
-    set array([gets $fd]) {}
-  }
-  close $fd
-}
-
-proc gcj_jacks_write {filename} {
-  global GCJ_UNDER_TEST
-  global libgcj_jar
-  global libjava_libgcc_s_path
-  global ld_library_path
-
-  set gcjl [split $GCJ_UNDER_TEST]
-  set gcj_cmd [lindex $gcjl 0]
-  set rest [join [lreplace $gcjl 0 0]]
-  append rest " -C -w"
-
-  set fd [open $filename w]
-  puts $fd "set JAVAC $gcj_cmd"
-  puts $fd "set JAVA_CLASSPATH \"$libgcj_jar\""
-  puts $fd "set JAVAC_FLAGS [list $rest]"
-  puts $fd "set JAVA [list [libjava_find_gij]]"
-
-  # Without an explicit limit on the heap size, tests depending on
-  # an OutOfMemoryError (e.g. "15.9.4-runtime-creation-2") can result
-  # in a lot of unnecessary thrashing.
-  puts $fd "set JAVA_FLAGS \"-mx=64m\""
-
-  puts $fd "set JAVAC_ENCODING_FLAG --encoding="
-  puts $fd "set JAVAC_DEPRECATION_FLAG -Wdeprecated"
-  puts $fd "set tcltest::testConstraints(encoding) 1"
-  puts $fd "set tcltest::testConstraints(gcj) 1"
-  puts $fd "set tcltest::testConstraints(assert) 1"
-  # "Time-consuming JVM limitation tests".
-  # puts $fd "set tcltest::testConstraints(jvm) 1"
-  close $fd
-
-  set ld_library_path $libjava_libgcc_s_path
-  set_ld_library_path_env_vars
-}
-
-proc gcj_jacks_parse {file} {
-  if {[catch {open $file} fd]} {
-    verbose "couldn't parse Jacks output: $fd"
-    return
-  }
-
-  verbose "Reading jacks.xfail"
-  gcj_jacks_setup_xfail xfails
-
-  while {! [eof $fd]} {
-    set line [gets $fd]
-    if {[string match RESULT* $line]} {
-      set linelist [split $line]
-      set test [lindex $linelist 1]
-      if {[info exists xfails($test)]} {
-	setup_xfail "*-*-*"
-      }
-      if {[lindex $linelist 2] == "PASSED"} {
-	pass $test
-      } else {
-	fail $test
-      }
-    }
-  }
-
-  close $fd
-}
-
-proc gcj_jacks_run {} {
-  global srcdir
-
-  if {! [file isdirectory $srcdir/libjava.jacks/jacks]} {
-    # No tests.
-    verbose "Jacks tests not found"
-    return
-  }
-
-  # Jacks forces us to do this.  You can't run it from a separate
-  # tree.
-  verbose "Copying Jacks..."
-  catch {system "rm -rf jacks"}
-  catch {system "cp -r $srcdir/libjava.jacks/jacks jacks"}
-
-  set here [pwd]
-  cd jacks
-
-  verbose "Writing Jacks setup file"
-  gcj_jacks_write gcj_setup
-
-  verbose "Running Jacks..."
-  # Just ignore error exits from the jacks program.
-  # It will always error exit for us, since don't completely pass.
-  # At the moment jacks has a hardcoded call to tclsh8.3. To override this,
-  # we check here on the version and launch the script directly with the
-  # tclsh$tcl_ver.
-  set tcl_ver [info tclversion]
-  if {[package vcompare  $tcl_ver 8.3] >= 0 } {
-    if {[catch {exec tclsh$tcl_ver jacks gcj} msg]} {
-	send_log "Couldn't run jacks: $msg\n"
-	return
-    }
-    gcj_jacks_parse logging/gcj.log
-  } else {
-      send_log "No suitable tclsh found, you need at least version 8.3 or up.\n"
-      return
-  }
-
-  cd $here
-}
-
-gcj_jacks_run
Index: libjava/testsuite/libjava.jacks/jacks.xfail
===================================================================
--- libjava/testsuite/libjava.jacks/jacks.xfail	(revision 120082)
+++ libjava/testsuite/libjava.jacks/jacks.xfail	(working copy)
@@ -1,119 +0,0 @@
-14.17-null-5
-8.5.2-non-static-member-usage-4
-8.4.6.2-hiding-6
-8.4.6.1-override-6
-8.4.6.3-default-9
-8.4.6.3-default-10
-8.4.6.3-default-11
-8.4.6.3-default-12
-8.4.6.3-default-13
-8.4.6.3-default-14
-16.1.8-definite-unassign-fail-1
-16.1.8-definite-unassign-fail-2
-16.1.8-definite-unassign-fail-3
-16.1.8-definite-unassign-fail-4
-16.2.10-definite-unassign-fail-5
-16.2.11-definite-unassign-fail-8
-16.2.11-definite-unassign-fail-9
-16.2.11-definite-unassign-fail-11
-16.2.8-final-1
-16.2.14-definite-unassign-fail-1
-16.2.14-definite-unassign-fail-2
-16.2.14-definite-unassign-fail-3
-16.2.14-definite-unassign-fail-4
-16.2.14-definite-unassign-fail-5
-16.2.14-definite-unassign-fail-6
-16.2.14-definite-unassign-fail-7
-16.2.14-definite-unassign-fail-8
-16.2.9-definite-unassign-fail-6
-16.2.9-definite-unassign-fail-7
-15.18.2-double-16
-15.18.1-float-1
-15.18.1-float-4
-15.18.1-float-6
-15.18.1-float-11
-15.18.1-float-12
-15.18.1-double-4
-15.18.1-double-13
-15.12.2.1-accessibility-method-6
-15.12.2.2-ambiguous-6
-15.12.2.2-ambiguous-10
-15.12.2.2-ambiguous-12
-15.12.2.2-ambiguous-14
-15.14.2-final-2
-15.14.1-final-2
-15.8.2-synthetic-1
-15.15.2-final-2
-15.15.1-final-2
-3.7-line-number-4
-3.7-line-number-6
-3.7-line-number-8
-3.7-line-number-10
-3.7-line-number-14
-3.5-16
-3.5-17
-3.4-line-number-3
-3.4-line-number-4
-3.4-line-number-5
-3.4-line-number-6
-3.4-line-number-13
-3.4-line-number-14
-3.4-line-number-15
-3.10.2-round-9
-3.10.2-round-10
-3.10.2-round-11
-3.10.2-round-12
-3.10.2-float-12
-3.10.2-float-13
-3.10.2-double-14
-7.4.2-2
-7.6-optional-restrictions-1
-4.7.10-jvms-class-1
-4.7.10-jvms-class-2
-4.7.10-jvms-class-3
-4.7.10-jvms-class-4
-4.7.10-jvms-class-5
-4.7.10-jvms-class-10
-4.7.10-jvms-class-11
-4.7.10-jvms-class-12
-4.7.10-jvms-class-13
-4.7.10-jvms-class-14
-4.7.10-jvms-class-17
-4.7.10-jvms-class-18
-4.7.10-jvms-class-19
-4.7.10-jvms-method-1
-4.7.10-jvms-method-2
-4.7.10-jvms-method-3
-4.7.10-jvms-method-4
-4.7.10-jvms-method-5
-4.7.10-jvms-method-10
-4.7.10-jvms-constructor-1
-4.7.10-jvms-constructor-2
-4.7.10-jvms-constructor-3
-4.7.10-jvms-constructor-4
-4.7.10-jvms-constructor-5
-4.7.10-jvms-constructor-10
-4.7.10-jvms-constructor-11
-4.7.10-jvms-constructor-12
-4.7.10-jvms-field-1
-4.7.10-jvms-field-2
-4.7.10-jvms-field-3
-4.7.10-jvms-field-4
-4.7.10-jvms-field-5
-4.7.10-jvms-field-10
-4.7.10-jvms-field-11
-4.7.10-jvms-lex-6
-4.7.10-jvms-lex-7
-4.7.10-jvms-lex-8
-4.7.10-jvms-lex-9
-4.7.10-jvms-lex-10
-non-jls-argument-expansion-11
-non-jls-argument-expansion-12
-non-jls-argument-expansion-tokens-1
-13.4.8-constant-runtime-2
-13.1-runtime-constant-4
-13.1-runtime-method-6
-12.4.1-runtime-2
-12.4.1-runtime-3
-12.4.1-runtime-4
-15.9.4-runtime-creation-2


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