diff options
| author | Tom Tromey <tromey@gcc.gnu.org> | 2007-01-09 19:58:05 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2007-01-09 19:58:05 +0000 |
| commit | 97b8365cafc3a344a22d3980b8ed885f5c6d8357 (patch) | |
| tree | 996a5f57d4a68c53473382e45cb22f574cb3e4db /libjava/testsuite | |
| parent | c648dedbde727ca3f883bb5fd773aa4af70d3369 (diff) | |
| download | gcc-97b8365cafc3a344a22d3980b8ed885f5c6d8357.zip gcc-97b8365cafc3a344a22d3980b8ed885f5c6d8357.tar.gz gcc-97b8365cafc3a344a22d3980b8ed885f5c6d8357.tar.bz2 | |
Merged gcj-eclipse branch to trunk.
From-SVN: r120621
Diffstat (limited to 'libjava/testsuite')
459 files changed, 832 insertions, 3686 deletions
diff --git a/libjava/testsuite/Makefile.in b/libjava/testsuite/Makefile.in index f419d3c..67231dc 100644 --- a/libjava/testsuite/Makefile.in +++ b/libjava/testsuite/Makefile.in @@ -79,6 +79,8 @@ AWK = @AWK@ BACKTRACESPEC = @BACKTRACESPEC@ BASH_JAR_FALSE = @BASH_JAR_FALSE@ BASH_JAR_TRUE = @BASH_JAR_TRUE@ +BUILD_ECJ1_FALSE = @BUILD_ECJ1_FALSE@ +BUILD_ECJ1_TRUE = @BUILD_ECJ1_TRUE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -98,7 +100,11 @@ DIVIDESPEC = @DIVIDESPEC@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +ECJ_BUILD_JAR = @ECJ_BUILD_JAR@ +ECJ_JAR = @ECJ_JAR@ EGREP = @EGREP@ +ENABLE_SHARED_FALSE = @ENABLE_SHARED_FALSE@ +ENABLE_SHARED_TRUE = @ENABLE_SHARED_TRUE@ EXCEPTIONSPEC = @EXCEPTIONSPEC@ EXEEXT = @EXEEXT@ GCC_UNWIND_INCLUDE = @GCC_UNWIND_INCLUDE@ @@ -109,6 +115,7 @@ GCJDEPMODE = @GCJDEPMODE@ GCJFLAGS = @GCJFLAGS@ GCJH = @GCJH@ GCJVERSION = @GCJVERSION@ +GCJ_FOR_ECJX = @GCJ_FOR_ECJX@ GCLIBS = @GCLIBS@ GCSPEC = @GCSPEC@ GCTESTSPEC = @GCTESTSPEC@ @@ -120,6 +127,8 @@ HASH_SYNC_SPEC = @HASH_SYNC_SPEC@ IEEESPEC = @IEEESPEC@ INCLTDL = @INCLTDL@ INSTALL_DATA = @INSTALL_DATA@ +INSTALL_ECJ_JAR_FALSE = @INSTALL_ECJ_JAR_FALSE@ +INSTALL_ECJ_JAR_TRUE = @INSTALL_ECJ_JAR_TRUE@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ @@ -128,6 +137,8 @@ JAR = @JAR@ JAVA_HOME = @JAVA_HOME@ JAVA_HOME_SET_FALSE = @JAVA_HOME_SET_FALSE@ JAVA_HOME_SET_TRUE = @JAVA_HOME_SET_TRUE@ +JAVA_MAINTAINER_MODE_FALSE = @JAVA_MAINTAINER_MODE_FALSE@ +JAVA_MAINTAINER_MODE_TRUE = @JAVA_MAINTAINER_MODE_TRUE@ JC1GCSPEC = @JC1GCSPEC@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -146,6 +157,7 @@ LIBGCJ_LD_SYMBOLIC = @LIBGCJ_LD_SYMBOLIC@ LIBGCJ_SPEC = @LIBGCJ_SPEC@ LIBICONV = @LIBICONV@ LIBLTDL = @LIBLTDL@ +LIBMAGIC = @LIBMAGIC@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ @@ -170,7 +182,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ -PLATFORM_INNER_NAT_HDRS = @PLATFORM_INNER_NAT_HDRS@ +PLATFORM = @PLATFORM@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -212,6 +224,8 @@ USING_WIN32_THREADS_TRUE = @USING_WIN32_THREADS_TRUE@ VERSION = @VERSION@ XLIB_AWT_FALSE = @XLIB_AWT_FALSE@ XLIB_AWT_TRUE = @XLIB_AWT_TRUE@ +X_AWT_FALSE = @X_AWT_FALSE@ +X_AWT_TRUE = @X_AWT_TRUE@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ @@ -257,6 +271,7 @@ here = @here@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ +host_exeext = @host_exeext@ host_os = @host_os@ host_subdir = @host_subdir@ host_vendor = @host_vendor@ diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp index 5100c8a..853b25e 100644 --- a/libjava/testsuite/lib/libjava.exp +++ b/libjava/testsuite/lib/libjava.exp @@ -75,14 +75,9 @@ proc libjava_find_program {prog} { return $file } -# Find `jv-scan'. -proc find_jvscan {} { - return [libjava_find_program jv-scan] -} - # Find `gcjh'. proc find_gcjh {} { - return [libjava_find_program gcjh] + return [libjava_find_program gjavah] } proc find_javac {} { @@ -378,6 +373,9 @@ proc libjava_arguments {{mode compile}} { [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" @@ -690,207 +688,6 @@ proc test_libjava_from_source { options srcfile compile_args inpfile resultfile # # Run the test specified by srcfile and resultfile. compile_args and # exec_args are options telling this proc how to work. -# -proc test_libjava_from_javac { options srcfile compile_args inpfile resultfile exec_args } { - global base_dir - global srcdir subdir objdir - global TOOL_OPTIONS - global GCJ_UNDER_TEST - global tmpdir - global runtests - global INTERPRETER - - # Make opts into an array. - set opts(_) x - unset opts(_) - foreach item $exec_args { - set opts($item) x - } - - # If we need threads and we don't have them then set the `no-exec' - # flag. This is case is also handled specially later. - if {[info exists opts(need-threads)]} { - global libjava_uses_threads - if {! $libjava_uses_threads} { - set opts(no-exec) x - } - } - set errname [file rootname [file tail $srcfile]] - if {! [runtest_file_p $runtests $errname]} { - return - } - - # bytecompile files with Sun's compiler for now. - set bc_ok [bytecompile_file $srcfile $objdir] - - set javac [find_javac] - # This is an ugly heuristic but it will have to do. - if {[string match *gcj* $javac]} { - set tag gcjC - } else { - set tag javac - } - if {[info exists opts(xfail-$tag)]} { - setup_xfail *-*-* - } - if {! $bc_ok} then { - if {[info exists opts(shouldfail)]} { - pass "$errname byte compilation" - return - } - fail "$errname byte compilation" - untested "$errname compilation from bytecode" - if {! [info exists opts(no-exec)] - || [info exists opts(need-threads)]} { - untested "$errname execution from bytecode->native test" - untested "$errname output from bytecode->native test" - } - return - } - if {[info exists opts(shouldfail)]} { - fail "$errname byte compilation" - return - } - pass "$errname byte compilation" - - set removeList {} - - # Find name to use for --main, and name of all class files. - set jvscan [find_jvscan] - verbose "jvscan is $jvscan" - set main_name [string trim \ - [libjava_prune_warnings \ - [lindex [local_exec "$jvscan --encoding=UTF-8 $srcfile --print-main" "" "" 300] 1]]] - verbose "main name is $main_name" - set class_out [string trim \ - [libjava_prune_warnings \ - [lindex [local_exec "$jvscan --encoding=UTF-8 $srcfile --list-class" "" "" 300] 1]]] - verbose "class list is $class_out" - - if {[string match "*parse error*" $main_name] - || [string match "*parse error*" $class_out]} { - untested "$errname compilation from bytecode" - if {! [info exists opts(no-exec)] - || [info exists opts(need-threads)]} { - untested "$errname execution from bytecode->native test" - untested "$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 - } - - eval lappend removeList $class_files - - # Usually it is an error for a test program not to have a `main' - # method. However, for no-exec tests it is ok. Treat no-link - # like no-exec here. - if {[info exists opts(no-link)]} { - set opts(no-exec) x - } - set largs {} - - if {[info exists opts(no-exec)]} { - set type object - set mode compile - } elseif {$main_name == ""} { - perror "No `main' given in program $errname" - return - } else { - set type executable - lappend largs "additional_flags=--main=$main_name" - # DOS/win32 targets default to .exe if no suffix is given - # We then try to delete a file that doesn't exist. It is - # simpler to add the suffix everywhere. - set executable "${objdir}/${main_name}.exe" - set mode link - } - - # We purposely ignore errors here; we still want to run the other - # appropriate tests. - set gij [libjava_find_gij] - # libjava_find_gij will return "" if it couldn't find the - # program; in this case we want to skip the test. - if {$INTERPRETER == "yes" && $gij != ""} { - libjava_invoke $errname "gij test" opts $gij \ - $inpfile $resultfile "" $main_name - } - - # Initial arguments. - set args [libjava_arguments $mode] - eval lappend args $largs - - if { $compile_args != "" } { - lappend args "additional_flags=$compile_args" - } - - if { $compile_args != "" } { - set errname "$errname $compile_args" - } - - verbose "compilation command = $args" 2 - # When compiling and not linking, we have to build each .o - # separately. We do this because DejaGNU's target_compile won't - # accept an empty "destfile" argument when the mode is "compile". - if {$mode == "compile"} { - foreach c_file $class_files { - set executable [file rootname [file tail $c_file]].o - # Don't write files which contain $ chars. - regsub -all "\\$" $executable "\^" executable - set x [libjava_prune_warnings \ - [libjava_tcompile '$c_file' "$executable" $type $args]] - lappend removeList $executable - if {$x != ""} { - break - } - } - } else { - # This is so evil: we de-listify CLASS_FILES so that we can - # turn around and quote the `$' in it for the shell. I really - # hate DejaGNU. It is so !@#$!@# unpredictable. - set hack "" - foreach stupid $class_files { - set hack "$hack $stupid" - } - lappend removeList $executable - set x [libjava_prune_warnings \ - [libjava_tcompile $hack "$executable" $type $args]] - } - if {[info exists opts(xfail-byte)]} { - setup_xfail *-*-* - } - if { $x != "" } { - verbose "target_compile failed: $x" 2 - fail "$errname compilation from bytecode" - if {! [info exists opts(no-exec)] - || [info exists opts(need-threads)]} { - untested "$errname execution from bytecode->native test" - untested "$errname output from bytecode->native test" - } - return; - } - pass "$errname compilation from bytecode" - - # Set up the options the way they are expected by libjava_invoke. - if {[info exists opts(xfail-byte-output)]} { - set opts(xfail-output) x - } - if {[libjava_invoke $errname "bytecode->native test" opts $executable \ - $inpfile $resultfile ""]} { - # Everything ok, so clean up. - eval gcj_cleanup $removeList - } -} - -# -# Run the test specified by srcfile and resultfile. compile_args and -# exec_args are options telling this proc how to work. # `no-link' don't try to link the program # `no-exec' don't try to run the test # `xfail-gcj' compilation from source will fail @@ -914,14 +711,12 @@ proc test_libjava_from_javac { options srcfile compile_args inpfile resultfile e # proc test_libjava { options srcfile compile_args inpfile resultfile exec_args } { test_libjava_from_source $options $srcfile $compile_args $inpfile $resultfile $exec_args - test_libjava_from_javac $options $srcfile $compile_args $inpfile $resultfile $exec_args - - # Test BC-ABI compilation, currently for bytecode->native only + + # Test BC-ABI compilation. set compile_args_bcabi $compile_args lappend compile_args_bcabi "-findirect-dispatch" - - test_libjava_from_javac $options $srcfile $compile_args_bcabi $inpfile $resultfile $exec_args - } + test_libjava_from_source $options $srcfile $compile_args_bcabi $inpfile $resultfile $exec_args +} # # libjava_version -- extract and print the version number of libjavap diff --git a/libjava/testsuite/libjava.cni/PR9577.h b/libjava/testsuite/libjava.cni/PR9577.h new file mode 100644 index 0000000..a8d6d19 --- /dev/null +++ b/libjava/testsuite/libjava.cni/PR9577.h @@ -0,0 +1,29 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __PR9577__ +#define __PR9577__ + +#pragma interface + +#include <java/lang/Object.h> +#include <gcj/array.h> + +extern "Java" +{ + class PR9577; +} + +class PR9577 : public ::java::lang::Object +{ + +public: + PR9577(); +private: + void sayHello(JArray< ::java::lang::String * > *, ::java::lang::Object *); +public: + static void main(JArray< ::java::lang::String * > *); + static ::java::lang::Class class$; +}; + +#endif // __PR9577__ diff --git a/libjava/testsuite/libjava.cni/PR9577.jar b/libjava/testsuite/libjava.cni/PR9577.jar Binary files differnew file mode 100644 index 0000000..6e9f5ce --- /dev/null +++ b/libjava/testsuite/libjava.cni/PR9577.jar diff --git a/libjava/testsuite/libjava.cni/cni.exp b/libjava/testsuite/libjava.cni/cni.exp index 22df146..61fee3b 100644 --- a/libjava/testsuite/libjava.cni/cni.exp +++ b/libjava/testsuite/libjava.cni/cni.exp @@ -4,13 +4,13 @@ # of options to pass to the compiler. Returns 0 on failure, 1 on # success. proc gcj_cni_compile_cxx_to_o {file {options {}}} { - global srcdir + global srcdir subdir set name [file rootname [file tail $file]] set oname ${name}.o # Find the generated header. - lappend options "additional_flags=-I. -I.." + lappend options "additional_flags=-I. -I.. -I$srcdir/$subdir" # Find libgcj headers. lappend options "additional_flags=-I$srcdir/.." @@ -28,28 +28,33 @@ proc gcj_cni_compile_cxx_to_o {file {options {}}} { # Build header files given name of .java file. Return 0 on failure. proc gcj_cni_build_headers {file} { + global libgcj_jar + set gcjh [find_gcjh] - set jvscan [find_jvscan] - set class_out [string trim \ - [libjava_prune_warnings \ - [lindex [local_exec "$jvscan --encoding=UTF-8 $file --list-class" "" "" 300] 1]]] - if {[string match "*parse error*" $class_out]} { - fail "$file header generation" - return 0 + # Currently we only build a header file for the main class from the + # .java file, and then others on an ad hoc basis. + set list {} + set main [file rootname [file tail $file]] + lappend list $main + # ... for instance, an obvious hack. + if {$main == "shortfield"} { + lappend list shortfieldbase } - foreach file [split $class_out] { + foreach file $list { + set cmd "$gcjh -cni -force -classpath .:$libgcj_jar $file" + verbose $cmd set x [string trim [libjava_prune_warnings \ - [lindex [local_exec "$gcjh $file" "" "" 300] 1]]] + [lindex [local_exec $cmd "" "" 300] 1]]] if {$x != ""} { verbose "local_exec failed: $x" 2 - fail "$file header generation" + fail "$main header generation" return 0 } } - pass "$file header generation" + pass "$main header generation" return 1 } @@ -64,18 +69,18 @@ proc gcj_cni_test_one {file} { return 1 } - if {! [bytecompile_file $file [pwd]]} { - fail "bytecompile $file" - # FIXME - should use `untested' on all remaining tests. - # But that is hard. - return 0 - } - pass "bytecompile $file" +# if {! [bytecompile_file $file [pwd]]} { +# fail "bytecompile $file" +# # FIXME - should use `untested' on all remaining tests. +# # But that is hard. +# return 0 +# } +# pass "bytecompile $file" - if {! [gcj_cni_build_headers $file]} { - # FIXME - return 0 - } +# if {! [gcj_cni_build_headers $file]} { +# # FIXME +# return 0 +# } set cfile [file join [file dirname $file] nat$main.cc] if {! [gcj_cni_compile_cxx_to_o $cfile]} { @@ -106,7 +111,7 @@ proc gcj_cni_run {} { # For now we only test CNI on native builds. if {$build_triplet == $host_triplet} { - catch { lsort [glob -nocomplain ${srcdir}/${subdir}/*.java] } srcfiles + catch { lsort [glob -nocomplain ${srcdir}/${subdir}/*.jar] } srcfiles foreach x $srcfiles { gcj_cni_test_one $x diff --git a/libjava/testsuite/libjava.cni/longfield.h b/libjava/testsuite/libjava.cni/longfield.h new file mode 100644 index 0000000..51ea17f --- /dev/null +++ b/libjava/testsuite/libjava.cni/longfield.h @@ -0,0 +1,33 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __longfield__ +#define __longfield__ + +#pragma interface + +#include <java/lang/Object.h> +#include <gcj/array.h> + +extern "Java" +{ + class longfield; +} + +class longfield : public ::java::lang::Object +{ + +public: + longfield(); + virtual void doitc(); + virtual void doitj(); + static void main(JArray< ::java::lang::String * > *); +public: // actually package-private + jlong __attribute__((aligned(__alignof__( ::java::lang::Object)))) lval; + jboolean bval; + ::java::lang::String * sval; +public: + static ::java::lang::Class class$; +}; + +#endif // __longfield__ diff --git a/libjava/testsuite/libjava.cni/longfield.jar b/libjava/testsuite/libjava.cni/longfield.jar Binary files differnew file mode 100644 index 0000000..aab9467 --- /dev/null +++ b/libjava/testsuite/libjava.cni/longfield.jar diff --git a/libjava/testsuite/libjava.cni/shortfield.h b/libjava/testsuite/libjava.cni/shortfield.h new file mode 100644 index 0000000..175a9fd --- /dev/null +++ b/libjava/testsuite/libjava.cni/shortfield.h @@ -0,0 +1,33 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __shortfield__ +#define __shortfield__ + +#pragma interface + +#include <shortfieldbase.h> +#include <gcj/array.h> + +extern "Java" +{ + class shortfield; +} + +class shortfield : public ::shortfieldbase +{ + +public: + shortfield(); +public: // actually package-private + virtual void ouch(); +public: + static void main(JArray< ::java::lang::String * > *); +public: // actually package-private + jshort __attribute__((aligned(__alignof__( ::shortfieldbase)))) size__; + jint data; +public: + static ::java::lang::Class class$; +}; + +#endif // __shortfield__ diff --git a/libjava/testsuite/libjava.cni/shortfield.jar b/libjava/testsuite/libjava.cni/shortfield.jar Binary files differnew file mode 100644 index 0000000..f7af1af --- /dev/null +++ b/libjava/testsuite/libjava.cni/shortfield.jar diff --git a/libjava/testsuite/libjava.cni/shortfieldbase.h b/libjava/testsuite/libjava.cni/shortfieldbase.h new file mode 100644 index 0000000..171ca3d --- /dev/null +++ b/libjava/testsuite/libjava.cni/shortfieldbase.h @@ -0,0 +1,25 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __shortfieldbase__ +#define __shortfieldbase__ + +#pragma interface + +#include <java/lang/Object.h> +extern "Java" +{ + class shortfieldbase; +} + +class shortfieldbase : public ::java::lang::Object +{ + +public: // actually package-private + shortfieldbase(); + jshort __attribute__((aligned(__alignof__( ::java::lang::Object)))) modCount; +public: + static ::java::lang::Class class$; +}; + +#endif // __shortfieldbase__ diff --git a/libjava/testsuite/libjava.compile/ArrayClass.java b/libjava/testsuite/libjava.compile/ArrayClass.java deleted file mode 100644 index cd2ac2b..0000000 --- a/libjava/testsuite/libjava.compile/ArrayClass.java +++ /dev/null @@ -1,11 +0,0 @@ -public class ArrayClass -{ - public static void main (String[] args) - { - System.out.println (ArrayClass.class); - System.out.println (ArrayClass[].class); - System.out.println (ArrayClass[][].class); - System.out.println (ArrayClass[][][].class); - System.out.println (ArrayClass[][][][].class); - } -} diff --git a/libjava/testsuite/libjava.compile/AssertBug.java b/libjava/testsuite/libjava.compile/AssertBug.java deleted file mode 100644 index 3938b11..0000000 --- a/libjava/testsuite/libjava.compile/AssertBug.java +++ /dev/null @@ -1,7 +0,0 @@ -// PR java/16927 -public class AssertBug { - public void bug(Integer i) { - assert(false): - i.toString() + "!"; - } -} diff --git a/libjava/testsuite/libjava.compile/Case.java b/libjava/testsuite/libjava.compile/Case.java deleted file mode 100644 index c5eb1d5..0000000 --- a/libjava/testsuite/libjava.compile/Case.java +++ /dev/null @@ -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; - } - } -} diff --git a/libjava/testsuite/libjava.compile/G19990210_1.java b/libjava/testsuite/libjava.compile/G19990210_1.java deleted file mode 100644 index 9404f71..0000000 --- a/libjava/testsuite/libjava.compile/G19990210_1.java +++ /dev/null @@ -1,18 +0,0 @@ -/*-------------------------------------------------------------------------*/ -/* File name : G19990210_1 */ -/* : */ -/* Cause : */ -/* : */ -/* Message : G19990210_1.java: In class `G19990210_1': */ -/* G19990210_1.java: In method `foo()': */ -/* G19990210_1.java:8: Unreachable statement. */ -/* return 0; */ -/* ^ */ -/* 1 error */ -/*-------------------------------------------------------------------------*/ -public class G19990210_1 { - int foo() { - try { ; } finally { ; } - return 0; - } -} diff --git a/libjava/testsuite/libjava.compile/G19990210_2.java b/libjava/testsuite/libjava.compile/G19990210_2.java deleted file mode 100644 index 3ad7d28..0000000 --- a/libjava/testsuite/libjava.compile/G19990210_2.java +++ /dev/null @@ -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; - ; - } -} diff --git a/libjava/testsuite/libjava.compile/G19990210_3.java b/libjava/testsuite/libjava.compile/G19990210_3.java deleted file mode 100644 index 36a56fd..0000000 --- a/libjava/testsuite/libjava.compile/G19990210_3.java +++ /dev/null @@ -1,23 +0,0 @@ -/*-------------------------------------------------------------------------*/ -/* File name : G19990210_3 */ -/* : */ -/* Cause : */ -/* : */ -/* Message : G19990210_3.java: In class `G19990210_3': */ -/* : G19990210_3.java: In method `foo()': */ -/* : G19990210_3.java:23: Invalid argument to `++'. */ -/* : o.i++; */ -/* : ^ */ -/* : 1 error */ -/*-------------------------------------------------------------------------*/ -public class G19990210_3 { - static void foo() { - bar o = new bar(); - synchronized(o) { - o.i++; - } - } -} -class bar { - static int i; -} diff --git a/libjava/testsuite/libjava.compile/G19990217_01.java b/libjava/testsuite/libjava.compile/G19990217_01.java deleted file mode 100644 index 3697dbe..0000000 --- a/libjava/testsuite/libjava.compile/G19990217_01.java +++ /dev/null @@ -1,16 +0,0 @@ -/*-------------------------------------------------------------------------*/ -/* File name : G19990217_01 */ -/* : */ -/* Cause : Compiler seems to run endlessly. */ -/* : */ -/* Message : No message. It's not stop to compile. */ -/*-------------------------------------------------------------------------*/ - -public class G19990217_01 { - int foo() { - try { - return 0; - } - finally { ; } - } -} diff --git a/libjava/testsuite/libjava.compile/G19990217_02.java b/libjava/testsuite/libjava.compile/G19990217_02.java deleted file mode 100644 index 8c290f2..0000000 --- a/libjava/testsuite/libjava.compile/G19990217_02.java +++ /dev/null @@ -1,16 +0,0 @@ -/*-------------------------------------------------------------------------*/ -/* File name : G19990217_02 */ -/* : */ -/* Cause : */ -/* : */ -/* Message : Can't access class `foo.bar'. */ -/* : Only public classes and interfaces in other packages can be */ -/* : accessed. */ -/* : public class G19990217_02 extends bar { */ -/* : ^ */ -/*-------------------------------------------------------------------------*/ -package foo; -public class G19990217_02 extends bar { -} -class bar { -} diff --git a/libjava/testsuite/libjava.compile/G19990217_02.no-link b/libjava/testsuite/libjava.compile/G19990217_02.no-link deleted file mode 100644 index e69cdec..0000000 --- a/libjava/testsuite/libjava.compile/G19990217_02.no-link +++ /dev/null @@ -1 +0,0 @@ -Don't link me diff --git a/libjava/testsuite/libjava.compile/G19990225_01.java b/libjava/testsuite/libjava.compile/G19990225_01.java deleted file mode 100644 index f20f473..0000000 --- a/libjava/testsuite/libjava.compile/G19990225_01.java +++ /dev/null @@ -1,7 +0,0 @@ -public class G19990225_01 { - static int foo ; - static { - foo = 0; - } -} - diff --git a/libjava/testsuite/libjava.compile/InnerExcept.java b/libjava/testsuite/libjava.compile/InnerExcept.java deleted file mode 100644 index df4b628..0000000 --- a/libjava/testsuite/libjava.compile/InnerExcept.java +++ /dev/null @@ -1,19 +0,0 @@ -import java.io.*; - -// Test case for http://gcc.gnu.org/PR12866 -// From Mark Wielaard -public class InnerExcept -{ - static private void createFile() throws IOException - { - new File("/dev/null"); - } - - class Inner - { - private void m() throws IOException - { - createFile(); - } - } -} diff --git a/libjava/testsuite/libjava.compile/MethodFailure4.java b/libjava/testsuite/libjava.compile/MethodFailure4.java deleted file mode 100644 index bed3a0e..0000000 --- a/libjava/testsuite/libjava.compile/MethodFailure4.java +++ /dev/null @@ -1,40 +0,0 @@ -import java.util.*; - -public class MethodFailure4 { - - public static String call(A obj) { - return "A"; - } - public static String call(I obj) { - return "I"; - } - - interface I {} - static class A {} - static class B extends A implements I {} - static class C extends B {} - - - public static A getA() { - return new A(); - } - - public static B getB() { - return new B(); - } - - public static C getC() { - return new C(); - } - - public static I getI() { - return new C(); - } - - // this method invocation is ambiguous - - public static void main(String[] argv) { - call( getC() ); - } - -} diff --git a/libjava/testsuite/libjava.compile/MethodFailure4.xfail b/libjava/testsuite/libjava.compile/MethodFailure4.xfail deleted file mode 100644 index e3b083b..0000000 --- a/libjava/testsuite/libjava.compile/MethodFailure4.xfail +++ /dev/null @@ -1 +0,0 @@ -shouldfail diff --git a/libjava/testsuite/libjava.compile/N19990310_01.java b/libjava/testsuite/libjava.compile/N19990310_01.java deleted file mode 100644 index a9b9c19..0000000 --- a/libjava/testsuite/libjava.compile/N19990310_01.java +++ /dev/null @@ -1,18 +0,0 @@ -/*--------------------------------------------------------------------------*/ -/* name : N19990310_01 */ -/* : */ -/* cause : When compare string with connected strings, error. */ -/* : */ -/* Message : Internal compiler error: program jc1 got */ -/* : fatal signal 11 */ -/*--------------------------------------------------------------------------*/ - -public class N19990310_01 { - public static void main(String[] args) { - - if ( "Hello" == ("Hel"+"lo") ) { - } - - System.out.println("OK"); - } -} diff --git a/libjava/testsuite/libjava.compile/N19990317.java b/libjava/testsuite/libjava.compile/N19990317.java deleted file mode 100644 index 669da3b..0000000 --- a/libjava/testsuite/libjava.compile/N19990317.java +++ /dev/null @@ -1,23 +0,0 @@ -/*--------------------------------------------------------------------------*/ -/* Name : N19990317.java */ -/* : */ -/* Cause : When initialize valiable whose name is equal to method */ -/* : return value, error. */ -/* : */ -/* Message : Internal compiler error: program jc1 got */ -/* : fatal signal 11 */ -/*--------------------------------------------------------------------------*/ - -class Point {} - -public class N19990317 { - - Point func() { - return null; - } - - public static void main(String[] args) { - int Point = 2; - System.out.println("OK"); - } -} diff --git a/libjava/testsuite/libjava.compile/OperatorBenchmark.java b/libjava/testsuite/libjava.compile/OperatorBenchmark.java deleted file mode 100644 index 03f660d..0000000 --- a/libjava/testsuite/libjava.compile/OperatorBenchmark.java +++ /dev/null @@ -1,886 +0,0 @@ -
-/*
- * Copyright (c) 1996, 1997 by Doug Bell <dbell@shvn.com>. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-
-// This file has been hacked to compile without the rest of the
-// benchmark code.
-
-class OperatorBenchmark {
-
- public int getSampleCount() { return 0; }
- public int getSampleMillis() { return 0; }
- public boolean go;
- public int useint[];
- public void startTest () { }
- public long finishTest () { return 0; }
- public void startTimer (boolean b) { }
- public void stopTimer (int a, int b) { }
- public void report (String s) { }
- public void println (String s) { }
-
- public int getTestTime () {
- return (int) (100 * getSampleCount() * getSampleMillis()) / 1000;
- }
-
- public int getRunningTime () {
- return (int) (1.1 * getTestTime());
- }
-
- public long runTest () {
- int dummy1 = 0, dummy2 = 0, dummy3 = 0; // occupy implicit index slots
- int cnt, ii;
- byte b1 = 1, b2 = 2, b3 = 3;
- short s1 = 1, s2 = 2, s3 = 3;
- int i1 = 1, i2 = 2, i3 = 3;
- long l1 = 1, l2 = 2, l3 = 3;
- float f1 = 1, f2 = 2, f3 = 3;
- double d1 = 1, d2 = 2, d3 = 3;
-
- startTest();
-
- println("--- byte operators, local vars");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- b1++;
- stopTimer(cnt, ii);
- }
- report("byte++");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- b1 += b2;
- stopTimer(cnt, ii);
- }
- report("byte += byte");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- b1 = (byte) (b2 + b3);
- stopTimer(cnt, ii);
- }
- report("byte = byte + byte");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- b1 *= b2;
- stopTimer(cnt, ii);
- }
- report("byte *= byte");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- b1 = (byte) (b2 * b3);
- stopTimer(cnt, ii);
- }
- report("byte = byte * byte");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- b1 *= 2;
- stopTimer(cnt, ii);
- }
- report("byte *= 2");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- b1 <<= 1;
- stopTimer(cnt, ii);
- }
- report("byte <<= 1");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- b1 %= b2;
- stopTimer(cnt, ii);
- }
- report("byte %= byte");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- b1 = (byte) (b2 % b3);
- stopTimer(cnt, ii);
- }
- report("byte = byte % byte");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- b1 /= b2;
- stopTimer(cnt, ii);
- }
- report("byte /= byte");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- b1 = (byte) (b2 / b3);
- stopTimer(cnt, ii);
- }
- report("byte = byte / byte");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- b1 /= 2;
- stopTimer(cnt, ii);
- }
- report("byte /= 2");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- b1 >>= 1;
- stopTimer(cnt, ii);
- }
- report("byte >>= 1");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- b1 >>= i2;
- stopTimer(cnt, ii);
- }
- report("byte >>= int");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- b1 = (byte) (b2 >> i3);
- stopTimer(cnt, ii);
- }
- report("byte = byte >> int");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- b1 |= b2;
- stopTimer(cnt, ii);
- }
- report("byte |= byte");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- b1 = (byte) (b2 | b3);
- stopTimer(cnt, ii);
- }
- report("byte = byte | byte");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- b1 &= b2;
- stopTimer(cnt, ii);
- }
- report("byte &= byte");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- b1 = (byte) (b2 & b3);
- stopTimer(cnt, ii);
- }
- report("byte = byte & byte");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- b1 ^= b2;
- stopTimer(cnt, ii);
- }
- report("byte ^= byte");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- b1 = (byte) (b2 ^ b3);
- stopTimer(cnt, ii);
- }
- report("byte = byte ^ byte");
-
-
- println("--- short operators, local vars");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- s1++;
- stopTimer(cnt, ii);
- }
- report("short++");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- s1 += s2;
- stopTimer(cnt, ii);
- }
- report("short += short");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- s1 = (short) (s2 + s3);
- stopTimer(cnt, ii);
- }
- report("short = short + short");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- s1 *= s2;
- stopTimer(cnt, ii);
- }
- report("short *= short");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- s1 = (short) (s2 * s3);
- stopTimer(cnt, ii);
- }
- report("short = short * short");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- s1 *= 2;
- stopTimer(cnt, ii);
- }
- report("short *= 2");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- s1 <<= 1;
- stopTimer(cnt, ii);
- }
- report("short <<= 1");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- s1 %= s2;
- stopTimer(cnt, ii);
- }
- report("short %= short");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- s1 = (short) (s2 % s3);
- stopTimer(cnt, ii);
- }
- report("short = short % short");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- s1 /= s2;
- stopTimer(cnt, ii);
- }
- report("short /= short");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- s1 = (short) (s2 / s3);
- stopTimer(cnt, ii);
- }
- report("short = short / short");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- s1 /= 2;
- stopTimer(cnt, ii);
- }
- report("short /= 2");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- s1 >>= 1;
- stopTimer(cnt, ii);
- }
- report("short >>= 1");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- s1 >>= i2;
- stopTimer(cnt, ii);
- }
- report("short >>= int");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- s1 = (short) (s2 >> i3);
- stopTimer(cnt, ii);
- }
- report("short = short >> int");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- s1 |= s2;
- stopTimer(cnt, ii);
- }
- report("short |= short");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- s1 = (short) (s2 | s3);
- stopTimer(cnt, ii);
- }
- report("short = short | short");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- s1 &= s2;
- stopTimer(cnt, ii);
- }
- report("short &= short");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- s1 = (short) (s2 & s3);
- stopTimer(cnt, ii);
- }
- report("short = short & short");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- s1 ^= s2;
- stopTimer(cnt, ii);
- }
- report("short ^= short");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- s1 = (short) (s2 ^ s3);
- stopTimer(cnt, ii);
- }
- report("short = short ^ short");
-
-
- println("--- int operators, local vars");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- i1++;
- stopTimer(cnt, ii);
- }
- report("int++");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- i1 += i2;
- stopTimer(cnt, ii);
- }
- report("int += int");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- i1 = (i2 + i3);
- stopTimer(cnt, ii);
- }
- report("int = int + int");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- i1 *= i2;
- stopTimer(cnt, ii);
- }
- report("int *= int");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- i1 = (i2 * i3);
- stopTimer(cnt, ii);
- }
- report("int = int * int");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- i1 *= 2;
- stopTimer(cnt, ii);
- }
- report("int *= 2");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- i1 <<= 1;
- stopTimer(cnt, ii);
- }
- report("int <<= 1");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- i1 %= i2;
- stopTimer(cnt, ii);
- }
- report("int %= int");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- i1 = (i2 % i3);
- stopTimer(cnt, ii);
- }
- report("int = int % int");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- i1 /= i2;
- stopTimer(cnt, ii);
- }
- report("int /= int");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- i1 = (i2 / i3);
- stopTimer(cnt, ii);
- }
- report("int = int / int");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- i1 /= 2;
- stopTimer(cnt, ii);
- }
- report("int /= 2");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- i1 >>= 1;
- stopTimer(cnt, ii);
- }
- report("int >>= 1");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- i1 >>= i2;
- stopTimer(cnt, ii);
- }
- report("int >>= int");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- i1 = i2 >> i3;
- stopTimer(cnt, ii);
- }
- report("int = int >> int");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- i1 |= i2;
- stopTimer(cnt, ii);
- }
- report("int |= int");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- i1 = i2 | i3;
- stopTimer(cnt, ii);
- }
- report("int = int | int");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- i1 &= i2;
- stopTimer(cnt, ii);
- }
- report("int &= int");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- i1 = i2 & i3;
- stopTimer(cnt, ii);
- }
- report("int = int & int");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- i1 ^= i2;
- stopTimer(cnt, ii);
- }
- report("int ^= int");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- i1 = i2 ^ i3;
- stopTimer(cnt, ii);
- }
- report("int = int ^ int");
-
-
- println("--- long operators, local vars");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- l1++;
- stopTimer(cnt, ii);
- }
- report("long++");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- l1 += l2;
- stopTimer(cnt, ii);
- }
- report("long += long");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- l1 = (l2 + l3);
- stopTimer(cnt, ii);
- }
- report("long = long + long");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- l1 *= l2;
- stopTimer(cnt, ii);
- }
- report("long *= long");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- l1 = (l2 * l3);
- stopTimer(cnt, ii);
- }
- report("long = long * long");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- l1 *= 2;
- stopTimer(cnt, ii);
- }
- report("long *= 2");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- l1 <<= 1;
- stopTimer(cnt, ii);
- }
- report("long <<= 1");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- l1 %= l2;
- stopTimer(cnt, ii);
- }
- report("long %= long");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- l1 = (l2 % l3);
- stopTimer(cnt, ii);
- }
- report("long = long % long");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- l1 /= l2;
- stopTimer(cnt, ii);
- }
- report("long /= long");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- l1 = (l2 / l3);
- stopTimer(cnt, ii);
- }
- report("long = long / long");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- l1 /= 2;
- stopTimer(cnt, ii);
- }
- report("long /= 2");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- l1 >>= 1;
- stopTimer(cnt, ii);
- }
- report("long >>= 1");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- l1 >>= i2;
- stopTimer(cnt, ii);
- }
- report("long >>= int");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- l1 = l2 >> i3;
- stopTimer(cnt, ii);
- }
- report("long = long >> int");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- l1 |= l2;
- stopTimer(cnt, ii);
- }
- report("long |= long");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- l1 = l2 | l3;
- stopTimer(cnt, ii);
- }
- report("long = long | long");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- l1 &= l2;
- stopTimer(cnt, ii);
- }
- report("long &= long");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- l1 = l2 & l3;
- stopTimer(cnt, ii);
- }
- report("long = long & long");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- l1 ^= l2;
- stopTimer(cnt, ii);
- }
- report("long ^= long");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- l1 = l2 ^ l3;
- stopTimer(cnt, ii);
- }
- report("long = long ^ long");
-
-
- println("--- float operators, local vars");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- f1 += f2;
- stopTimer(cnt, ii);
- }
- report("float += float");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- f1 = (float) (f2 + f3);
- stopTimer(cnt, ii);
- }
- report("float = float + float");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- f1 *= f2;
- stopTimer(cnt, ii);
- }
- report("float *= float");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- f1 = (float) (f2 * f3);
- stopTimer(cnt, ii);
- }
- report("float = float * float");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- f1 %= f2;
- stopTimer(cnt, ii);
- }
- report("float %= float");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- f1 = (float) (f2 % f3);
- stopTimer(cnt, ii);
- }
- report("float = float % float");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- f1 /= f2;
- stopTimer(cnt, ii);
- }
- report("float /= float");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- f1 = (float) (f2 / f3);
- stopTimer(cnt, ii);
- }
- report("float = float / float");
-
-
- println("--- double operators, local vars");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- d1 += d2;
- stopTimer(cnt, ii);
- }
- report("double += double");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- d1 = (d2 + d3);
- stopTimer(cnt, ii);
- }
- report("double = double + double");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- d1 *= d2;
- stopTimer(cnt, ii);
- }
- report("double *= double");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- d1 = (d2 * d3);
- stopTimer(cnt, ii);
- }
- report("double = double * double");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- d1 %= d2;
- stopTimer(cnt, ii);
- }
- report("double %= double");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- d1 = (d2 % d3);
- stopTimer(cnt, ii);
- }
- report("double = double % double");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- d1 /= d2;
- stopTimer(cnt, ii);
- }
- report("double /= double");
-
- for (cnt = getSampleCount(); --cnt >= 0; ) {
- startTimer(true);
- for (ii = 0; go; ii++)
- d1 = (d2 / d3);
- stopTimer(cnt, ii);
- }
- report("double = double / double");
-
- useint[0] = dummy1; useint[1] = dummy2; useint[2] = dummy3;
- return finishTest();
- }
-} // class OperatorBenchmark
-
-// EOF
diff --git a/libjava/testsuite/libjava.compile/PR11600.java b/libjava/testsuite/libjava.compile/PR11600.java deleted file mode 100644 index 3cffa73..0000000 --- a/libjava/testsuite/libjava.compile/PR11600.java +++ /dev/null @@ -1,7 +0,0 @@ -public class PR11600 implements Cloneable -{ - public Object clone () - { - return super.clone (); - } -} diff --git a/libjava/testsuite/libjava.compile/PR11600.xfail b/libjava/testsuite/libjava.compile/PR11600.xfail deleted file mode 100644 index e3b083b..0000000 --- a/libjava/testsuite/libjava.compile/PR11600.xfail +++ /dev/null @@ -1 +0,0 @@ -shouldfail diff --git a/libjava/testsuite/libjava.compile/PR12374.java b/libjava/testsuite/libjava.compile/PR12374.java deleted file mode 100644 index 19e8193..0000000 --- a/libjava/testsuite/libjava.compile/PR12374.java +++ /dev/null @@ -1,27 +0,0 @@ -public class PR12374 { - - /* We weren't coping with field refs on a string constant... */ - - Object Foo() - { - return "".CASE_INSENSITIVE_ORDER; - } - - /* Special casing access to array.length while analysing syntax is - evil. Especially when it means we can't cope with a type - called length. */ - - class length - { - static final int i = 2; - } - - int bar() - { - return length.i; - } - - public static void main (String[] argv) - { - } -} diff --git a/libjava/testsuite/libjava.compile/PR124.java b/libjava/testsuite/libjava.compile/PR124.java deleted file mode 100644 index 2ec1fe9..0000000 --- a/libjava/testsuite/libjava.compile/PR124.java +++ /dev/null @@ -1,9 +0,0 @@ -import java.lang.reflect.*; - -public class PR124 -{ - public static void main (String[] args) - { - System.out.println (new InvocationTargetException ()); - } -} diff --git a/libjava/testsuite/libjava.compile/PR124.xfail b/libjava/testsuite/libjava.compile/PR124.xfail deleted file mode 100644 index e3b083b..0000000 --- a/libjava/testsuite/libjava.compile/PR124.xfail +++ /dev/null @@ -1 +0,0 @@ -shouldfail diff --git a/libjava/testsuite/libjava.compile/PR127.java b/libjava/testsuite/libjava.compile/PR127.java deleted file mode 100644 index 6a2e699..0000000 --- a/libjava/testsuite/libjava.compile/PR127.java +++ /dev/null @@ -1,11 +0,0 @@ -// Test case for PR127: -// gcj dumps core on method invocation on a primitive type - -class PR127 -{ - void f() - { - int i; - i.f(); - } -} diff --git a/libjava/testsuite/libjava.compile/PR127.xfail b/libjava/testsuite/libjava.compile/PR127.xfail deleted file mode 100644 index e3b083b..0000000 --- a/libjava/testsuite/libjava.compile/PR127.xfail +++ /dev/null @@ -1 +0,0 @@ -shouldfail diff --git a/libjava/testsuite/libjava.compile/PR12857.java b/libjava/testsuite/libjava.compile/PR12857.java deleted file mode 100644 index 9ed234f..0000000 --- a/libjava/testsuite/libjava.compile/PR12857.java +++ /dev/null @@ -1,4 +0,0 @@ -// Based on original test case from Yves Martin. -interface PR12857 { - static final String CONST = PR12857.class.getName(); -} diff --git a/libjava/testsuite/libjava.compile/PR129_B.java b/libjava/testsuite/libjava.compile/PR129_B.java deleted file mode 100644 index 238df99..0000000 --- a/libjava/testsuite/libjava.compile/PR129_B.java +++ /dev/null @@ -1,9 +0,0 @@ -import support.PR129_A; - -public class PR129_B { - public static void main ( String[] args ) { - int length = PR129_A.strArr.length; - System.out.println ( "Array length: " + length ); - } -} - diff --git a/libjava/testsuite/libjava.compile/PR129_B.no-link b/libjava/testsuite/libjava.compile/PR129_B.no-link deleted file mode 100644 index e69cdec..0000000 --- a/libjava/testsuite/libjava.compile/PR129_B.no-link +++ /dev/null @@ -1 +0,0 @@ -Don't link me diff --git a/libjava/testsuite/libjava.compile/PR13024.java b/libjava/testsuite/libjava.compile/PR13024.java deleted file mode 100644 index 61ab17c..0000000 --- a/libjava/testsuite/libjava.compile/PR13024.java +++ /dev/null @@ -1,18 +0,0 @@ -import java.io.*; -import java.util.zip.*; - -class PR13024 { - void isZipOrJarArchive(File file) throws IOException { - ZipFile zipFile = null; - - try { - zipFile = new ZipFile(file); - } finally { - if (zipFile != null) { - try { - zipFile.close(); - } catch (IOException ignored) {} - } - } - } -} diff --git a/libjava/testsuite/libjava.compile/PR13237.java b/libjava/testsuite/libjava.compile/PR13237.java deleted file mode 100644 index 6333a46..0000000 --- a/libjava/testsuite/libjava.compile/PR13237.java +++ /dev/null @@ -1,3 +0,0 @@ -class PR13237 { - double kappa = Math.sqrt(2.0); -} diff --git a/libjava/testsuite/libjava.compile/PR1343.java b/libjava/testsuite/libjava.compile/PR1343.java deleted file mode 100644 index be35925..0000000 --- a/libjava/testsuite/libjava.compile/PR1343.java +++ /dev/null @@ -1,17 +0,0 @@ -import java.util.Vector; - -public class PR1343 -{ - void f(Object[] l) - { - class x1 - { - }; - } - void f(Vector l) - { - class x1 - { - }; - } -} diff --git a/libjava/testsuite/libjava.compile/PR13733.java b/libjava/testsuite/libjava.compile/PR13733.java deleted file mode 100644 index fb5cc82..0000000 --- a/libjava/testsuite/libjava.compile/PR13733.java +++ /dev/null @@ -1,10 +0,0 @@ -// 15.26: "The type of an assignment expression is the type of the variable" -// (LHS). -class PR13733 { - String a, c = ""; - Object b; - - void bug() { - a = (b = c); // invalid without cast - } -} diff --git a/libjava/testsuite/libjava.compile/PR13733.xfail b/libjava/testsuite/libjava.compile/PR13733.xfail deleted file mode 100644 index e3b083b..0000000 --- a/libjava/testsuite/libjava.compile/PR13733.xfail +++ /dev/null @@ -1 +0,0 @@ -shouldfail diff --git a/libjava/testsuite/libjava.compile/PR140.java b/libjava/testsuite/libjava.compile/PR140.java deleted file mode 100644 index 0f59d6e..0000000 --- a/libjava/testsuite/libjava.compile/PR140.java +++ /dev/null @@ -1,13 +0,0 @@ -public class PR140 { - public static void fill(int[] a) { - for (int i = 0; i < a.length; i++) { - a[i] = i; - } - } - public static void main(String[] args) { - int[] a = new int[3]; - fill(a); - a.length = 3000; - fill(a); - } -} diff --git a/libjava/testsuite/libjava.compile/PR140.xfail b/libjava/testsuite/libjava.compile/PR140.xfail deleted file mode 100644 index e3b083b..0000000 --- a/libjava/testsuite/libjava.compile/PR140.xfail +++ /dev/null @@ -1 +0,0 @@ -shouldfail diff --git a/libjava/testsuite/libjava.compile/PR14853.java b/libjava/testsuite/libjava.compile/PR14853.java deleted file mode 100644 index a800c52..0000000 --- a/libjava/testsuite/libjava.compile/PR14853.java +++ /dev/null @@ -1,17 +0,0 @@ -class tt -{ - static final tt tt1 = new tt(); - tt() - { - } -} - -public class PR14853 -{ - public static void main (String[] args) - { - // This is an invalid assignment. gcj would get confused in - // definite assignment when compiling to object code. - tt.tt1 = new tt(); - } -} diff --git a/libjava/testsuite/libjava.compile/PR14853.xfail b/libjava/testsuite/libjava.compile/PR14853.xfail deleted file mode 100644 index e3b083b..0000000 --- a/libjava/testsuite/libjava.compile/PR14853.xfail +++ /dev/null @@ -1 +0,0 @@ -shouldfail diff --git a/libjava/testsuite/libjava.compile/PR15769.java b/libjava/testsuite/libjava.compile/PR15769.java deleted file mode 100644 index 8107626..0000000 --- a/libjava/testsuite/libjava.compile/PR15769.java +++ /dev/null @@ -1,10 +0,0 @@ -class PR15769 { - private boolean foo () { return false; } - - - public boolean bar (double blaz) - { - return (Double.POSITIVE_INFINITY != blaz) && foo (); - } -} - diff --git a/libjava/testsuite/libjava.compile/PR16249.java b/libjava/testsuite/libjava.compile/PR16249.java deleted file mode 100644 index 5495dda..0000000 --- a/libjava/testsuite/libjava.compile/PR16249.java +++ /dev/null @@ -1,18 +0,0 @@ -// Regression test for PR java/16249.
-
-class PR16249
-{
- static void bug(byte[] iCode, int pc)
- {
- while (pc < 100) {
- try {
- switch (iCode[pc] & 0xff) {
- case 666:
- iCode[++pc] = 1;
- }
- }
- catch (Throwable ex) {
- }
- }
- }
-}
diff --git a/libjava/testsuite/libjava.compile/PR163.java b/libjava/testsuite/libjava.compile/PR163.java deleted file mode 100644 index 283c8ac..0000000 --- a/libjava/testsuite/libjava.compile/PR163.java +++ /dev/null @@ -1,8 +0,0 @@ -// Test case for the PR gcj/163 - -// Uninitalized final variables should not be permitted. - -class PR163 -{ - final int foo; -} diff --git a/libjava/testsuite/libjava.compile/PR163.xfail b/libjava/testsuite/libjava.compile/PR163.xfail deleted file mode 100644 index e3b083b..0000000 --- a/libjava/testsuite/libjava.compile/PR163.xfail +++ /dev/null @@ -1 +0,0 @@ -shouldfail diff --git a/libjava/testsuite/libjava.compile/PR164.java b/libjava/testsuite/libjava.compile/PR164.java deleted file mode 100644 index d3a288f..0000000 --- a/libjava/testsuite/libjava.compile/PR164.java +++ /dev/null @@ -1,6 +0,0 @@ -// Test from PR 164. - -class PR164 -{ - volatile final int foo = 8; -} diff --git a/libjava/testsuite/libjava.compile/PR164.xfail b/libjava/testsuite/libjava.compile/PR164.xfail deleted file mode 100644 index e3b083b..0000000 --- a/libjava/testsuite/libjava.compile/PR164.xfail +++ /dev/null @@ -1 +0,0 @@ -shouldfail diff --git a/libjava/testsuite/libjava.compile/PR16675.java b/libjava/testsuite/libjava.compile/PR16675.java deleted file mode 100644 index 11e6d4b..0000000 --- a/libjava/testsuite/libjava.compile/PR16675.java +++ /dev/null @@ -1,13 +0,0 @@ -public class PR16675 { - public PR16675(Object obj) { } - - public void someTestMethod() { - // gcj crashed compiling this, as `null' had type `void*'. - new PR16675(null) { }; - } - - public void someTestMethod2() { - new PR16675((Object) null) { }; - } - -} diff --git a/libjava/testsuite/libjava.compile/PR16701.java b/libjava/testsuite/libjava.compile/PR16701.java deleted file mode 100644 index 60d459a..0000000 --- a/libjava/testsuite/libjava.compile/PR16701.java +++ /dev/null @@ -1,10 +0,0 @@ -class Cl -{ - private static final int CONSTANT1 = 0x001; - public static final int CONSTANT2 = 0x002 >> CONSTANT1; -} - -public class PR16701 -{ - public static final int VALUE = Cl.CONSTANT2; -} diff --git a/libjava/testsuite/libjava.compile/PR19277.java b/libjava/testsuite/libjava.compile/PR19277.java deleted file mode 100644 index 61ed0bf..0000000 --- a/libjava/testsuite/libjava.compile/PR19277.java +++ /dev/null @@ -1,7 +0,0 @@ -class PR19277 -{ - void snafu (int[] array) - { - array.length++; - } -} diff --git a/libjava/testsuite/libjava.compile/PR19277.xfail b/libjava/testsuite/libjava.compile/PR19277.xfail deleted file mode 100644 index e3b083b..0000000 --- a/libjava/testsuite/libjava.compile/PR19277.xfail +++ /dev/null @@ -1 +0,0 @@ -shouldfail diff --git a/libjava/testsuite/libjava.compile/PR19295.java b/libjava/testsuite/libjava.compile/PR19295.java deleted file mode 100644 index 336f7e9..0000000 --- a/libjava/testsuite/libjava.compile/PR19295.java +++ /dev/null @@ -1,16 +0,0 @@ -public class PR19295 implements myInterface { - public long tagBits = 0; - - public final boolean isArrayType() { - return (tagBits & IsArrayType) != 0; - } -} - -abstract class blah { - public final static int Bit1 = 0x2; -} - -interface myInterface { - long IsArrayType = blah.Bit1; -} - diff --git a/libjava/testsuite/libjava.compile/PR19674.java b/libjava/testsuite/libjava.compile/PR19674.java deleted file mode 100644 index 2c23895b..0000000 --- a/libjava/testsuite/libjava.compile/PR19674.java +++ /dev/null @@ -1,7 +0,0 @@ -public interface PR19674 -{ - public interface Inside - { - void m(int p, int p2); - }; -} diff --git a/libjava/testsuite/libjava.compile/PR20312.java b/libjava/testsuite/libjava.compile/PR20312.java deleted file mode 100644 index 463172b..0000000 --- a/libjava/testsuite/libjava.compile/PR20312.java +++ /dev/null @@ -1,8 +0,0 @@ -/* Can't throw what the overridden method doesn't. */ -public class PR20312 -{ - public String toString( ) throws java.io.IOException - { - return "SNAFU"; - } -} diff --git a/libjava/testsuite/libjava.compile/PR20312.xfail b/libjava/testsuite/libjava.compile/PR20312.xfail deleted file mode 100644 index e3b083b..0000000 --- a/libjava/testsuite/libjava.compile/PR20312.xfail +++ /dev/null @@ -1 +0,0 @@ -shouldfail diff --git a/libjava/testsuite/libjava.compile/PR20418.java b/libjava/testsuite/libjava.compile/PR20418.java deleted file mode 100644 index 003f3cd..0000000 --- a/libjava/testsuite/libjava.compile/PR20418.java +++ /dev/null @@ -1,7 +0,0 @@ -public class PR20418 -{ - public static void main( String[] args) - { - java.io.File = new java.io.File( "junk"); - } -} diff --git a/libjava/testsuite/libjava.compile/PR20418.xfail b/libjava/testsuite/libjava.compile/PR20418.xfail deleted file mode 100644 index e3b083b..0000000 --- a/libjava/testsuite/libjava.compile/PR20418.xfail +++ /dev/null @@ -1 +0,0 @@ -shouldfail diff --git a/libjava/testsuite/libjava.compile/PR206.java b/libjava/testsuite/libjava.compile/PR206.java deleted file mode 100644 index 0183912..0000000 --- a/libjava/testsuite/libjava.compile/PR206.java +++ /dev/null @@ -1,7 +0,0 @@ -class PR206 { - - PR206 (String s) - { - support.PR206_A x; - } -} diff --git a/libjava/testsuite/libjava.compile/PR20697.java b/libjava/testsuite/libjava.compile/PR20697.java deleted file mode 100644 index 56efb1d..0000000 --- a/libjava/testsuite/libjava.compile/PR20697.java +++ /dev/null @@ -1,29 +0,0 @@ -public class PR20697 -{ - public interface I - { - public void m(); - } - - public static class A2 implements I - { - public void m() - { - return; - } - } - -} - -class Test extends PR20697.A2 -{ - public void m() - { - return; - } - - public void n() - { - m(); - } -} diff --git a/libjava/testsuite/libjava.compile/PR207.java b/libjava/testsuite/libjava.compile/PR207.java deleted file mode 100644 index 97b10f0..0000000 --- a/libjava/testsuite/libjava.compile/PR207.java +++ /dev/null @@ -1,6 +0,0 @@ -class PR207 { - PR207 (String s) - { - System.out.println (s + support.PR207_A.hello()); - } -} diff --git a/libjava/testsuite/libjava.compile/PR207.xfail b/libjava/testsuite/libjava.compile/PR207.xfail deleted file mode 100644 index 76540af..0000000 --- a/libjava/testsuite/libjava.compile/PR207.xfail +++ /dev/null @@ -1 +0,0 @@ -no-link diff --git a/libjava/testsuite/libjava.compile/PR208.java b/libjava/testsuite/libjava.compile/PR208.java deleted file mode 100644 index 0b5f537..0000000 --- a/libjava/testsuite/libjava.compile/PR208.java +++ /dev/null @@ -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(); - } -} diff --git a/libjava/testsuite/libjava.compile/PR208.xfail b/libjava/testsuite/libjava.compile/PR208.xfail deleted file mode 100644 index 76540af..0000000 --- a/libjava/testsuite/libjava.compile/PR208.xfail +++ /dev/null @@ -1 +0,0 @@ -no-link diff --git a/libjava/testsuite/libjava.compile/PR209.java b/libjava/testsuite/libjava.compile/PR209.java deleted file mode 100644 index d4539c6..0000000 --- a/libjava/testsuite/libjava.compile/PR209.java +++ /dev/null @@ -1,4 +0,0 @@ -public class PR209 -{ - public int i = java.sql.Types.TINYINT; -} diff --git a/libjava/testsuite/libjava.compile/PR21045.java b/libjava/testsuite/libjava.compile/PR21045.java deleted file mode 100644 index 3d34ee1..0000000 --- a/libjava/testsuite/libjava.compile/PR21045.java +++ /dev/null @@ -1,11 +0,0 @@ -public class PR21045 -{ - class InnerBase { - InnerBase() throws Exception, NullPointerException {} - } - void method() { - try { - InnerBase obj = new InnerBase() {}; - } catch (Exception e) {} - } -} diff --git a/libjava/testsuite/libjava.compile/PR224.java b/libjava/testsuite/libjava.compile/PR224.java deleted file mode 100644 index eae4032..0000000 --- a/libjava/testsuite/libjava.compile/PR224.java +++ /dev/null @@ -1,16 +0,0 @@ -// File PrivateInnerInterface.java - -public class PR224 { - private interface Inter {} -} - - -class PrivateInnerInterface_Test extends PR224 { - void foo() { - // Implement the interface with an innerclass - Inter i = new Inter() { } ; - } -} - -// This should fail to compile because Inter is private in the superclass - diff --git a/libjava/testsuite/libjava.compile/PR224.xfail b/libjava/testsuite/libjava.compile/PR224.xfail deleted file mode 100644 index e3b083b..0000000 --- a/libjava/testsuite/libjava.compile/PR224.xfail +++ /dev/null @@ -1 +0,0 @@ -shouldfail diff --git a/libjava/testsuite/libjava.compile/PR232.java b/libjava/testsuite/libjava.compile/PR232.java deleted file mode 100644 index 516b0ed..0000000 --- a/libjava/testsuite/libjava.compile/PR232.java +++ /dev/null @@ -1,16 +0,0 @@ -// Use of a "static final String" as a monitor causes ICE -// in jc1 (20000520) -// -// Program received signal SIGSEGV, Segmentation fault. -// put_decl_node (node=0x0) at ../../../gcc/java/lang.c:413 -// 413 if (TREE_CODE (node) == POINTER_TYPE) - -class PR232 -{ - static final String lock= "LOCK"; - - void a() - { - synchronized(lock) {} - } -}; diff --git a/libjava/testsuite/libjava.compile/PR232B.java b/libjava/testsuite/libjava.compile/PR232B.java deleted file mode 100644 index 0c12653..0000000 --- a/libjava/testsuite/libjava.compile/PR232B.java +++ /dev/null @@ -1,15 +0,0 @@ -// This triggers a failure when compiling from bytecode (only) with 20000519 - -public class PR232B -{ - private static Object lock = new Object(); - private static PR232B instance = null; - - public void a() - { - synchronized(lock) - { - instance = new PR232B(); - } - } -}; diff --git a/libjava/testsuite/libjava.compile/PR234.java b/libjava/testsuite/libjava.compile/PR234.java deleted file mode 100644 index 61a1158..0000000 --- a/libjava/testsuite/libjava.compile/PR234.java +++ /dev/null @@ -1,24 +0,0 @@ -// PR234.java -public class PR234 extends B implements I -{ - public static void main(String args[]) - { - PR234 x = new PR234(); - x.m(); - } -} - -// B.java -class B -{ - public void m() - { - System.out.println ("yes"); - } -} - -// I.java -interface I -{ - public void m(); -} diff --git a/libjava/testsuite/libjava.compile/PR23431_1.java b/libjava/testsuite/libjava.compile/PR23431_1.java deleted file mode 100644 index 79d20ba..0000000 --- a/libjava/testsuite/libjava.compile/PR23431_1.java +++ /dev/null @@ -1,9 +0,0 @@ -abstract class Foo -{ - public abstract void bar( ); -} - -class PR23431_1 extends Foo -{ - private void bar( ) { } -} diff --git a/libjava/testsuite/libjava.compile/PR23431_1.xfail b/libjava/testsuite/libjava.compile/PR23431_1.xfail deleted file mode 100644 index e3b083b..0000000 --- a/libjava/testsuite/libjava.compile/PR23431_1.xfail +++ /dev/null @@ -1 +0,0 @@ -shouldfail diff --git a/libjava/testsuite/libjava.compile/PR23431_2.java b/libjava/testsuite/libjava.compile/PR23431_2.java deleted file mode 100644 index 3f696ff..0000000 --- a/libjava/testsuite/libjava.compile/PR23431_2.java +++ /dev/null @@ -1,9 +0,0 @@ -interface Foo -{ - public void bar( ); -} - -class PR23431_2 implements Foo -{ - private void bar( ) { } -} diff --git a/libjava/testsuite/libjava.compile/PR23431_2.xfail b/libjava/testsuite/libjava.compile/PR23431_2.xfail deleted file mode 100644 index e3b083b..0000000 --- a/libjava/testsuite/libjava.compile/PR23431_2.xfail +++ /dev/null @@ -1 +0,0 @@ -shouldfail diff --git a/libjava/testsuite/libjava.compile/PR235.java b/libjava/testsuite/libjava.compile/PR235.java deleted file mode 100644 index 46a727b..0000000 --- a/libjava/testsuite/libjava.compile/PR235.java +++ /dev/null @@ -1,7 +0,0 @@ -public class PR235 -{ - public static Class[] ConstructArgs = - { - Integer.TYPE - }; -} diff --git a/libjava/testsuite/libjava.compile/PR238.java b/libjava/testsuite/libjava.compile/PR238.java deleted file mode 100644 index b876524..0000000 --- a/libjava/testsuite/libjava.compile/PR238.java +++ /dev/null @@ -1,9 +0,0 @@ -public class PR238 -{ - void foo(A a) - { - a.toString(); - } - - class A {} -} diff --git a/libjava/testsuite/libjava.compile/PR238.xfail b/libjava/testsuite/libjava.compile/PR238.xfail deleted file mode 100644 index 76540af..0000000 --- a/libjava/testsuite/libjava.compile/PR238.xfail +++ /dev/null @@ -1 +0,0 @@ -no-link diff --git a/libjava/testsuite/libjava.compile/PR295.java b/libjava/testsuite/libjava.compile/PR295.java deleted file mode 100644 index d884a26..0000000 --- a/libjava/testsuite/libjava.compile/PR295.java +++ /dev/null @@ -1,11 +0,0 @@ -public class PR295 { - public class csemi { - }; - - public int foo; - - public interface isemi { - }; - - public int bar; -} diff --git a/libjava/testsuite/libjava.compile/PR310.java b/libjava/testsuite/libjava.compile/PR310.java deleted file mode 100644 index a77f6a8..0000000 --- a/libjava/testsuite/libjava.compile/PR310.java +++ /dev/null @@ -1,9 +0,0 @@ -public class PR310 -{ - void m (long l) - { - switch (l) - { - } - } -} diff --git a/libjava/testsuite/libjava.compile/PR310.xfail b/libjava/testsuite/libjava.compile/PR310.xfail deleted file mode 100644 index e3b083b..0000000 --- a/libjava/testsuite/libjava.compile/PR310.xfail +++ /dev/null @@ -1 +0,0 @@ -shouldfail diff --git a/libjava/testsuite/libjava.compile/PR3417.java b/libjava/testsuite/libjava.compile/PR3417.java deleted file mode 100644 index e5f251a..0000000 --- a/libjava/testsuite/libjava.compile/PR3417.java +++ /dev/null @@ -1,6 +0,0 @@ -// Make sure that assignment conversion checks are done for `return'. - -class PR3417 -{ - char func (int i) { return i; } -} diff --git a/libjava/testsuite/libjava.compile/PR3417.xfail b/libjava/testsuite/libjava.compile/PR3417.xfail deleted file mode 100644 index e3b083b..0000000 --- a/libjava/testsuite/libjava.compile/PR3417.xfail +++ /dev/null @@ -1 +0,0 @@ -shouldfail diff --git a/libjava/testsuite/libjava.compile/PR374.java b/libjava/testsuite/libjava.compile/PR374.java deleted file mode 100644 index e96ab5f..0000000 --- a/libjava/testsuite/libjava.compile/PR374.java +++ /dev/null @@ -1,9 +0,0 @@ -public class PR374 -{ - Object a, b[], c[]; - - public void foo () - { - c = new Object[10]; - } -} diff --git a/libjava/testsuite/libjava.compile/PR375.java b/libjava/testsuite/libjava.compile/PR375.java deleted file mode 100644 index 26dba04..0000000 --- a/libjava/testsuite/libjava.compile/PR375.java +++ /dev/null @@ -1,7 +0,0 @@ -public class PR375 -{ - public void foo () - { - (Boolean.TRUE).booleanValue (); - } -} diff --git a/libjava/testsuite/libjava.compile/PR4766.java b/libjava/testsuite/libjava.compile/PR4766.java deleted file mode 100644 index 840f669..0000000 --- a/libjava/testsuite/libjava.compile/PR4766.java +++ /dev/null @@ -1,25 +0,0 @@ -// Test that bytecode generation works even when `finally' clause -// doesn't return normally. - -public class PR4766 -{ - public static int myfunction() - { - try - { - System.out.println ("hi"); - } - catch( Exception e ) - { - e.printStackTrace(); - } - finally - { - return 0; - } - } - - public static void main (String[] args) - { - } -} diff --git a/libjava/testsuite/libjava.compile/PR5641.java b/libjava/testsuite/libjava.compile/PR5641.java deleted file mode 100644 index 8c7d3aa..0000000 --- a/libjava/testsuite/libjava.compile/PR5641.java +++ /dev/null @@ -1,20 +0,0 @@ -interface I -{ - void m(); -} -abstract class C implements I {} -class Foo -{ - void Bar(C c) - { - c.m(); - } - void blah(C c) - { - c.m(); - } - - public static void main (String[] args) - { - } -} diff --git a/libjava/testsuite/libjava.compile/PR5641.xfail b/libjava/testsuite/libjava.compile/PR5641.xfail deleted file mode 100644 index 76540af..0000000 --- a/libjava/testsuite/libjava.compile/PR5641.xfail +++ /dev/null @@ -1 +0,0 @@ -no-link diff --git a/libjava/testsuite/libjava.compile/PR5848.java b/libjava/testsuite/libjava.compile/PR5848.java deleted file mode 100644 index a1270ff..0000000 --- a/libjava/testsuite/libjava.compile/PR5848.java +++ /dev/null @@ -1,14 +0,0 @@ -import java.util.Vector; -import java.util.Enumeration; - -public class PR5848 -{ - private Vector data; - void sub() - { - long sz = 0; - for (Enumeration e = data.elements() ; e.hasMoreElements() ;) { - sz =+ ((byte[])e.nextElement()).length; - } - } -} diff --git a/libjava/testsuite/libjava.compile/PR5848.xfail b/libjava/testsuite/libjava.compile/PR5848.xfail deleted file mode 100644 index 76540af..0000000 --- a/libjava/testsuite/libjava.compile/PR5848.xfail +++ /dev/null @@ -1 +0,0 @@ -no-link diff --git a/libjava/testsuite/libjava.compile/PR5902.java b/libjava/testsuite/libjava.compile/PR5902.java deleted file mode 100644 index 1a78a26..0000000 --- a/libjava/testsuite/libjava.compile/PR5902.java +++ /dev/null @@ -1,4 +0,0 @@ -class PR5902 -{ - double d = 019f; -} diff --git a/libjava/testsuite/libjava.compile/PR5913.java b/libjava/testsuite/libjava.compile/PR5913.java deleted file mode 100644 index 4c0c74d..0000000 --- a/libjava/testsuite/libjava.compile/PR5913.java +++ /dev/null @@ -1,6 +0,0 @@ -class PR5913 -{ - boolean test1 = ("" + 1) instanceof String; - // This also tests literal parsing, as mentioned in PR 5902. - boolean test2 = "" + 0x1instanceof String; -} diff --git a/libjava/testsuite/libjava.compile/PR6026.java b/libjava/testsuite/libjava.compile/PR6026.java deleted file mode 100644 index 14a4a36..0000000 --- a/libjava/testsuite/libjava.compile/PR6026.java +++ /dev/null @@ -1,4 +0,0 @@ -class PR6026 -{ - double d = 0.4e1+0.8; -} diff --git a/libjava/testsuite/libjava.compile/PR6865.java b/libjava/testsuite/libjava.compile/PR6865.java deleted file mode 100644 index ddcc0e6..0000000 --- a/libjava/testsuite/libjava.compile/PR6865.java +++ /dev/null @@ -1,5 +0,0 @@ -// gcj crashes on this -public class PR6865 -{ - private foo; -} diff --git a/libjava/testsuite/libjava.compile/PR6865.xfail b/libjava/testsuite/libjava.compile/PR6865.xfail deleted file mode 100644 index e3b083b..0000000 --- a/libjava/testsuite/libjava.compile/PR6865.xfail +++ /dev/null @@ -1 +0,0 @@ -shouldfail diff --git a/libjava/testsuite/libjava.compile/Semi.java b/libjava/testsuite/libjava.compile/Semi.java deleted file mode 100644 index 39b3edc..0000000 --- a/libjava/testsuite/libjava.compile/Semi.java +++ /dev/null @@ -1,8 +0,0 @@ -// Simple compiler test. - -public class Semi -{ - Semi () { }; -} - - diff --git a/libjava/testsuite/libjava.compile/Statics.java b/libjava/testsuite/libjava.compile/Statics.java deleted file mode 100644 index b86a57c..0000000 --- a/libjava/testsuite/libjava.compile/Statics.java +++ /dev/null @@ -1,7 +0,0 @@ -// Simple compiler test. - -public interface Statics { - - public static final int OwnerGrabButtonMask = 1<<24; - -} diff --git a/libjava/testsuite/libjava.compile/SuperConstr.java b/libjava/testsuite/libjava.compile/SuperConstr.java deleted file mode 100644 index eef5050..0000000 --- a/libjava/testsuite/libjava.compile/SuperConstr.java +++ /dev/null @@ -1,20 +0,0 @@ -// It is legal to reference "this" from an enclosing type, or an instance -// field from an enclosing type, in a super constructor call. - -public class SuperConstr -{ - SuperConstr (Object x, Outer y) {} -} - -class Outer -{ - Object x; - - class Sub extends SuperConstr - { - Sub() - { - super(x, Outer.this); - } - } -} diff --git a/libjava/testsuite/libjava.compile/T20020529.java b/libjava/testsuite/libjava.compile/T20020529.java deleted file mode 100644 index 19f1ea8..0000000 --- a/libjava/testsuite/libjava.compile/T20020529.java +++ /dev/null @@ -1,23 +0,0 @@ -public class T20020529 -{ - public void checkXMLLangAttributeValue(String lang) - { - int offset = -1; - if (lang.length() >= 2) { - char ch0 = lang.charAt(0); - } - if (offset > 0) { - char ch = lang.charAt(offset++); - if (ch != '-') { - offset = -1; - } else { - while (true) - { - if (ch == '-') - ch = lang.charAt(offset++); - ch = lang.charAt(offset++); - } - } - } - } -} diff --git a/libjava/testsuite/libjava.compile/T20020604.java b/libjava/testsuite/libjava.compile/T20020604.java deleted file mode 100644 index fba68c2..0000000 --- a/libjava/testsuite/libjava.compile/T20020604.java +++ /dev/null @@ -1,17 +0,0 @@ -// Regression test for gcj crash, when compiled with -O2 on -// i686-pc-linux-gnu. -public class T20020604 -{ - static double d2 = 0.0; - - static Object lockObject = new Object(); - - public static double f(double d1) { - - synchronized (lockObject){ - d2 = Math.max(d1, d2); - } - - return d2; - } -} diff --git a/libjava/testsuite/libjava.compile/Twice.java b/libjava/testsuite/libjava.compile/Twice.java deleted file mode 100644 index d80760f..0000000 --- a/libjava/testsuite/libjava.compile/Twice.java +++ /dev/null @@ -1,14 +0,0 @@ -// Simple compiler test. - -public class Twice -{ - Twice (boolean q) - { - if (q) - for (int p = 0; p < 10; p++); - else - for (int p = 0; p < 10; p++); - } -} - - diff --git a/libjava/testsuite/libjava.compile/Where.java b/libjava/testsuite/libjava.compile/Where.java deleted file mode 100644 index 08fcc78..0000000 --- a/libjava/testsuite/libjava.compile/Where.java +++ /dev/null @@ -1,12 +0,0 @@ -// Simple compiler test. - -public final class Where implements support.Waldo -{ - int WhereIsWaldo () - { - // The compiler should find 'here' in support.Waldo. - return here; - } -} - - diff --git a/libjava/testsuite/libjava.compile/Where.xfail b/libjava/testsuite/libjava.compile/Where.xfail deleted file mode 100644 index 755ab87..0000000 --- a/libjava/testsuite/libjava.compile/Where.xfail +++ /dev/null @@ -1 +0,0 @@ -xfail-gcj diff --git a/libjava/testsuite/libjava.compile/XercesBug.java b/libjava/testsuite/libjava.compile/XercesBug.java deleted file mode 100644 index 9184d00..0000000 --- a/libjava/testsuite/libjava.compile/XercesBug.java +++ /dev/null @@ -1,13 +0,0 @@ -// This is java/4007 -public final class XercesBug -{ - static final class OrderedHashtable - { - private Entry[] fEntries = null; - public static final class Entry - { - int x; - } - - } -} diff --git a/libjava/testsuite/libjava.compile/abstr.java b/libjava/testsuite/libjava.compile/abstr.java deleted file mode 100644 index f59db26..0000000 --- a/libjava/testsuite/libjava.compile/abstr.java +++ /dev/null @@ -1,14 +0,0 @@ -// This fails to compile from bytecode for some versions of the compiler. - -interface foo -{ - public void start (); -} - -public abstract class abstr implements foo -{ - public void doit () - { - start (); - } -} diff --git a/libjava/testsuite/libjava.compile/abstr.xfail b/libjava/testsuite/libjava.compile/abstr.xfail deleted file mode 100644 index 76540af..0000000 --- a/libjava/testsuite/libjava.compile/abstr.xfail +++ /dev/null @@ -1 +0,0 @@ -no-link diff --git a/libjava/testsuite/libjava.compile/assignment.java b/libjava/testsuite/libjava.compile/assignment.java deleted file mode 100644 index ec05f73..0000000 --- a/libjava/testsuite/libjava.compile/assignment.java +++ /dev/null @@ -1,19 +0,0 @@ -// A definite assignment test. - -public class assignment -{ - public static Byte foo () - { - Byte b; - - while (true) { - try { - b = Byte.decode ("42"); - break; - } catch (NumberFormatException ignored) {} - } - - return b; - } -} - diff --git a/libjava/testsuite/libjava.compile/assignment_2.java b/libjava/testsuite/libjava.compile/assignment_2.java deleted file mode 100644 index 38b58db..0000000 --- a/libjava/testsuite/libjava.compile/assignment_2.java +++ /dev/null @@ -1,32 +0,0 @@ - -/** - * assignment_2.java - * - * - * Created: Thu Apr 13 16:48:40 2000 - * - * @author Oliver Brandt - * @version - */ - -public class assignment_2 { - public assignment_2 () - { - } - - public int foo () - { - int result; - - try - { - result = 0; - } - finally - { - } - return result; - - } - -}// test diff --git a/libjava/testsuite/libjava.compile/block.java b/libjava/testsuite/libjava.compile/block.java deleted file mode 100644 index 6bf99b1..0000000 --- a/libjava/testsuite/libjava.compile/block.java +++ /dev/null @@ -1,14 +0,0 @@ -// Class block -// Generated on Thu Apr 20 15:03:23 PDT 2000 -// It is illegal to use modifiers for in-block (local) classes - -class block { - public void foo () - { - public class xxx {} - } - public static void main (String[] arg) - { - System.out.println ("Testing class `block'..."); - } -} diff --git a/libjava/testsuite/libjava.compile/block.xfail b/libjava/testsuite/libjava.compile/block.xfail deleted file mode 100644 index e3b083b..0000000 --- a/libjava/testsuite/libjava.compile/block.xfail +++ /dev/null @@ -1 +0,0 @@ -shouldfail diff --git a/libjava/testsuite/libjava.compile/comment.java b/libjava/testsuite/libjava.compile/comment.java deleted file mode 100644 index ebc5a97..0000000 --- a/libjava/testsuite/libjava.compile/comment.java +++ /dev/null @@ -1,7 +0,0 @@ -public class comment -{ - /*** - // This is supposed to be a comment. - */ -} - diff --git a/libjava/testsuite/libjava.compile/compile.exp b/libjava/testsuite/libjava.compile/compile.exp deleted file mode 100644 index 9eba0d4..0000000 --- a/libjava/testsuite/libjava.compile/compile.exp +++ /dev/null @@ -1,20 +0,0 @@ -global srcdir subdir - -catch { lsort [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 "" "$x" "" "" "" $args - test_libjava "" "$x" "-O3" "" "" $args -} - -# Local Variables: -# tcl-indent-level:4 -# End: diff --git a/libjava/testsuite/libjava.compile/consthrow.java b/libjava/testsuite/libjava.compile/consthrow.java deleted file mode 100644 index 02d1afc..0000000 --- a/libjava/testsuite/libjava.compile/consthrow.java +++ /dev/null @@ -1,6 +0,0 @@ -public class consthrow -{ - public consthrow () throws Object - { - } -} diff --git a/libjava/testsuite/libjava.compile/consthrow.xfail b/libjava/testsuite/libjava.compile/consthrow.xfail deleted file mode 100644 index f34b59d..0000000 --- a/libjava/testsuite/libjava.compile/consthrow.xfail +++ /dev/null @@ -1,2 +0,0 @@ -no-link -shouldfail diff --git a/libjava/testsuite/libjava.compile/final_assignment_check.java b/libjava/testsuite/libjava.compile/final_assignment_check.java deleted file mode 100644 index 418fd91..0000000 --- a/libjava/testsuite/libjava.compile/final_assignment_check.java +++ /dev/null @@ -1,12 +0,0 @@ -class f { - final static char c = 3; - final static byte b = 0.1; - final static short s = 3.5f; - final static int i = 4L; - final static long x = 2.5; - final static float y = 2.6; - final static String S = new Object (); - void foo () { - final int i = 2.1; - } -} diff --git a/libjava/testsuite/libjava.compile/final_assignment_check.xfail b/libjava/testsuite/libjava.compile/final_assignment_check.xfail deleted file mode 100644 index e3b083b..0000000 --- a/libjava/testsuite/libjava.compile/final_assignment_check.xfail +++ /dev/null @@ -1 +0,0 @@ -shouldfail diff --git a/libjava/testsuite/libjava.compile/final_initialization_in_ctor.java b/libjava/testsuite/libjava.compile/final_initialization_in_ctor.java deleted file mode 100644 index 8ea56a2..0000000 --- a/libjava/testsuite/libjava.compile/final_initialization_in_ctor.java +++ /dev/null @@ -1,21 +0,0 @@ -// This test case was insipred by -// http://gcc.gnu.org/ml/java/2001-09/msg00181.html - -class M { - int size () { return 3; } -} - -class final_initialization_in_ctor { - - final float loadFactor; - - public final_initialization_in_ctor(M m) - { - this(Math.max(m.size() * 2, 30), (float)40.0); - } - - public final_initialization_in_ctor(int initialCapacity, float loadFactor) - { - this.loadFactor = loadFactor; - } -} diff --git a/libjava/testsuite/libjava.compile/final_local_switch.java b/libjava/testsuite/libjava.compile/final_local_switch.java deleted file mode 100644 index c4a4de6..0000000 --- a/libjava/testsuite/libjava.compile/final_local_switch.java +++ /dev/null @@ -1,16 +0,0 @@ -// This bug was discovered while working on java/1413 (compiling freetds.) -// http://gcc.gnu.org/ml/java-prs/2000-q4/msg00156.html -// The following code should build. - -class final_local_switch { - void foo (int type) { - final byte CHARSET_CHANGE = (byte)3; - final byte CHARSET_CHANGES = (byte)4; - switch (type) { - case CHARSET_CHANGE: - break; - case CHARSET_CHANGES: - break; - } - } -} diff --git a/libjava/testsuite/libjava.compile/iface.java b/libjava/testsuite/libjava.compile/iface.java deleted file mode 100644 index 6a57fcf..0000000 --- a/libjava/testsuite/libjava.compile/iface.java +++ /dev/null @@ -1,24 +0,0 @@ -// Test for searching through interface extension. - -interface basei -{ - public int method (); -} - -interface basei2 -{ - public int confuse (); -} - -interface derivedi extends basei, basei2 -{ - public void nothing (); -} - -public class iface -{ - public int try_it (derivedi x) - { - return x.method (); - } -} diff --git a/libjava/testsuite/libjava.compile/inner_1.java b/libjava/testsuite/libjava.compile/inner_1.java deleted file mode 100644 index d9a0210..0000000 --- a/libjava/testsuite/libjava.compile/inner_1.java +++ /dev/null @@ -1,36 +0,0 @@ -// inner class regression test. - -package bar.foo; - -class other { - class foo {} -} - -class inner_1 { - static void bar () { - inner_1 xxxx; // Refers to inner_1 - bar.foo.another xyz; // Refers to non inner another - bar.foo.other.foo X; // OK to declare, inner class foo - bar.foo.inner_1.t bar; // Inner class t - inner_1.t foo; // Inner class t - t foobar; // Inner class t - other.foo zag; // Valid for declaration. - t.ungah x; - } - void foo () { - // z.t.u foo; - t t1 = new t(); - t1.print (); - new t().print(); - } - - class t { - void print () { - System.out.println ("This is `inner_1.t'"); - } - class ungah {} - } -} - -class another { -} diff --git a/libjava/testsuite/libjava.compile/inner_1.xfail b/libjava/testsuite/libjava.compile/inner_1.xfail deleted file mode 100644 index 755ab87..0000000 --- a/libjava/testsuite/libjava.compile/inner_1.xfail +++ /dev/null @@ -1 +0,0 @@ -xfail-gcj diff --git a/libjava/testsuite/libjava.compile/inner_data.java b/libjava/testsuite/libjava.compile/inner_data.java deleted file mode 100644 index 0bb35e89..0000000 --- a/libjava/testsuite/libjava.compile/inner_data.java +++ /dev/null @@ -1,18 +0,0 @@ -// Test referencing protected data from parent of inner class. - -import java.util.Random; - -public class inner_data -{ - private class Randomer extends Super { - public long xxx () - { - return seed; - } - } -} - -class Super -{ - protected long seed; -} diff --git a/libjava/testsuite/libjava.compile/inner_inherit.java b/libjava/testsuite/libjava.compile/inner_inherit.java deleted file mode 100644 index 44ad6a9..0000000 --- a/libjava/testsuite/libjava.compile/inner_inherit.java +++ /dev/null @@ -1,14 +0,0 @@ -// Test to insure that we can refer to methods inherited through an -// inner class. - -public class inner_inherit -{ - private class Agent extends Thread { - } - - public void f () - { - Agent a = new Agent(); - a.setDaemon(true); - } -} diff --git a/libjava/testsuite/libjava.compile/inner_priv.java b/libjava/testsuite/libjava.compile/inner_priv.java deleted file mode 100644 index 0601c68..0000000 --- a/libjava/testsuite/libjava.compile/inner_priv.java +++ /dev/null @@ -1,11 +0,0 @@ -// Test to ensure that private inner classes are ok. - -public class inner_priv -{ - private class K - { - int z; - } - - K foo; -} diff --git a/libjava/testsuite/libjava.compile/inner_pub.java b/libjava/testsuite/libjava.compile/inner_pub.java deleted file mode 100644 index 616488f..0000000 --- a/libjava/testsuite/libjava.compile/inner_pub.java +++ /dev/null @@ -1,11 +0,0 @@ -// Test to ensure that public inner classes work. - -public class inner_pub -{ - public class really_inner - { - int z; - } - - really_inner foo; -} diff --git a/libjava/testsuite/libjava.compile/invokeinterface/A.java b/libjava/testsuite/libjava.compile/invokeinterface/A.java deleted file mode 100644 index a4167cd..0000000 --- a/libjava/testsuite/libjava.compile/invokeinterface/A.java +++ /dev/null @@ -1,4 +0,0 @@ -public interface A -{ - public void a(); -} diff --git a/libjava/testsuite/libjava.compile/invokeinterface/B.java b/libjava/testsuite/libjava.compile/invokeinterface/B.java deleted file mode 100644 index 3661e09..0000000 --- a/libjava/testsuite/libjava.compile/invokeinterface/B.java +++ /dev/null @@ -1,4 +0,0 @@ -public interface B extends A -{ - public void b(); -} diff --git a/libjava/testsuite/libjava.compile/invokeinterface/Test.java b/libjava/testsuite/libjava.compile/invokeinterface/Test.java deleted file mode 100644 index 2fb793f..0000000 --- a/libjava/testsuite/libjava.compile/invokeinterface/Test.java +++ /dev/null @@ -1,19 +0,0 @@ -public class Test implements B -{ - public static void main(String args[]) - { - Test t = new Test(); - B a = (B) t; - a.a(); - } - - public void a() - { - System.out.println("A"); - } - - public void b() - { - System.out.println("B"); - } -} diff --git a/libjava/testsuite/libjava.compile/narrow_case.java b/libjava/testsuite/libjava.compile/narrow_case.java deleted file mode 100644 index 48b5682..0000000 --- a/libjava/testsuite/libjava.compile/narrow_case.java +++ /dev/null @@ -1,11 +0,0 @@ -public class narrow_case -{ - private int test(byte b) - { - switch (b) - { - case '0' :return 0; - } - return 99; - } -} diff --git a/libjava/testsuite/libjava.compile/not_a_redef.java b/libjava/testsuite/libjava.compile/not_a_redef.java deleted file mode 100644 index 7a2f55c..0000000 --- a/libjava/testsuite/libjava.compile/not_a_redef.java +++ /dev/null @@ -1,6 +0,0 @@ -package bar.foo; -// This is not a redef. - -class not_a_redef { - class baz { class bar { class foo {}} class foo {}} -} diff --git a/libjava/testsuite/libjava.compile/not_a_redef.xfail b/libjava/testsuite/libjava.compile/not_a_redef.xfail deleted file mode 100644 index 76540af..0000000 --- a/libjava/testsuite/libjava.compile/not_a_redef.xfail +++ /dev/null @@ -1 +0,0 @@ -no-link diff --git a/libjava/testsuite/libjava.compile/perc.java b/libjava/testsuite/libjava.compile/perc.java deleted file mode 100644 index 8dc2f6f..0000000 --- a/libjava/testsuite/libjava.compile/perc.java +++ /dev/null @@ -1,9 +0,0 @@ -// This generates code that `gcj -C' doesn't like. - -public class perc -{ - public static void main (String[] args) - { - System.out.println (27.0 % 10.0); - } -} diff --git a/libjava/testsuite/libjava.compile/plusplus.java b/libjava/testsuite/libjava.compile/plusplus.java deleted file mode 100644 index b8e9bd9..0000000 --- a/libjava/testsuite/libjava.compile/plusplus.java +++ /dev/null @@ -1,10 +0,0 @@ -// Test from MoT <Sebastien.Villemot@ens.fr>. - -class plusplus { - public static void main(String[] args) - { - int n = 5; - int[] gnu = new int[10]; - gnu[n]++; - } -} diff --git a/libjava/testsuite/libjava.compile/pr10459.java b/libjava/testsuite/libjava.compile/pr10459.java deleted file mode 100644 index e527f34..0000000 --- a/libjava/testsuite/libjava.compile/pr10459.java +++ /dev/null @@ -1,15 +0,0 @@ -public class pr10459 -{ - pr10459 x; - - public void aMethod() throws Throwable - { - for (; ;x.foo().foo()) - ; - } - - pr10459 foo() - { - return null; - } -} diff --git a/libjava/testsuite/libjava.compile/pr13788.java b/libjava/testsuite/libjava.compile/pr13788.java deleted file mode 100644 index 44f25ea..0000000 --- a/libjava/testsuite/libjava.compile/pr13788.java +++ /dev/null @@ -1,8 +0,0 @@ -class pr13788 { - private static final int DUMMY1 = 1 >>> 1; - - public static void main(String [] args) { - System.out.println(DUMMY1); - } -} - diff --git a/libjava/testsuite/libjava.compile/pr15656.java b/libjava/testsuite/libjava.compile/pr15656.java deleted file mode 100644 index 4076c9f..0000000 --- a/libjava/testsuite/libjava.compile/pr15656.java +++ /dev/null @@ -1,8 +0,0 @@ -// This used to cause a gcj crash in error_if_numeric_overflow. - -public class pr15656 { - public static void defineClass () - { - Object ctor = new Object; - } -} diff --git a/libjava/testsuite/libjava.compile/pr15656.xfail b/libjava/testsuite/libjava.compile/pr15656.xfail deleted file mode 100644 index e3b083b..0000000 --- a/libjava/testsuite/libjava.compile/pr15656.xfail +++ /dev/null @@ -1 +0,0 @@ -shouldfail diff --git a/libjava/testsuite/libjava.compile/pr172.java b/libjava/testsuite/libjava.compile/pr172.java deleted file mode 100644 index 4dc26d0..0000000 --- a/libjava/testsuite/libjava.compile/pr172.java +++ /dev/null @@ -1,9 +0,0 @@ -// jc1 (2.96 20000313) says "`A_Inner' not found" - -public class pr172 -{ - class A_Inner - { - A_Inner (A_Inner i) {} - } -} diff --git a/libjava/testsuite/libjava.compile/pr17329.java b/libjava/testsuite/libjava.compile/pr17329.java deleted file mode 100644 index fa31f18..0000000 --- a/libjava/testsuite/libjava.compile/pr17329.java +++ /dev/null @@ -1,14 +0,0 @@ -// gcj had a problem with "SomeClass.field++" when gimplifying. - -class helper -{ - static int value; -} - -public class pr17329 -{ - static void doit () - { - helper.value += 2; - } -} diff --git a/libjava/testsuite/libjava.compile/pr174.java b/libjava/testsuite/libjava.compile/pr174.java deleted file mode 100644 index b819372..0000000 --- a/libjava/testsuite/libjava.compile/pr174.java +++ /dev/null @@ -1,15 +0,0 @@ -class A -{ -} - -public class pr174 -{ - public pr174() - { - A a = new A(); - } - - class A - { - } -} diff --git a/libjava/testsuite/libjava.compile/pr17500.java b/libjava/testsuite/libjava.compile/pr17500.java deleted file mode 100644 index 825133d..0000000 --- a/libjava/testsuite/libjava.compile/pr17500.java +++ /dev/null @@ -1,28 +0,0 @@ -// gcj had a problem compiling code where two anonymous classes had -// captured constructor arguments of the same type but with different -// names. - -public class pr17500 -{ - public Object m1 (final Object one) - { - return new Comparable() - { - public int compareTo(Object other) - { - return one == other ? 0 : 1; - } - }; - } - - public Object m2 (final Object two) - { - return new Comparable() - { - public int compareTo(Object other) - { - return two == other ? 0 : 1; - } - }; - } -} diff --git a/libjava/testsuite/libjava.compile/pr176.java b/libjava/testsuite/libjava.compile/pr176.java deleted file mode 100644 index a52b5bb..0000000 --- a/libjava/testsuite/libjava.compile/pr176.java +++ /dev/null @@ -1,15 +0,0 @@ -// gcj (20000313) reports "Type `x' not found in the declaration of the -// return type of method `getX'." - -public class pr176 -{ - class A - { - x getX() - { - return new x(); - } - - class x {} - } -} diff --git a/libjava/testsuite/libjava.compile/pr21519.java b/libjava/testsuite/libjava.compile/pr21519.java deleted file mode 100644 index c836a8f9..0000000 --- a/libjava/testsuite/libjava.compile/pr21519.java +++ /dev/null @@ -1,8 +0,0 @@ -public class pr21519 { - char[] source; - public int compute(int pos) { - for (int i = 0; i < pos; ++i) - if (!(source[i] == ' ' || source[i] == '\t')) return -1; - return pos; - } -} diff --git a/libjava/testsuite/libjava.compile/pr21540.java b/libjava/testsuite/libjava.compile/pr21540.java deleted file mode 100644 index 4d6841f..0000000 --- a/libjava/testsuite/libjava.compile/pr21540.java +++ /dev/null @@ -1,15 +0,0 @@ -public class pr21540 -{ - public static final long xxx = 555; - - public boolean fn (int v) - { - switch (v) - { - case ((int) xxx >>> 32): - return true; - default: - return false; - } - } -} diff --git a/libjava/testsuite/libjava.compile/pr25429.java b/libjava/testsuite/libjava.compile/pr25429.java deleted file mode 100644 index a869b58..0000000 --- a/libjava/testsuite/libjava.compile/pr25429.java +++ /dev/null @@ -1,13 +0,0 @@ -public class pr25429 -{ - private static final int CONST = 0; - class I { - public void f () { - switch(0) { - case CONST: - } - } - } - - public static void main(String[] args) { } -} diff --git a/libjava/testsuite/libjava.compile/pr26042.java b/libjava/testsuite/libjava.compile/pr26042.java deleted file mode 100644 index 485b36a..0000000 --- a/libjava/testsuite/libjava.compile/pr26042.java +++ /dev/null @@ -1,12 +0,0 @@ -class One -{ - long l; // no ICE if this is int, not long - int b; // no ICE if this line is gone; type doesn't matter -} - -public class pr26042 -{ - class Three extends One { } - Three three () { return new Three (); } -} - diff --git a/libjava/testsuite/libjava.compile/pr7912.java b/libjava/testsuite/libjava.compile/pr7912.java deleted file mode 100644 index a7de398..0000000 --- a/libjava/testsuite/libjava.compile/pr7912.java +++ /dev/null @@ -1,8 +0,0 @@ -public class pr7912 -{ - static Cloneable c; - public static void main(String[] args) - { - c = new int[1]; - } -} diff --git a/libjava/testsuite/libjava.compile/pr8712.java b/libjava/testsuite/libjava.compile/pr8712.java deleted file mode 100644 index 7a6eb75..0000000 --- a/libjava/testsuite/libjava.compile/pr8712.java +++ /dev/null @@ -1,7 +0,0 @@ -public class pr8712 -{ - boolean x(pr8712 a) - { - return (!(a instanceof pr8712)); - } -} diff --git a/libjava/testsuite/libjava.compile/pr8955.java b/libjava/testsuite/libjava.compile/pr8955.java deleted file mode 100644 index ae78f50..0000000 --- a/libjava/testsuite/libjava.compile/pr8955.java +++ /dev/null @@ -1,13 +0,0 @@ -public class pr8955 -{ - static final int val = Integer.MIN_VALUE; - void foo() - { - switch(1) { - case val: - break; - case 1: - break; - } - } -} diff --git a/libjava/testsuite/libjava.compile/redef1.java b/libjava/testsuite/libjava.compile/redef1.java deleted file mode 100644 index a3e138a..0000000 --- a/libjava/testsuite/libjava.compile/redef1.java +++ /dev/null @@ -1,6 +0,0 @@ -package bar.foo; -// A case of innerclass redefinition - -class redef1 { - class redef1 {} -} diff --git a/libjava/testsuite/libjava.compile/redef1.xfail b/libjava/testsuite/libjava.compile/redef1.xfail deleted file mode 100644 index e3b083b..0000000 --- a/libjava/testsuite/libjava.compile/redef1.xfail +++ /dev/null @@ -1 +0,0 @@ -shouldfail diff --git a/libjava/testsuite/libjava.compile/redef2.java b/libjava/testsuite/libjava.compile/redef2.java deleted file mode 100644 index 9f8e5b8..0000000 --- a/libjava/testsuite/libjava.compile/redef2.java +++ /dev/null @@ -1,6 +0,0 @@ -package bar.foo; -// A case of innerclass redefinition - -class redef2 { - class foo {class redef2{}} -} diff --git a/libjava/testsuite/libjava.compile/redef2.xfail b/libjava/testsuite/libjava.compile/redef2.xfail deleted file mode 100644 index e3b083b..0000000 --- a/libjava/testsuite/libjava.compile/redef2.xfail +++ /dev/null @@ -1 +0,0 @@ -shouldfail diff --git a/libjava/testsuite/libjava.compile/redef3.java b/libjava/testsuite/libjava.compile/redef3.java deleted file mode 100644 index df638f1..0000000 --- a/libjava/testsuite/libjava.compile/redef3.java +++ /dev/null @@ -1,6 +0,0 @@ -package bar.foo; -// A case of innerclass redefinition - -class redef3 { - class foo { class bar {} class bar {}} -} diff --git a/libjava/testsuite/libjava.compile/redef3.xfail b/libjava/testsuite/libjava.compile/redef3.xfail deleted file mode 100644 index e3b083b..0000000 --- a/libjava/testsuite/libjava.compile/redef3.xfail +++ /dev/null @@ -1 +0,0 @@ -shouldfail diff --git a/libjava/testsuite/libjava.compile/redef4.java b/libjava/testsuite/libjava.compile/redef4.java deleted file mode 100644 index db4f499..0000000 --- a/libjava/testsuite/libjava.compile/redef4.java +++ /dev/null @@ -1,6 +0,0 @@ -package bar.foo; -// A case of innerclass redefinition - -class redef4 { - class foo { class bar { class foo {}}} -} diff --git a/libjava/testsuite/libjava.compile/redef4.xfail b/libjava/testsuite/libjava.compile/redef4.xfail deleted file mode 100644 index e3b083b..0000000 --- a/libjava/testsuite/libjava.compile/redef4.xfail +++ /dev/null @@ -1 +0,0 @@ -shouldfail diff --git a/libjava/testsuite/libjava.compile/redef5.java b/libjava/testsuite/libjava.compile/redef5.java deleted file mode 100644 index 2698e0f..0000000 --- a/libjava/testsuite/libjava.compile/redef5.java +++ /dev/null @@ -1,6 +0,0 @@ -package bar.foo; -// Redefining and stuffing the redefined class with something - -class redef5 { - class redef5 {void foobar() {}} -} diff --git a/libjava/testsuite/libjava.compile/redef5.xfail b/libjava/testsuite/libjava.compile/redef5.xfail deleted file mode 100644 index e3b083b..0000000 --- a/libjava/testsuite/libjava.compile/redef5.xfail +++ /dev/null @@ -1 +0,0 @@ -shouldfail diff --git a/libjava/testsuite/libjava.compile/redef6.java b/libjava/testsuite/libjava.compile/redef6.java deleted file mode 100644 index 1489d5e..0000000 --- a/libjava/testsuite/libjava.compile/redef6.java +++ /dev/null @@ -1,6 +0,0 @@ -package bar.foo; -// Redefining and stuffing the redefined class with something - -class redef6 { - class redef6 {int foo;} -} diff --git a/libjava/testsuite/libjava.compile/redef6.xfail b/libjava/testsuite/libjava.compile/redef6.xfail deleted file mode 100644 index e3b083b..0000000 --- a/libjava/testsuite/libjava.compile/redef6.xfail +++ /dev/null @@ -1 +0,0 @@ -shouldfail diff --git a/libjava/testsuite/libjava.compile/rh174912.java b/libjava/testsuite/libjava.compile/rh174912.java deleted file mode 100644 index 65c1bf5..0000000 --- a/libjava/testsuite/libjava.compile/rh174912.java +++ /dev/null @@ -1,17 +0,0 @@ -// Derived from Red Hat bugzilla 174912 -// https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=174912 -// The bug is that the anonymous class constructor here will end up -// with a bogus '[3C' in its signature. - -public class rh174912 { - public rh174912(char[][] args) { } - - public Object m() { - return new rh174912(new char[][] { "hi".toCharArray(), - "bob".toCharArray(), - "and joe".toCharArray() }) { - }; - } - - public static void main(String[] args) { } -} diff --git a/libjava/testsuite/libjava.compile/rh175833.java b/libjava/testsuite/libjava.compile/rh175833.java deleted file mode 100644 index 6bdec57..0000000 --- a/libjava/testsuite/libjava.compile/rh175833.java +++ /dev/null @@ -1,13 +0,0 @@ -// Follow-on to PR 25429 -public class rh175833 -{ - private static final Object CONST = new Object(); - class I { - public Object f () { - // We need an accessor here. - return CONST; - } - } - - public static void main(String[] args) { } -} diff --git a/libjava/testsuite/libjava.compile/static_1.java b/libjava/testsuite/libjava.compile/static_1.java deleted file mode 100644 index ff01a1e..0000000 --- a/libjava/testsuite/libjava.compile/static_1.java +++ /dev/null @@ -1,12 +0,0 @@ -package bar.foo; - -class static_1 { - class bar { - // No Static members: methods, fields, inner classes. - static int foo; - static int xyzzy (){return 0;} - static {} - static class foo {} - // No Member interface FIXME - } -} diff --git a/libjava/testsuite/libjava.compile/static_1.xfail b/libjava/testsuite/libjava.compile/static_1.xfail deleted file mode 100644 index e3b083b..0000000 --- a/libjava/testsuite/libjava.compile/static_1.xfail +++ /dev/null @@ -1 +0,0 @@ -shouldfail diff --git a/libjava/testsuite/libjava.compile/static_2.java b/libjava/testsuite/libjava.compile/static_2.java deleted file mode 100644 index fdb5b99..0000000 --- a/libjava/testsuite/libjava.compile/static_2.java +++ /dev/null @@ -1,10 +0,0 @@ -package bar.foo; - -class static_2 { - static class koink { - static int i; - static void foo (){} - static {} - static class foo {} - } -} diff --git a/libjava/testsuite/libjava.compile/static_2.xfail b/libjava/testsuite/libjava.compile/static_2.xfail deleted file mode 100644 index 76540af..0000000 --- a/libjava/testsuite/libjava.compile/static_2.xfail +++ /dev/null @@ -1 +0,0 @@ -no-link diff --git a/libjava/testsuite/libjava.compile/static_3.java b/libjava/testsuite/libjava.compile/static_3.java deleted file mode 100644 index 894e579..0000000 --- a/libjava/testsuite/libjava.compile/static_3.java +++ /dev/null @@ -1,5 +0,0 @@ -package bar.foo; - -class static_3 { - static class zoink { static class zork {}} -} diff --git a/libjava/testsuite/libjava.compile/static_3.xfail b/libjava/testsuite/libjava.compile/static_3.xfail deleted file mode 100644 index 76540af..0000000 --- a/libjava/testsuite/libjava.compile/static_3.xfail +++ /dev/null @@ -1 +0,0 @@ -no-link diff --git a/libjava/testsuite/libjava.compile/static_init.java b/libjava/testsuite/libjava.compile/static_init.java deleted file mode 100644 index 2e77b5e..0000000 --- a/libjava/testsuite/libjava.compile/static_init.java +++ /dev/null @@ -1,4 +0,0 @@ -class static_init -{ - native { } -} diff --git a/libjava/testsuite/libjava.compile/static_init.xfail b/libjava/testsuite/libjava.compile/static_init.xfail deleted file mode 100644 index e3b083b..0000000 --- a/libjava/testsuite/libjava.compile/static_init.xfail +++ /dev/null @@ -1 +0,0 @@ -shouldfail diff --git a/libjava/testsuite/libjava.compile/static_init2.java b/libjava/testsuite/libjava.compile/static_init2.java deleted file mode 100644 index 8cae968..0000000 --- a/libjava/testsuite/libjava.compile/static_init2.java +++ /dev/null @@ -1,9 +0,0 @@ -class static_init2 { - static final float two_to_the_30 = - (float) (1L << 30); - - static float[] floatValues = { - (float)1.0, - (float)two_to_the_30, - }; -} diff --git a/libjava/testsuite/libjava.compile/static_inner.java b/libjava/testsuite/libjava.compile/static_inner.java deleted file mode 100644 index ca0d99f..0000000 --- a/libjava/testsuite/libjava.compile/static_inner.java +++ /dev/null @@ -1,19 +0,0 @@ -// File Parent.java -class Parent { - public static class Kid { - public Kid(int age) { - this.age = age; - } - - int age; - } -} - -// File NewParent.java -public class static_inner extends Parent { - - public static void main(String[] argv) { - Kid kid = new Kid(2); - } - -} diff --git a/libjava/testsuite/libjava.compile/support/Case.java b/libjava/testsuite/libjava.compile/support/Case.java deleted file mode 100644 index 709b47a..0000000 --- a/libjava/testsuite/libjava.compile/support/Case.java +++ /dev/null @@ -1,6 +0,0 @@ -package support; - -public class Case -{ - public static final int A = 9; -} diff --git a/libjava/testsuite/libjava.compile/support/PR129_A.java b/libjava/testsuite/libjava.compile/support/PR129_A.java deleted file mode 100644 index 643dad6..0000000 --- a/libjava/testsuite/libjava.compile/support/PR129_A.java +++ /dev/null @@ -1,6 +0,0 @@ -package support; - -public class PR129_A { - public static String[] strArr = { "A", "B", "C" }; -} - diff --git a/libjava/testsuite/libjava.compile/support/PR206_A.java b/libjava/testsuite/libjava.compile/support/PR206_A.java deleted file mode 100644 index dffd498..0000000 --- a/libjava/testsuite/libjava.compile/support/PR206_A.java +++ /dev/null @@ -1,8 +0,0 @@ -package support; - -public final class PR206_A { - static - { - String s = System.getProperty ("soylent"); - } -} diff --git a/libjava/testsuite/libjava.compile/support/PR207_A.java b/libjava/testsuite/libjava.compile/support/PR207_A.java deleted file mode 100644 index 1d465f5..0000000 --- a/libjava/testsuite/libjava.compile/support/PR207_A.java +++ /dev/null @@ -1,13 +0,0 @@ -package support; - -public final class PR207_A { - static - { - String s = System.getProperty ("soylent"); - } - - public static String hello () - { - return "green"; - } -} diff --git a/libjava/testsuite/libjava.compile/support/Waldo.java b/libjava/testsuite/libjava.compile/support/Waldo.java deleted file mode 100644 index e28829d..0000000 --- a/libjava/testsuite/libjava.compile/support/Waldo.java +++ /dev/null @@ -1,7 +0,0 @@ -package support; - -public interface Waldo { - - public static final int here = 9; - -} diff --git a/libjava/testsuite/libjava.compile/uesc.java b/libjava/testsuite/libjava.compile/uesc.java deleted file mode 100644 index b41ef69..0000000 --- a/libjava/testsuite/libjava.compile/uesc.java +++ /dev/null @@ -1,9 +0,0 @@ -public class uesc -{ - public foo (Object[] v[]) - { - char z = '\uuu00a0'; - char y = '\u00au0'; // At one point we erroneously - // accepted this. - } -} diff --git a/libjava/testsuite/libjava.compile/uesc.xfail b/libjava/testsuite/libjava.compile/uesc.xfail deleted file mode 100644 index e3b083b..0000000 --- a/libjava/testsuite/libjava.compile/uesc.xfail +++ /dev/null @@ -1 +0,0 @@ -shouldfail diff --git a/libjava/testsuite/libjava.compile/weirddecl.java b/libjava/testsuite/libjava.compile/weirddecl.java deleted file mode 100644 index f6d9b3f..0000000 --- a/libjava/testsuite/libjava.compile/weirddecl.java +++ /dev/null @@ -1,8 +0,0 @@ -public class weirddecl -{ - // Weird but legal decl. - public String foo (String[] dumb[]) - { - return dumb[0][0]; - } -} diff --git a/libjava/testsuite/libjava.compile/weirddecl.xfail b/libjava/testsuite/libjava.compile/weirddecl.xfail deleted file mode 100644 index 76540af..0000000 --- a/libjava/testsuite/libjava.compile/weirddecl.xfail +++ /dev/null @@ -1 +0,0 @@ -no-link diff --git a/libjava/testsuite/libjava.compile/zeroexp.java b/libjava/testsuite/libjava.compile/zeroexp.java deleted file mode 100644 index f14efbb..0000000 --- a/libjava/testsuite/libjava.compile/zeroexp.java +++ /dev/null @@ -1,10 +0,0 @@ -public class zeroexp -{ - public static void main (String[] argv) - { - // gcj used to give an error about this literal. - float f = 0E-6F; - double d = 0E-9; - System.out.println ("" + f + " " + d); - } -} diff --git a/libjava/testsuite/libjava.jacks/jacks.exp b/libjava/testsuite/libjava.jacks/jacks.exp deleted file mode 100644 index 4640a71..0000000 --- a/libjava/testsuite/libjava.jacks/jacks.exp +++ /dev/null @@ -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" - - 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 diff --git a/libjava/testsuite/libjava.jacks/jacks.xfail b/libjava/testsuite/libjava.jacks/jacks.xfail deleted file mode 100644 index 081e8ac..0000000 --- a/libjava/testsuite/libjava.jacks/jacks.xfail +++ /dev/null @@ -1,686 +0,0 @@ -12.4.1-runtime-1 -12.4.1-runtime-2 -12.4.1-runtime-3 -12.4.1-runtime-4 -13.1-runtime-constant-1 -13.1-runtime-constant-3 -13.1-runtime-field-1 -13.1-runtime-method-6 -13.4.8-constant-runtime-1 -13.4.8-constant-runtime-2 -14-runtime-jump-1 -14-runtime-jump-2 -14.14-label-1 -14.14-label-2 -14.14-label-5 -14.14-label-8 -14.14-plain-2 -14.14-plain-5 -14.17-null-1 -14.17-null-3 -14.17-null-4 -14.17-null-5 -14.19-shadow-12 -14.19-shadow-13 -14.19-shadow-14 -14.19-shadow-15 -14.19-shadow-4 -14.19-shadow-5 -14.19-shadow-6 -14.19-shadow-7 -14.19.exception-13 -14.19.exception-14 -14.19.exception-15 -14.19.exception-16 -14.19.exception-21 -14.19.exception-22 -14.19.exception-23 -14.19.exception-24 -14.20-abrupt-10 -14.20-abrupt-14 -14.20-abrupt-2 -14.20-abrupt-6 -14.20-block-4 -14.20-block-9 -14.20-catch-15 -14.20-catch-17 -14.20-do-10 -14.20-do-11 -14.20-do-12 -14.20-do-13 -14.20-do-14 -14.20-do-15 -14.20-do-16 -14.20-do-17 -14.20-do-18 -14.20-do-19 -14.20-do-20 -14.20-do-21 -14.20-do-22 -14.20-do-23 -14.20-do-24 -14.20-do-25 -14.20-do-26 -14.20-do-27 -14.20-do-28 -14.20-do-29 -14.20-do-30 -14.20-do-31 -14.20-do-32 -14.20-do-33 -14.20-do-6 -14.20-do-9 -14.20-for-15 -14.20-for-16 -14.20-for-17 -14.20-for-18 -14.20-for-19 -14.20-for-20 -14.20-for-21 -14.20-for-22 -14.20-for-4 -14.20-for-8 -14.20-for-update-1 -14.20-if-6 -14.20-label-10 -14.20-label-11 -14.20-label-12 -14.20-label-13 -14.20-label-14 -14.20-label-15 -14.20-label-5 -14.20-label-8 -14.20-label-9 -14.20-local-2 -14.20-switch-14 -14.20-switch-17 -14.20-switch-18 -14.20-switch-19 -14.20-switch-20 -14.20-switch-21 -14.20-switch-22 -14.20-switch-23 -14.20-switch-24 -14.20-switch-8 -14.20-synchronized-3 -14.20-try-14 -14.20-try-18 -14.20-try-22 -14.20-try-27 -14.20-try-3 -14.20-try-31 -14.20-try-9 -14.20-while-12 -14.20-while-13 -14.20-while-14 -14.20-while-15 -14.20-while-16 -14.20-while-17 -14.20-while-18 -14.20-while-19 -14.20-while-4 -14.3-1 -14.3-scope-10 -14.3-scope-2 -14.3-scope-4 -14.3-scope-5 -14.3-scope-9 -14.3.1-runtime-3 -14.4.2-shadow-5 -14.4.2-shadow-6 -14.4.2-shadow-7 -14.4.2-shadow-9 -14.7-shadow-3 -15.11.1-ambiguous-2 -15.11.1-ambiguous-3 -15.11.1-explicit-constructor-3 -15.11.1-runtime-static-1 -15.11.1-runtime-static-2 -15.11.1-runtime-static-3 -15.11.1-runtime-static-4 -15.11.2-explicit-constructor-2 -15.11.2-meaning-11 -15.11.2-meaning-13 -15.11.2-meaning-14 -15.11.2-meaning-17 -15.11.2-meaning-6 -15.11.2-meaning-8 -15.11.2-meaning-9 -15.11.2-runtime-1 -15.11.2-runtime-2 -15.11.2-syntax-1 -15.12.1-syntax-1 -15.12.1-type-14 -15.12.2.1-accessibility-method-3 -15.12.2.1-accessibility-method-5 -15.12.2.1-accessibility-method-6 -15.12.2.2-ambiguous-10 -15.12.2.2-ambiguous-12 -15.12.2.2-ambiguous-14 -15.12.2.2-ambiguous-17 -15.12.2.2-ambiguous-18 -15.12.2.2-ambiguous-21 -15.12.2.2-ambiguous-25 -15.12.2.2-ambiguous-27 -15.12.2.2-ambiguous-3 -15.12.2.2-ambiguous-6 -15.12.2.2-ambiguous-9 -15.12.3-abstract-1 -15.12.3-abstract-2 -15.12.3-abstract-3 -15.12.3-explicit-constructor-10 -15.12.3-explicit-constructor-3 -15.12.3-explicit-constructor-4 -15.12.3-explicit-constructor-5 -15.12.3-explicit-constructor-7 -15.12.3-explicit-constructor-9 -15.12.3-runtime-mode-1 -15.12.3-runtime-mode-2 -15.12.3-runtime-mode-3 -15.12.3-runtime-mode-4 -15.12.3-runtime-mode-6 -15.12.4.1-runtime-static-1 -15.12.4.1-runtime-static-2 -15.12.4.1-runtime-super-1 -15.12.4.1-runtime-super-2 -15.14-runtime-3 -15.14-runtime-4 -15.15-runtime-3 -15.15-runtime-4 -15.16-semantic-5 -15.16-value-1 -15.16-value-2 -15.17-mod-3 -15.17-mod-4 -15.17.3-assoc-2 -15.17.3-double-1 -15.17.3-double-10 -15.17.3-double-11 -15.17.3-double-12 -15.17.3-double-13 -15.17.3-double-14 -15.17.3-double-2 -15.17.3-double-3 -15.17.3-double-4 -15.17.3-double-5 -15.17.3-double-6 -15.17.3-double-7 -15.17.3-double-8 -15.17.3-double-9 -15.17.3-float-1 -15.17.3-float-10 -15.17.3-float-11 -15.17.3-float-12 -15.17.3-float-13 -15.17.3-float-14 -15.17.3-float-2 -15.17.3-float-3 -15.17.3-float-4 -15.17.3-float-5 -15.17.3-float-6 -15.17.3-float-7 -15.17.3-float-8 -15.17.3-float-9 -15.18.1-double-1 -15.18.1-double-10 -15.18.1-double-11 -15.18.1-double-12 -15.18.1-double-13 -15.18.1-double-2 -15.18.1-double-3 -15.18.1-double-4 -15.18.1-double-5 -15.18.1-double-6 -15.18.1-double-7 -15.18.1-double-8 -15.18.1-double-9 -15.18.1-float-1 -15.18.1-float-10 -15.18.1-float-11 -15.18.1-float-12 -15.18.1-float-2 -15.18.1-float-3 -15.18.1-float-4 -15.18.1-float-5 -15.18.1-float-6 -15.18.1-float-7 -15.18.1-float-8 -15.18.1-float-9 -15.18.1-valid-1 -15.20-2-runtime-1 -15.25-runtime-1 -15.26.2-add-12 -15.26.2-and-10 -15.26.2-and-12 -15.26.2-div-12 -15.26.2-left-shift-12 -15.26.2-mod-12 -15.26.2-mult-12 -15.26.2-or-10 -15.26.2-or-12 -15.26.2-signed-right-shift-12 -15.26.2-sub-12 -15.26.2-unsigned-right-shift-12 -15.26.2-xor-10 -15.26.2-xor-12 -15.28-cast-simple-name-1 -15.28-cast-simple-name-2 -15.28-cast-simple-name-3 -15.28-instanceof-3 -15.28-notstring-1 -15.28-null-1 -15.28-null-3 -15.28-primitive-15 -15.28-primitive-17 -15.28-primitive-3 -15.28-qualified-name-10 -15.28-qualified-name-5 -15.28-qualified-name-6 -15.28-qualified-name-7 -15.28-qualified-name-8 -15.28-qualified-name-9 -15.28-qualified-namestr-7 -15.28-qualified-namestr-8 -15.28-qualified-namestr-9 -15.28-simple-name-6 -15.28-simple-name-8 -15.28-simple-namestr-1 -15.28-simple-namestr-2 -15.28-simple-namestr-3 -15.28-simple-namestr-4 -15.28-string-15 -15.28-string-17 -15.28-string-18 -15.28-string-2 -15.28-string-5 -15.28-string-9 -15.28-uninitialized-simple-name-3 -15.8.2-synthetic-1 -15.8.2-type-11 -15.8.2-type-12 -15.8.2-type-13 -15.8.2-type-14 -15.8.4-static-2 -15.8.5-field-expression-6 -15.8.5-method-expression-8 -15.8.5-variable-5 -15.8.5-variable-6 -15.8.5-variable-7 -15.8.5-variable-8 -15.9-runtime-numcalls-1 -15.9.1-qualified-anonymous-10 -15.9.1-qualified-anonymous-12 -15.9.1-qualified-anonymous-13 -15.9.1-qualified-anonymous-14 -15.9.1-qualified-anonymous-17 -15.9.1-qualified-anonymous-18 -15.9.1-qualified-anonymous-2 -15.9.1-qualified-anonymous-20 -15.9.1-qualified-anonymous-22 -15.9.1-qualified-anonymous-26 -15.9.1-qualified-anonymous-28 -15.9.1-qualified-anonymous-4 -15.9.1-qualified-anonymous-5 -15.9.1-qualified-concrete-12 -15.9.1-qualified-concrete-14 -15.9.1-qualified-concrete-16 -15.9.1-qualified-concrete-24 -15.9.1-qualified-concrete-4 -15.9.1-qualified-concrete-5 -15.9.1-unqualified-anonymous-12 -15.9.1-unqualified-anonymous-14 -15.9.1-unqualified-anonymous-15 -15.9.1-unqualified-anonymous-2 -15.9.1-unqualified-anonymous-23 -15.9.1-unqualified-anonymous-24 -15.9.1-unqualified-anonymous-26 -15.9.1-unqualified-anonymous-27 -15.9.1-unqualified-anonymous-4 -15.9.1-unqualified-anonymous-5 -15.9.1-unqualified-concrete-14 -15.9.1-unqualified-concrete-15 -15.9.1-unqualified-concrete-2 -15.9.1-unqualified-concrete-4 -15.9.1-unqualified-concrete-5 -15.9.4-runtime-creation-1 -15.9.4-runtime-creation-2 -15.9.4-runtime-creation-5 -15.9.5.1-exception-4 -15.9.5.1-superconstructor-7 -15.9.5.1-superconstructor-8 -16-instance-5 -16-instance-6 -16-instance-7 -16-static-1 -16-static-2 -16.1.2-definite-unassignment-fail-6 -16.1.3-definite-unassignment-fail-6 -16.1.5-not-assignable-7 -16.1.5-not-assignable-8 -16.1.7-compound-definite-unassignment-fail-6 -16.1.7-compound-definite-unassignment-fail-7 -16.2.10-definite-assign-pass-2 -16.2.10-definite-unassign-pass-1 -16.2.10-definite-unassign-pass-2 -16.2.10-definite-unassign-pass-3 -16.2.10-definite-unassign-pass-4 -16.2.10-definite-unassign-pass-5 -16.2.10-definite-unassign-pass-6 -16.2.10-definite-unassign-pass-7 -16.2.10-definite-unassign-pass-8 -16.2.11-definite-assign-pass-2 -16.2.11-definite-unassign-pass-1 -16.2.11-definite-unassign-pass-2 -16.2.11-definite-unassign-pass-3 -16.2.11-definite-unassign-pass-4 -16.2.11-definite-unassign-pass-5 -16.2.11-definite-unassign-pass-6 -16.2.11-definite-unassign-pass-7 -16.2.11-definite-unassign-pass-8 -16.2.14-definite-unassign-fail-12 -16.2.14-definite-unassign-fail-13 -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.3-local-class-11 -16.2.3-local-class-4 -16.2.3-local-class-5 -16.2.5-definite-unassign-pass-1 -16.2.5-definite-unassign-pass-2 -16.2.5-definite-unassign-pass-3 -16.2.8-final-3 -16.2.8-final-4 -16.2.8-unassigned-1 -16.2.8-unassigned-20 -16.2.8-unassigned-21 -16.2.8-unassigned-22 -16.2.8-unassigned-23 -16.2.8-unassigned-6 -16.2.8-unassigned-8 -16.2.8-unassigned-9 -16.2.9-definite-assign-pass-2 -16.2.9-definite-unassign-pass-1 -16.2.9-definite-unassign-pass-2 -16.2.9-definite-unassign-pass-3 -16.2.9-definite-unassign-pass-4 -16.2.9-definite-unassign-pass-5 -16.2.9-definite-unassign-pass-6 -16.2.9-definite-unassign-pass-7 -16.5-anonymous-3 -16.5-runtime-1 -16.5-runtime-2 -16.5-runtime-3 -16.5-runtime-4 -16.5-runtime-5 -16.8-constructor-8 -201-enhanced-for-final -201-enhanced-for-int-array -201-enhanced-for-Iterable -201-enhanced-for-object -201-enhanced-for-with-generics -3.10.1-invalid-3 -3.10.1-invalid-4 -3.10.2-double-13 -3.10.2-double-14 -3.10.2-round-10 -3.10.2-round-11 -3.10.2-round-12 -3.10.2-round-7 -3.10.2-round-9 -3.2-valid-1 -4.5.4-parameter-2 -4.5.4-parameter-3 -4.5.4-static-1 -4.5.4-static-5 -4.7.10-jvms-class-18 -4.7.10-jvms-class-6 -4.7.10-jvms-class-7 -4.7.10-jvms-class-8 -4.7.10-jvms-constructor-6 -4.7.10-jvms-constructor-8 -4.7.10-jvms-field-6 -4.7.10-jvms-field-8 -4.7.10-jvms-method-6 -4.7.10-jvms-method-8 -5.1.2-btd-1 -5.1.2-btd-3 -5.1.2-btd-5 -5.1.2-btf-1 -5.1.2-btf-3 -5.1.2-btf-5 -5.1.2-std-3 -5.1.2-std-5 -5.1.2-stf-1 -5.1.2-stf-3 -5.1.2-stf-5 -6.3-1 -6.5.1-type-15 -6.5.1-type-16 -6.5.1-typeorpackage-2 -6.5.4.1-simple-10 -6.5.4.1-simple-11 -6.5.4.1-simple-6 -6.5.5.1-import-2 -6.5.5.1-import-3 -6.5.5.1-nested-14 -6.5.5.1-nested-19 -6.5.5.1-nested-20 -6.5.5.1-nested-21 -6.5.5.1-nested-23 -6.5.5.1-nested-8 -6.5.5.1-nested-9 -6.5.5.2-type-4 -6.5.5.2-type-5 -6.5.5.2-type-6 -6.5.5.2-type-7 -6.5.5.2-type-8 -6.5.6.1-explicit-constructor-2 -6.5.6.1-field-6 -6.5.6.1-local-3 -6.5.6.1-local-4 -6.5.6.2-expression-6 -6.5.6.2-type-2 -6.5.6.2-type-6 -6.5.6.2-type-8 -6.5.6.2-type-9 -6.6.1-11 -6.6.1-8 -6.6.1-array-11 -6.6.1-array-13 -6.6.1-array-14 -6.6.1-array-17 -6.6.1-array-2 -6.6.1-array-20 -6.6.1-array-22 -6.6.1-array-23 -6.6.1-array-26 -6.6.1-array-29 -6.6.1-array-3 -6.6.1-array-31 -6.6.1-array-32 -6.6.1-array-35 -6.6.1-array-5 -6.6.1-array-8 -6.6.2.1-protected-type-2 -6.6.2.2-protected-creation-3 -7.1-named-5 -7.1-named-6 -7.1-named-7 -7.4.2-2 -7.5.1-accessible-4 -7.5.1-accessible-5 -7.5.1-canonical-3 -7.5.1-duplicate-4 -7.5.1-shadow-2 -7.5.2-accessible-1 -7.5.2-accessible-3 -7.5.2-accessible-4 -7.5.2-canonical-2 -7.5.2-canonical-3 -7.5.2-duplicate-1 -7.5.2-duplicate-2 -7.5.2-duplicate-3 -7.5.2-duplicate-4 -7.6-optional-restrictions-1 -7.6-unnamed-scope-1 -7.6-unnamed-scope-2 -8.1.1.1-default-abstract-11 -8.1.1.1-default-abstract-13 -8.1.1.1-default-abstract-15 -8.1.1.1-default-abstract-19 -8.1.1.1-default-abstract-21 -8.1.1.1-default-abstract-25 -8.1.2-enclosing-10 -8.1.2-enclosing-4 -8.1.2-enclosing-5 -8.1.2-enclosing-7 -8.1.2-runtime-1 -8.1.2-static-1 -8.1.2-static-11 -8.1.2-static-16 -8.1.3-object-3 -8.3-inheritance-1 -8.3-inheritance-2 -8.3-inheritance-3 -8.3-runtime-1 -8.3.1.2-final-17 -8.3.1.2-final-19 -8.3.1.2-final-2 -8.3.1.2-final-21 -8.3.1.2-final-24 -8.3.1.2-final-27 -8.3.1.2-final-28 -8.3.1.2-final-29 -8.3.2-abrupt-3 -8.3.2-abrupt-5 -8.3.2.2-super-2 -8.3.2.3-illegal-forward-instance-1 -8.3.2.3-illegal-forward-instance-2 -8.3.2.3-illegal-forward-instance-3 -8.3.2.3-illegal-forward-instance-4 -8.3.2.3-illegal-forward-instance-5 -8.3.2.3-illegal-forward-instance-6 -8.3.2.3-illegal-forward-instance-7 -8.3.2.3-illegal-forward-instance-8 -8.3.2.3-illegal-forward-instance-9 -8.3.2.3-illegal-forward-static-1 -8.3.2.3-illegal-forward-static-10 -8.3.2.3-illegal-forward-static-2 -8.3.2.3-illegal-forward-static-3 -8.3.2.3-illegal-forward-static-4 -8.3.2.3-illegal-forward-static-5 -8.3.2.3-illegal-forward-static-6 -8.3.2.3-illegal-forward-static-7 -8.3.2.3-illegal-forward-static-8 -8.3.2.3-illegal-forward-static-9 -8.3.2.3-legal-forward-instance-11 -8.4.6-inheritance-1 -8.4.6-inheritance-2 -8.4.6.1-override-3 -8.4.6.2-hiding-3 -8.4.6.3-default-10 -8.4.6.3-default-12 -8.4.6.3-default-14 -8.4.6.3-default-4 -8.4.6.3-default-6 -8.4.6.3-modifier-10 -8.4.6.3-modifier-11 -8.4.6.3-modifier-12 -8.4.6.3-modifier-13 -8.4.6.3-modifier-8 -8.4.6.3-modifier-9 -8.4.6.3-signature-4 -8.4.6.4-abstract-1 -8.4.6.4-abstract-10 -8.4.6.4-abstract-2 -8.4.6.4-abstract-9 -8.4.6.4-multiple-3 -8.4.6.4-multiple-4 -8.4.6.4-multiple-7 -8.4.6.4-multiple-8 -8.5-inheritance-1 -8.5-inheritance-2 -8.5-inheritance-3 -8.5-inheritance-6 -8.5.2-non-static-member-usage-4 -8.5.2-non-static-member-usage-5 -8.6-abrupt-1 -8.6-abrupt-4 -8.6-checked-exception-10 -8.6-checked-exception-11 -8.6-checked-exception-12 -8.6-checked-exception-2 -8.6-checked-exception-4 -8.6-checked-exception-5 -8.6-checked-exception-6 -8.6-checked-exception-8 -8.6-complete-1 -8.6-complete-4 -8.6-complete-5 -8.7-abrupt-1 -8.7-complete-1 -8.7-complete-3 -8.8.5.1-example-1 -8.8.5.1-example-3 -8.8.5.1-qualified-1 -8.8.5.1-qualified-10 -8.8.5.1-qualified-11 -8.8.5.1-qualified-12 -8.8.5.1-qualified-13 -8.8.5.1-qualified-15 -8.8.5.1-qualified-2 -8.8.5.1-qualified-3 -8.8.5.1-qualified-4 -8.8.5.1-runtime-super-1 -8.8.7-accessible-default-constructor-inner-18 -8.8.7-accessible-default-constructor-inner-26 -8.8.7-runtime-accessible-default-1 -9.1.1-in-class-17 -9.1.1-in-class-24 -9.1.1-in-interface-16 -9.1.1-in-interface-2 -9.1.1-in-interface-3 -9.1.1-in-interface-9 -9.1.2-supertype-1 -9.2-implicit-18 -9.2-implicit-19 -9.2-implicit-2 -9.2-implicit-3 -9.2-implicit-4 -9.2-implicit-6 -9.2-implicit-7 -9.3.1-illegal-forward-1 -9.3.1-illegal-forward-2 -9.3.1-init-1 -9.4.1-conflict-2 -non-jls-argument-expansion-11 -non-jls-argument-expansion-12 -non-jls-argument-expansion-error-1 -non-jls-argument-expansion-error-2 -non-jls-argument-expansion-tokens-1 -non-jls-jsr41.2-clash-1 -non-jls-jsr41.3-runtime-2 -non-jls-jsr41.4-definite-unassignment-fail-22 -non-jls-jsr41.4-definite-unassignment-pass-10 -non-jls-jsr41.4-definite-unassignment-pass-9 -non-jls-jsr41.4-definite-unassignment-try-1 -non-jls-jsr41.4-definite-unassignment-try-2 -non-jls-jsr41.4-definite-unassignment-try-3 -non-jls-jsr41.4-definite-unassignment-try-4 -non-jls-jsr41.4-definite-unassignment-try-5 -non-jls-jsr41.4-definite-unassignment-try-6 -non-jls-jsr41.4-definite-unassignment-try-7 -non-jls-jsr41.4-definite-unassignment-try-8 -non-jls-jsr41.4-loop-1 -non-jls-jsr41.4-loop-10 -non-jls-jsr41.4-loop-11 -non-jls-jsr41.4-loop-12 -non-jls-jsr41.4-loop-13 -non-jls-jsr41.4-loop-14 -non-jls-jsr41.4-loop-15 -non-jls-jsr41.4-loop-2 -non-jls-jsr41.4-loop-3 -non-jls-jsr41.4-loop-7 -non-jls-jsr41.4-loop-8 -non-jls-jsr41.4-loop-9 diff --git a/libjava/testsuite/libjava.jni/PR15133.h b/libjava/testsuite/libjava.jni/PR15133.h new file mode 100644 index 0000000..af9f8f8 --- /dev/null +++ b/libjava/testsuite/libjava.jni/PR15133.h @@ -0,0 +1,19 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ + +#include <jni.h> + +#ifndef __PR15133__ +#define __PR15133__ + +#ifdef __cplusplus +extern "C" +{ +#endif + +JNIEXPORT void JNICALL Java_PR15133_printIt (JNIEnv *env, jobject, jint); + +#ifdef __cplusplus +} +#endif + +#endif /* __PR15133__ */ diff --git a/libjava/testsuite/libjava.jni/PR15133.jar b/libjava/testsuite/libjava.jni/PR15133.jar Binary files differnew file mode 100644 index 0000000..ad76705 --- /dev/null +++ b/libjava/testsuite/libjava.jni/PR15133.jar diff --git a/libjava/testsuite/libjava.jni/PR18116.h b/libjava/testsuite/libjava.jni/PR18116.h new file mode 100644 index 0000000..56fc648 --- /dev/null +++ b/libjava/testsuite/libjava.jni/PR18116.h @@ -0,0 +1,19 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ + +#include <jni.h> + +#ifndef __PR18116__ +#define __PR18116__ + +#ifdef __cplusplus +extern "C" +{ +#endif + +JNIEXPORT jint JNICALL Java_PR18116_doit (JNIEnv *env, jclass, jstring); + +#ifdef __cplusplus +} +#endif + +#endif /* __PR18116__ */ diff --git a/libjava/testsuite/libjava.jni/PR18116.jar b/libjava/testsuite/libjava.jni/PR18116.jar Binary files differnew file mode 100644 index 0000000..b9a0034 --- /dev/null +++ b/libjava/testsuite/libjava.jni/PR18116.jar diff --git a/libjava/testsuite/libjava.jni/PR28178.h b/libjava/testsuite/libjava.jni/PR28178.h new file mode 100644 index 0000000..e686439 --- /dev/null +++ b/libjava/testsuite/libjava.jni/PR28178.h @@ -0,0 +1,19 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ + +#include <jni.h> + +#ifndef __PR28178__ +#define __PR28178__ + +#ifdef __cplusplus +extern "C" +{ +#endif + +JNIEXPORT void JNICALL Java_PR28178_m (JNIEnv *env, jclass); + +#ifdef __cplusplus +} +#endif + +#endif /* __PR28178__ */ diff --git a/libjava/testsuite/libjava.jni/PR28178.jar b/libjava/testsuite/libjava.jni/PR28178.jar Binary files differnew file mode 100644 index 0000000..0c9082b --- /dev/null +++ b/libjava/testsuite/libjava.jni/PR28178.jar diff --git a/libjava/testsuite/libjava.jni/bytebuffer.h b/libjava/testsuite/libjava.jni/bytebuffer.h new file mode 100644 index 0000000..33b5c3a --- /dev/null +++ b/libjava/testsuite/libjava.jni/bytebuffer.h @@ -0,0 +1,25 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ + +#include <jni.h> + +#ifndef __bytebuffer__ +#define __bytebuffer__ + +#ifdef __cplusplus +extern "C" +{ +#endif + +JNIEXPORT void JNICALL Java_bytebuffer_testByteBuffer (JNIEnv *env, jclass, jobject); +JNIEXPORT void JNICALL Java_bytebuffer_testCharBuffer (JNIEnv *env, jclass, jobject); +JNIEXPORT void JNICALL Java_bytebuffer_testDoubleBuffer (JNIEnv *env, jclass, jobject); +JNIEXPORT void JNICALL Java_bytebuffer_testFloatBuffer (JNIEnv *env, jclass, jobject); +JNIEXPORT void JNICALL Java_bytebuffer_testIntBuffer (JNIEnv *env, jclass, jobject); +JNIEXPORT void JNICALL Java_bytebuffer_testLongBuffer (JNIEnv *env, jclass, jobject); +JNIEXPORT void JNICALL Java_bytebuffer_testShortBuffer (JNIEnv *env, jclass, jobject); + +#ifdef __cplusplus +} +#endif + +#endif /* __bytebuffer__ */ diff --git a/libjava/testsuite/libjava.jni/bytebuffer.jar b/libjava/testsuite/libjava.jni/bytebuffer.jar Binary files differnew file mode 100644 index 0000000..d0ca6d7 --- /dev/null +++ b/libjava/testsuite/libjava.jni/bytebuffer.jar diff --git a/libjava/testsuite/libjava.jni/calls.h b/libjava/testsuite/libjava.jni/calls.h new file mode 100644 index 0000000..64b9670 --- /dev/null +++ b/libjava/testsuite/libjava.jni/calls.h @@ -0,0 +1,19 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ + +#include <jni.h> + +#ifndef __calls__ +#define __calls__ + +#ifdef __cplusplus +extern "C" +{ +#endif + +JNIEXPORT jint JNICALL Java_calls_docall (JNIEnv *env, jobject); + +#ifdef __cplusplus +} +#endif + +#endif /* __calls__ */ diff --git a/libjava/testsuite/libjava.jni/calls.jar b/libjava/testsuite/libjava.jni/calls.jar Binary files differnew file mode 100644 index 0000000..3a188ea --- /dev/null +++ b/libjava/testsuite/libjava.jni/calls.jar diff --git a/libjava/testsuite/libjava.jni/cxxtest.h b/libjava/testsuite/libjava.jni/cxxtest.h new file mode 100644 index 0000000..d903636 --- /dev/null +++ b/libjava/testsuite/libjava.jni/cxxtest.h @@ -0,0 +1,19 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ + +#include <jni.h> + +#ifndef __cxxtest__ +#define __cxxtest__ + +#ifdef __cplusplus +extern "C" +{ +#endif + +JNIEXPORT jobjectArray JNICALL Java_cxxtest_fetch (JNIEnv *env, jobject); + +#ifdef __cplusplus +} +#endif + +#endif /* __cxxtest__ */ diff --git a/libjava/testsuite/libjava.jni/cxxtest.jar b/libjava/testsuite/libjava.jni/cxxtest.jar Binary files differnew file mode 100644 index 0000000..5a9a0d7 --- /dev/null +++ b/libjava/testsuite/libjava.jni/cxxtest.jar diff --git a/libjava/testsuite/libjava.jni/directbuffer.h b/libjava/testsuite/libjava.jni/directbuffer.h new file mode 100644 index 0000000..6d5c652 --- /dev/null +++ b/libjava/testsuite/libjava.jni/directbuffer.h @@ -0,0 +1,26 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ + +#include <jni.h> + +#ifndef __directbuffer__ +#define __directbuffer__ + +#ifdef __cplusplus +extern "C" +{ +#endif + +JNIEXPORT jobject JNICALL Java_directbuffer_createDirectByteBuffer (JNIEnv *env, jclass); +JNIEXPORT void JNICALL Java_directbuffer_testDirectByteBuffer (JNIEnv *env, jclass, jobject, jint); +JNIEXPORT void JNICALL Java_directbuffer_testCharBuffer (JNIEnv *env, jclass, jobject, jint); +JNIEXPORT void JNICALL Java_directbuffer_testDoubleBuffer (JNIEnv *env, jclass, jobject, jint); +JNIEXPORT void JNICALL Java_directbuffer_testFloatBuffer (JNIEnv *env, jclass, jobject, jint); +JNIEXPORT void JNICALL Java_directbuffer_testIntBuffer (JNIEnv *env, jclass, jobject, jint); +JNIEXPORT void JNICALL Java_directbuffer_testLongBuffer (JNIEnv *env, jclass, jobject, jint); +JNIEXPORT void JNICALL Java_directbuffer_testShortBuffer (JNIEnv *env, jclass, jobject, jint); + +#ifdef __cplusplus +} +#endif + +#endif /* __directbuffer__ */ diff --git a/libjava/testsuite/libjava.jni/directbuffer.jar b/libjava/testsuite/libjava.jni/directbuffer.jar Binary files differnew file mode 100644 index 0000000..f1630da --- /dev/null +++ b/libjava/testsuite/libjava.jni/directbuffer.jar diff --git a/libjava/testsuite/libjava.jni/field.h b/libjava/testsuite/libjava.jni/field.h new file mode 100644 index 0000000..fd1597a --- /dev/null +++ b/libjava/testsuite/libjava.jni/field.h @@ -0,0 +1,19 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ + +#include <jni.h> + +#ifndef __field__ +#define __field__ + +#ifdef __cplusplus +extern "C" +{ +#endif + +JNIEXPORT jobjectArray JNICALL Java_field_fetch (JNIEnv *env, jobject); + +#ifdef __cplusplus +} +#endif + +#endif /* __field__ */ diff --git a/libjava/testsuite/libjava.jni/field.jar b/libjava/testsuite/libjava.jni/field.jar Binary files differnew file mode 100644 index 0000000..3f636e8 --- /dev/null +++ b/libjava/testsuite/libjava.jni/field.jar diff --git a/libjava/testsuite/libjava.jni/final_method.h b/libjava/testsuite/libjava.jni/final_method.h new file mode 100644 index 0000000..dbb8235 --- /dev/null +++ b/libjava/testsuite/libjava.jni/final_method.h @@ -0,0 +1,19 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ + +#include <jni.h> + +#ifndef __final_1method__ +#define __final_1method__ + +#ifdef __cplusplus +extern "C" +{ +#endif + +JNIEXPORT jstring JNICALL Java_final_1method_meth (JNIEnv *env, jobject); + +#ifdef __cplusplus +} +#endif + +#endif /* __final_1method__ */ diff --git a/libjava/testsuite/libjava.jni/final_method.jar b/libjava/testsuite/libjava.jni/final_method.jar Binary files differnew file mode 100644 index 0000000..a5f4b63 --- /dev/null +++ b/libjava/testsuite/libjava.jni/final_method.jar diff --git a/libjava/testsuite/libjava.jni/findclass.h b/libjava/testsuite/libjava.jni/findclass.h new file mode 100644 index 0000000..d0d301e --- /dev/null +++ b/libjava/testsuite/libjava.jni/findclass.h @@ -0,0 +1,19 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ + +#include <jni.h> + +#ifndef __findclass__ +#define __findclass__ + +#ifdef __cplusplus +extern "C" +{ +#endif + +JNIEXPORT jclass JNICALL Java_findclass_doit (JNIEnv *env, jclass, jstring); + +#ifdef __cplusplus +} +#endif + +#endif /* __findclass__ */ diff --git a/libjava/testsuite/libjava.jni/findclass.jar b/libjava/testsuite/libjava.jni/findclass.jar Binary files differnew file mode 100644 index 0000000..03fe860 --- /dev/null +++ b/libjava/testsuite/libjava.jni/findclass.jar diff --git a/libjava/testsuite/libjava.jni/iface.h b/libjava/testsuite/libjava.jni/iface.h new file mode 100644 index 0000000..58680dd --- /dev/null +++ b/libjava/testsuite/libjava.jni/iface.h @@ -0,0 +1,19 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ + +#include <jni.h> + +#ifndef __iface__ +#define __iface__ + +#ifdef __cplusplus +extern "C" +{ +#endif + +JNIEXPORT void JNICALL Java_iface_doCalls (JNIEnv *env, jobject, jobject); + +#ifdef __cplusplus +} +#endif + +#endif /* __iface__ */ diff --git a/libjava/testsuite/libjava.jni/iface.jar b/libjava/testsuite/libjava.jni/iface.jar Binary files differnew file mode 100644 index 0000000..0a9a1af --- /dev/null +++ b/libjava/testsuite/libjava.jni/iface.jar diff --git a/libjava/testsuite/libjava.jni/invocation/PR16923.jar b/libjava/testsuite/libjava.jni/invocation/PR16923.jar Binary files differnew file mode 100644 index 0000000..a1a7b88 --- /dev/null +++ b/libjava/testsuite/libjava.jni/invocation/PR16923.jar diff --git a/libjava/testsuite/libjava.jni/invoke.h b/libjava/testsuite/libjava.jni/invoke.h new file mode 100644 index 0000000..553c598 --- /dev/null +++ b/libjava/testsuite/libjava.jni/invoke.h @@ -0,0 +1,19 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ + +#include <jni.h> + +#ifndef __invoke__ +#define __invoke__ + +#ifdef __cplusplus +extern "C" +{ +#endif + +JNIEXPORT jint JNICALL Java_invoke_val (JNIEnv *env, jclass); + +#ifdef __cplusplus +} +#endif + +#endif /* __invoke__ */ diff --git a/libjava/testsuite/libjava.jni/invoke.jar b/libjava/testsuite/libjava.jni/invoke.jar Binary files differnew file mode 100644 index 0000000..dd05797 --- /dev/null +++ b/libjava/testsuite/libjava.jni/invoke.jar diff --git a/libjava/testsuite/libjava.jni/jni.exp b/libjava/testsuite/libjava.jni/jni.exp index 317c5ae..5fa6ede 100644 --- a/libjava/testsuite/libjava.jni/jni.exp +++ b/libjava/testsuite/libjava.jni/jni.exp @@ -4,7 +4,7 @@ # of options to pass to the compiler. Returns 0 on failure, 1 on # success. proc gcj_jni_compile_c_to_so {file {options {}}} { - global srcdir + global srcdir subdir global host_triplet verbose "options: $options" set options_cxx $options @@ -31,7 +31,7 @@ proc gcj_jni_compile_c_to_so {file {options {}}} { lappend options "additional_flags=${so_flag} -fPIC" # Find the generated header. - lappend options "additional_flags=-I. -I.." + lappend options "additional_flags=-I. -I.. -I$srcdir/$subdir" # Ensure that the generated header has correct prototypes. set cfile [file rootname $file].c @@ -60,10 +60,16 @@ proc gcj_jni_compile_c_to_so {file {options {}}} { # Build a header file from a .class file. Return 0 on failure. proc gcj_jni_build_header {file} { + global libgcj_jar + set gcjh [find_gcjh] set file [file rootname $file] + + set cmd "$gcjh -jni -force -classpath .:$libgcj_jar $file" + verbose $cmd + set x [string trim [libjava_prune_warnings \ - [lindex [local_exec "$gcjh -jni $file" "" "" 300] 1]]] + [lindex [local_exec $cmd "" "" 300] 1]]] if {$x != ""} { verbose "local_exec failed: $x" 2 fail "$file header generation" @@ -100,19 +106,19 @@ proc gcj_jni_test_one {file} { return 1 } - if {! [bytecompile_file $file [pwd]]} { - fail "bytecompile $file" - # FIXME - should use `untested' on all remaining tests. - # But that is hard. - return 0 - } - pass "bytecompile $file" +# if {! [bytecompile_file $file [pwd]]} { +# fail "bytecompile $file" +# # FIXME - should use `untested' on all remaining tests. +# # But that is hard. +# return 0 +# } +# pass "bytecompile $file" - set bytefile [file rootname [file tail $file]].class - if {! [gcj_jni_build_header $bytefile]} { - # FIXME - return 0 - } +# set bytefile [file rootname [file tail $file]].class +# if {! [gcj_jni_build_header $bytefile]} { +# # FIXME +# return 0 +# } set cfile [file rootname $file].c set cxxflags "" @@ -180,7 +186,8 @@ proc gcj_jni_test_one {file} { # cxxldlibflags to libjava_invoke. if {$INTERPRETER == "yes" && $gij != ""} { libjava_invoke $errname "gij test" opts $gij \ - "" $resultfile $cxxldlibflags $main + "" $resultfile $cxxldlibflags \ + -classpath $file $main } # When we succeed we remove all our clutter. @@ -194,7 +201,7 @@ proc gcj_jni_test_one {file} { # options to pass to the compiler. Returns 0 on failure, 1 on # success. proc gcj_jni_invocation_compile_c_to_binary {file {options {}}} { - global srcdir + global srcdir subdir global host_triplet verbose "options: $options" set options_cxx $options @@ -208,7 +215,7 @@ proc gcj_jni_invocation_compile_c_to_binary {file {options {}}} { lappend options "additional_flags= -bind_at_load -multiply_defined suppress" } # Find the generated header. - lappend options "additional_flags=-I. -I.." + lappend options "additional_flags=-I. -I.. -I$srcdir/$subdir" # Find jni.h and jni_md.h. lappend options "additional_flags=-I$srcdir/../include -I$srcdir/../classpath/include" @@ -231,6 +238,7 @@ proc gcj_jni_invocation_compile_c_to_binary {file {options {}}} { # Do all the work for a single invocation API test. Return 0 on # failure. proc gcj_jni_invocation_test_one {file} { + global env global runtests global host_triplet global INTERPRETER @@ -242,13 +250,13 @@ proc gcj_jni_invocation_test_one {file} { return 1 } - if {! [bytecompile_file $file [pwd]]} { - fail "bytecompile $file" - # FIXME - should use `untested' on all remaining tests. - # But that is hard. - return 0 - } - pass "bytecompile $file" +# if {! [bytecompile_file $file [pwd]]} { +# fail "bytecompile $file" +# # FIXME - should use `untested' on all remaining tests. +# # But that is hard. +# return 0 +# } +# pass "bytecompile $file" set cfile [file rootname $file].c # Darwin needs -liconv linked, otherwise we get some unresolved. @@ -281,10 +289,14 @@ proc gcj_jni_invocation_test_one {file} { set resultfile [file rootname $file].out + set env(CLASSPATH) $file + verbose "CLASSPATH = $env(CLASSPATH)" if {! [gcj_invoke $main $resultfile ""]} { + unset env(CLASSPATH) # FIXME return 0 } + unset env(CLASSPATH) # We purposely ignore errors here; we still want to run the other # appropriate tests. @@ -304,14 +316,14 @@ proc gcj_jni_run {} { # For now we only test JNI on native builds. if {$build_triplet == $host_triplet} { - catch { lsort [glob -nocomplain ${srcdir}/${subdir}/*.java] } srcfiles + catch { lsort [glob -nocomplain ${srcdir}/${subdir}/*.jar] } srcfiles foreach x $srcfiles { gcj_jni_test_one $x } # Run JNI invocation API tests - catch { lsort [glob -nocomplain ${srcdir}/${subdir}/invocation/*.java] } srcfiles + catch { lsort [glob -nocomplain ${srcdir}/${subdir}/invocation/*.jar] } srcfiles foreach x $srcfiles { gcj_jni_invocation_test_one $x diff --git a/libjava/testsuite/libjava.jni/jniutf.h b/libjava/testsuite/libjava.jni/jniutf.h new file mode 100644 index 0000000..b58db2e --- /dev/null +++ b/libjava/testsuite/libjava.jni/jniutf.h @@ -0,0 +1,19 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ + +#include <jni.h> + +#ifndef __jniutf__ +#define __jniutf__ + +#ifdef __cplusplus +extern "C" +{ +#endif + +JNIEXPORT void JNICALL Java_jniutf_printString (JNIEnv *env, jobject, jstring); + +#ifdef __cplusplus +} +#endif + +#endif /* __jniutf__ */ diff --git a/libjava/testsuite/libjava.jni/jniutf.jar b/libjava/testsuite/libjava.jni/jniutf.jar Binary files differnew file mode 100644 index 0000000..764808c --- /dev/null +++ b/libjava/testsuite/libjava.jni/jniutf.jar diff --git a/libjava/testsuite/libjava.jni/martin.h b/libjava/testsuite/libjava.jni/martin.h new file mode 100644 index 0000000..73b6a06 --- /dev/null +++ b/libjava/testsuite/libjava.jni/martin.h @@ -0,0 +1,19 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ + +#include <jni.h> + +#ifndef __martin__ +#define __martin__ + +#ifdef __cplusplus +extern "C" +{ +#endif + +JNIEXPORT void JNICALL Java_martin_myNative (JNIEnv *env, jobject, jstring); + +#ifdef __cplusplus +} +#endif + +#endif /* __martin__ */ diff --git a/libjava/testsuite/libjava.jni/martin.jar b/libjava/testsuite/libjava.jni/martin.jar Binary files differnew file mode 100644 index 0000000..a0293a7 --- /dev/null +++ b/libjava/testsuite/libjava.jni/martin.jar diff --git a/libjava/testsuite/libjava.jni/noclass.h b/libjava/testsuite/libjava.jni/noclass.h new file mode 100644 index 0000000..67869a9 --- /dev/null +++ b/libjava/testsuite/libjava.jni/noclass.h @@ -0,0 +1,19 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ + +#include <jni.h> + +#ifndef __noclass__ +#define __noclass__ + +#ifdef __cplusplus +extern "C" +{ +#endif + +JNIEXPORT void JNICALL Java_noclass_find_1it (JNIEnv *env, jclass); + +#ifdef __cplusplus +} +#endif + +#endif /* __noclass__ */ diff --git a/libjava/testsuite/libjava.jni/noclass.jar b/libjava/testsuite/libjava.jni/noclass.jar Binary files differnew file mode 100644 index 0000000..969aa95 --- /dev/null +++ b/libjava/testsuite/libjava.jni/noclass.jar diff --git a/libjava/testsuite/libjava.jni/overload.h b/libjava/testsuite/libjava.jni/overload.h new file mode 100644 index 0000000..7b717cd --- /dev/null +++ b/libjava/testsuite/libjava.jni/overload.h @@ -0,0 +1,20 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ + +#include <jni.h> + +#ifndef __overload__ +#define __overload__ + +#ifdef __cplusplus +extern "C" +{ +#endif + +JNIEXPORT jint JNICALL Java_overload_over__I (JNIEnv *env, jclass, jint); +JNIEXPORT jint JNICALL Java_overload_over__II (JNIEnv *env, jclass, jint, jint); + +#ifdef __cplusplus +} +#endif + +#endif /* __overload__ */ diff --git a/libjava/testsuite/libjava.jni/overload.jar b/libjava/testsuite/libjava.jni/overload.jar Binary files differnew file mode 100644 index 0000000..430d3d6 --- /dev/null +++ b/libjava/testsuite/libjava.jni/overload.jar diff --git a/libjava/testsuite/libjava.jni/pr11951.h b/libjava/testsuite/libjava.jni/pr11951.h new file mode 100644 index 0000000..caeefdb --- /dev/null +++ b/libjava/testsuite/libjava.jni/pr11951.h @@ -0,0 +1,19 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ + +#include <jni.h> + +#ifndef __pr11951__ +#define __pr11951__ + +#ifdef __cplusplus +extern "C" +{ +#endif + +JNIEXPORT void JNICALL Java_pr11951_nmethod (JNIEnv *env, jclass); + +#ifdef __cplusplus +} +#endif + +#endif /* __pr11951__ */ diff --git a/libjava/testsuite/libjava.jni/pr11951.jar b/libjava/testsuite/libjava.jni/pr11951.jar Binary files differnew file mode 100644 index 0000000..adea29f --- /dev/null +++ b/libjava/testsuite/libjava.jni/pr11951.jar diff --git a/libjava/testsuite/libjava.jni/pr18278.h b/libjava/testsuite/libjava.jni/pr18278.h new file mode 100644 index 0000000..4003fef --- /dev/null +++ b/libjava/testsuite/libjava.jni/pr18278.h @@ -0,0 +1,19 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ + +#include <jni.h> + +#ifndef __pr18278__ +#define __pr18278__ + +#ifdef __cplusplus +extern "C" +{ +#endif + +JNIEXPORT jobject JNICALL Java_pr18278_weakRef (JNIEnv *env, jclass, jobject); + +#ifdef __cplusplus +} +#endif + +#endif /* __pr18278__ */ diff --git a/libjava/testsuite/libjava.jni/pr18278.jar b/libjava/testsuite/libjava.jni/pr18278.jar Binary files differnew file mode 100644 index 0000000..c1bf148 --- /dev/null +++ b/libjava/testsuite/libjava.jni/pr18278.jar diff --git a/libjava/testsuite/libjava.jni/pr23739.h b/libjava/testsuite/libjava.jni/pr23739.h new file mode 100644 index 0000000..70f228c --- /dev/null +++ b/libjava/testsuite/libjava.jni/pr23739.h @@ -0,0 +1,19 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ + +#include <jni.h> + +#ifndef __pr23739__ +#define __pr23739__ + +#ifdef __cplusplus +extern "C" +{ +#endif + +JNIEXPORT void JNICALL Java_pr23739_checkOrder (JNIEnv *env, jclass, jclass, jclass); + +#ifdef __cplusplus +} +#endif + +#endif /* __pr23739__ */ diff --git a/libjava/testsuite/libjava.jni/pr23739.jar b/libjava/testsuite/libjava.jni/pr23739.jar Binary files differnew file mode 100644 index 0000000..d837046 --- /dev/null +++ b/libjava/testsuite/libjava.jni/pr23739.jar diff --git a/libjava/testsuite/libjava.jni/register.h b/libjava/testsuite/libjava.jni/register.h new file mode 100644 index 0000000..85b606b --- /dev/null +++ b/libjava/testsuite/libjava.jni/register.h @@ -0,0 +1,19 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ + +#include <jni.h> + +#ifndef __register__ +#define __register__ + +#ifdef __cplusplus +extern "C" +{ +#endif + +JNIEXPORT jint JNICALL Java_register_doit (JNIEnv *env, jclass, jint); + +#ifdef __cplusplus +} +#endif + +#endif /* __register__ */ diff --git a/libjava/testsuite/libjava.jni/register.jar b/libjava/testsuite/libjava.jni/register.jar Binary files differnew file mode 100644 index 0000000..e8682e1a --- /dev/null +++ b/libjava/testsuite/libjava.jni/register.jar diff --git a/libjava/testsuite/libjava.jni/register2.c b/libjava/testsuite/libjava.jni/register2.c index 1ed10a8..318e4d8 100644 --- a/libjava/testsuite/libjava.jni/register2.c +++ b/libjava/testsuite/libjava.jni/register2.c @@ -1,6 +1,6 @@ #include <stdlib.h> #include <assert.h> -#include <register2.h> +#include <jni.h> static int twentythree (JNIEnv *env, jclass k) diff --git a/libjava/testsuite/libjava.jni/register2.jar b/libjava/testsuite/libjava.jni/register2.jar Binary files differnew file mode 100644 index 0000000..807524c --- /dev/null +++ b/libjava/testsuite/libjava.jni/register2.jar diff --git a/libjava/testsuite/libjava.jni/simple_int.h b/libjava/testsuite/libjava.jni/simple_int.h new file mode 100644 index 0000000..b0b9b57 --- /dev/null +++ b/libjava/testsuite/libjava.jni/simple_int.h @@ -0,0 +1,19 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ + +#include <jni.h> + +#ifndef __simple_1int__ +#define __simple_1int__ + +#ifdef __cplusplus +extern "C" +{ +#endif + +JNIEXPORT jint JNICALL Java_simple_1int_nat (JNIEnv *env, jclass, jint); + +#ifdef __cplusplus +} +#endif + +#endif /* __simple_1int__ */ diff --git a/libjava/testsuite/libjava.jni/simple_int.jar b/libjava/testsuite/libjava.jni/simple_int.jar Binary files differnew file mode 100644 index 0000000..1f0bdc6 --- /dev/null +++ b/libjava/testsuite/libjava.jni/simple_int.jar diff --git a/libjava/testsuite/libjava.jni/throwit.h b/libjava/testsuite/libjava.jni/throwit.h new file mode 100644 index 0000000..97c7223 --- /dev/null +++ b/libjava/testsuite/libjava.jni/throwit.h @@ -0,0 +1,19 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ + +#include <jni.h> + +#ifndef __throwit__ +#define __throwit__ + +#ifdef __cplusplus +extern "C" +{ +#endif + +JNIEXPORT void JNICALL Java_throwit_throwit (JNIEnv *env, jclass, jstring, jboolean); + +#ifdef __cplusplus +} +#endif + +#endif /* __throwit__ */ diff --git a/libjava/testsuite/libjava.jni/throwit.jar b/libjava/testsuite/libjava.jni/throwit.jar Binary files differnew file mode 100644 index 0000000..9fc43b9 --- /dev/null +++ b/libjava/testsuite/libjava.jni/throwit.jar diff --git a/libjava/testsuite/libjava.jni/virtual.h b/libjava/testsuite/libjava.jni/virtual.h new file mode 100644 index 0000000..7d9ef82 --- /dev/null +++ b/libjava/testsuite/libjava.jni/virtual.h @@ -0,0 +1,19 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ + +#include <jni.h> + +#ifndef __virtual__ +#define __virtual__ + +#ifdef __cplusplus +extern "C" +{ +#endif + +JNIEXPORT jboolean JNICALL Java_virtual_equals (JNIEnv *env, jobject, jobject); + +#ifdef __cplusplus +} +#endif + +#endif /* __virtual__ */ diff --git a/libjava/testsuite/libjava.jni/virtual.jar b/libjava/testsuite/libjava.jni/virtual.jar Binary files differnew file mode 100644 index 0000000..dd4090b --- /dev/null +++ b/libjava/testsuite/libjava.jni/virtual.jar diff --git a/libjava/testsuite/libjava.jvmti/events.h b/libjava/testsuite/libjava.jvmti/events.h new file mode 100644 index 0000000..2f81b63 --- /dev/null +++ b/libjava/testsuite/libjava.jvmti/events.h @@ -0,0 +1,27 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __events__ +#define __events__ + +#pragma interface + +#include <java/lang/Object.h> +#include <gcj/array.h> + +extern "Java" +{ + class events; +} + +class events : public ::java::lang::Object +{ + +public: + events(); + static void do_events_tests(); + static void main(JArray< ::java::lang::String * > *); + static ::java::lang::Class class$; +}; + +#endif // __events__ diff --git a/libjava/testsuite/libjava.jvmti/events.jar b/libjava/testsuite/libjava.jvmti/events.jar Binary files differnew file mode 100644 index 0000000..121df82 --- /dev/null +++ b/libjava/testsuite/libjava.jvmti/events.jar diff --git a/libjava/testsuite/libjava.jvmti/geterrorname.h b/libjava/testsuite/libjava.jvmti/geterrorname.h new file mode 100644 index 0000000..957e1c23 --- /dev/null +++ b/libjava/testsuite/libjava.jvmti/geterrorname.h @@ -0,0 +1,27 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __geterrorname__ +#define __geterrorname__ + +#pragma interface + +#include <java/lang/Object.h> +#include <gcj/array.h> + +extern "Java" +{ + class geterrorname; +} + +class geterrorname : public ::java::lang::Object +{ + +public: + geterrorname(); + static void do_errorname_tests(); + static void main(JArray< ::java::lang::String * > *); + static ::java::lang::Class class$; +}; + +#endif // __geterrorname__ diff --git a/libjava/testsuite/libjava.jvmti/geterrorname.jar b/libjava/testsuite/libjava.jvmti/geterrorname.jar Binary files differnew file mode 100644 index 0000000..a0c5ae0 --- /dev/null +++ b/libjava/testsuite/libjava.jvmti/geterrorname.jar diff --git a/libjava/testsuite/libjava.jvmti/jvmti.exp b/libjava/testsuite/libjava.jvmti/jvmti.exp index 18be872..c69fd2b 100644 --- a/libjava/testsuite/libjava.jvmti/jvmti.exp +++ b/libjava/testsuite/libjava.jvmti/jvmti.exp @@ -31,27 +31,23 @@ proc gcj_jvmti_compile_cxx_to_o {file {options {}}} { # Build header files given name of .java file. Return 0 on failure. proc gcj_jvmti_build_headers {file} { + global libgcj_jar + set gcjh [find_gcjh] - set jvscan [find_jvscan] - set class_out [string trim \ - [libjava_prune_warnings \ - [lindex [local_exec "$jvscan --encoding=UTF-8 $file --list-class" "" "" 300] 1]]] - if {[string match "*parse error*" $class_out]} { + # Currently we only build a header file for the main class from the + # .java file. If we need more than this, we'll have to figure + # something out. + set file [file rootname [file tail $file]] + + set x [string trim [libjava_prune_warnings \ + [lindex [local_exec "$gcjh -cni -force -classpath .:$libgcj_jar $file" "" "" 300] 1]]] + if {$x != ""} { + verbose "local_exec failed: $x" 2 fail "$file header generation" return 0 } - foreach file [split $class_out] { - set x [string trim [libjava_prune_warnings \ - [lindex [local_exec "$gcjh $file" "" "" 300] 1]]] - if {$x != ""} { - verbose "local_exec failed: $x" 2 - fail "$file header generation" - return 0 - } - } - pass "$file header generation" return 1 } @@ -67,18 +63,18 @@ proc gcj_jvmti_test_one {file} { return 1 } - if {! [bytecompile_file $file [pwd]]} { - fail "bytecompile $file" - # FIXME - should use `untested' on all remaining tests. - # But that is hard. - return 0 - } - pass "bytecompile $file" +# if {! [bytecompile_file $file [pwd]]} { +# fail "bytecompile $file" +# # FIXME - should use `untested' on all remaining tests. +# # But that is hard. +# return 0 +# } +# pass "bytecompile $file" - if {! [gcj_jvmti_build_headers $file]} { - # FIXME - return 0 - } +# if {! [gcj_jvmti_build_headers $file]} { +# # FIXME +# return 0 +# } set cfile [file join [file dirname $file] nat$main.cc] if {! [gcj_jvmti_compile_cxx_to_o $cfile]} { @@ -109,7 +105,7 @@ proc gcj_jvmti_run {} { # For now we only test JVMTI on native builds. if {$build_triplet == $host_triplet} { - catch { lsort [glob -nocomplain ${srcdir}/${subdir}/*.java] } srcfiles + catch { lsort [glob -nocomplain ${srcdir}/${subdir}/*.jar] } srcfiles foreach x $srcfiles { gcj_jvmti_test_one $x diff --git a/libjava/testsuite/libjava.lang/ArrayStore.jar b/libjava/testsuite/libjava.lang/ArrayStore.jar Binary files differnew file mode 100644 index 0000000..7c10d12 --- /dev/null +++ b/libjava/testsuite/libjava.lang/ArrayStore.jar diff --git a/libjava/testsuite/libjava.lang/ArrayStore2.jar b/libjava/testsuite/libjava.lang/ArrayStore2.jar Binary files differnew file mode 100644 index 0000000..833a232 --- /dev/null +++ b/libjava/testsuite/libjava.lang/ArrayStore2.jar diff --git a/libjava/testsuite/libjava.lang/ArrayStore2.xfail b/libjava/testsuite/libjava.lang/ArrayStore2.xfail deleted file mode 100644 index e4c7ce3..0000000 --- a/libjava/testsuite/libjava.lang/ArrayStore2.xfail +++ /dev/null @@ -1 +0,0 @@ -xfail-source-output diff --git a/libjava/testsuite/libjava.lang/Array_1.jar b/libjava/testsuite/libjava.lang/Array_1.jar Binary files differnew file mode 100644 index 0000000..c97b13a --- /dev/null +++ b/libjava/testsuite/libjava.lang/Array_1.jar diff --git a/libjava/testsuite/libjava.lang/Array_2.jar b/libjava/testsuite/libjava.lang/Array_2.jar Binary files differnew file mode 100644 index 0000000..8713ba7 --- /dev/null +++ b/libjava/testsuite/libjava.lang/Array_2.jar diff --git a/libjava/testsuite/libjava.lang/Array_3.jar b/libjava/testsuite/libjava.lang/Array_3.jar Binary files differnew file mode 100644 index 0000000..c907e65 --- /dev/null +++ b/libjava/testsuite/libjava.lang/Array_3.jar diff --git a/libjava/testsuite/libjava.lang/Class_1.jar b/libjava/testsuite/libjava.lang/Class_1.jar Binary files differnew file mode 100644 index 0000000..6756094 --- /dev/null +++ b/libjava/testsuite/libjava.lang/Class_1.jar diff --git a/libjava/testsuite/libjava.lang/CompareNaN.jar b/libjava/testsuite/libjava.lang/CompareNaN.jar Binary files differnew file mode 100644 index 0000000..c6b8db4 --- /dev/null +++ b/libjava/testsuite/libjava.lang/CompareNaN.jar diff --git a/libjava/testsuite/libjava.lang/Divide_1.jar b/libjava/testsuite/libjava.lang/Divide_1.jar Binary files differnew file mode 100644 index 0000000..4add13c --- /dev/null +++ b/libjava/testsuite/libjava.lang/Divide_1.jar diff --git a/libjava/testsuite/libjava.lang/EvaluationOrder.jar b/libjava/testsuite/libjava.lang/EvaluationOrder.jar Binary files differnew file mode 100644 index 0000000..f122c72 --- /dev/null +++ b/libjava/testsuite/libjava.lang/EvaluationOrder.jar diff --git a/libjava/testsuite/libjava.lang/ExtraClassLoader.jar b/libjava/testsuite/libjava.lang/ExtraClassLoader.jar Binary files differnew file mode 100644 index 0000000..0230f87 --- /dev/null +++ b/libjava/testsuite/libjava.lang/ExtraClassLoader.jar diff --git a/libjava/testsuite/libjava.lang/FileHandleGcTest.jar b/libjava/testsuite/libjava.lang/FileHandleGcTest.jar Binary files differnew file mode 100644 index 0000000..b3fc4bd --- /dev/null +++ b/libjava/testsuite/libjava.lang/FileHandleGcTest.jar diff --git a/libjava/testsuite/libjava.lang/Final.jar b/libjava/testsuite/libjava.lang/Final.jar Binary files differnew file mode 100644 index 0000000..5c64878 --- /dev/null +++ b/libjava/testsuite/libjava.lang/Final.jar diff --git a/libjava/testsuite/libjava.lang/Float_1.jar b/libjava/testsuite/libjava.lang/Float_1.jar Binary files differnew file mode 100644 index 0000000..20a6ff0 --- /dev/null +++ b/libjava/testsuite/libjava.lang/Float_1.jar diff --git a/libjava/testsuite/libjava.lang/Float_2.jar b/libjava/testsuite/libjava.lang/Float_2.jar Binary files differnew file mode 100644 index 0000000..e3ee413 --- /dev/null +++ b/libjava/testsuite/libjava.lang/Float_2.jar diff --git a/libjava/testsuite/libjava.lang/G19990301_01.jar b/libjava/testsuite/libjava.lang/G19990301_01.jar Binary files differnew file mode 100644 index 0000000..fd33638 --- /dev/null +++ b/libjava/testsuite/libjava.lang/G19990301_01.jar diff --git a/libjava/testsuite/libjava.lang/G19990302_02.jar b/libjava/testsuite/libjava.lang/G19990302_02.jar Binary files differnew file mode 100644 index 0000000..bc4f269 --- /dev/null +++ b/libjava/testsuite/libjava.lang/G19990302_02.jar diff --git a/libjava/testsuite/libjava.lang/G19990303_01.jar b/libjava/testsuite/libjava.lang/G19990303_01.jar Binary files differnew file mode 100644 index 0000000..b3e1941 --- /dev/null +++ b/libjava/testsuite/libjava.lang/G19990303_01.jar diff --git a/libjava/testsuite/libjava.lang/G19990303_02.jar b/libjava/testsuite/libjava.lang/G19990303_02.jar Binary files differnew file mode 100644 index 0000000..e5ef15c --- /dev/null +++ b/libjava/testsuite/libjava.lang/G19990303_02.jar diff --git a/libjava/testsuite/libjava.lang/G19990304_01.jar b/libjava/testsuite/libjava.lang/G19990304_01.jar Binary files differnew file mode 100644 index 0000000..1cf234a --- /dev/null +++ b/libjava/testsuite/libjava.lang/G19990304_01.jar diff --git a/libjava/testsuite/libjava.lang/G19990310_01.jar b/libjava/testsuite/libjava.lang/G19990310_01.jar Binary files differnew file mode 100644 index 0000000..e689e43 --- /dev/null +++ b/libjava/testsuite/libjava.lang/G19990310_01.jar diff --git a/libjava/testsuite/libjava.lang/II.jar b/libjava/testsuite/libjava.lang/II.jar Binary files differnew file mode 100644 index 0000000..22d15cd --- /dev/null +++ b/libjava/testsuite/libjava.lang/II.jar diff --git a/libjava/testsuite/libjava.lang/InterfaceDispatch.jar b/libjava/testsuite/libjava.lang/InterfaceDispatch.jar Binary files differnew file mode 100644 index 0000000..1f87ec3 --- /dev/null +++ b/libjava/testsuite/libjava.lang/InterfaceDispatch.jar diff --git a/libjava/testsuite/libjava.lang/InvokeInterface.jar b/libjava/testsuite/libjava.lang/InvokeInterface.jar Binary files differnew file mode 100644 index 0000000..55a923a --- /dev/null +++ b/libjava/testsuite/libjava.lang/InvokeInterface.jar diff --git a/libjava/testsuite/libjava.lang/InvokeReturn.jar b/libjava/testsuite/libjava.lang/InvokeReturn.jar Binary files differnew file mode 100644 index 0000000..a64e0d5 --- /dev/null +++ b/libjava/testsuite/libjava.lang/InvokeReturn.jar diff --git a/libjava/testsuite/libjava.lang/Invoke_1.jar b/libjava/testsuite/libjava.lang/Invoke_1.jar Binary files differnew file mode 100644 index 0000000..6d43ecb --- /dev/null +++ b/libjava/testsuite/libjava.lang/Invoke_1.jar diff --git a/libjava/testsuite/libjava.lang/Invoke_2.jar b/libjava/testsuite/libjava.lang/Invoke_2.jar Binary files differnew file mode 100644 index 0000000..ac8882c --- /dev/null +++ b/libjava/testsuite/libjava.lang/Invoke_2.jar diff --git a/libjava/testsuite/libjava.lang/KeepInline.jar b/libjava/testsuite/libjava.lang/KeepInline.jar Binary files differnew file mode 100644 index 0000000..754becf --- /dev/null +++ b/libjava/testsuite/libjava.lang/KeepInline.jar diff --git a/libjava/testsuite/libjava.lang/LargeFile.jar b/libjava/testsuite/libjava.lang/LargeFile.jar Binary files differnew file mode 100644 index 0000000..245fa48 --- /dev/null +++ b/libjava/testsuite/libjava.lang/LargeFile.jar diff --git a/libjava/testsuite/libjava.lang/MathBuiltin.jar b/libjava/testsuite/libjava.lang/MathBuiltin.jar Binary files differnew file mode 100644 index 0000000..4cefc67 --- /dev/null +++ b/libjava/testsuite/libjava.lang/MathBuiltin.jar diff --git a/libjava/testsuite/libjava.lang/Matrix4f.jar b/libjava/testsuite/libjava.lang/Matrix4f.jar Binary files differnew file mode 100644 index 0000000..eaa7241 --- /dev/null +++ b/libjava/testsuite/libjava.lang/Matrix4f.jar diff --git a/libjava/testsuite/libjava.lang/N19990310_02.jar b/libjava/testsuite/libjava.lang/N19990310_02.jar Binary files differnew file mode 100644 index 0000000..49e97e4 --- /dev/null +++ b/libjava/testsuite/libjava.lang/N19990310_02.jar diff --git a/libjava/testsuite/libjava.lang/N19990310_3.jar b/libjava/testsuite/libjava.lang/N19990310_3.jar Binary files differnew file mode 100644 index 0000000..a096693 --- /dev/null +++ b/libjava/testsuite/libjava.lang/N19990310_3.jar diff --git a/libjava/testsuite/libjava.lang/N19990310_4.jar b/libjava/testsuite/libjava.lang/N19990310_4.jar Binary files differnew file mode 100644 index 0000000..b21f474 --- /dev/null +++ b/libjava/testsuite/libjava.lang/N19990310_4.jar diff --git a/libjava/testsuite/libjava.lang/N19990310_5.jar b/libjava/testsuite/libjava.lang/N19990310_5.jar Binary files differnew file mode 100644 index 0000000..d944000 --- /dev/null +++ b/libjava/testsuite/libjava.lang/N19990310_5.jar diff --git a/libjava/testsuite/libjava.lang/Overflow.jar b/libjava/testsuite/libjava.lang/Overflow.jar Binary files differnew file mode 100644 index 0000000..4bfda6b --- /dev/null +++ b/libjava/testsuite/libjava.lang/Overflow.jar diff --git a/libjava/testsuite/libjava.lang/PR12350.jar b/libjava/testsuite/libjava.lang/PR12350.jar Binary files differnew file mode 100644 index 0000000..8d655c2 --- /dev/null +++ b/libjava/testsuite/libjava.lang/PR12350.jar diff --git a/libjava/testsuite/libjava.lang/PR12416.jar b/libjava/testsuite/libjava.lang/PR12416.jar Binary files differnew file mode 100644 index 0000000..8235008 --- /dev/null +++ b/libjava/testsuite/libjava.lang/PR12416.jar diff --git a/libjava/testsuite/libjava.lang/PR12656.jar b/libjava/testsuite/libjava.lang/PR12656.jar Binary files differnew file mode 100644 index 0000000..c54e92d --- /dev/null +++ b/libjava/testsuite/libjava.lang/PR12656.jar diff --git a/libjava/testsuite/libjava.lang/PR12915.jar b/libjava/testsuite/libjava.lang/PR12915.jar Binary files differnew file mode 100644 index 0000000..29ce9c0 --- /dev/null +++ b/libjava/testsuite/libjava.lang/PR12915.jar diff --git a/libjava/testsuite/libjava.lang/PR141.jar b/libjava/testsuite/libjava.lang/PR141.jar Binary files differnew file mode 100644 index 0000000..c7b9629 --- /dev/null +++ b/libjava/testsuite/libjava.lang/PR141.jar diff --git a/libjava/testsuite/libjava.lang/PR160.jar b/libjava/testsuite/libjava.lang/PR160.jar Binary files differnew file mode 100644 index 0000000..f1fed74 --- /dev/null +++ b/libjava/testsuite/libjava.lang/PR160.jar diff --git a/libjava/testsuite/libjava.lang/PR162.jar b/libjava/testsuite/libjava.lang/PR162.jar Binary files differnew file mode 100644 index 0000000..69acecc --- /dev/null +++ b/libjava/testsuite/libjava.lang/PR162.jar diff --git a/libjava/testsuite/libjava.lang/PR16867.jar b/libjava/testsuite/libjava.lang/PR16867.jar Binary files differnew file mode 100644 index 0000000..a1c46c4 --- /dev/null +++ b/libjava/testsuite/libjava.lang/PR16867.jar diff --git a/libjava/testsuite/libjava.lang/PR18699.jar b/libjava/testsuite/libjava.lang/PR18699.jar Binary files differnew file mode 100644 index 0000000..c16dc75 --- /dev/null +++ b/libjava/testsuite/libjava.lang/PR18699.jar diff --git a/libjava/testsuite/libjava.lang/PR19870.jar b/libjava/testsuite/libjava.lang/PR19870.jar Binary files differnew file mode 100644 index 0000000..13255d8 --- /dev/null +++ b/libjava/testsuite/libjava.lang/PR19870.jar diff --git a/libjava/testsuite/libjava.lang/PR19870_2.jar b/libjava/testsuite/libjava.lang/PR19870_2.jar Binary files differnew file mode 100644 index 0000000..05daaf9 --- /dev/null +++ b/libjava/testsuite/libjava.lang/PR19870_2.jar diff --git a/libjava/testsuite/libjava.lang/PR19921.jar b/libjava/testsuite/libjava.lang/PR19921.jar Binary files differnew file mode 100644 index 0000000..515f3bf --- /dev/null +++ b/libjava/testsuite/libjava.lang/PR19921.jar diff --git a/libjava/testsuite/libjava.lang/PR20056.jar b/libjava/testsuite/libjava.lang/PR20056.jar Binary files differnew file mode 100644 index 0000000..2bd6d54e --- /dev/null +++ b/libjava/testsuite/libjava.lang/PR20056.jar diff --git a/libjava/testsuite/libjava.lang/PR218.jar b/libjava/testsuite/libjava.lang/PR218.jar Binary files differnew file mode 100644 index 0000000..7647404 --- /dev/null +++ b/libjava/testsuite/libjava.lang/PR218.jar diff --git a/libjava/testsuite/libjava.lang/PR242.jar b/libjava/testsuite/libjava.lang/PR242.jar Binary files differnew file mode 100644 index 0000000..41b7fe1 --- /dev/null +++ b/libjava/testsuite/libjava.lang/PR242.jar diff --git a/libjava/testsuite/libjava.lang/PR25535.jar b/libjava/testsuite/libjava.lang/PR25535.jar Binary files differnew file mode 100644 index 0000000..924c256 --- /dev/null +++ b/libjava/testsuite/libjava.lang/PR25535.jar diff --git a/libjava/testsuite/libjava.lang/PR260.jar b/libjava/testsuite/libjava.lang/PR260.jar Binary files differnew file mode 100644 index 0000000..a0ca132 --- /dev/null +++ b/libjava/testsuite/libjava.lang/PR260.jar diff --git a/libjava/testsuite/libjava.lang/PR260.out b/libjava/testsuite/libjava.lang/PR260.out index cba2234..e69de29 100644 --- a/libjava/testsuite/libjava.lang/PR260.out +++ b/libjava/testsuite/libjava.lang/PR260.out @@ -1 +0,0 @@ -A initialized diff --git a/libjava/testsuite/libjava.lang/PR26858.jar b/libjava/testsuite/libjava.lang/PR26858.jar Binary files differnew file mode 100644 index 0000000..c9b3abb --- /dev/null +++ b/libjava/testsuite/libjava.lang/PR26858.jar diff --git a/libjava/testsuite/libjava.lang/PR27908.jar b/libjava/testsuite/libjava.lang/PR27908.jar Binary files differnew file mode 100644 index 0000000..e280407 --- /dev/null +++ b/libjava/testsuite/libjava.lang/PR27908.jar diff --git a/libjava/testsuite/libjava.lang/PR29013.jar b/libjava/testsuite/libjava.lang/PR29013.jar Binary files differnew file mode 100644 index 0000000..198ac6e --- /dev/null +++ b/libjava/testsuite/libjava.lang/PR29013.jar diff --git a/libjava/testsuite/libjava.lang/PR29495.jar b/libjava/testsuite/libjava.lang/PR29495.jar Binary files differnew file mode 100644 index 0000000..6e03871 --- /dev/null +++ b/libjava/testsuite/libjava.lang/PR29495.jar diff --git a/libjava/testsuite/libjava.lang/PR29495.java b/libjava/testsuite/libjava.lang/PR29495.java new file mode 100644 index 0000000..7df00e8 --- /dev/null +++ b/libjava/testsuite/libjava.lang/PR29495.java @@ -0,0 +1,56 @@ +// Test various reflection methods. + +import java.lang.annotation.Inherited; +import java.lang.reflect.Method; +import java.lang.reflect.Field; + +public class PR29495 +{ + public class container<T> + { + // This class has a synthetic field... + + public T get(T v) { return v; } + } + + public class concrete extends container<String> + { + // This makes us have a synthetic bridge method. + public String get(String v) { return "hi" + v; } + } + + // varargs method + public static void va(Object... args) + { + } + + public static void check(boolean x, String m) + { + if (! x) + System.out.println("fail: " + m); + } + + public static void main(String[] args) throws Throwable + { + check (Inherited.class.isAnnotation(), "Inherited isAnnotation"); + + Method m = PR29495.class.getDeclaredMethod("va", new Class[] { Object[].class }); + check (m.isVarArgs(), "va isVarArgs"); + + m = concrete.class.getDeclaredMethod("get", new Class[] { Object.class }); + check (m.isSynthetic(), "get isSynthetic"); + check (m.isBridge(), "get isBridge"); + + Field[] fs = container.class.getDeclaredFields(); + boolean ok = false; + for (int i = 0; i < fs.length; ++i) + { + if (fs[i].isSynthetic()) + { + ok = true; + break; + } + } + check (ok, "container has synthetic field"); + } +} diff --git a/libjava/testsuite/libjava.compile/pr21519.no-link b/libjava/testsuite/libjava.lang/PR29495.out index e69de29..e69de29 100644 --- a/libjava/testsuite/libjava.compile/pr21519.no-link +++ b/libjava/testsuite/libjava.lang/PR29495.out diff --git a/libjava/testsuite/libjava.lang/PR3096.jar b/libjava/testsuite/libjava.lang/PR3096.jar Binary files differnew file mode 100644 index 0000000..4ed8f4a --- /dev/null +++ b/libjava/testsuite/libjava.lang/PR3096.jar diff --git a/libjava/testsuite/libjava.lang/PR3731.jar b/libjava/testsuite/libjava.lang/PR3731.jar Binary files differnew file mode 100644 index 0000000..7473cb4 --- /dev/null +++ b/libjava/testsuite/libjava.lang/PR3731.jar diff --git a/libjava/testsuite/libjava.lang/PR5057.jar b/libjava/testsuite/libjava.lang/PR5057.jar Binary files differnew file mode 100644 index 0000000..ac7ac95 --- /dev/null +++ b/libjava/testsuite/libjava.lang/PR5057.jar diff --git a/libjava/testsuite/libjava.lang/PR5057_2.jar b/libjava/testsuite/libjava.lang/PR5057_2.jar Binary files differnew file mode 100644 index 0000000..b0accb7 --- /dev/null +++ b/libjava/testsuite/libjava.lang/PR5057_2.jar diff --git a/libjava/testsuite/libjava.lang/PR55.jar b/libjava/testsuite/libjava.lang/PR55.jar Binary files differnew file mode 100644 index 0000000..a5cb7d6 --- /dev/null +++ b/libjava/testsuite/libjava.lang/PR55.jar diff --git a/libjava/testsuite/libjava.lang/PR56.jar b/libjava/testsuite/libjava.lang/PR56.jar Binary files differnew file mode 100644 index 0000000..20f87b5 --- /dev/null +++ b/libjava/testsuite/libjava.lang/PR56.jar diff --git a/libjava/testsuite/libjava.lang/PR6085.jar b/libjava/testsuite/libjava.lang/PR6085.jar Binary files differnew file mode 100644 index 0000000..ec70660 --- /dev/null +++ b/libjava/testsuite/libjava.lang/PR6085.jar diff --git a/libjava/testsuite/libjava.lang/PR6204.jar b/libjava/testsuite/libjava.lang/PR6204.jar Binary files differnew file mode 100644 index 0000000..704de3a --- /dev/null +++ b/libjava/testsuite/libjava.lang/PR6204.jar diff --git a/libjava/testsuite/libjava.lang/PR6520.jar b/libjava/testsuite/libjava.lang/PR6520.jar Binary files differnew file mode 100644 index 0000000..441d1ea --- /dev/null +++ b/libjava/testsuite/libjava.lang/PR6520.jar diff --git a/libjava/testsuite/libjava.lang/PR6729.jar b/libjava/testsuite/libjava.lang/PR6729.jar Binary files differnew file mode 100644 index 0000000..7e63700 --- /dev/null +++ b/libjava/testsuite/libjava.lang/PR6729.jar diff --git a/libjava/testsuite/libjava.lang/PR6820.jar b/libjava/testsuite/libjava.lang/PR6820.jar Binary files differnew file mode 100644 index 0000000..ba5d3e1 --- /dev/null +++ b/libjava/testsuite/libjava.lang/PR6820.jar diff --git a/libjava/testsuite/libjava.lang/PR7482.jar b/libjava/testsuite/libjava.lang/PR7482.jar Binary files differnew file mode 100644 index 0000000..f035202 --- /dev/null +++ b/libjava/testsuite/libjava.lang/PR7482.jar diff --git a/libjava/testsuite/libjava.lang/PR8866.jar b/libjava/testsuite/libjava.lang/PR8866.jar Binary files differnew file mode 100644 index 0000000..2bc6d58 --- /dev/null +++ b/libjava/testsuite/libjava.lang/PR8866.jar diff --git a/libjava/testsuite/libjava.lang/Process_1.jar b/libjava/testsuite/libjava.lang/Process_1.jar Binary files differnew file mode 100644 index 0000000..8499991 --- /dev/null +++ b/libjava/testsuite/libjava.lang/Process_1.jar diff --git a/libjava/testsuite/libjava.lang/Process_2.jar b/libjava/testsuite/libjava.lang/Process_2.jar Binary files differnew file mode 100644 index 0000000..2b26bff --- /dev/null +++ b/libjava/testsuite/libjava.lang/Process_2.jar diff --git a/libjava/testsuite/libjava.lang/Process_3.jar b/libjava/testsuite/libjava.lang/Process_3.jar Binary files differnew file mode 100644 index 0000000..620a644 --- /dev/null +++ b/libjava/testsuite/libjava.lang/Process_3.jar diff --git a/libjava/testsuite/libjava.lang/Process_4.jar b/libjava/testsuite/libjava.lang/Process_4.jar Binary files differnew file mode 100644 index 0000000..2014ad0 --- /dev/null +++ b/libjava/testsuite/libjava.lang/Process_4.jar diff --git a/libjava/testsuite/libjava.lang/Process_5.jar b/libjava/testsuite/libjava.lang/Process_5.jar Binary files differnew file mode 100644 index 0000000..1046430 --- /dev/null +++ b/libjava/testsuite/libjava.lang/Process_5.jar diff --git a/libjava/testsuite/libjava.lang/Process_6.jar b/libjava/testsuite/libjava.lang/Process_6.jar Binary files differnew file mode 100644 index 0000000..a1a3500 --- /dev/null +++ b/libjava/testsuite/libjava.lang/Process_6.jar diff --git a/libjava/testsuite/libjava.lang/RH194522.jar b/libjava/testsuite/libjava.lang/RH194522.jar Binary files differnew file mode 100644 index 0000000..a7c75a2 --- /dev/null +++ b/libjava/testsuite/libjava.lang/RH194522.jar diff --git a/libjava/testsuite/libjava.lang/Serialization.jar b/libjava/testsuite/libjava.lang/Serialization.jar Binary files differnew file mode 100644 index 0000000..376cb6b --- /dev/null +++ b/libjava/testsuite/libjava.lang/Serialization.jar diff --git a/libjava/testsuite/libjava.lang/Shazam.jar b/libjava/testsuite/libjava.lang/Shazam.jar Binary files differnew file mode 100644 index 0000000..b3257f6 --- /dev/null +++ b/libjava/testsuite/libjava.lang/Shazam.jar diff --git a/libjava/testsuite/libjava.lang/StackTrace2.jar b/libjava/testsuite/libjava.lang/StackTrace2.jar Binary files differnew file mode 100644 index 0000000..fc289f1 --- /dev/null +++ b/libjava/testsuite/libjava.lang/StackTrace2.jar diff --git a/libjava/testsuite/libjava.lang/StaticConstructor.jar b/libjava/testsuite/libjava.lang/StaticConstructor.jar Binary files differnew file mode 100644 index 0000000..0f4ff4c --- /dev/null +++ b/libjava/testsuite/libjava.lang/StaticConstructor.jar diff --git a/libjava/testsuite/libjava.lang/StringBuffer_1.jar b/libjava/testsuite/libjava.lang/StringBuffer_1.jar Binary files differnew file mode 100644 index 0000000..fd406af --- /dev/null +++ b/libjava/testsuite/libjava.lang/StringBuffer_1.jar diff --git a/libjava/testsuite/libjava.lang/StringBuffer_overflow.jar b/libjava/testsuite/libjava.lang/StringBuffer_overflow.jar Binary files differnew file mode 100644 index 0000000..be8b655 --- /dev/null +++ b/libjava/testsuite/libjava.lang/StringBuffer_overflow.jar diff --git a/libjava/testsuite/libjava.lang/String_overflow.jar b/libjava/testsuite/libjava.lang/String_overflow.jar Binary files differnew file mode 100644 index 0000000..1400db8 --- /dev/null +++ b/libjava/testsuite/libjava.lang/String_overflow.jar diff --git a/libjava/testsuite/libjava.lang/SyncGlobal.jar b/libjava/testsuite/libjava.lang/SyncGlobal.jar Binary files differnew file mode 100644 index 0000000..54589c2 --- /dev/null +++ b/libjava/testsuite/libjava.lang/SyncGlobal.jar diff --git a/libjava/testsuite/libjava.lang/SyncTest.jar b/libjava/testsuite/libjava.lang/SyncTest.jar Binary files differnew file mode 100644 index 0000000..3f30e7a --- /dev/null +++ b/libjava/testsuite/libjava.lang/SyncTest.jar diff --git a/libjava/testsuite/libjava.lang/Synch.jar b/libjava/testsuite/libjava.lang/Synch.jar Binary files differnew file mode 100644 index 0000000..10b7580 --- /dev/null +++ b/libjava/testsuite/libjava.lang/Synch.jar diff --git a/libjava/testsuite/libjava.lang/TLtest.jar b/libjava/testsuite/libjava.lang/TLtest.jar Binary files differnew file mode 100644 index 0000000..de4ed66 --- /dev/null +++ b/libjava/testsuite/libjava.lang/TLtest.jar diff --git a/libjava/testsuite/libjava.lang/TestProxy.jar b/libjava/testsuite/libjava.lang/TestProxy.jar Binary files differnew file mode 100644 index 0000000..706f086 --- /dev/null +++ b/libjava/testsuite/libjava.lang/TestProxy.jar diff --git a/libjava/testsuite/libjava.lang/TestProxy.java b/libjava/testsuite/libjava.lang/TestProxy.java index ea2e1f0..08e16aa 100644 --- a/libjava/testsuite/libjava.lang/TestProxy.java +++ b/libjava/testsuite/libjava.lang/TestProxy.java @@ -1,4 +1,6 @@ -import java.lang.reflect.*; +import java.lang.reflect.Proxy; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; import java.net.*; public class TestProxy diff --git a/libjava/testsuite/libjava.lang/Thread_Alive.jar b/libjava/testsuite/libjava.lang/Thread_Alive.jar Binary files differnew file mode 100644 index 0000000..548b6a9 --- /dev/null +++ b/libjava/testsuite/libjava.lang/Thread_Alive.jar diff --git a/libjava/testsuite/libjava.lang/Thread_HoldsLock.jar b/libjava/testsuite/libjava.lang/Thread_HoldsLock.jar Binary files differnew file mode 100644 index 0000000..8c094f6 --- /dev/null +++ b/libjava/testsuite/libjava.lang/Thread_HoldsLock.jar diff --git a/libjava/testsuite/libjava.lang/Thread_Interrupt.jar b/libjava/testsuite/libjava.lang/Thread_Interrupt.jar Binary files differnew file mode 100644 index 0000000..b52d436 --- /dev/null +++ b/libjava/testsuite/libjava.lang/Thread_Interrupt.jar diff --git a/libjava/testsuite/libjava.lang/Thread_Join.jar b/libjava/testsuite/libjava.lang/Thread_Join.jar Binary files differnew file mode 100644 index 0000000..4a1d252 --- /dev/null +++ b/libjava/testsuite/libjava.lang/Thread_Join.jar diff --git a/libjava/testsuite/libjava.lang/Thread_Monitor.jar b/libjava/testsuite/libjava.lang/Thread_Monitor.jar Binary files differnew file mode 100644 index 0000000..2345c8b --- /dev/null +++ b/libjava/testsuite/libjava.lang/Thread_Monitor.jar diff --git a/libjava/testsuite/libjava.lang/Thread_Sleep.jar b/libjava/testsuite/libjava.lang/Thread_Sleep.jar Binary files differnew file mode 100644 index 0000000..2320add --- /dev/null +++ b/libjava/testsuite/libjava.lang/Thread_Sleep.jar diff --git a/libjava/testsuite/libjava.lang/Thread_Sleep_2.jar b/libjava/testsuite/libjava.lang/Thread_Sleep_2.jar Binary files differnew file mode 100644 index 0000000..a657ed9 --- /dev/null +++ b/libjava/testsuite/libjava.lang/Thread_Sleep_2.jar diff --git a/libjava/testsuite/libjava.lang/Thread_Wait.jar b/libjava/testsuite/libjava.lang/Thread_Wait.jar Binary files differnew file mode 100644 index 0000000..1ecb6a3 --- /dev/null +++ b/libjava/testsuite/libjava.lang/Thread_Wait.jar diff --git a/libjava/testsuite/libjava.lang/Thread_Wait_2.jar b/libjava/testsuite/libjava.lang/Thread_Wait_2.jar Binary files differnew file mode 100644 index 0000000..b043de4 --- /dev/null +++ b/libjava/testsuite/libjava.lang/Thread_Wait_2.jar diff --git a/libjava/testsuite/libjava.lang/Thread_Wait_Interrupt.jar b/libjava/testsuite/libjava.lang/Thread_Wait_Interrupt.jar Binary files differnew file mode 100644 index 0000000..dcafc43 --- /dev/null +++ b/libjava/testsuite/libjava.lang/Thread_Wait_Interrupt.jar diff --git a/libjava/testsuite/libjava.lang/Throw_1.jar b/libjava/testsuite/libjava.lang/Throw_1.jar Binary files differnew file mode 100644 index 0000000..330562d --- /dev/null +++ b/libjava/testsuite/libjava.lang/Throw_1.jar diff --git a/libjava/testsuite/libjava.lang/Throw_2.jar b/libjava/testsuite/libjava.lang/Throw_2.jar Binary files differnew file mode 100644 index 0000000..6cfb11f --- /dev/null +++ b/libjava/testsuite/libjava.lang/Throw_2.jar diff --git a/libjava/testsuite/libjava.lang/Throw_3.jar b/libjava/testsuite/libjava.lang/Throw_3.jar Binary files differnew file mode 100644 index 0000000..0aefbe0 --- /dev/null +++ b/libjava/testsuite/libjava.lang/Throw_3.jar diff --git a/libjava/testsuite/libjava.lang/anfi.jar b/libjava/testsuite/libjava.lang/anfi.jar Binary files differnew file mode 100644 index 0000000..81225e4 --- /dev/null +++ b/libjava/testsuite/libjava.lang/anfi.jar diff --git a/libjava/testsuite/libjava.lang/anon.jar b/libjava/testsuite/libjava.lang/anon.jar Binary files differnew file mode 100644 index 0000000..295e164 --- /dev/null +++ b/libjava/testsuite/libjava.lang/anon.jar diff --git a/libjava/testsuite/libjava.lang/anon2.jar b/libjava/testsuite/libjava.lang/anon2.jar Binary files differnew file mode 100644 index 0000000..3906ff5 --- /dev/null +++ b/libjava/testsuite/libjava.lang/anon2.jar diff --git a/libjava/testsuite/libjava.lang/anon3.jar b/libjava/testsuite/libjava.lang/anon3.jar Binary files differnew file mode 100644 index 0000000..83bce16 --- /dev/null +++ b/libjava/testsuite/libjava.lang/anon3.jar diff --git a/libjava/testsuite/libjava.lang/anon4.jar b/libjava/testsuite/libjava.lang/anon4.jar Binary files differnew file mode 100644 index 0000000..5362e8d --- /dev/null +++ b/libjava/testsuite/libjava.lang/anon4.jar diff --git a/libjava/testsuite/libjava.lang/anon_ctor_itf_arg.jar b/libjava/testsuite/libjava.lang/anon_ctor_itf_arg.jar Binary files differnew file mode 100644 index 0000000..d9c4202 --- /dev/null +++ b/libjava/testsuite/libjava.lang/anon_ctor_itf_arg.jar diff --git a/libjava/testsuite/libjava.lang/anonarray.jar b/libjava/testsuite/libjava.lang/anonarray.jar Binary files differnew file mode 100644 index 0000000..d2b2070 --- /dev/null +++ b/libjava/testsuite/libjava.lang/anonarray.jar diff --git a/libjava/testsuite/libjava.lang/anonarray2.jar b/libjava/testsuite/libjava.lang/anonarray2.jar Binary files differnew file mode 100644 index 0000000..608a081 --- /dev/null +++ b/libjava/testsuite/libjava.lang/anonarray2.jar diff --git a/libjava/testsuite/libjava.lang/anonarray3.jar b/libjava/testsuite/libjava.lang/anonarray3.jar Binary files differnew file mode 100644 index 0000000..b24906f --- /dev/null +++ b/libjava/testsuite/libjava.lang/anonarray3.jar diff --git a/libjava/testsuite/libjava.lang/assign.jar b/libjava/testsuite/libjava.lang/assign.jar Binary files differnew file mode 100644 index 0000000..1b9896c --- /dev/null +++ b/libjava/testsuite/libjava.lang/assign.jar diff --git a/libjava/testsuite/libjava.lang/assign2.jar b/libjava/testsuite/libjava.lang/assign2.jar Binary files differnew file mode 100644 index 0000000..8f1e116 --- /dev/null +++ b/libjava/testsuite/libjava.lang/assign2.jar diff --git a/libjava/testsuite/libjava.lang/bclink.jar b/libjava/testsuite/libjava.lang/bclink.jar Binary files differnew file mode 100644 index 0000000..86709d6 --- /dev/null +++ b/libjava/testsuite/libjava.lang/bclink.jar diff --git a/libjava/testsuite/libjava.lang/bytearray.jar b/libjava/testsuite/libjava.lang/bytearray.jar Binary files differnew file mode 100644 index 0000000..550ae7b --- /dev/null +++ b/libjava/testsuite/libjava.lang/bytearray.jar diff --git a/libjava/testsuite/libjava.lang/direct_read.jar b/libjava/testsuite/libjava.lang/direct_read.jar Binary files differnew file mode 100644 index 0000000..da334fb --- /dev/null +++ b/libjava/testsuite/libjava.lang/direct_read.jar diff --git a/libjava/testsuite/libjava.lang/direct_write.jar b/libjava/testsuite/libjava.lang/direct_write.jar Binary files differnew file mode 100644 index 0000000..b3188aa --- /dev/null +++ b/libjava/testsuite/libjava.lang/direct_write.jar diff --git a/libjava/testsuite/libjava.lang/emptystring.jar b/libjava/testsuite/libjava.lang/emptystring.jar Binary files differnew file mode 100644 index 0000000..6303487 --- /dev/null +++ b/libjava/testsuite/libjava.lang/emptystring.jar diff --git a/libjava/testsuite/libjava.lang/err1.jar b/libjava/testsuite/libjava.lang/err1.jar Binary files differnew file mode 100644 index 0000000..11917d9 --- /dev/null +++ b/libjava/testsuite/libjava.lang/err1.jar diff --git a/libjava/testsuite/libjava.lang/err10.jar b/libjava/testsuite/libjava.lang/err10.jar Binary files differnew file mode 100644 index 0000000..05d8f96 --- /dev/null +++ b/libjava/testsuite/libjava.lang/err10.jar diff --git a/libjava/testsuite/libjava.lang/err11.jar b/libjava/testsuite/libjava.lang/err11.jar Binary files differnew file mode 100644 index 0000000..a818007 --- /dev/null +++ b/libjava/testsuite/libjava.lang/err11.jar diff --git a/libjava/testsuite/libjava.lang/err12.jar b/libjava/testsuite/libjava.lang/err12.jar Binary files differnew file mode 100644 index 0000000..ec9f19b --- /dev/null +++ b/libjava/testsuite/libjava.lang/err12.jar diff --git a/libjava/testsuite/libjava.lang/err13.jar b/libjava/testsuite/libjava.lang/err13.jar Binary files differnew file mode 100644 index 0000000..dde1830 --- /dev/null +++ b/libjava/testsuite/libjava.lang/err13.jar diff --git a/libjava/testsuite/libjava.lang/err14.jar b/libjava/testsuite/libjava.lang/err14.jar Binary files differnew file mode 100644 index 0000000..f1b6785 --- /dev/null +++ b/libjava/testsuite/libjava.lang/err14.jar diff --git a/libjava/testsuite/libjava.lang/err2.jar b/libjava/testsuite/libjava.lang/err2.jar Binary files differnew file mode 100644 index 0000000..d825a60 --- /dev/null +++ b/libjava/testsuite/libjava.lang/err2.jar diff --git a/libjava/testsuite/libjava.lang/err3.jar b/libjava/testsuite/libjava.lang/err3.jar Binary files differnew file mode 100644 index 0000000..be1bd61 --- /dev/null +++ b/libjava/testsuite/libjava.lang/err3.jar diff --git a/libjava/testsuite/libjava.lang/err4.jar b/libjava/testsuite/libjava.lang/err4.jar Binary files differnew file mode 100644 index 0000000..f1e7822 --- /dev/null +++ b/libjava/testsuite/libjava.lang/err4.jar diff --git a/libjava/testsuite/libjava.lang/err5.jar b/libjava/testsuite/libjava.lang/err5.jar Binary files differnew file mode 100644 index 0000000..9a573ab --- /dev/null +++ b/libjava/testsuite/libjava.lang/err5.jar diff --git a/libjava/testsuite/libjava.lang/err6.jar b/libjava/testsuite/libjava.lang/err6.jar Binary files differnew file mode 100644 index 0000000..2a12b80 --- /dev/null +++ b/libjava/testsuite/libjava.lang/err6.jar diff --git a/libjava/testsuite/libjava.lang/err7.jar b/libjava/testsuite/libjava.lang/err7.jar Binary files differnew file mode 100644 index 0000000..f349844 --- /dev/null +++ b/libjava/testsuite/libjava.lang/err7.jar diff --git a/libjava/testsuite/libjava.lang/err8.jar b/libjava/testsuite/libjava.lang/err8.jar Binary files differnew file mode 100644 index 0000000..5baf89b --- /dev/null +++ b/libjava/testsuite/libjava.lang/err8.jar diff --git a/libjava/testsuite/libjava.lang/err9.jar b/libjava/testsuite/libjava.lang/err9.jar Binary files differnew file mode 100644 index 0000000..cb629e3 --- /dev/null +++ b/libjava/testsuite/libjava.lang/err9.jar diff --git a/libjava/testsuite/libjava.lang/final_inner.jar b/libjava/testsuite/libjava.lang/final_inner.jar Binary files differnew file mode 100644 index 0000000..0a37fd9 --- /dev/null +++ b/libjava/testsuite/libjava.lang/final_inner.jar diff --git a/libjava/testsuite/libjava.lang/final_int.jar b/libjava/testsuite/libjava.lang/final_int.jar Binary files differnew file mode 100644 index 0000000..43feb70 --- /dev/null +++ b/libjava/testsuite/libjava.lang/final_int.jar diff --git a/libjava/testsuite/libjava.lang/final_static_and_friend.jar b/libjava/testsuite/libjava.lang/final_static_and_friend.jar Binary files differnew file mode 100644 index 0000000..ca7b2ad --- /dev/null +++ b/libjava/testsuite/libjava.lang/final_static_and_friend.jar diff --git a/libjava/testsuite/libjava.lang/indirect.jar b/libjava/testsuite/libjava.lang/indirect.jar Binary files differnew file mode 100644 index 0000000..bc77286 --- /dev/null +++ b/libjava/testsuite/libjava.lang/indirect.jar diff --git a/libjava/testsuite/libjava.lang/indirect_read.jar b/libjava/testsuite/libjava.lang/indirect_read.jar Binary files differnew file mode 100644 index 0000000..d0835e9 --- /dev/null +++ b/libjava/testsuite/libjava.lang/indirect_read.jar diff --git a/libjava/testsuite/libjava.lang/indirect_write.jar b/libjava/testsuite/libjava.lang/indirect_write.jar Binary files differnew file mode 100644 index 0000000..9393a27 --- /dev/null +++ b/libjava/testsuite/libjava.lang/indirect_write.jar diff --git a/libjava/testsuite/libjava.lang/initexc.jar b/libjava/testsuite/libjava.lang/initexc.jar Binary files differnew file mode 100644 index 0000000..d43546f --- /dev/null +++ b/libjava/testsuite/libjava.lang/initexc.jar diff --git a/libjava/testsuite/libjava.lang/initfield.jar b/libjava/testsuite/libjava.lang/initfield.jar Binary files differnew file mode 100644 index 0000000..955cb02 --- /dev/null +++ b/libjava/testsuite/libjava.lang/initfield.jar diff --git a/libjava/testsuite/libjava.lang/inline.jar b/libjava/testsuite/libjava.lang/inline.jar Binary files differnew file mode 100644 index 0000000..b5c9449 --- /dev/null +++ b/libjava/testsuite/libjava.lang/inline.jar diff --git a/libjava/testsuite/libjava.lang/inner1.jar b/libjava/testsuite/libjava.lang/inner1.jar Binary files differnew file mode 100644 index 0000000..382ba64 --- /dev/null +++ b/libjava/testsuite/libjava.lang/inner1.jar diff --git a/libjava/testsuite/libjava.lang/inner2.jar b/libjava/testsuite/libjava.lang/inner2.jar Binary files differnew file mode 100644 index 0000000..48e917e --- /dev/null +++ b/libjava/testsuite/libjava.lang/inner2.jar diff --git a/libjava/testsuite/libjava.lang/inner3.jar b/libjava/testsuite/libjava.lang/inner3.jar Binary files differnew file mode 100644 index 0000000..a128236 --- /dev/null +++ b/libjava/testsuite/libjava.lang/inner3.jar diff --git a/libjava/testsuite/libjava.lang/inner4.jar b/libjava/testsuite/libjava.lang/inner4.jar Binary files differnew file mode 100644 index 0000000..cdfb0be --- /dev/null +++ b/libjava/testsuite/libjava.lang/inner4.jar diff --git a/libjava/testsuite/libjava.lang/inner_array.jar b/libjava/testsuite/libjava.lang/inner_array.jar Binary files differnew file mode 100644 index 0000000..eddcff5 --- /dev/null +++ b/libjava/testsuite/libjava.lang/inner_array.jar diff --git a/libjava/testsuite/libjava.lang/inner_interface.jar b/libjava/testsuite/libjava.lang/inner_interface.jar Binary files differnew file mode 100644 index 0000000..b85f38a --- /dev/null +++ b/libjava/testsuite/libjava.lang/inner_interface.jar diff --git a/libjava/testsuite/libjava.lang/instance.jar b/libjava/testsuite/libjava.lang/instance.jar Binary files differnew file mode 100644 index 0000000..7691410 --- /dev/null +++ b/libjava/testsuite/libjava.lang/instance.jar diff --git a/libjava/testsuite/libjava.lang/instinit.jar b/libjava/testsuite/libjava.lang/instinit.jar Binary files differnew file mode 100644 index 0000000..9368434 --- /dev/null +++ b/libjava/testsuite/libjava.lang/instinit.jar diff --git a/libjava/testsuite/libjava.lang/instinit2.jar b/libjava/testsuite/libjava.lang/instinit2.jar Binary files differnew file mode 100644 index 0000000..7573a0d --- /dev/null +++ b/libjava/testsuite/libjava.lang/instinit2.jar diff --git a/libjava/testsuite/libjava.lang/invoke_from_inner.jar b/libjava/testsuite/libjava.lang/invoke_from_inner.jar Binary files differnew file mode 100644 index 0000000..064e018 --- /dev/null +++ b/libjava/testsuite/libjava.lang/invoke_from_inner.jar diff --git a/libjava/testsuite/libjava.lang/invokethrow.jar b/libjava/testsuite/libjava.lang/invokethrow.jar Binary files differnew file mode 100644 index 0000000..1344d62 --- /dev/null +++ b/libjava/testsuite/libjava.lang/invokethrow.jar diff --git a/libjava/testsuite/libjava.lang/klass.jar b/libjava/testsuite/libjava.lang/klass.jar Binary files differnew file mode 100644 index 0000000..269f96d --- /dev/null +++ b/libjava/testsuite/libjava.lang/klass.jar diff --git a/libjava/testsuite/libjava.lang/lang.exp b/libjava/testsuite/libjava.lang/lang.exp index abc36d5..5e46770 100644 --- a/libjava/testsuite/libjava.lang/lang.exp +++ b/libjava/testsuite/libjava.lang/lang.exp @@ -26,8 +26,8 @@ foreach x $srcfiles { verbose "inpfile is $inpfile" - test_libjava $options "${prefix}.java" "" $inpfile $resfile $args - test_libjava $options "${prefix}.java" "-O3" $inpfile $resfile $args + test_libjava $options "${prefix}.jar" "" $inpfile $resfile $args + test_libjava $options "${prefix}.jar" "-O3" $inpfile $resfile $args } # Local Variables: diff --git a/libjava/testsuite/libjava.lang/md5test.jar b/libjava/testsuite/libjava.lang/md5test.jar Binary files differnew file mode 100644 index 0000000..d38891b --- /dev/null +++ b/libjava/testsuite/libjava.lang/md5test.jar diff --git a/libjava/testsuite/libjava.lang/multiple_finit.jar b/libjava/testsuite/libjava.lang/multiple_finit.jar Binary files differnew file mode 100644 index 0000000..cd81522 --- /dev/null +++ b/libjava/testsuite/libjava.lang/multiple_finit.jar diff --git a/libjava/testsuite/libjava.lang/negzero.jar b/libjava/testsuite/libjava.lang/negzero.jar Binary files differnew file mode 100644 index 0000000..1f23c61 --- /dev/null +++ b/libjava/testsuite/libjava.lang/negzero.jar diff --git a/libjava/testsuite/libjava.lang/nested_with_ctor.jar b/libjava/testsuite/libjava.lang/nested_with_ctor.jar Binary files differnew file mode 100644 index 0000000..31c5d45 --- /dev/null +++ b/libjava/testsuite/libjava.lang/nested_with_ctor.jar diff --git a/libjava/testsuite/libjava.lang/newarray_overflow.jar b/libjava/testsuite/libjava.lang/newarray_overflow.jar Binary files differnew file mode 100644 index 0000000..65413cc --- /dev/null +++ b/libjava/testsuite/libjava.lang/newarray_overflow.jar diff --git a/libjava/testsuite/libjava.lang/override.jar b/libjava/testsuite/libjava.lang/override.jar Binary files differnew file mode 100644 index 0000000..ab734b8 --- /dev/null +++ b/libjava/testsuite/libjava.lang/override.jar diff --git a/libjava/testsuite/libjava.lang/pr100.jar b/libjava/testsuite/libjava.lang/pr100.jar Binary files differnew file mode 100644 index 0000000..a7f4921 --- /dev/null +++ b/libjava/testsuite/libjava.lang/pr100.jar diff --git a/libjava/testsuite/libjava.lang/pr109.jar b/libjava/testsuite/libjava.lang/pr109.jar Binary files differnew file mode 100644 index 0000000..fbcdf26 --- /dev/null +++ b/libjava/testsuite/libjava.lang/pr109.jar diff --git a/libjava/testsuite/libjava.lang/pr13107.jar b/libjava/testsuite/libjava.lang/pr13107.jar Binary files differnew file mode 100644 index 0000000..89f4779 --- /dev/null +++ b/libjava/testsuite/libjava.lang/pr13107.jar diff --git a/libjava/testsuite/libjava.lang/pr13107_2.jar b/libjava/testsuite/libjava.lang/pr13107_2.jar Binary files differnew file mode 100644 index 0000000..5dad7ad --- /dev/null +++ b/libjava/testsuite/libjava.lang/pr13107_2.jar diff --git a/libjava/testsuite/libjava.lang/pr13107_3.jar b/libjava/testsuite/libjava.lang/pr13107_3.jar Binary files differnew file mode 100644 index 0000000..8fe3275 --- /dev/null +++ b/libjava/testsuite/libjava.lang/pr13107_3.jar diff --git a/libjava/testsuite/libjava.lang/pr133.jar b/libjava/testsuite/libjava.lang/pr133.jar Binary files differnew file mode 100644 index 0000000..f9e36ef --- /dev/null +++ b/libjava/testsuite/libjava.lang/pr133.jar diff --git a/libjava/testsuite/libjava.lang/pr16789.jar b/libjava/testsuite/libjava.lang/pr16789.jar Binary files differnew file mode 100644 index 0000000..4c95e04 --- /dev/null +++ b/libjava/testsuite/libjava.lang/pr16789.jar diff --git a/libjava/testsuite/libjava.lang/pr17536.jar b/libjava/testsuite/libjava.lang/pr17536.jar Binary files differnew file mode 100644 index 0000000..513e4d9 --- /dev/null +++ b/libjava/testsuite/libjava.lang/pr17536.jar diff --git a/libjava/testsuite/libjava.lang/pr179.jar b/libjava/testsuite/libjava.lang/pr179.jar Binary files differnew file mode 100644 index 0000000..2eaee64 --- /dev/null +++ b/libjava/testsuite/libjava.lang/pr179.jar diff --git a/libjava/testsuite/libjava.lang/pr179.java b/libjava/testsuite/libjava.lang/pr179.java index 7124ded..9fd4657 100644 --- a/libjava/testsuite/libjava.lang/pr179.java +++ b/libjava/testsuite/libjava.lang/pr179.java @@ -4,6 +4,7 @@ // Class.isInstance() and Class.isAssignableFrom(), and isAssignableFrom() // functionality in the event that an interface argument that is not // implemented by any loaded class is given. +// Note that the desired output changed from 1.4 to 1.5. class A { @@ -46,14 +47,3 @@ public class pr179 System.out.println (C.class.isInstance (c)); } } - -/* Expected Output: -A initialized -false -B initialized -false -true -C initialized -false -true -*/ diff --git a/libjava/testsuite/libjava.lang/pr179.out b/libjava/testsuite/libjava.lang/pr179.out index 3a63ad6..0a43def 100644 --- a/libjava/testsuite/libjava.lang/pr179.out +++ b/libjava/testsuite/libjava.lang/pr179.out @@ -1,8 +1,7 @@ -A initialized false -B initialized false true -C initialized +A initialized false +C initialized true diff --git a/libjava/testsuite/libjava.lang/pr184.jar b/libjava/testsuite/libjava.lang/pr184.jar Binary files differnew file mode 100644 index 0000000..2770b3d --- /dev/null +++ b/libjava/testsuite/libjava.lang/pr184.jar diff --git a/libjava/testsuite/libjava.lang/pr21785.jar b/libjava/testsuite/libjava.lang/pr21785.jar Binary files differnew file mode 100644 index 0000000..e2edfd4 --- /dev/null +++ b/libjava/testsuite/libjava.lang/pr21785.jar diff --git a/libjava/testsuite/libjava.lang/pr21844.jar b/libjava/testsuite/libjava.lang/pr21844.jar Binary files differnew file mode 100644 index 0000000..92c7be5 --- /dev/null +++ b/libjava/testsuite/libjava.lang/pr21844.jar diff --git a/libjava/testsuite/libjava.lang/pr22211.jar b/libjava/testsuite/libjava.lang/pr22211.jar Binary files differnew file mode 100644 index 0000000..a743c44 --- /dev/null +++ b/libjava/testsuite/libjava.lang/pr22211.jar diff --git a/libjava/testsuite/libjava.lang/pr24321.jar b/libjava/testsuite/libjava.lang/pr24321.jar Binary files differnew file mode 100644 index 0000000..335298a --- /dev/null +++ b/libjava/testsuite/libjava.lang/pr24321.jar diff --git a/libjava/testsuite/libjava.lang/pr25676.jar b/libjava/testsuite/libjava.lang/pr25676.jar Binary files differnew file mode 100644 index 0000000..c0e0d4c --- /dev/null +++ b/libjava/testsuite/libjava.lang/pr25676.jar diff --git a/libjava/testsuite/libjava.lang/pr26390.jar b/libjava/testsuite/libjava.lang/pr26390.jar Binary files differnew file mode 100644 index 0000000..2320e40 --- /dev/null +++ b/libjava/testsuite/libjava.lang/pr26390.jar diff --git a/libjava/testsuite/libjava.lang/pr26990.jar b/libjava/testsuite/libjava.lang/pr26990.jar Binary files differnew file mode 100644 index 0000000..32ec056 --- /dev/null +++ b/libjava/testsuite/libjava.lang/pr26990.jar diff --git a/libjava/testsuite/libjava.lang/pr27171.jar b/libjava/testsuite/libjava.lang/pr27171.jar Binary files differnew file mode 100644 index 0000000..20422fb --- /dev/null +++ b/libjava/testsuite/libjava.lang/pr27171.jar diff --git a/libjava/testsuite/libjava.lang/pr6388.jar b/libjava/testsuite/libjava.lang/pr6388.jar Binary files differnew file mode 100644 index 0000000..5f4e4c0 --- /dev/null +++ b/libjava/testsuite/libjava.lang/pr6388.jar diff --git a/libjava/testsuite/libjava.lang/pr83.jar b/libjava/testsuite/libjava.lang/pr83.jar Binary files differnew file mode 100644 index 0000000..68e29f8 --- /dev/null +++ b/libjava/testsuite/libjava.lang/pr83.jar diff --git a/libjava/testsuite/libjava.lang/pr8415.jar b/libjava/testsuite/libjava.lang/pr8415.jar Binary files differnew file mode 100644 index 0000000..0701225 --- /dev/null +++ b/libjava/testsuite/libjava.lang/pr8415.jar diff --git a/libjava/testsuite/libjava.lang/pr8676.jar b/libjava/testsuite/libjava.lang/pr8676.jar Binary files differnew file mode 100644 index 0000000..a597301 --- /dev/null +++ b/libjava/testsuite/libjava.lang/pr8676.jar diff --git a/libjava/testsuite/libjava.lang/pr8823.jar b/libjava/testsuite/libjava.lang/pr8823.jar Binary files differnew file mode 100644 index 0000000..bb23284 --- /dev/null +++ b/libjava/testsuite/libjava.lang/pr8823.jar diff --git a/libjava/testsuite/libjava.lang/pr8945.jar b/libjava/testsuite/libjava.lang/pr8945.jar Binary files differnew file mode 100644 index 0000000..dd244b5 --- /dev/null +++ b/libjava/testsuite/libjava.lang/pr8945.jar diff --git a/libjava/testsuite/libjava.lang/private_direct_read.jar b/libjava/testsuite/libjava.lang/private_direct_read.jar Binary files differnew file mode 100644 index 0000000..e44c068 --- /dev/null +++ b/libjava/testsuite/libjava.lang/private_direct_read.jar diff --git a/libjava/testsuite/libjava.lang/private_direct_write.jar b/libjava/testsuite/libjava.lang/private_direct_write.jar Binary files differnew file mode 100644 index 0000000..06ef8bf --- /dev/null +++ b/libjava/testsuite/libjava.lang/private_direct_write.jar diff --git a/libjava/testsuite/libjava.lang/private_indirect_read.jar b/libjava/testsuite/libjava.lang/private_indirect_read.jar Binary files differnew file mode 100644 index 0000000..1683111 --- /dev/null +++ b/libjava/testsuite/libjava.lang/private_indirect_read.jar diff --git a/libjava/testsuite/libjava.lang/private_indirect_write.jar b/libjava/testsuite/libjava.lang/private_indirect_write.jar Binary files differnew file mode 100644 index 0000000..ace4c5a --- /dev/null +++ b/libjava/testsuite/libjava.lang/private_indirect_write.jar diff --git a/libjava/testsuite/libjava.lang/search_outer.jar b/libjava/testsuite/libjava.lang/search_outer.jar Binary files differnew file mode 100644 index 0000000..136dbb3 --- /dev/null +++ b/libjava/testsuite/libjava.lang/search_outer.jar diff --git a/libjava/testsuite/libjava.lang/shatest.jar b/libjava/testsuite/libjava.lang/shatest.jar Binary files differnew file mode 100644 index 0000000..58c3d4f --- /dev/null +++ b/libjava/testsuite/libjava.lang/shatest.jar diff --git a/libjava/testsuite/libjava.lang/stacktrace.jar b/libjava/testsuite/libjava.lang/stacktrace.jar Binary files differnew file mode 100644 index 0000000..9ae27ab --- /dev/null +++ b/libjava/testsuite/libjava.lang/stacktrace.jar diff --git a/libjava/testsuite/libjava.lang/stringconst.jar b/libjava/testsuite/libjava.lang/stringconst.jar Binary files differnew file mode 100644 index 0000000..aab9f93 --- /dev/null +++ b/libjava/testsuite/libjava.lang/stringconst.jar diff --git a/libjava/testsuite/libjava.lang/stringconst.xfail b/libjava/testsuite/libjava.lang/stringconst.xfail deleted file mode 100644 index e4c7ce3..0000000 --- a/libjava/testsuite/libjava.lang/stringconst.xfail +++ /dev/null @@ -1 +0,0 @@ -xfail-source-output diff --git a/libjava/testsuite/libjava.lang/stringconst2.jar b/libjava/testsuite/libjava.lang/stringconst2.jar Binary files differnew file mode 100644 index 0000000..5a6bee3 --- /dev/null +++ b/libjava/testsuite/libjava.lang/stringconst2.jar diff --git a/libjava/testsuite/libjava.lang/stub.jar b/libjava/testsuite/libjava.lang/stub.jar Binary files differnew file mode 100644 index 0000000..1c2fca1 --- /dev/null +++ b/libjava/testsuite/libjava.lang/stub.jar diff --git a/libjava/testsuite/libjava.lang/test_long.jar b/libjava/testsuite/libjava.lang/test_long.jar Binary files differnew file mode 100644 index 0000000..f6b3ee0 --- /dev/null +++ b/libjava/testsuite/libjava.lang/test_long.jar diff --git a/libjava/testsuite/libjava.lang/tmi.jar b/libjava/testsuite/libjava.lang/tmi.jar Binary files differnew file mode 100644 index 0000000..3e77d86 --- /dev/null +++ b/libjava/testsuite/libjava.lang/tmi.jar diff --git a/libjava/testsuite/libjava.lang/tp.jar b/libjava/testsuite/libjava.lang/tp.jar Binary files differnew file mode 100644 index 0000000..9cf6cb8 --- /dev/null +++ b/libjava/testsuite/libjava.lang/tp.jar diff --git a/libjava/testsuite/libjava.lang/update_outer.jar b/libjava/testsuite/libjava.lang/update_outer.jar Binary files differnew file mode 100644 index 0000000..f6489d0 --- /dev/null +++ b/libjava/testsuite/libjava.lang/update_outer.jar diff --git a/libjava/testsuite/libjava.lang/utf8concat.jar b/libjava/testsuite/libjava.lang/utf8concat.jar Binary files differnew file mode 100644 index 0000000..55ba02a --- /dev/null +++ b/libjava/testsuite/libjava.lang/utf8concat.jar diff --git a/libjava/testsuite/libjava.lang/utilTest.jar b/libjava/testsuite/libjava.lang/utilTest.jar Binary files differnew file mode 100644 index 0000000..f3a4169 --- /dev/null +++ b/libjava/testsuite/libjava.lang/utilTest.jar diff --git a/libjava/testsuite/libjava.lang/verify.jar b/libjava/testsuite/libjava.lang/verify.jar Binary files differnew file mode 100644 index 0000000..7946994b --- /dev/null +++ b/libjava/testsuite/libjava.lang/verify.jar diff --git a/libjava/testsuite/libjava.loader/TestEarlyGC.jar b/libjava/testsuite/libjava.loader/TestEarlyGC.jar Binary files differnew file mode 100644 index 0000000..7a9c0ef --- /dev/null +++ b/libjava/testsuite/libjava.loader/TestEarlyGC.jar diff --git a/libjava/testsuite/libjava.loader/TestLeak.jar b/libjava/testsuite/libjava.loader/TestLeak.jar Binary files differnew file mode 100644 index 0000000..d7bd247 --- /dev/null +++ b/libjava/testsuite/libjava.loader/TestLeak.jar diff --git a/libjava/testsuite/libjava.loader/TestLeak.java b/libjava/testsuite/libjava.loader/TestLeak.java index 9d467f2..3ef4525 100644 --- a/libjava/testsuite/libjava.loader/TestLeak.java +++ b/libjava/testsuite/libjava.loader/TestLeak.java @@ -1,9 +1,9 @@ import java.net.*; -import java.lang.reflect.*; +import java.lang.reflect.Proxy; public class TestLeak { - class MyLoader extends URLClassLoader + static class MyLoader extends URLClassLoader { public MyLoader (URL urls[]) { diff --git a/libjava/testsuite/libjava.loader/TestMultiple.jar b/libjava/testsuite/libjava.loader/TestMultiple.jar Binary files differnew file mode 100644 index 0000000..dfb454c --- /dev/null +++ b/libjava/testsuite/libjava.loader/TestMultiple.jar diff --git a/libjava/testsuite/libjava.loader/TestParent.jar b/libjava/testsuite/libjava.loader/TestParent.jar Binary files differnew file mode 100644 index 0000000..41f66db --- /dev/null +++ b/libjava/testsuite/libjava.loader/TestParent.jar diff --git a/libjava/testsuite/libjava.loader/dummy.class b/libjava/testsuite/libjava.loader/dummy.class Binary files differnew file mode 100644 index 0000000..58ffb90 --- /dev/null +++ b/libjava/testsuite/libjava.loader/dummy.class diff --git a/libjava/testsuite/libjava.loader/loader.exp b/libjava/testsuite/libjava.loader/loader.exp index 86e5181..a94e4e9 100644 --- a/libjava/testsuite/libjava.loader/loader.exp +++ b/libjava/testsuite/libjava.loader/loader.exp @@ -21,7 +21,7 @@ proc gcj_loader_test_one {srcfile} { set errname [file rootname [file tail $srcfile]] set args [libjava_arguments link] - lappend args "additional_flags=--main=[file rootname [file tail $srcfile]] $srcdir/$subdir/MyLoader.java $objdir/[gcj_object_file_name $args dummy]" + lappend args "additional_flags=--main=[file rootname [file tail $srcfile]] [gcj_object_file_name $args dummy]" set x [libjava_prune_warnings \ [libjava_tcompile $srcfile "$executable" executable $args]] @@ -45,19 +45,19 @@ proc gcj_loader_run {} { global build_triplet host_triplet global GCJ_UNDER_TEST - set file "${srcdir}/${subdir}/dummy.java" - if {! [bytecompile_file $file [pwd]]} { - fail "bytecompile $file" - # FIXME - should use `untested' on all remaining tests. - # But that is hard. - return 0 - } - pass "bytecompile $file" +# set file "${srcdir}/${subdir}/dummy.java" +# if {! [bytecompile_file $file [pwd]]} { +# fail "bytecompile $file" +# # FIXME - should use `untested' on all remaining tests. +# # But that is hard. +# return 0 +# } +# pass "bytecompile $file" set args [libjava_arguments compile] - lappend args "additional_flags=--resource $objdir/dummy.class" + lappend args "additional_flags=--resource $srcdir/$subdir/dummy.class" set x [libjava_prune_warnings \ - [libjava_tcompile "$objdir/dummy.class" "$objdir/[gcj_object_file_name $args dummy]" object $args]] + [libjava_tcompile "$srcdir/$subdir/dummy.class" "$objdir/[gcj_object_file_name $args dummy]" object $args]] if { $x != "" } { verbose "resource compilation failed: $x" 2 @@ -67,7 +67,7 @@ proc gcj_loader_run {} { } pass "resource compilation: dummy.class" - catch { lsort [glob -nocomplain ${srcdir}/${subdir}/Test*.java] } srcfiles + catch { lsort [glob -nocomplain ${srcdir}/${subdir}/Test*.jar] } srcfiles foreach x $srcfiles { gcj_loader_test_one $x diff --git a/libjava/testsuite/libjava.special/special.exp b/libjava/testsuite/libjava.special/special.exp index ab18b47..8397f85 100644 --- a/libjava/testsuite/libjava.special/special.exp +++ b/libjava/testsuite/libjava.special/special.exp @@ -1,5 +1,10 @@ # Special test cases. These require tricky build procedures. +proc gcj_special_try_compiler {} { + global srcdir subdir + return [bytecompile_file ${srcdir}/${subdir}/pr21115I.java [pwd]] +} + proc gcj_special_pr21115 {} { global srcdir subdir env @@ -94,5 +99,10 @@ proc gcj_special_lazy_illegal_access {} { return 1 } -gcj_special_pr21115 -gcj_special_lazy_illegal_access +# For these tests it is simpler to require that gcj work. So we try +# the compiler and if it fails, we simply skip the tests. + +if {[gcj_special_try_compiler]} { + gcj_special_pr21115 + gcj_special_lazy_illegal_access +} |