diff options
Diffstat (limited to 'libjava/testsuite')
329 files changed, 0 insertions, 9128 deletions
diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog deleted file mode 100644 index 90f933f5ab1..00000000000 --- a/libjava/testsuite/ChangeLog +++ /dev/null @@ -1,990 +0,0 @@ -2000-07-11 Andrew Haley <aph@cygnus.com> - - * libjava.compile/static_init2.java: New file. - -2000-07-07 Tom Tromey <tromey@cygnus.com> - - * libjava.lang/stringconst2.out: New file. - * libjava.lang/stringconst2.java: New file. - -2000-06-23 Tom Tromey <tromey@cygnus.com> - - For PR gcj/260: - * libjava.lang/PR260.out: New file. - * libjava.lang/PR260.java: New file. - -2000-06-13 Warren Levy <warrenl@cygnus.com> - - Test for PR java.lang/258: - * libjava.lang/Class_1.java: New file. - * libjava.lang/Class_1.out: New file. - -2000-05-29 Bryce McKinlay <bryce@albatross.co.nz> - - * libjava.lang/PR242.java: New file. PR gcj/242. - -2000-05-23 Tom Tromey <tromey@cygnus.com> - - * libjava.compile/PR238.java: New file. For PR gcj/238. - - * libjava.lang/stringconst.out: New file. - * libjava.lang/stringconst.java: New file. - -2000-05-22 Bryce McKinlay <bryce@albatross.co.nz> - - * libjava.compile/PR232B.java: Additional PR gcj/232 test. - -2000-05-22 Tom Tromey <tromey@cygnus.com> - - * libjava.compile/PR235.java: New file. For PR gcj/235. - -2000-05-21 Tom Tromey <tromey@cygnus.com> - - * libjava.compile/PR234.java: New file. For PR gcj/234. - -2000-05-22 Bryce McKinlay <bryce@albatross.co.nz> - - Test for PR gcj/232: - * libjava.compile/PR232.java: New file. - -2000-05-18 Tom Tromey <tromey@cygnus.com> - - * lib/libjava.exp (bytecompile_file): Use exec, not system. - -2000-05-17 Tom Tromey <tromey@cygnus.com> - - * libjava.mauve/mauve.exp (test_mauve): Call `prune_warnings'. - (test_mauve_sim): Likewise. - (test_mauve): Redirect stderr in system call. - (test_mauve_sim): Likewise. - * lib/libjava.exp (test_libjava_from_source): Call - `prune_warnings'. - (test_libjava_from_javac): Likewise. - (bytecompile_file): Redirect stderr in system call. - * lib/libjava.exp (libjava_find_program): New proc. - (find_jvscan): Use it. - (find_gcjh): New proc. - - * libjava.compile/compile.exp: Use "", not $options. - -2000-05-16 Tom Tromey <tromey@cygnus.com> - - * libjava.lang/instance.out: New file. - * libjava.lang/instance.java: New file. - -2000-05-10 Bryce McKinlay <bryce@albatross.co.nz> - - * libjava.lang/StringBuffer_1.java: New file. - * libjava.lang/StringBuffer_1.out: New file. - -2000-05-08 Bryce McKinlay <bryce@albatross.co.nz> - - Test for PR gcj/224: - * libjava.compile/PR224.java: New file. - * libjava.compile/PR224.xfail: New file. - -2000-04-28 Bryce McKinlay <bryce@albatross.co.nz> - - Test for PR gcj/218: - * libjava.lang/PR218.java: New file. - * libjava.lang/PR218.out: New file. - -2000-04-25 Alexandre Petit-Bianco <apbianco@cygnus.com> - - * libjava.compile/MethodFailure4.java: New file. - * libjava.compile/MethodFailure4.out: New file. - -2000-04-20 Alexandre Petit-Bianco <apbianco@cygnus.com> - - * libjava.compile/block.java: New file. - * libjava.compile/block.out: New file. - -2000-04-20 Tom Tromey <tromey@cygnus.com> - - * libjava.jni/throwit.out: Fixed output to be correct. - - * libjava.jni/noclass.java (main): `find_it' throws an exception. - -2000-04-16 Anthony Green <green@redhat.com> - - * libjava.compile/PR209.java: New file. - -2000-04-16 Anthony Green <green@redhat.com> - - * libjava.compile/PR208.java: New file. - -2000-04-16 Anthony Green <green@redhat.com> - - * libjava.compile/PR207.java: New file. - libjava.compile/PR207_A.java: New file. - libjava.compile/PR206.java: New file. - libjava.compile/PR206_A.java: New file. - -2000-04-14 Bryce McKinlay <bryce@albatross.co.nz> - - Additional test for PR gcj/148: - * libjava.compile/assignment_2.java: New file. - -2000-03-28 Bryce McKinlay <bryce@albatross.co.nz> - - Test case for PR libgcj/184: - * libjava.lang/pr184.java: New file. - * libjava.lang/pr184.out: New file. - -2000-03-27 Tom Tromey <tromey@cygnus.com> - - * libjava.lang/test_long.out: New file. - * libjava.lang/test_long.java: New file. - -2000-03-26 Tom Tromey <tromey@cygnus.com> - - * libjava.lang/Array_1.xfail: Removed. - -2000-03-23 Bryce McKinlay <bryce@albatross.co.nz> - - * libjava.lang/Thread_Wait.java: New file. - * libjava.lang/Thread_Sleep.java: New file. - * libjava.lang/Thread_Monitor.java: New file. - * libjava.lang/Thread_Wait.out: New file. - * libjava.lang/Thread_Sleep.out: New file. - * libjava.lang/Thread_Monitor.out: New file. - * libjava.lang/Thread_Interrupt.java: New file. - * libjava.lang/Thread_Wait_2.java: New file. - * libjava.lang/Thread_Wait_2.out: New file. - * libjava.lang/Thread_Wait_Interrupt.java: New file. - * libjava.lang/Thread_Wait_Interrupt.out: New file. - * libjava.lang/Thread_Interrupt.out: New file. - * libjava.lang/Thread_Join.java: New file. - * libjava.lang/Thread_Join.out: New file. - * libjava.lang/Thread_Alive.java: New file. - * libjava.lang/Thread_Alive.out: New file. - -2000-03-22 Tom Tromey <tromey@cygnus.com> - - * libjava.compile/iface.java: New file. - * libjava.compile/static_3.java: New file. - * libjava.compile/static_2.java: New file. - * libjava.compile/static_1.xfail: New file. - * libjava.compile/static_1.java: New file. - * libjava.compile/redef6.xfail: New file. - * libjava.compile/redef6.java: New file. - * libjava.compile/redef5.xfail: New file. - * libjava.compile/redef5.java: New file. - * libjava.compile/redef4.xfail: New file. - * libjava.compile/redef4.java: New file. - * libjava.compile/redef3.xfail: New file. - * libjava.compile/redef3.java: New file. - * libjava.compile/redef2.xfail: New file. - * libjava.compile/redef2.java: New file. - * libjava.compile/redef1.xfail: New file. - * libjava.compile/redef1.java: New file. - * libjava.compile/not_a_redef.java: New file. - * libjava.compile/inner_1.java: New file. - * libjava.compile/static_init.xfail: New file. - * libjava.compile/static_init.java: New file. - -2000-03-21 Bryce McKinlay <bryce@albatross.co.nz> - - Test case for PR libgcj/179: - * libjava.lang/pr179.java: New file. - * libjava.lang/pr179.out: New file. - -2000-03-18 Tom Tromey <tromey@cygnus.com> - - * libjava.lang/pr109.java: Added `println' at end. - -2000-03-15 Tom Tromey <tromey@cygnus.com> - - * libjava.compile/pr176.java: New file, for PR gcj/176. - -2000-03-15 Bryce McKinlay <bryce@albatross.co.nz> - - * libjava.compile/pr172.java: Correct classname to match file name. - * libjava.compile/pr174.java: ditto. Remove superfluous main() - method. - * libjava.compile/PR140.xfail: New file. - -2000-03-14 Tom Tromey <tromey@cygnus.com> - - * libjava.compile/PR140.java: New file, for PR gcj/140. - - * libjava.compile/pr172.java: New file, for PR gcj/172. - - * libjava.compile/pr174.java: New file, for PR gcj/174. - -2000-03-07 Tom Tromey <tromey@cygnus.com> - - * libjava.lang/PR162.java: Mention `PR162', not `Test', as class - name. - -2000-03-07 Bryce McKinlay <bryce@albatross.co.nz> - - Test for PR gcj/163: - * libjava.lang/PR163.java: New file. - * libjava.lang/PR163.xfail: New file. - -2000-03-07 Tom Tromey <tromey@cygnus.com> - - * lib/libjava.exp (test_libjava_from_javac): Removed hack for - interfaces. Fail if jv-scan reports a parse error. - - Test for PR gcj/162: - * libjava.lang/PR162.out: New file. - * libjava.lang/PR162.java: New file. - -2000-03-06 Tom Tromey <tromey@cygnus.com> - - Test for PR gcj/164: - * libjava.compile/PR164.xfail: New file. - * libjava.compile/PR164.java: New file. - -2000-03-06 Bryce McKinlay <bryce@albatross.co.nz> - - * libjava.compile/PR127.java: New file. - * libjava.compile/PR127.xfail: New file. - PR 127 test case from Joerg Brunsmann. - -2000-03-05 Tom Tromey <tromey@cygnus.com> - - * lib/libjava.exp (test_libjava): Document `shouldfail' token. - (test_libjava_from_source): Handle `shouldfail' case. - (test_libjava_from_javac): Likewise. - - Test for PR libgcj/124: - * libjava.compile/PR124.java: New file. - * libjava.compile/PR124.xfail: New file. - -2000-03-05 Anthony Green <green@redhat.com> - - * libjava.lang/PR141.java: New file. - * libjava.lang/PR141.out: New file. - For PR java.io/141. - -2000-03-05 Anthony Green <green@redhat.com> - - * libjava.compile/PR129_B.java: New file. - * libjava.compile/support/PR129_A.java: New file. - For PR gcj/129. - -2000-03-04 Anthony Green <green@redhat.com> - - * libjava.lang/PR160.java: New file. - * libjava.lang/PR160.out: New file. - -2000-02-28 Mo DeJong <mdejong@cygnus.com> - - * libjava.compile/static_inner.java: New file. - -2000-02-23 Tom Tromey <tromey@cygnus.com> - - * libjava.jni/noclass.c: New file. - * libjava.jni/noclass.out: New file. - * libjava.jni/noclass.java: New file. - -2000-02-18 Tom Tromey <tromey@cygnus.com> - - * libjava.jni/register.java: New file. - * libjava.jni/register.c: New file. - * libjava.jni/register.out: New file. - -2000-02-16 Tom Tromey <tromey@cygnus.com> - - * libjava.jni/calls.c: New file. - * libjava.jni/calls.out: New file. - * libjava.jni/calls.java: New file. - - * libjava.jni/throwit.java: New file. - * libjava.jni/throwit.c: New file. - * libjava.jni/throwit.out: New file. - -2000-02-15 Tom Tromey <tromey@cygnus.com> - - * libjava.jni/findclass.java: New file - * libjava.jni/findclass.c: New file - * libjava.jni/findclass.out: New file - -2000-02-16 Bryce McKinlay <bryce@albatross.co.nz> - - * libjava.lang/InterfaceDispatch.java: New file. - * libjava.lang/InterfaceDispatch.out: New file. - -2000-02-15 Tom Tromey <tromey@cygnus.com> - - * libjava.jni/virtual.java: New file. - * libjava.jni/virtual.c: New file. - * libjava.jni/virtual.out: New file. - * libjava.jni/final_method.java: New file. - * libjava.jni/final_method.c: New file. - * libjava.jni/final_method.out: New file. - * libjava.jni/overload.java: New file. - * libjava.jni/overload.c: New file. - * libjava.jni/overload.out: New file. - * libjava.jni/simple_int.java: New file. - * libjava.jni/simple_int.c: New file. - * libjava.jni/simple_int.out: New file. - * libjava.jni/invoke.out: New file. - * libjava.jni/invoke.c: New file. - * libjava.jni/invoke.java: New file. - -2000-02-12 Anthony Green <green@cygnus.com> - - * libjava.compile/comment.java: New file. - -2000-02-12 Anthony Green <green@cygnus.com> - - * libjava.compile/assignment.java: New file. - -2000-02-12 Anthony Green <green@cygnus.com> - - * libjava.compile/inner_data.java: New file. - -2000-02-12 Anthony Green <green@cygnus.com> - - * libjava.compile/inner_inherit.java: New file. - -2000-02-12 Alexandre Petit-Bianco <apbianco@cygnus.com> - - * libjava.lang/inner_interface.out: New file. - * libjava.lang/inner_interface.java: New file. - * libjava.lang/final_int.out: New file. - * libjava.lang/final_int.java: New file. - * libjava.lang/final_static_and_friend.out: New file. - * libjava.lang/final_static_and_friend.java: New file. - -2000-02-07 Alexandre Petit-Bianco <apbianco@cygnus.com> - - * libjava.lang/anonarray3.out: New file. - * libjava.lang/anonarray3.java: New file. - -2000-02-09 Tom Tromey <tromey@cygnus.com> - - * libjava.compile/inner_priv.java: New file. - -2000-02-07 Alexandre Petit-Bianco <apbianco@cygnus.com> - - * libjava.lang/instinit2.out: New file. - * libjava.lang/instinit2.java: New file. - * libjava.lang/instinit.out: New file. - * libjava.lang/instinit.java: New file. - * libjava.lang/anonarray2.out: New file. - * libjava.lang/anonarray2.java: New file. - * libjava.lang/anonarray.out: New file. - * libjava.lang/anonarray.java: New file. - * libjava.lang/nested_with_ctor.out: New file. - * libjava.lang/nested_with_ctor.java: New file. - * libjava.lang/anfi.out: New file. - * libjava.lang/anfi.java: New file. - * libjava.lang/stub.out: New file. - * libjava.lang/stub.java: New file. - -2000-01-30 Alexandre Petit-Bianco <apbianco@cygnus.com> - - * libjava.lang/final_inner.java: New file. - * libjava.lang/final_inner.out: Likewise. - -2000-01-20 Tom Tromey <tromey@cygnus.com> - - * libjava.compile/BlankFinal.java: New file. - -2000-01-19 Alexandre Petit-Bianco <apbianco@cygnus.com> - - * libjava.lang/anon.java, libjava.lang/anon2.java, - libjava.lang/anon3.java, libjava.lang/anon4.java, - libjava.lang/direct_read.java, libjava.lang/direct_write.java, - libjava.lang/indirect.java, libjava.lang/indirect_read.java, - libjava.lang/indirect_write.java, libjava.lang/inner1.java, - libjava.lang/inner2.java, libjava.lang/inner3.java, - libjava.lang/inner4.java, libjava.lang/inner_array.java, - libjava.lang/multiple_finit.java, - libjava.lang/private_direct_read.java, - libjava.lang/private_direct_write.java, - libjava.lang/private_indirect_read.java, - libjava.lang/private_indirect_write.java, - libjava.lang/search_outer.java, libjava.lang/tmi.java, - libjava.lang/tp.java, libjava.lang/update_outer.java: New files. - -2000-01-18 Tom Tromey <tromey@cygnus.com> - - * libjava.compile/inner_pub.java: New file. - -2000-01-16 Anthony Green <green@cygnus.com> - - * libjava.lang/pr133.out: New file. - * libjava.lang/pr133.java: New file. - - * libjava.lang/pr100.xpo: New file. - * libjava.lang/pr100.java: New file. - -2000-01-16 Anthony Green <green@cygnus.com> - - * libjava.lang/pr93.xpo: New file. - * libjava.lang/pr93.java: New file. - -2000-01-16 Anthony Green <green@cygnus.com> - - * libjava.lang/lang.exp: Handle regexp matches correctly. - -2000-01-16 Anthony Green <green@cygnus.com> - - * libjava.lang/pr83.out: New file. - * libjava.lang/pr83.java: New file. - - * libjava.lang/pr109.out: New file. - * libjava.lang/pr109.java: New file. - -2000-01-11 Tom Tromey <tromey@cygnus.com> - - * libjava.lang/klass.out: New file. - * libjava.lang/klass.java: New file. - -1999-12-31 Tom Tromey <tromey@cygnus.com> - - * libjava.mauve/mauve.exp (mauve_compute_uses): Let user select - specific tests to run. - -1999-10-19 Bryce McKinlay <bryce@albatross.co.nz> - - * libjava.compile/invokeinterface: New directory. - * libjava.compile/invokeinterface/Test.java: New file. Test code for - PR gcj/71 and PR gcj/72. - * libjava.compile/invokeinterface/A.java: New file. - * libjava.compile/invokeinterface/B.java: New file. - -1999-10-02 Anthony Green <green@cygnus.com> - - * libjava.compile/Case.xfail: Removed. This test should pass now. - - * libjava.compile/compile.exp: Copied from test.exp. - * libjava.compile/test.exp: Removed. - - * libjava.lang/lang.exp: Copied from test.exp. - * libjava.lang/test.exp: Removed. - -1999-10-01 Tom Tromey <tromey@cygnus.com> - - * libjava.lang/PR56.out: New file. - * libjava.lang/PR56.java: New file. - -1999-09-29 Tom Tromey <tromey@cygnus.com> - - * libjava.lang/PR55.out: New file. - * libjava.lang/PR55.java: New file. - -1999-08-25 Tom Tromey <tromey@cygnus.com> - - * libjava.toshiba/G19990304_01.out: New file. - * libjava.toshiba/G19990304_01.java: New file. - - * libjava.lang/G19990310_01.out: New file. - * libjava.lang/G19990310_01.java: New file. - -1999-08-17 Tom Tromey <tromey@cygnus.com> - - From Bryce McKinlay: - * libjava.lang/Array_2.java: New file. - * libjava.lang/Array_2.out: New file. - -1999-08-09 Anthony Green <green@cygnus.com> - - * libjava.lang/Primes.java: New file. - * libjava.lang/Primes.out: New file. - -1999-07-31 Alexandre Oliva <oliva@dcc.unicamp.br> - - * lib/libjava.exp (bytecompile_file): Use `env(SUN_JAVAC)', that - defaults to javac, as Sun-javac compiler or compatible. - (libjava_init): Get GCJ from environment if neither GCJ_UNDER_TEST - nor TOOL_EXECUTABLE are set. Set `original_ld_library_path' from - environment. - (libjava_arguments): Prepend `.' and `$srcdir/$subdir' to - CLASSPATH, for `support' sources. Search for libgcj.spec in - `$objdir/..', by adding -B to GCJ_UNDER_TEST. Append - original_ld_library_path to ld_library_path. - * libjava.mauve/mauve.exp (test_mauve): Set `env(GCJ)' from - GCJ_UNDER_TEST, calculated just like in libjava.exp. - -1999-07-14 Tom Tromey <tromey@cygnus.com> - - * libjava.compile/G19990217_02.no-link: New file. - * libjava.compile/test.exp: Look for `.no-link' file. - * lib/libjava.exp (test_libjava_from_source): Added `no-link' - option. - (test_libjava_from_javac): Likewise. Also, handle package - information from class name when creating class file name. - -1999-07-13 Tom Tromey <tromey@cygnus.com> - - * libjava.lang/test.exp: New file. - * libjava.lang/err9.out: New file. - * libjava.lang/err9.java: New file. - * libjava.lang/err8.out: New file. - * libjava.lang/err8.java: New file. - * libjava.lang/err7.out: New file. - * libjava.lang/err7.java: New file. - * libjava.lang/err6.out: New file. - * libjava.lang/err6.java: New file. - * libjava.lang/err5.out: New file. - * libjava.lang/err5.java: New file. - * libjava.lang/err4.out: New file. - * libjava.lang/err4.java: New file. - * libjava.lang/err3.out: New file. - * libjava.lang/err3.java: New file. - * libjava.lang/err2.out: New file. - * libjava.lang/err2.java: New file. - * libjava.lang/err13.out: New file. - * libjava.lang/err13.java: New file. - * libjava.lang/err12.out: New file. - * libjava.lang/err12.java: New file. - * libjava.lang/err11.out: New file. - * libjava.lang/err11.java: New file. - * libjava.lang/err10.out: New file. - * libjava.lang/err10.java: New file. - * libjava.lang/err1.out: New file. - * libjava.lang/err1.java: New file. - * libjava.lang/N19990310_5.out: New file. - * libjava.lang/N19990310_5.java: New file. - * libjava.lang/N19990310_4.out: New file. - * libjava.lang/N19990310_4.java: New file. - * libjava.lang/N19990310_3.out: New file. - * libjava.lang/N19990310_3.java: New file. - * libjava.lang/N19990310_02.out: New file. - * libjava.lang/N19990310_02.java: New file. - * libjava.lang/G19990303_02.out: New file. - * libjava.lang/G19990303_02.java: New file. - * libjava.lang/G19990303_01.out: New file. - * libjava.lang/G19990303_01.java: New file. - * libjava.lang/G19990302_02.out: New file. - * libjava.lang/G19990302_02.java: New file. - * libjava.lang/G19990301_01.out: New file. - * libjava.lang/G19990301_01.java: New file. - - * libjava.compile/N19990317.java: New file. - * libjava.compile/N19990310_01.java: New file. - * libjava.compile/G19990225_01.java: New file. - * libjava.compile/G19990217_02.java: New file. - * libjava.compile/G19990217_01.java: New file. - * libjava.compile/G19990210_3.java: New file. - * libjava.compile/G19990210_2.java: New file. - * libjava.compile/G19990210_1.java: New file. - -1999-07-06 Tom Tromey <tromey@cygnus.com> - - * libjava.lang/Final.xfail: Output fails, not exec. - - * libjava.lang/Final.xfail: New file. - * libjava.compile/Case.xfail: New file. - * libjava.compile/Where.xfail: New file. - * libjava.compile/test.exp: Look for `.xfail' files. - * libjava.lang/test.exp: Don't look for `.arg' files. - Do look for `.xfail' files. - * lib/libjava.exp (test_libjava_from_source): Changed meaning of - `exec_args' argument. Handle `xfail-*' arguments. - (test_libjava_from_javac): Likewise. - (test_libjava): Likewise. - (libjava_read_xfail): New proc. - -1999-07-05 Bryce McKinlay <bryce@albatross.co.nz> - - * libjava.lang/Final.java: Added. - * libjava.lang/Final.out: Added. - -1999-07-02 Tom Tromey <tromey@cygnus.com> - - * libjava.lang/Finalize_1.out: Removed. - * libjava.lang/Finalize_1.java: Removed. - - * libjava.lang/Thread_1.out: Updated. - * libjava.lang/Thread_1.java: Don't run exit test. - -Thu Jul 1 16:22:19 1999 Anthony Green <green@cygnus.com> - - * libjava.mauve/mauve.exp: Don't stop counting test results - prematurely. - -1999-06-25 Tom Tromey <tromey@cygnus.com> - - * lib/libjava.exp (test_libjava_from_javac): Fixed typo. Always - make class_files a list. - - * lib/libjava.exp (test_libjava_from_javac): Prepend `$objdir/' to - class file names. - -1999-06-24 Tom Tromey <tromey@cygnus.com> - - * lib/libjava.exp (libjava_arguments): If `libtool' not found in - build tree, just use $GCJ_UNDER_TEST as compiler. - -1999-06-23 Tom Tromey <tromey@cygnus.com> - - * lib/libjava.exp (libjava_arguments): Handle -lzgcj. - -1999-05-24 Anthony Green <green@cygnus.com> - - * libjava.lang/Shazam.java: New file. - libjava.lang/Shazam.out: New file. - -1999-05-12 Andrew Haley <aph@cygnus.com> - - * libjava.lang/Invoke_2.java: New file. - -1999-05-03 Tom Tromey <tromey@cygnus.com> - - * lib/libjava.exp (libjava_arguments): Don't use -nodefaultlibs. - (libjava_find_lib): Add `-L' option to find the actual library. - - * libjava.mauve/mauve.exp (test_mauve): Pass `link' to - libjava_arguments when linking. - (test_mauve_sim): Likewise. - * lib/libjava.exp (libjava_arguments): Run `libtool' to link. - Don't use `-static'. Added `mode' argument. Use -nodefaultlibs - when linking. - (test_libjava_from_source): Mention why target_compile failed. - Pass `link' to libjava_arguments when linking. Only do `xfails' - for tests we would actually have run. - (test_libjava_from_javac): Likewise. - (libjava_find_lib): Return name of `.la' file. - -1999-04-26 Tom Tromey <tromey@cygnus.com> - - * lib/libjava.exp (libjava_find_lib): New proc. - (libjava_arguments): Use it. Force static linking. - -Thu Apr 22 14:19:35 1999 Anthony Green <green@cygnus.com> - - * libjava.compile/OperatorBenchmark.java: New file. - -1999-04-09 Warren Levy <warrenl@cygnus.com> - - * libjava.mauve/mauve.exp (KEYS): Default to libgcj. - -1999-04-09 Tom Tromey <tromey@cygnus.com> - - * libjava.compile/plusplus.java: New file. - From MoT <Sebastien.Villemot@ens.fr>. - -1999-04-06 Tom Tromey <tromey@cygnus.com> - - * libjava.mauve/mauve.exp (test_mauve_sim): Reference - mauve-libgcj. - (test_mauve): Likewise. - -1999-03-30 Tom Tromey <tromey@cygnus.com> - - * libjava.mauve/mauve.exp: Renamed from test.exp. With the new - name it is easier to run just the Mauve tests. - - * libjava.mauve/test.exp (test_mauve): Added gnu/testlet/config to - list of files to link in. - (test_mauve_sim): Likewise. - * libjava.mauve/DejaGNUTestHarness.java (srcdir, tmpdir): New - static variables. - (DejaGNUTestHarness): Removed argument from constructor. - (dejasrcdir): New static variable. - (main): Set `dejasrcdir'. - (getSourceDirectory): New method. - -1999-03-08 Tom Tromey <tromey@cygnus.com> - - * libjava.compile/perc.java: New file. - -1999-02-26 Tom Tromey <tromey@cygnus.com> - - * libjava.util/test.exp: Removed. - -1999-02-25 Tom Tromey <tromey@cygnus.com> - - * libjava.mauve/test.exp: Make sure current directory is correct - after tests are run. - - * libjava.mauve/test.exp (test_mauve): Removed extra arg in call - to bytecompile_file. - (test_mauve_sim): Likewise. - -Thu Feb 25 09:21:03 1999 Anthony Green <green@cygnus.com> - - * libjava.compile/euc_comment1.java, - libjava.compile/euc_comment2.java, - libjava.compile/euc_comment3.java, - libjava.compile/euc_comment1.java, - libjava.compile/euc_comment2.java, - libjava.compile/euc_comment3.java: New files. - - * libjava.compile/Case.java, libjava.compile/support/Case.java: - New files. - -1999-02-24 Tom Tromey <tromey@cygnus.com> - - * lib/libjava.exp (find_jvscan): New proc. - (bytecompile_file): Removed `srcfile_in' argument. - (test_libjava_from_javac): Use `jv-scan' program to find name of - `main' and name of all generated classes. Compile all generated - classes, not just primary class. For no-exec tests, only try to - build the .o, not the full executable. - -Wed Feb 24 11:22:32 1999 Anthony Green <green@hoser.cygnus.com> - - * libjava.compile/test.exp: Minor fix. - -1999-02-23 Anthony Green <green@cygnus.com> - - * libjava.compile/Where.java, libjava.compile/support/Waldo.java, - libjava.compile/Twice.java, libjava.compile/Semi.java, - libjava.compile/Statics.java, libjava.compile/test.exp, - libjava.lang/Synch.java, libjava.lang/Synch.out: New files. - -1999-02-16 Tom Tromey <tromey@cygnus.com> - - * Makefile.in: Rebuilt. - * Makefile.am (AUTOMAKE_OPTIONS): Added no-installinfo. - -Wed Feb 17 19:53:51 1999 Warren Levy <warrenl@cygnus.com> - - * libjava.mauve/test.exp: modified file allows Mauve tests to - run on JMR board; simplified script to use same procedure for - all testing - -1999-02-10 Tom Tromey <tromey@cygnus.com> - - * lib/libjava.exp (libjava_arguments): Updated to track library - renames. - -1999-02-07 Tom Tromey <tromey@cygnus.com> - - * libjava.lang/slash.java: New file. - * libjava.lang/slash.out: New file. - -Mon Feb 1 05:17:40 1999 Anthony Green <green@fencer.cygnus.com> - - * lib/libjava.exp: Test compiling from source as well as from - bytecodes. - -1999-01-11 Tom Tromey <tromey@cygnus.com> - - * libjava.mauve/test.exp (mauve_compute_uses): Read classes file, - not choices file. - - * libjava.mauve/test.exp (test_mauve): Added - ResourceNotFoundException to list of harness files to compile. - (test_mauve_sim): Likewise. - -1998-12-17 Tom Tromey <tromey@cygnus.com> - - * libjava.lang/Invoke_1.java: New file. - - * libjava.lang/Thread_1.java (Thread_1): Class now public. - * libjava.lang/Array_1.java (Array_1): Class now public. - - * libjava.lang/Throw_1.out: New file. - * libjava.lang/Throw_1.java: New file. - -1998-12-11 Tom Tromey <tromey@cygnus.com> - - * lib/libjava.exp (libjava_arguments): New proc. - (test_libjava): Use it. - (bytecompile_file): Added classpath argument. - * libjava.mauve/test.exp: New file. - * libjava.mauve/DejaGNUTestHarness.java: New file. - -1998-12-08 Tom Tromey <tromey@cygnus.com> - - * Various: removed all test files that migrated to Mauve. - -1998-12-07 Tom Tromey <tromey@cygnus.com> - - * libjava.lang/Array_1.java (main): Removed extraneous - getSuperclass call. - -1998-11-23 Tom Tromey <tromey@cygnus.com> - - * libjava.lang/Finalize_1.java (main): Clear `f' before GC. - -1998-10-08 Tom Tromey <tromey@cygnus.com> - - * libjava.lang/Thread_1.out: Added missing line. - -Fri Oct 2 14:55:46 1998 Tom Tromey <tromey@cygnus.com> - - * libjava.lang/Array_1.java: Changed so Cloneable test can run - even if clone test itself fails. - - * libjava.lang/Array_1.java: Uncommented calls to getSuperclass. - Added test to see if array implements Cloneable. - -Thu Oct 1 11:28:06 1998 Tom Tromey <tromey@cygnus.com> - - * libjava.lang/Array_1.java: New file. - * libjava.lang/Array_1.out: New file. - -Thu Oct 1 13:51:00 1998 Anthony Green <green@cygnus.com> - - * testsuite/lib/libjava.exp: Find qthreads library correctly. - -Tue Sep 29 16:36:43 1998 Warren Levy <warrenl@cygnus.com> - - * libjava.util/Hashtable_1.java, libjava.util/Hashtable_1.out: Created. - -Tue Sep 29 00:40:26 1998 Tom Tromey <tromey@cygnus.com> - - * libjava.lang/Thread_1.java (started): New field. - (run): Set `started'. Handle all synchronization here. - (Thread_1): Initialize `started'. - (doit): Just start both threads and let them handle their own - synchronization. - - * libjava.lang/Boolean_5.out: Changed to reflect the - Boolean_5.java changes. - * libjava.lang/Boolean_5.java: Don't replace the system - properties, just augment them. Don't print the property object. - * libjava.lang/Long_2.out: Changed to reflect Long_2.java - changes. - * libjava.lang/Long_2.java: Don't replace the system properties, - just augment them. Don't print the property object. - * libjava.lang/Integer_2.out: Changed to reflect Integer_2.java - changes. - * libjava.lang/Integer_2.java: Don't replace the system - properties, just augment them. Don't print the property object. - -Sat Sep 26 15:57:39 1998 Tom Tromey <tromey@cygnus.com> - - * libjava.lang/Thread_1.java (main): Catch InterruptedException. - -Tue Sep 22 13:45:58 1998 Tom Tromey <tromey@cygnus.com> - - * libjava.lang/Thread_1.out: New file. - * libjava.lang/Thread_1.java: New file. - -Mon Sep 21 14:20:08 1998 Tom Tromey <tromey@cygnus.com> - - * lib/libjava.exp (test_libjava): Use runtest_file_p to see if - test should be short-circuited. - -Tue Sep 15 13:57:45 1998 Tom Tromey <tromey@cygnus.com> - - * libjava.lang/Character_9.java: New file. - * libjava.lang/Character_9.out: New file. - -Mon Sep 14 12:27:04 1998 Tom Tromey <tromey@cygnus.com> - - * libjava.lang/Character_8.out: New file. - * libjava.lang/Character_8.java: New file. - * libjava.lang/Character_7.out: New file. - * libjava.lang/Character_7.java: New file. - * libjava.lang/Character_6.out: New file. - * libjava.lang/Character_6.java: New file. - * libjava.lang/Character_5.out: New file. - * libjava.lang/Character_5.java: New file. - * libjava.lang/Character_4.out: New file. - * libjava.lang/Character_4.java: New file. - * libjava.lang/Character_3.out: New file. - * libjava.lang/Character_3.java: New file. - * libjava.lang/Character_2.out: New file. - * libjava.lang/Character_2.java: New file. - -Fri Sep 11 10:04:55 1998 Tom Tromey <tromey@cygnus.com> - - * libjava.lang/Character_1.out: New file. - * libjava.lang/Character_1.java: New file. - -Fri Sep 18 14:43:59 1998 Warren Levy <warrenl@cygnus.com> - - * libjava.lang/Long_1.java, libjava.lang/Long_1.out, - libjava.lang/Long_2.java, libjava.lang/Long_2.out: Created. - -Fri Sep 18 12:43:52 1998 Warren Levy <warrenl@cygnus.com> - - * libjava.lang/Integer_1.java, libjava.lang/Integer_1.out, - libjava.lang/Integer_2.java, libjava.lang/Integer_2.out: Created. - - * libjava.lang/String_2.java, libjava.lang/String_2.out: Use JDK 1.2 - values for hashCode. - -Thu Sep 10 12:44:42 1998 Warren Levy <warrenl@cygnus.com> - - * libjava.lang/String_1.java, libjava.lang/String_1.out, - libjava.lang/String_2.java, libjava.lang/String_2.out, - libjava.lang/String_3.java, libjava.lang/String_3.out, - libjava.lang/String_4.java, libjava.lang/String_4.out, - libjava.lang/String_5.java, libjava.lang/String_5.out, - libjava.lang/String_6.java, libjava.lang/String_6.out, - libjava.lang/String_7.java, libjava.lang/String_7.out, - libjava.lang/String_8.java, libjava.lang/String_8.out, - libjava.lang/String_9.java, libjava.lang/String_9.out: Created. - -Tue Sep 8 13:31:59 1998 Warren Levy <warrenl@cygnus.com> - - * libjava.lang/Byte_1.java, libjava.lang/Byte_1.out, - libjava.lang/Short_1.java, libjava.lang/Short_1.out: New files. - -Thu Sep 3 15:57:57 1998 Warren Levy <warrenl@cygnus.com> - - * libjava.lang/Boolean_1.java, libjava.lang/Boolean_1.out, - libjava.lang/Boolean_2.java, libjava.lang/Boolean_2.out, - libjava.lang/Boolean_3.java, libjava.lang/Boolean_3.out, - libjava.lang/Boolean_4.java, libjava.lang/Boolean_4.out, - libjava.lang/Boolean_5.java, libjava.lang/Boolean_5.out: Created. - -Tue Sep 1 12:27:54 1998 Tom Tromey <tromey@cygnus.com> - - * lib/libjava.exp (bytecompile_file): Don't throw error if byte - compilation fails. Added `srcfile_in' argument. Changed return - value. - (test_libjava): Gracefully handle byte-compilation failure. - - * libjava.lang/System_15.java (main): Typo fix. - (System_15): Choose correct class name. - (X): Moved into System_15. - - * libjava.lang/System_1.java, libjava.lang/System_1.out, - libjava.lang/System_10.java, libjava.lang/System_10.out, - libjava.lang/System_11.java, libjava.lang/System_11.out, - libjava.lang/System_12.java, libjava.lang/System_12.out, - libjava.lang/System_13.java, libjava.lang/System_13.out, - libjava.lang/System_14.java, libjava.lang/System_14.out, - libjava.lang/System_15.java, libjava.lang/System_15.out, - libjava.lang/System_2.java, libjava.lang/System_2.out, - libjava.lang/System_3.java, libjava.lang/System_3.out, - libjava.lang/System_4.java, libjava.lang/System_4.out, - libjava.lang/System_5.java, libjava.lang/System_5.out, - libjava.lang/System_6.java, libjava.lang/System_6.out, - libjava.lang/System_7.java, libjava.lang/System_7.out, - libjava.lang/System_8.java, libjava.lang/System_8.out, - libjava.lang/System_9.java, libjava.lang/System_9.out: New files. - - * lib/libjava.exp (test_libjava): Only add -lgc or -lqthreads if - library is actually found. - - * lib/libjava.exp (test_libjava): Look for qthreads. - -Mon Aug 31 17:49:21 1998 Warren Levy <warrenl@cygnus.com> - - * libjava.util/Random_1.java, libjava.util/Random_1.out, - libjava.util/Random_2.java, libjava.util/Random_2.out, - libjava.util/Random_3.java, libjava.util/Random_3.out, - libjava.util/Random_4.java, libjava.util/Random_4.out, - libjava.util/Random_5.java, libjava.util/Random_5.out, - libjava.util/Random_6.java, libjava.util/Random_6.out, - libjava.util/Random_7.java, libjava.util/Random_7.out, - libjava.util/Random_8.java, libjava.util/Random_8.out, - libjava.util/test.exp: Created. - -Mon Aug 31 16:37:19 1998 Tom Tromey <tromey@cygnus.com> - - * lib/libjava.exp: Changed gjavac to gcj everywhere. - -Wed Aug 26 12:20:10 1998 Anthony Green <green@cygnus.com> - - * Makefile.am (EXPECT,RUNTEST): Find expect and runtest - correctly. - * Makefile.in: Rebuild. - -Tue Aug 25 18:43:33 1998 Anthony Green <green@cygnus.com> - - * lib/libjava.exp: Fix CLASSPATH setting. - -Tue Aug 25 17:27:37 1998 Anthony Green <green@cygnus.com> - - * ChangeLog, lib/libjava.exp, config/default.exp, - libjava.lang/Finalize_1.java, libjava.lang/Finalize_1.out, - libjava.lang/Float_1.java, libjava.lang/Float_1.out - libjava.lang/test.exp, Makefile.am, Makefile.in: Created. - diff --git a/libjava/testsuite/Makefile.am b/libjava/testsuite/Makefile.am deleted file mode 100644 index e1d359d8f76..00000000000 --- a/libjava/testsuite/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -## Process this file with automake to produce Makefile.in. - -AUTOMAKE_OPTIONS = foreign dejagnu no-installinfo - -# Setup the testing framework, if you have one -EXPECT = `if [ -f $(top_builddir)/../expect/expect ] ; then \ - echo $(top_builddir)/../expect/expect ; \ - else echo expect ; fi` - -RUNTEST = `if [ -f $(top_srcdir)/../dejagnu/runtest ] ; then \ - echo $(top_srcdir)/../dejagnu/runtest ; \ - else echo runtest; fi` - -RUNTESTFLAGS = @AM_RUNTESTFLAGS@ - diff --git a/libjava/testsuite/Makefile.in b/libjava/testsuite/Makefile.in deleted file mode 100644 index 180ce65b451..00000000000 --- a/libjava/testsuite/Makefile.in +++ /dev/null @@ -1,274 +0,0 @@ -# Makefile.in generated automatically by automake 1.4 from Makefile.am - -# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -SHELL = @SHELL@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include - -DESTDIR = - -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ - -top_builddir = .. - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -transform = @program_transform_name@ - -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_alias = @build_alias@ -build_triplet = @build@ -host_alias = @host_alias@ -host_triplet = @host@ -target_alias = @target_alias@ -target_triplet = @target@ -AM_RUNTESTFLAGS = @AM_RUNTESTFLAGS@ -AR = @AR@ -AS = @AS@ -CC = @CC@ -COMPPATH = @COMPPATH@ -CPP = @CPP@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -DIRLTDL = @DIRLTDL@ -DIVIDESPEC = @DIVIDESPEC@ -DLLTOOL = @DLLTOOL@ -EH_COMMON_INCLUDE = @EH_COMMON_INCLUDE@ -EXCEPTIONSPEC = @EXCEPTIONSPEC@ -EXEEXT = @EXEEXT@ -FORCELIBGCCSPEC = @FORCELIBGCCSPEC@ -GCDEPS = @GCDEPS@ -GCINCS = @GCINCS@ -GCLIBS = @GCLIBS@ -GCOBJS = @GCOBJS@ -GCSPEC = @GCSPEC@ -GCTESTSPEC = @GCTESTSPEC@ -INCLTDL = @INCLTDL@ -LIBDATASTARTSPEC = @LIBDATASTARTSPEC@ -LIBGCJTESTSPEC = @LIBGCJTESTSPEC@ -LIBGCJ_CFLAGS = @LIBGCJ_CFLAGS@ -LIBGCJ_CXXFLAGS = @LIBGCJ_CXXFLAGS@ -LIBGCJ_JAVAFLAGS = @LIBGCJ_JAVAFLAGS@ -LIBLTDL = @LIBLTDL@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -OBJDUMP = @OBJDUMP@ -PACKAGE = @PACKAGE@ -PERL = @PERL@ -RANLIB = @RANLIB@ -SYSDEP_SOURCES = @SYSDEP_SOURCES@ -SYSTEMSPEC = @SYSTEMSPEC@ -THREADDEPS = @THREADDEPS@ -THREADINCS = @THREADINCS@ -THREADLIBS = @THREADLIBS@ -THREADOBJS = @THREADOBJS@ -THREADSPEC = @THREADSPEC@ -VERSION = @VERSION@ -ZDEPS = @ZDEPS@ -ZINCS = @ZINCS@ -ZLIBS = @ZLIBS@ -ZLIBSPEC = @ZLIBSPEC@ -ZLIBTESTSPEC = @ZLIBTESTSPEC@ -here = @here@ -libgcj_basedir = @libgcj_basedir@ - -AUTOMAKE_OPTIONS = foreign dejagnu no-installinfo - -# Setup the testing framework, if you have one -EXPECT = `if [ -f $(top_builddir)/../expect/expect ] ; then \ - echo $(top_builddir)/../expect/expect ; \ - else echo expect ; fi` - - -RUNTEST = `if [ -f $(top_srcdir)/../dejagnu/runtest ] ; then \ - echo $(top_srcdir)/../dejagnu/runtest ; \ - else echo runtest; fi` - - -RUNTESTFLAGS = @AM_RUNTESTFLAGS@ -mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs -CONFIG_HEADER = ../include/config.h -CONFIG_CLEAN_FILES = -DIST_COMMON = ChangeLog Makefile.am Makefile.in - - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = tar -GZIP_ENV = --best -all: all-redirect -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --foreign testsuite/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - -tags: TAGS -TAGS: - - -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -subdir = testsuite - -distdir: $(DISTFILES) - here=`cd $(top_builddir) && pwd`; \ - top_distdir=`cd $(top_distdir) && pwd`; \ - distdir=`cd $(distdir) && pwd`; \ - cd $(top_srcdir) \ - && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign testsuite/Makefile - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ - cp -pr $$/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done - -DEJATOOL = $(PACKAGE) - -RUNTESTDEFAULTFLAGS = --tool $(DEJATOOL) --srcdir $$srcdir - -check-DEJAGNU: site.exp - srcdir=`cd $(srcdir) && pwd`; export srcdir; \ - EXPECT=$(EXPECT); export EXPECT; \ - runtest=$(RUNTEST); \ - if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \ - $$runtest $(RUNTESTDEFAULTFLAGS) $(RUNTESTFLAGS); \ - else echo "WARNING: could not find \`runtest'" 1>&2; :;\ - fi -site.exp: Makefile - @echo 'Making a new site.exp file...' - @test ! -f site.bak || rm -f site.bak - @echo '## these variables are automatically generated by make ##' > $@-t - @echo '# Do not edit here. If you wish to override these values' >> $@-t - @echo '# edit the last section' >> $@-t - @echo 'set tool $(DEJATOOL)' >> $@-t - @echo 'set srcdir $(srcdir)' >> $@-t - @echo 'set objdir' `pwd` >> $@-t - @echo 'set host_alias $(host_alias)' >> $@-t - @echo 'set host_triplet $(host_triplet)' >> $@-t - @echo 'set target_alias $(target_alias)' >> $@-t - @echo 'set target_triplet $(target_triplet)' >> $@-t - @echo 'set build_alias $(build_alias)' >> $@-t - @echo 'set build_triplet $(build_triplet)' >> $@-t - @echo '## All variables above are generated by configure. Do Not Edit ##' >> $@-t - @test ! -f site.exp || sed '1,/^## All variables above are.*##/ d' site.exp >> $@-t - @test ! -f site.exp || mv site.exp site.bak - @mv $@-t site.exp -info-am: -info: info-am -dvi-am: -dvi: dvi-am -check-am: all-am - $(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU -check: check-am -installcheck-am: -installcheck: installcheck-am -install-info-am: -install-info: install-info-am -install-exec-am: -install-exec: install-exec-am - -install-data-am: -install-data: install-data-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am -uninstall-am: -uninstall: uninstall-am -all-am: Makefile -all-redirect: all-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: - - -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -maintainer-clean-generic: -mostlyclean-am: mostlyclean-generic - -mostlyclean: mostlyclean-am - -clean-am: clean-generic mostlyclean-am - -clean: clean-am - -distclean-am: distclean-generic clean-am - -rm -f libtool - -distclean: distclean-am - -maintainer-clean-am: maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -maintainer-clean: maintainer-clean-am - -.PHONY: tags distdir check-DEJAGNU info-am info dvi-am dvi check \ -check-am installcheck-am installcheck install-info-am install-info \ -install-exec-am install-exec install-data-am install-data install-am \ -install uninstall-am uninstall all-redirect all-am all installdirs \ -mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/libjava/testsuite/config/default.exp b/libjava/testsuite/config/default.exp deleted file mode 100644 index 90967cccc18..00000000000 --- a/libjava/testsuite/config/default.exp +++ /dev/null @@ -1 +0,0 @@ -load_lib "standard.exp" diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp deleted file mode 100644 index cf9b9a95ba2..00000000000 --- a/libjava/testsuite/lib/libjava.exp +++ /dev/null @@ -1,669 +0,0 @@ -# Copyright (C) 1998, 1999, 2000 Free Software Foundation - -load_lib "libgloss.exp" - -# GCJ_UNDER_TEST is the compiler under test. - -global tmpdir - -if ![info exists tmpdir] { - set tmpdir "/tmp" -} - -# Read an `xfail' file if it exists. Returns a list of xfail tokens. -proc libjava_read_xfail {file} { - if {! [file exists $file]} { - return "" - } - set fd [open $file r] - set tokens [string trim [read $fd]] - close $fd - return $tokens -} - -# Find a particular executable. FIXME: this relies on DejaGnu -# internals. These should probably be exposed in a better way. -proc libjava_find_program {prog} { - global tool_root_dir - - set file [lookfor_file $tool_root_dir $prog] - if { $file == "" } { - set file [lookfor_file $tool_root_dir gcc/$prog]; - } - if {$file == ""} { - set file $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] -} - -proc bytecompile_file { file objdir {classpath {}} } { - global env - global SUN_JAVAC - set dirname [file dirname $file] - - # If JDK doesn't run on your platform but some other - # JDK-compatible javac does, you may set SUN_JAVAC to point to it. - # One of the most important properties of a SUN_JAVAC is that it - # must create class-files even for classes that have not been - # specified in the command line, but that were needed to compile - # those that have. For example, Pizza won't do it, but you can - # use `kaffe sun.tools.javac.Main', if you have Sun's classes.zip - # in the kaffe's default search path. - if ![info exists SUN_JAVAC] { - if [info exists env(SUN_JAVAC)] { - set SUN_JAVAC $env(SUN_JAVAC) - } else { - set SUN_JAVAC "javac" - } - } - - catch {unset env(CLASSPATH)} - if {$classpath != ""} then { - set env(CLASSPATH) $classpath - } - if {[catch { - set here [pwd] - cd $dirname - set q [eval exec "$SUN_JAVAC [list $file] -d $objdir 2>@ stdout"] - cd $here - # "return" a result - set q $q - } msg]} then { - verbose "couldn't compile $file: $msg" - set r 0 - } else { - set r 1 - } - return $r -} - -set libjava_initialized 0 - -# -# Build the status wrapper library as needed. -# -proc libjava_init { args } { - global wrapper_file; - global wrap_compile_flags; - global libjava_initialized - global GCJ_UNDER_TEST - global TOOL_EXECUTABLE - global original_ld_library_path - global env - - if { $libjava_initialized == 1 } { return; } - - if ![info exists GCJ_UNDER_TEST] { - if [info exists TOOL_EXECUTABLE] { - set GCJ_UNDER_TEST $TOOL_EXECUTABLE; - } else { - if [info exists env(GCJ)] { - set GCJ_UNDER_TEST $env(GCJ) - } else { - set GCJ_UNDER_TEST "[find_gcj]" - } - } - } - - if [info exists env(LD_LIBRARY_PATH)] { - set original_ld_library_path $env(LD_LIBRARY_PATH) - } else { - if [info exists env(SHLIB_PATH)] { - set original_ld_library_path $env(SHLIB_PATH) - } else { - set original_ld_library_path "" - } - } - - set wrapper_file ""; - set wrap_compile_flags ""; - if [target_info exists needs_status_wrapper] { - set result [build_wrapper "testglue.o"]; - if { $result != "" } { - set wrapper_file [lindex $result 0]; - set wrap_compile_flags [lindex $result 1]; - } else { - warning "Status wrapper failed to build." - } - } - - set libjava_initialized 1 -} - -# Find a library. We know where libtool puts the actual libraries, -# and we look there. The implementation is fairly hacky. We can't -# compile with -nodefaultlibs, because that will also eliminate the -# system libraries we need. In order to have gcj still work, it must -# find the appropriate libraries so we must add -L options for their -# paths. However we can't simply use those libraries; we still need -# libtool for linking. -proc libjava_find_lib {dir name} { - global base_dir - set gp [get_multilibs] - foreach sub {.libs _libs} { - if {$gp != ""} { - if {[file exists $gp/$dir/$sub/lib${name}.a]} then { - return "$gp/$dir/lib${name}.la -L$gp/$dir/$sub" - } - } - set lib [findfile $base_dir/../../$dir/$sub/lib${name}.a \ - "$base_dir/../../$dir/lib${name}.la -L$base_dir/../../$dir/$sub" \ - ""] - if {$lib != ""} { - return $lib - } - } - return "" -} - -# Compute arguments needed for compiler. MODE is a libtool mode: -# either compile or link. -proc libjava_arguments {{mode compile}} { - global base_dir - global LIBJAVA - global LIBGC - global LIBQTHREADS - global LIBZ - global srcdir subdir objdir - global TOOL_OPTIONS - global GCJ_UNDER_TEST - global tmpdir - global runtests - global env - - if [info exists LIBJAVA] { - set libjava $LIBJAVA; - } else { - set libjava [libjava_find_lib libjava gcj] - } - - if [info exists LIBGC] { - set libgc $LIBGC; - } else { - set libgc [libjava_find_lib boehm-gc gcjgc] - } - - if [info exists LIBQTHREADS] { - set libqthreads $LIBQTHREADS - } else { - set libqthreads [libjava_find_lib qthreads gcjcoop] - } - - if [info exists LIBZ] { - set libz $LIBZ - } else { - set libz [libjava_find_lib zlib zgcj] - } - - # FIXME: there's no way to determine whether -lpthread is - # required. We should get this info from configure, or it should - # just be in the compiler driver. - - verbose "using LIBJAVA = $libjava" 2 - verbose "using LIBGC = $libgc" 2 - verbose "using LIBQTHREADS = $libqthreads" 2 - verbose "using LIBZ = $libz" 2 - set args "" - - # Basically we want to build up a colon separated path list from - # the value of $libjava. - - # First strip away any -L arguments. - regsub -all -- "-L" $libjava "" ld_library_path - - # Then remove any -lgcj argument. - regsub -all -- " -lgcj.*" $ld_library_path "" ld_library_path - - # First strip away any -L arguments. - regsub -all -- "-L" $libgc $ld_library_path ld_library_path - - # Then remove any -lgcjgc argument. - regsub -all -- " -lgcjgc.*" $ld_library_path "" ld_library_path - - # That's enough to make things work for the normal case. - # If we wanted to handle an arbitrary value of libjava, - # then we'd have to do a lot more work. - - # Set variables the dynamic linker looks at. - global original_ld_library_path - setenv LD_LIBRARY_PATH "$ld_library_path:$original_ld_library_path" - setenv SHLIB_PATH "$ld_library_path:$original_ld_library_path" - - # Set the CLASSPATH environment variable - verbose "CLASSPATH is .:$srcdir/$subdir:$objdir/..:$objdir/../libgcj.zip" - global env - set env(CLASSPATH) ".:$srcdir/$subdir:$objdir/..:$objdir/../libgcj.zip" - - global wrapper_file wrap_compile_flags; - lappend args "additional_flags=$wrap_compile_flags"; - lappend args "libs=$wrapper_file"; - lappend args "libs=$libjava"; - lappend args "libs=$libgc"; - lappend args "libs=$libqthreads" - lappend args "libs=$libz" - lappend args debug - - if { [target_info needs_status_wrapper]!="" && [info exists gluefile] } { - lappend args "libs=${gluefile}" - lappend args "ldflags=$wrap_flags" - } - - if [info exists TOOL_OPTIONS] { - lappend args "additional_flags=$TOOL_OPTIONS" - } - - # Search for libtool. We need it to link. - set found_compiler 0 - set d [absolute $objdir] - foreach x {. .. ../.. ../../..} { - if {[file exists $d/$x/libtool]} then { - # We have to run silently to avoid DejaGNU lossage. - lappend args \ - "compiler=$d/$x/libtool --silent --mode=$mode $GCJ_UNDER_TEST -B$objdir/../" - set found_compiler 1 - break - } - } - if {! $found_compiler} { - # Append -B$objdir/../ so that we find libgcj.spec before it - # is installed. - lappend args "compiler=$GCJ_UNDER_TEST -B$objdir/../" - } - - return $args -} - - -# -# 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_source { options srcfile compile_args inpfile resultfile exec_args } { - global base_dir - global LIBJAVA - global LIBGC - global srcdir subdir objdir - global TOOL_OPTIONS - global GCJ_UNDER_TEST - global tmpdir - global runtests - - # Make opts into an array. - set opts(_) x - unset opts(_) - foreach item $exec_args { - set opts($item) x - } - - set errname [file rootname [file tail $srcfile]] - if {! [runtest_file_p $runtests $errname]} { - return - } - - if {[info exists opts(no-link)]} { - set mode compile - } else { - set mode link - } - set args [libjava_arguments $mode] - if {! [info exists opts(no-link)]} { - # Add the --main flag - lappend args "additional_flags=--main=[file rootname [file tail $srcfile]]" - if { $compile_args != "" } { - lappend args "additional_flags=$compile_args" - } - } - - regsub "^.*/(\[^/.\]+)\[.\]\[^/]*$" "$srcfile" "\\1" out - set executable "${objdir}/$out" - if {[info exists opts(no-link)]} { - append executable ".o" - set target object - } else { - set target executable - } - if { $compile_args != "" } { - set errname "$errname $compile_args" - } - - set x [prune_warnings \ - [target_compile $srcfile "$executable" $target $args]] - if {[info exists opts(xfail-gcj)]} { - setup_xfail *-*-* - } - if { $x != "" } { - verbose "target_compile failed: $x" 2 - - if {[info exists opts(shouldfail)]} { - pass "$errname compilation from source" - return - } - - fail "$errname compilation from source" - if {[info exists opts(xfail-gcj)] || ! [info exists opts(no-exec)]} { - setup_xfail "*-*-*" - fail "$errname execution from source compiled test" - setup_xfail "*-*-*" - fail "$errname output from source compiled test" - } - return - } - if {[info exists opts(shouldfail)]} { - fail "$errname compilation from source" - return - } - pass "$errname compilation from source" - - if {[info exists opts(no-exec)] - || [info exists opts(no-link)]} { - return - } - - set result [libjava_load $executable "" "$inpfile"]; - set status [lindex $result 0]; - set output [lindex $result 1]; - if {[info exists opts(xfail-exec)]} then { - setup_xfail *-*-* - } - $status "$errname execution from source compiled test" - if { $status != "pass" } { - setup_xfail "*-*-*" - fail "$errname execution from source compiled test" - return; - } - - verbose "resultfile is $resultfile" - set id [open $resultfile r]; - set expected "" - append expected [read $id]; - regsub -all "\r" "$output" "" output; - regsub "\n*$" $expected "" expected - regsub "\n*$" $output "" output - regsub "^\n*" $expected "" expected - regsub "^\n*" $output "" output - regsub -all "\[ \t\]\[ \t\]*" $expected " " expected - regsub -all "\[ \t\]*\n\n*" $expected "\n" expected - regsub -all "\[ \t\]\[ \t\]*" $output " " output - regsub -all "\[ \t\]*\n\n*" $output "\n" output - verbose "expected is $expected" - verbose "actual is $output" - set passed 0; - if {$options == "regexp_match"} { - if [regexp $expected $output] { - set passed 1; - } - } else { - if { $expected == $output } { - set passed 1; - } - } - if {[info exists opts(xfail-output)]} { - setup_xfail *-*-* - } - if { $passed == 1 } { - pass "$errname output from source compiled test" - } else { - clone_output "expected was $expected" - clone_output "output was $output" - fail "$errname output from source compiled test" - } - close $id; -} - -# -# 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 LIBJAVA - global LIBGC - global srcdir subdir objdir - global TOOL_OPTIONS - global GCJ_UNDER_TEST - global tmpdir - global runtests - - # Make opts into an array. - set opts(_) x - unset opts(_) - foreach item $exec_args { - set opts($item) 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] - # FIXME: assumes we are using javac to compile to bytecode. - # This is not always the case. - if {[info exists opts(xfail-javac)]} { - setup_xfail *-*-* - } - if {! $bc_ok} then { - if {[info exists opts(shouldfail)]} { - pass "$errname byte compilation" - return - } - fail "$errname byte compilation" - setup_xfail "*-*-*" - fail "$errname compilation from bytecode" - if {! [info exists opts(no-exec)]} { - setup_xfail "*-*-*" - fail "$errname execution from bytecode->native test" - setup_xfail "*-*-*" - fail "$errname output from bytecode->native test" - } - return - } - if {[info exists opts(shouldfail)]} { - fail "$errname byte compilation" - return - } - pass "$errname byte compilation" - - # 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 \ - [prune_warnings \ - [target_compile $srcfile "" none \ - "compiler=$jvscan additional_flags=--print-main"]]] - verbose "main name is $main_name" - set class_out [string trim \ - [prune_warnings \ - [target_compile $srcfile "" none \ - "compiler=$jvscan additional_flags=--list-class"]]] - verbose "class list is $class_out" - - if {[string match "*parse error*" $main_name] - || [string match "*parse error*" $class_out]} { - # Do the remaining fails. - setup_xfail "*-*-*" - fail "$errname compilation from bytecode" - if {! [info exists opts(no-exec)]} { - setup_xfail "*-*-*" - fail "$errname execution from bytecode->native test" - setup_xfail "*-*-*" - fail "$errname output from bytecode->native test" - } - return - } - - # Turn "a b" into "a.class b.class". - # Also, turn "foo.bar" into "foo/bar.class". - set class_files {} - foreach file [split [string trim $class_out]] { - set file [join [split $file .] /] - lappend class_files $objdir/$file.class - } - - # Usually it is an error for a test program not to have a `main' - # 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 {$main_name == ""} { - if {! [info exists opts(no-exec)]} { - perror "No `main' given in program $errname" - return - } else { - set type object - set mode compile - } - } else { - set type executable - lappend largs "additional_flags=--main=$main_name" - set executable "${objdir}/$main_name" - set mode link - } - - # 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 - set x [prune_warnings \ - [target_compile $c_file "$executable" $type $args]] - if {$x != ""} { - break - } - } - } else { - set x [prune_warnings \ - [target_compile $class_files "$executable" $type $args]] - } - if {[info exists opts(xfail-byte)]} { - setup_xfail *-*-* - } - if { $x != "" } { - verbose "target_compile failed: $x" 2 - fail "$errname compilation from bytecode" - setup_xfail "*-*-*" - if {! [info exists opts(no-exec)]} { - fail "$errname execution from bytecode->native test" - setup_xfail "*-*-*" - fail "$errname output from bytecode->native test" - } - return; - } - pass "$errname compilation from bytecode" - - if {[info exists opts(no-exec)]} { - return - } - - set result [libjava_load $executable "" "$inpfile"]; - set status [lindex $result 0]; - set output [lindex $result 1]; - if {[info exists opts(xfail-exec)]} { - setup_xfail *-*-* - } - $status "$errname execution from bytecode->native test" - if { $status != "pass" } { - setup_xfail "*-*-*" - fail "$errname output from bytecode->native test" - return; - } - - verbose "resultfile is $resultfile" - set id [open $resultfile r]; - set expected "" - append expected [read $id]; - regsub -all "\r" "$output" "" output; - regsub "\n*$" $expected "" expected - regsub "\n*$" $output "" output - regsub "^\n*" $expected "" expected - regsub "^\n*" $output "" output - regsub -all "\[ \t\]\[ \t\]*" $expected " " expected - regsub -all "\[ \t\]*\n\n*" $expected "\n" expected - regsub -all "\[ \t\]\[ \t\]*" $output " " output - regsub -all "\[ \t\]*\n\n*" $output "\n" output - verbose "expected is $expected" - verbose "actual is $output" - set passed 0; - if {[info exists opts(xfail-output)]} { - setup_xfail *-*-* - } - if {$options == "regexp_match"} { - if [regexp $expected $output] { - set passed 1; - } - } else { - if { $expected == $output } { - set passed 1; - } - } - if { $passed == 1 } { - pass "$errname output from bytecode->native test" - } else { - clone_output "expected was $expected" - clone_output "output was $output" - fail "$errname output from bytecode->native test" - } - close $id; -} - -# -# 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 -# `xfail-javac' compilation with javac will fail -# `xfail-gcjC' compilation with gcj -C will fail -# `shouldfail' compilation from source is supposed to fail -# This is different from xfail, which marks a known -# failure that we just havne't fixed. -# A compilation marked this way should fail with any -# front end. -# `xfail-byte' compilation from bytecode will fail -# `xfail-exec' exec will fail -# `xfail-output' output will be wrong -# -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 - } - -# -# libjava_version -- extract and print the version number of libjavap -# -proc default_libjava_version {} { -} - -proc default_libjava_start { } { -} - -# Local Variables: -# tcl-indent-level:4 -# End: diff --git a/libjava/testsuite/libjava.compile/BlankFinal.java b/libjava/testsuite/libjava.compile/BlankFinal.java deleted file mode 100644 index be5bf8e9a0f..00000000000 --- a/libjava/testsuite/libjava.compile/BlankFinal.java +++ /dev/null @@ -1,16 +0,0 @@ -// Test to see if "blank final" variables work. -// From Mo DeJong <mdejong@cygnus.com> - -public class BlankFinal { - static final boolean cond; - - static { - try - { - cond = true; - } - catch(Exception e) { - // do nothing - } - } -} diff --git a/libjava/testsuite/libjava.compile/Case.java b/libjava/testsuite/libjava.compile/Case.java deleted file mode 100644 index c5eb1d51947..00000000000 --- 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 9404f71f6ab..00000000000 --- 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 3ad7d28ba26..00000000000 --- 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 36a56fdf81a..00000000000 --- 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 3697dbe230c..00000000000 --- 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 8c290f23b06..00000000000 --- 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 e69cdecc103..00000000000 --- 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 f20f473f83a..00000000000 --- 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/MethodFailure4.java b/libjava/testsuite/libjava.compile/MethodFailure4.java deleted file mode 100644 index bed3a0e1311..00000000000 --- 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 e3b083b1fa5..00000000000 --- 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 a9b9c192236..00000000000 --- 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 669da3b824a..00000000000 --- 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 03f660d848d..00000000000 --- 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/PR124.java b/libjava/testsuite/libjava.compile/PR124.java deleted file mode 100644 index 2ec1fe9ea01..00000000000 --- 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 e3b083b1fa5..00000000000 --- 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 6a2e699a46b..00000000000 --- 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 e3b083b1fa5..00000000000 --- a/libjava/testsuite/libjava.compile/PR127.xfail +++ /dev/null @@ -1 +0,0 @@ -shouldfail diff --git a/libjava/testsuite/libjava.compile/PR129_B.java b/libjava/testsuite/libjava.compile/PR129_B.java deleted file mode 100644 index 238df999a27..00000000000 --- 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/PR140.java b/libjava/testsuite/libjava.compile/PR140.java deleted file mode 100644 index 0f59d6e1d68..00000000000 --- 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 e3b083b1fa5..00000000000 --- a/libjava/testsuite/libjava.compile/PR140.xfail +++ /dev/null @@ -1 +0,0 @@ -shouldfail diff --git a/libjava/testsuite/libjava.compile/PR163.java b/libjava/testsuite/libjava.compile/PR163.java deleted file mode 100644 index 283c8ac1c9c..00000000000 --- 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 e3b083b1fa5..00000000000 --- 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 d3a288f1b51..00000000000 --- 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 e3b083b1fa5..00000000000 --- a/libjava/testsuite/libjava.compile/PR164.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 018391271ad..00000000000 --- 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/PR207.java b/libjava/testsuite/libjava.compile/PR207.java deleted file mode 100644 index 97b10f0aa27..00000000000 --- 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/PR208.java b/libjava/testsuite/libjava.compile/PR208.java deleted file mode 100644 index 0b5f5371936..00000000000 --- 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/PR209.java b/libjava/testsuite/libjava.compile/PR209.java deleted file mode 100644 index d4539c6fa79..00000000000 --- 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/PR224.java b/libjava/testsuite/libjava.compile/PR224.java deleted file mode 100644 index eae4032e123..00000000000 --- 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 e3b083b1fa5..00000000000 --- 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 516b0ed1f6c..00000000000 --- 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 0c126531d67..00000000000 --- 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 61a11581f78..00000000000 --- 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/PR235.java b/libjava/testsuite/libjava.compile/PR235.java deleted file mode 100644 index 46a727b2a67..00000000000 --- 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 b876524ffdf..00000000000 --- 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/Semi.java b/libjava/testsuite/libjava.compile/Semi.java deleted file mode 100644 index 39b3edc84b8..00000000000 --- 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 b86a57c409e..00000000000 --- 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/Twice.java b/libjava/testsuite/libjava.compile/Twice.java deleted file mode 100644 index d80760f4dd5..00000000000 --- 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 08fcc78b1d6..00000000000 --- 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 755ab8794df..00000000000 --- a/libjava/testsuite/libjava.compile/Where.xfail +++ /dev/null @@ -1 +0,0 @@ -xfail-gcj diff --git a/libjava/testsuite/libjava.compile/assignment.java b/libjava/testsuite/libjava.compile/assignment.java deleted file mode 100644 index ec05f73a503..00000000000 --- 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 38b58db76ee..00000000000 --- 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 6bf99b13135..00000000000 --- 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 e3b083b1fa5..00000000000 --- 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 ebc5a974de0..00000000000 --- 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 4a358a6d37d..00000000000 --- a/libjava/testsuite/libjava.compile/compile.exp +++ /dev/null @@ -1,20 +0,0 @@ -global srcdir subdir - -catch "glob -nocomplain ${srcdir}/${subdir}/*.java" srcfiles -verbose "srcfiles are $srcfiles" - -set prefix "" -foreach x $srcfiles { - set args [libjava_read_xfail [file rootname $x].xfail] - if {[file exists [file rootname $x].no-link]} { - lappend args no-link - } - lappend args no-exec - - test_libjava "" "$x" "" "" "" $args - test_libjava "" "$x" "-O" "" "" $args -} - -# Local Variables: -# tcl-indent-level:4 -# End: diff --git a/libjava/testsuite/libjava.compile/euc_comment1.java b/libjava/testsuite/libjava.compile/euc_comment1.java deleted file mode 100644 index bb556236eac..00000000000 --- a/libjava/testsuite/libjava.compile/euc_comment1.java +++ /dev/null @@ -1,5 +0,0 @@ -public class euc_comment1 { - public static void main(String[] args) { - /* ÆþÎÏ */ - } -} diff --git a/libjava/testsuite/libjava.compile/euc_comment2.java b/libjava/testsuite/libjava.compile/euc_comment2.java deleted file mode 100644 index 9a9426f8005..00000000000 --- a/libjava/testsuite/libjava.compile/euc_comment2.java +++ /dev/null @@ -1,5 +0,0 @@ -public class euc_comment2 { - public static void main(String[] args) { - // ÆþÎÏ - } -} diff --git a/libjava/testsuite/libjava.compile/euc_comment3.java b/libjava/testsuite/libjava.compile/euc_comment3.java deleted file mode 100644 index b0f35d09d34..00000000000 --- a/libjava/testsuite/libjava.compile/euc_comment3.java +++ /dev/null @@ -1,5 +0,0 @@ -public class euc_comment3 { - public static void main(String[] args) { - // ÆþÎÏ - } -} diff --git a/libjava/testsuite/libjava.compile/iface.java b/libjava/testsuite/libjava.compile/iface.java deleted file mode 100644 index 6a57fcf4bf7..00000000000 --- 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 d9a0210a928..00000000000 --- 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_data.java b/libjava/testsuite/libjava.compile/inner_data.java deleted file mode 100644 index 63d4902f366..00000000000 --- a/libjava/testsuite/libjava.compile/inner_data.java +++ /dev/null @@ -1,14 +0,0 @@ -// Test referencing protected data from parent of inner class. - -import java.util.Random; - -public class inner_data -{ - private class Randomer extends Random { - public long xxx () - { - return seed; - } - } -} - diff --git a/libjava/testsuite/libjava.compile/inner_inherit.java b/libjava/testsuite/libjava.compile/inner_inherit.java deleted file mode 100644 index 44ad6a96c22..00000000000 --- 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 0601c68bff4..00000000000 --- 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 616488fa484..00000000000 --- 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 a4167cde2f7..00000000000 --- 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 3661e096a91..00000000000 --- 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 2fb793f7934..00000000000 --- 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/not_a_redef.java b/libjava/testsuite/libjava.compile/not_a_redef.java deleted file mode 100644 index 7a2f55cb797..00000000000 --- 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/perc.java b/libjava/testsuite/libjava.compile/perc.java deleted file mode 100644 index 8dc2f6f01fb..00000000000 --- 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 b8e9bd9fcbb..00000000000 --- 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/pr172.java b/libjava/testsuite/libjava.compile/pr172.java deleted file mode 100644 index 4dc26d04e71..00000000000 --- 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/pr174.java b/libjava/testsuite/libjava.compile/pr174.java deleted file mode 100644 index b819372ce7f..00000000000 --- 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/pr176.java b/libjava/testsuite/libjava.compile/pr176.java deleted file mode 100644 index a52b5bbf808..00000000000 --- 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/redef1.java b/libjava/testsuite/libjava.compile/redef1.java deleted file mode 100644 index a3e138a8c84..00000000000 --- 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 e3b083b1fa5..00000000000 --- 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 9f8e5b85782..00000000000 --- 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 e3b083b1fa5..00000000000 --- 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 df638f1e34a..00000000000 --- 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 e3b083b1fa5..00000000000 --- 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 db4f4994466..00000000000 --- 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 e3b083b1fa5..00000000000 --- 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 2698e0ff7a2..00000000000 --- 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 e3b083b1fa5..00000000000 --- 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 1489d5e048d..00000000000 --- 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 e3b083b1fa5..00000000000 --- a/libjava/testsuite/libjava.compile/redef6.xfail +++ /dev/null @@ -1 +0,0 @@ -shouldfail diff --git a/libjava/testsuite/libjava.compile/sjis_comment1.java b/libjava/testsuite/libjava.compile/sjis_comment1.java deleted file mode 100644 index 26132821960..00000000000 --- a/libjava/testsuite/libjava.compile/sjis_comment1.java +++ /dev/null @@ -1,5 +0,0 @@ -public class sjis_comment1 { - public static void main(String[] args) { - /* “ü—Í */ - } -} diff --git a/libjava/testsuite/libjava.compile/sjis_comment2.java b/libjava/testsuite/libjava.compile/sjis_comment2.java deleted file mode 100644 index d4ae92f191b..00000000000 --- a/libjava/testsuite/libjava.compile/sjis_comment2.java +++ /dev/null @@ -1,5 +0,0 @@ -public class sjis_comment2 { - public static void main(String[] args) { - // “ü—Í - } -} diff --git a/libjava/testsuite/libjava.compile/sjis_comment3.java b/libjava/testsuite/libjava.compile/sjis_comment3.java deleted file mode 100644 index 7370c4e444d..00000000000 --- a/libjava/testsuite/libjava.compile/sjis_comment3.java +++ /dev/null @@ -1,5 +0,0 @@ -public class sjis_comment3 { - 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 ff01a1ef98d..00000000000 --- 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 e3b083b1fa5..00000000000 --- 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 fdb5b99dac5..00000000000 --- 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_3.java b/libjava/testsuite/libjava.compile/static_3.java deleted file mode 100644 index 894e5799b1f..00000000000 --- 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_init.java b/libjava/testsuite/libjava.compile/static_init.java deleted file mode 100644 index 2e77b5e4a82..00000000000 --- 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 e3b083b1fa5..00000000000 --- 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 8cae968045b..00000000000 --- 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 ca0d99f4c8e..00000000000 --- 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 709b47aca5a..00000000000 --- 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 643dad671b8..00000000000 --- 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 dffd498286b..00000000000 --- 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 1d465f5222e..00000000000 --- 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 e28829d7af5..00000000000 --- 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.jni/calls.c b/libjava/testsuite/libjava.jni/calls.c deleted file mode 100644 index c125941076a..00000000000 --- a/libjava/testsuite/libjava.jni/calls.c +++ /dev/null @@ -1,69 +0,0 @@ -#include <stdio.h> -#include <calls.h> - -jint -Java_calls_docall (JNIEnv *env, jobject _this) -{ - jmethodID method; - jclass klass, super; - - jbyte b; - jshort s; - jchar c; - jint i; - jlong l; - jfloat f; - jdouble d; - - jvalue val; - - jint fails = 0; - - klass = (*env)->GetObjectClass (env, _this); - super = (*env)->GetSuperclass (env, klass); - - method = (*env)->GetMethodID (env, klass, "byte_f", "()B"); - b = (*env)->CallByteMethod (env, _this, method); - if (b != 23) - ++fails; - - method = (*env)->GetMethodID (env, klass, "char_f", "(I)C"); - val.i = 10; - c = (*env)->CallCharMethodV (env, _this, method, &val); - if (c != ('a' + 10)) - ++fails; - - method = (*env)->GetMethodID (env, super, "int_f", "()I"); - i = (*env)->CallNonvirtualIntMethod (env, _this, super, method); - if (i != 27) - ++fails; - - i = (*env)->CallIntMethod (env, _this, method); - if (i != 1023) - ++fails; - - method = (*env)->GetStaticMethodID (env, klass, "long_f", "(J)J"); - l = (*env)->CallStaticLongMethod (env, klass, method, (jlong) 10); - if (l != 2033) - ++fails; - - method = (*env)->GetMethodID (env, klass, "void_f", "()V"); - (*env)->CallVoidMethod (env, _this, method); - - method = (*env)->GetStaticMethodID (env, klass, "short_f", "()S"); - s = (*env)->CallStaticShortMethod (env, klass, method); - if (s != 2) - ++fails; - - method = (*env)->GetMethodID (env, klass, "double_f", "()D"); - d = (*env)->CallDoubleMethod (env, _this, method); - if (d != -1.0) - ++fails; - - method = (*env)->GetMethodID (env, klass, "float_f", "()F"); - f = (*env)->CallFloatMethod (env, _this, method); - if (f != 1.0) - ++fails; - - return fails; -} diff --git a/libjava/testsuite/libjava.jni/calls.java b/libjava/testsuite/libjava.jni/calls.java deleted file mode 100644 index b98017c0c13..00000000000 --- a/libjava/testsuite/libjava.jni/calls.java +++ /dev/null @@ -1,66 +0,0 @@ -// Test a bunch of different calls. - -class base -{ - public int int_f () - { - return 27; - } -} - -public class calls extends base -{ - static - { - System.loadLibrary ("calls"); - } - - public native int docall (); - - public byte byte_f () - { - return 23; - } - - public char char_f (int z) - { - return (char) ('a' + z); - } - - public int int_f () - { - return 1023; - } - - public static long long_f (long q) - { - return q + 2023; - } - - public void void_f () - { - System.out.println ("void"); - } - - public static short short_f () - { - return 2; - } - - public double double_f () - { - return -1.0; - } - - public float float_f () - { - return (float) 1.0; - } - - public static void main (String[] args) - { - calls c = new calls (); - if (c.docall () != 0) - System.out.println ("fail"); - } -} diff --git a/libjava/testsuite/libjava.jni/calls.out b/libjava/testsuite/libjava.jni/calls.out deleted file mode 100644 index cbab1f6b63a..00000000000 --- a/libjava/testsuite/libjava.jni/calls.out +++ /dev/null @@ -1 +0,0 @@ -void diff --git a/libjava/testsuite/libjava.jni/final_method.c b/libjava/testsuite/libjava.jni/final_method.c deleted file mode 100644 index 82977374bcb..00000000000 --- a/libjava/testsuite/libjava.jni/final_method.c +++ /dev/null @@ -1,7 +0,0 @@ -#include <final_method.h> - -jstring -Java_final_1method_meth (JNIEnv *env, jobject thisv) -{ - return (*env)->NewStringUTF (env, "zardoz has spoken"); -} diff --git a/libjava/testsuite/libjava.jni/final_method.java b/libjava/testsuite/libjava.jni/final_method.java deleted file mode 100644 index dcb684e0849..00000000000 --- a/libjava/testsuite/libjava.jni/final_method.java +++ /dev/null @@ -1,17 +0,0 @@ -// Minimal test a non-static final method. - -public class final_method -{ - static - { - System.loadLibrary ("final_method"); - } - - public final native String meth (); - - public static void main (String[] args) - { - final_method fm = new final_method (); - System.out.println (fm.meth ()); - } -} diff --git a/libjava/testsuite/libjava.jni/final_method.out b/libjava/testsuite/libjava.jni/final_method.out deleted file mode 100644 index d93c9b5587e..00000000000 --- a/libjava/testsuite/libjava.jni/final_method.out +++ /dev/null @@ -1 +0,0 @@ -zardoz has spoken diff --git a/libjava/testsuite/libjava.jni/findclass.c b/libjava/testsuite/libjava.jni/findclass.c deleted file mode 100644 index 9a71508ab3f..00000000000 --- a/libjava/testsuite/libjava.jni/findclass.c +++ /dev/null @@ -1,12 +0,0 @@ -#include <stdlib.h> - -#include <findclass.h> - -jclass -Java_findclass_doit (JNIEnv *env, jclass klass, jstring name) -{ - const char *buf = (*env)->GetStringUTFChars (env, name, NULL); - jclass k = (*env)->FindClass (env, buf); - (*env)->ReleaseStringUTFChars (env, name, buf); - return k; -} diff --git a/libjava/testsuite/libjava.jni/findclass.java b/libjava/testsuite/libjava.jni/findclass.java deleted file mode 100644 index b857538e663..00000000000 --- a/libjava/testsuite/libjava.jni/findclass.java +++ /dev/null @@ -1,16 +0,0 @@ -// Test FindClass part of JNI. - -public class findclass -{ - static - { - System.loadLibrary ("findclass"); - } - - public static native Class doit (String name); - - public static void main (String[] args) - { - System.out.println ("" + doit ("java/lang/String")); - } -} diff --git a/libjava/testsuite/libjava.jni/findclass.out b/libjava/testsuite/libjava.jni/findclass.out deleted file mode 100644 index 124026a2e98..00000000000 --- a/libjava/testsuite/libjava.jni/findclass.out +++ /dev/null @@ -1 +0,0 @@ -class java.lang.String diff --git a/libjava/testsuite/libjava.jni/invoke.c b/libjava/testsuite/libjava.jni/invoke.c deleted file mode 100644 index 35a446eae25..00000000000 --- a/libjava/testsuite/libjava.jni/invoke.c +++ /dev/null @@ -1,7 +0,0 @@ -#include <invoke.h> - -jint -Java_invoke_val (JNIEnv *env, jclass klass) -{ - return 23; -} diff --git a/libjava/testsuite/libjava.jni/invoke.java b/libjava/testsuite/libjava.jni/invoke.java deleted file mode 100644 index 91c9d374701..00000000000 --- a/libjava/testsuite/libjava.jni/invoke.java +++ /dev/null @@ -1,18 +0,0 @@ -// Test to make sure the minimal invocation works. - -public class invoke -{ - public static native int val (); - - static - { - System.out.println ("trying..."); - System.loadLibrary ("invoke"); - System.out.println ("loaded"); - } - - public static void main (String[] args) - { - System.out.println (val ()); - } -} diff --git a/libjava/testsuite/libjava.jni/invoke.out b/libjava/testsuite/libjava.jni/invoke.out deleted file mode 100644 index f59a6d2e495..00000000000 --- a/libjava/testsuite/libjava.jni/invoke.out +++ /dev/null @@ -1,3 +0,0 @@ -trying... -loaded -23 diff --git a/libjava/testsuite/libjava.jni/noclass.c b/libjava/testsuite/libjava.jni/noclass.c deleted file mode 100644 index 5f2caf428ae..00000000000 --- a/libjava/testsuite/libjava.jni/noclass.c +++ /dev/null @@ -1,9 +0,0 @@ -#include <noclass.h> - -void -Java_noclass_find_1it (JNIEnv *env, jclass k) -{ - /* We cause an exception by asking for a class we know does not - exist. */ - k = (*env)->FindClass (env, "java/lang/Sarcophagus"); -} diff --git a/libjava/testsuite/libjava.jni/noclass.java b/libjava/testsuite/libjava.jni/noclass.java deleted file mode 100644 index 7e0b8c34cca..00000000000 --- a/libjava/testsuite/libjava.jni/noclass.java +++ /dev/null @@ -1,25 +0,0 @@ -// Test to make sure JNI implementation catches exceptions. - -public class noclass -{ - static - { - System.loadLibrary ("noclass"); - } - - public static native void find_it (); - - public static void main (String[] args) - { - try - { - find_it (); - } - catch (Throwable _) - { - // If find_it() causes a crash, or doesn't throw an exception, - // we won't be running this next line. - System.out.println ("Ok"); - } - } -} diff --git a/libjava/testsuite/libjava.jni/noclass.out b/libjava/testsuite/libjava.jni/noclass.out deleted file mode 100644 index 7326d960397..00000000000 --- a/libjava/testsuite/libjava.jni/noclass.out +++ /dev/null @@ -1 +0,0 @@ -Ok diff --git a/libjava/testsuite/libjava.jni/overload.c b/libjava/testsuite/libjava.jni/overload.c deleted file mode 100644 index d171fc3ac9b..00000000000 --- a/libjava/testsuite/libjava.jni/overload.c +++ /dev/null @@ -1,16 +0,0 @@ -#include <overload.h> - -jint -Java_overload_over__I (JNIEnv *env, jclass klass, jint val) -{ - return val; -} - - -jint -Java_overload_over__II (JNIEnv *env, jclass klass, jint one, jint two) -{ - return one + two; -} - - diff --git a/libjava/testsuite/libjava.jni/overload.java b/libjava/testsuite/libjava.jni/overload.java deleted file mode 100644 index c2e6037a50c..00000000000 --- a/libjava/testsuite/libjava.jni/overload.java +++ /dev/null @@ -1,18 +0,0 @@ -// Test to make sure overloaded functions with long names work. - -public class overload -{ - static - { - System.loadLibrary ("overload"); - } - - public static native int over (int one); - public static native int over (int one, int two); - - public static void main (String[] args) - { - System.out.println (over (1)); - System.out.println (over (1, 2)); - } -} diff --git a/libjava/testsuite/libjava.jni/overload.out b/libjava/testsuite/libjava.jni/overload.out deleted file mode 100644 index 2b2f2e1b926..00000000000 --- a/libjava/testsuite/libjava.jni/overload.out +++ /dev/null @@ -1,2 +0,0 @@ -1 -3 diff --git a/libjava/testsuite/libjava.jni/register.c b/libjava/testsuite/libjava.jni/register.c deleted file mode 100644 index 738182cf0f6..00000000000 --- a/libjava/testsuite/libjava.jni/register.c +++ /dev/null @@ -1,32 +0,0 @@ -#include <stdlib.h> -#include <assert.h> -#include <register.h> - -static jint -some_random_name (JNIEnv *env, jclass k, jint v) -{ - return v - 1; -} - -jint -JNI_OnLoad (JavaVM *vm, void *nothing) -{ - JNIEnv *env; - JNINativeMethod meth; - jclass k; - jint r; - - r = (*vm)->GetEnv (vm, (void **) &env, JNI_VERSION_1_2); - assert (r == JNI_OK); - k = (*env)->FindClass (env, "register"); - assert (k != NULL); - - meth.name = "doit"; - meth.signature = "(I)I"; - meth.fnPtr = some_random_name; - - r = (*env)->RegisterNatives (env, k, &meth, 1); - assert (r == JNI_OK); - - return JNI_VERSION_1_2; -} diff --git a/libjava/testsuite/libjava.jni/register.java b/libjava/testsuite/libjava.jni/register.java deleted file mode 100644 index 0c0cbf62891..00000000000 --- a/libjava/testsuite/libjava.jni/register.java +++ /dev/null @@ -1,16 +0,0 @@ -// register.java - Test RegisterNatives. - -public class register -{ - static - { - System.loadLibrary ("register"); - } - - public static native int doit (int z); - - public static void main (String[] args) - { - System.out.println (doit (24)); - } -} diff --git a/libjava/testsuite/libjava.jni/register.out b/libjava/testsuite/libjava.jni/register.out deleted file mode 100644 index 409940768f2..00000000000 --- a/libjava/testsuite/libjava.jni/register.out +++ /dev/null @@ -1 +0,0 @@ -23 diff --git a/libjava/testsuite/libjava.jni/simple_int.c b/libjava/testsuite/libjava.jni/simple_int.c deleted file mode 100644 index a86f2d2babd..00000000000 --- a/libjava/testsuite/libjava.jni/simple_int.c +++ /dev/null @@ -1,7 +0,0 @@ -#include <simple_int.h> - -jint -Java_simple_1int_nat (JNIEnv *env, jclass klass, jint val) -{ - return 2 * val; -} diff --git a/libjava/testsuite/libjava.jni/simple_int.java b/libjava/testsuite/libjava.jni/simple_int.java deleted file mode 100644 index 6306c4e9335..00000000000 --- a/libjava/testsuite/libjava.jni/simple_int.java +++ /dev/null @@ -1,16 +0,0 @@ -// Test a simple static function with an `int' argument. - -public class simple_int -{ - public static native int nat (int z); - - static - { - System.loadLibrary ("simple_int"); - } - - public static void main (String[] args) - { - System.out.println (nat (23)); - } -} diff --git a/libjava/testsuite/libjava.jni/simple_int.out b/libjava/testsuite/libjava.jni/simple_int.out deleted file mode 100644 index 9e5feb52569..00000000000 --- a/libjava/testsuite/libjava.jni/simple_int.out +++ /dev/null @@ -1 +0,0 @@ -46 diff --git a/libjava/testsuite/libjava.jni/throwit.c b/libjava/testsuite/libjava.jni/throwit.c deleted file mode 100644 index 0b02459b464..00000000000 --- a/libjava/testsuite/libjava.jni/throwit.c +++ /dev/null @@ -1,25 +0,0 @@ -#include <stdlib.h> -#include <throwit.h> - -void -Java_throwit_throwit (JNIEnv *env, jclass klass, jstring name, - jboolean is_new) -{ - const char *buf = (*env)->GetStringUTFChars (env, name, NULL); - jclass k = (*env)->FindClass (env, buf); - (*env)->ReleaseStringUTFChars (env, name, buf); - - if (k == NULL || (*env)->ExceptionCheck (env)) - return; - - if (is_new) - (*env)->ThrowNew (env, k, "the word is zardoz"); - else - { - jmethodID id = (*env)->GetMethodID (env, k, "<init>", - "(Ljava.lang.String;)V"); - jstring z = (*env)->NewStringUTF (env, "zardoz is the word"); - jobject obj = (*env)->NewObject (env, k, id, z); - (*env)->Throw (env, obj); - } -} diff --git a/libjava/testsuite/libjava.jni/throwit.java b/libjava/testsuite/libjava.jni/throwit.java deleted file mode 100644 index 459622d390f..00000000000 --- a/libjava/testsuite/libjava.jni/throwit.java +++ /dev/null @@ -1,33 +0,0 @@ -// Test to see if throw works. - -public class throwit -{ - static - { - System.loadLibrary ("throwit"); - } - - public static native void throwit (String name, boolean is_new); - - public static void main (String[] args) - { - try - { - throwit ("java/lang/UnknownError", false); - } - catch (Throwable x) - { - System.out.println (x.getClass ()); - System.out.println (x.getMessage ()); - } - try - { - throwit ("java/lang/Throwable", true); - } - catch (Throwable x) - { - System.out.println (x.getClass ()); - System.out.println (x.getMessage ()); - } - } -} diff --git a/libjava/testsuite/libjava.jni/throwit.out b/libjava/testsuite/libjava.jni/throwit.out deleted file mode 100644 index c50b7a9abbc..00000000000 --- a/libjava/testsuite/libjava.jni/throwit.out +++ /dev/null @@ -1,4 +0,0 @@ -class java.lang.UnknownError -zardoz is the word -class java.lang.Throwable -the word is zardoz diff --git a/libjava/testsuite/libjava.jni/virtual.c b/libjava/testsuite/libjava.jni/virtual.c deleted file mode 100644 index bda837df102..00000000000 --- a/libjava/testsuite/libjava.jni/virtual.c +++ /dev/null @@ -1,7 +0,0 @@ -#include <virtual.h> - -jboolean -Java_virtual_equals (JNIEnv *env, jobject thisv, jobject other) -{ - return JNI_FALSE; -} diff --git a/libjava/testsuite/libjava.jni/virtual.java b/libjava/testsuite/libjava.jni/virtual.java deleted file mode 100644 index 496389ce5e3..00000000000 --- a/libjava/testsuite/libjava.jni/virtual.java +++ /dev/null @@ -1,17 +0,0 @@ -// Minimal test of a virtual method. - -public class virtual -{ - static - { - System.loadLibrary ("virtual"); - } - - public native boolean equals (Object obj); - - public static void main (String[] args) - { - Object v = new virtual (); - System.out.println (v.equals (v)); - } -} diff --git a/libjava/testsuite/libjava.jni/virtual.out b/libjava/testsuite/libjava.jni/virtual.out deleted file mode 100644 index c508d5366f7..00000000000 --- a/libjava/testsuite/libjava.jni/virtual.out +++ /dev/null @@ -1 +0,0 @@ -false diff --git a/libjava/testsuite/libjava.lang/Array_1.java b/libjava/testsuite/libjava.lang/Array_1.java deleted file mode 100644 index 1fcf04eeb4d..00000000000 --- a/libjava/testsuite/libjava.lang/Array_1.java +++ /dev/null @@ -1,18 +0,0 @@ -// Test of array stuff. Technically this probably isn't in java.lang. - -public class Array_1 -{ - public static void main (String[] args) - { - int x[][] = { { 1, 2}, null }; - - System.out.println(Cloneable.class.isInstance(x)); - - // This example is from the Java Spec book. - int y[][] = (int[][]) x.clone(); - System.out.println(x == y); - System.out.println(x[0] == y[0] && x[1] == y[1]); - - System.out.println(x.getClass().getSuperclass()); - } -} diff --git a/libjava/testsuite/libjava.lang/Array_1.out b/libjava/testsuite/libjava.lang/Array_1.out deleted file mode 100644 index 3cc754d2ef9..00000000000 --- a/libjava/testsuite/libjava.lang/Array_1.out +++ /dev/null @@ -1,4 +0,0 @@ -true -false -true -class java.lang.Object diff --git a/libjava/testsuite/libjava.lang/Array_2.java b/libjava/testsuite/libjava.lang/Array_2.java deleted file mode 100644 index b406c47d6df..00000000000 --- a/libjava/testsuite/libjava.lang/Array_2.java +++ /dev/null @@ -1,14 +0,0 @@ -// Test to make sure multidimensional arrays work. -// From Bryce McKinlay - -public class Array_2 -{ - static final int a = 10, b = 15; - - public static void main(String args[]) - { - int[][] foo = new int [a][b]; - System.out.println(foo.length); - System.out.println(foo[a-1].length); - } -} diff --git a/libjava/testsuite/libjava.lang/Array_2.out b/libjava/testsuite/libjava.lang/Array_2.out deleted file mode 100644 index 349103a8769..00000000000 --- a/libjava/testsuite/libjava.lang/Array_2.out +++ /dev/null @@ -1,2 +0,0 @@ -10 -15 diff --git a/libjava/testsuite/libjava.lang/Class_1.java b/libjava/testsuite/libjava.lang/Class_1.java deleted file mode 100644 index f2156ebff30..00000000000 --- a/libjava/testsuite/libjava.lang/Class_1.java +++ /dev/null @@ -1,49 +0,0 @@ -class C {} -class D extends C implements I {} -interface I {} -interface J extends I {} - -public class Class_1 -{ - static void printIsAssignableFrom(Class a, Class b, boolean c) - { - // The field 'c' can be viewed to see the expected value. - System.out.println(a.isAssignableFrom(b)); - } - - public static void main (String arg[]) - { - System.out.println("Testing class `Class_1'..."); - printIsAssignableFrom(C.class, Object.class, false); - printIsAssignableFrom(C.class, C.class, true); - printIsAssignableFrom(C.class, D.class, true); - printIsAssignableFrom(D.class, C.class, false); - - printIsAssignableFrom(Object.class, int[].class, true); - printIsAssignableFrom(int[].class, int[].class, true); - printIsAssignableFrom(C[].class, D.class, false); - printIsAssignableFrom(C[].class, D[].class, true); - // Known compiler limitation prevents next case from compiling. - // printIsAssignableFrom(C[].class, C[][].class, false); - System.out.println("printIsAssignableFrom(C[].class, C[][].class, false);" + - " case uncompilable due to known compiler limitation."); - - printIsAssignableFrom(Object.class, I.class, true); - printIsAssignableFrom(I.class, I.class, true); - printIsAssignableFrom(D.class, I.class, false); - printIsAssignableFrom(I.class, D.class, true); - - printIsAssignableFrom(D.class, J.class, false); - printIsAssignableFrom(J.class, D.class, false); - - printIsAssignableFrom(I.class, J.class, true); - printIsAssignableFrom(J.class, J.class, true); - printIsAssignableFrom(J.class, I.class, false); - - // Returns true iff both Class objects are equal. - printIsAssignableFrom(long.class, long.class, true); - - // Does not work for primitive types in general. - printIsAssignableFrom(long.class, int.class, false); - } -} diff --git a/libjava/testsuite/libjava.lang/Class_1.out b/libjava/testsuite/libjava.lang/Class_1.out deleted file mode 100644 index 531b94f0625..00000000000 --- a/libjava/testsuite/libjava.lang/Class_1.out +++ /dev/null @@ -1,21 +0,0 @@ -Testing class `Class_1'... -false -true -true -false -true -true -false -true -false -true -true -false -true -false -false -true -true -false -true -false diff --git a/libjava/testsuite/libjava.lang/Divide_1.java b/libjava/testsuite/libjava.lang/Divide_1.java deleted file mode 100644 index d4e01939aa5..00000000000 --- a/libjava/testsuite/libjava.lang/Divide_1.java +++ /dev/null @@ -1,105 +0,0 @@ -public class Divide_1 -{ - static int b = Integer.parseInt ("-1"); - int b1 = Integer.parseInt ("-1"); - static int zero = Integer.parseInt ("0"); - - void probe () - { - try { - int a = Integer.parseInt ("-80000000", 16); - int c = a/b; - System.out.println (c); - } catch (Exception _) { - System.out.println (_); - } - - try { - int a = Integer.parseInt ("-80000000", 16); - int c = a/-1; - System.out.println (c); - } catch (Exception _) { - System.out.println (_); - } - - try { - int a = Integer.parseInt ("-80000000", 16); - int c = a%b; - System.out.println (c); - } catch (Exception _) { - System.out.println (_); - } - - try { - int a = Integer.parseInt ("-80000000", 16); - int c = a%b1; - System.out.println (c); - } catch (Exception _) { - System.out.println (_); - } - - try { - int a = Integer.parseInt ("-80000000", 16); - int c = a%-1; - System.out.println (c); - } catch (Exception _) { - System.out.println (_); - } - - try { - int a = Integer.parseInt ("8000", 16); - int b = Integer.parseInt ("0", 16); - int c = a/b; - System.out.println (c); - } catch (Exception _) { - System.out.println (_); - } - - try { - int a = Integer.parseInt ("8000", 16); - int b = Integer.parseInt ("0", 16); - int c = a%b; - System.out.println (c); - } catch (Exception _) { - System.out.println (_); - } - - try { - long a = Long.parseLong ("-8000000000000000", 16); - long c = a/b; - System.out.println (c); - } catch (Exception _) { - System.out.println (_); - } - - try { - long a = Long.parseLong ("-8000000000000000", 16); - long c = a%b; - System.out.println (c); - } catch (Exception _) { - System.out.println (_); - } - - try { - long a = Long.parseLong ("8000", 16); - long b = Long.parseLong ("0", 16); - long c = a/b; - System.out.println (c); - } catch (Exception _) { - System.out.println (_); - } - - try { - long a = Long.parseLong ("8000", 16); - long b = Long.parseLong ("0", 16); - long c = a%b; - System.out.println (c); - } catch (Exception _) { - System.out.println (_); - } - } - - public static void main (String[] args) { - new Divide_1 ().probe (); - } -} diff --git a/libjava/testsuite/libjava.lang/Divide_1.out b/libjava/testsuite/libjava.lang/Divide_1.out deleted file mode 100644 index 6e1f87ed4fc..00000000000 --- a/libjava/testsuite/libjava.lang/Divide_1.out +++ /dev/null @@ -1,11 +0,0 @@ --2147483648 --2147483648 -0 -0 -0 -java.lang.ArithmeticException: / by zero -java.lang.ArithmeticException: / by zero --9223372036854775808 -0 -java.lang.ArithmeticException: / by zero -java.lang.ArithmeticException: / by zero diff --git a/libjava/testsuite/libjava.lang/Final.java b/libjava/testsuite/libjava.lang/Final.java deleted file mode 100644 index 1b22096c359..00000000000 --- a/libjava/testsuite/libjava.lang/Final.java +++ /dev/null @@ -1,20 +0,0 @@ -public final class Final -{ - public static void main(String args[]) - { - Final f = null; - try - { - f.doSomething(); - } - catch (NullPointerException x) - { - System.out.println("NullPointerException - ok"); - } - } - - void doSomething() - { - System.out.println("This should not happen"); - } -} diff --git a/libjava/testsuite/libjava.lang/Final.out b/libjava/testsuite/libjava.lang/Final.out deleted file mode 100644 index 2e513123d7c..00000000000 --- a/libjava/testsuite/libjava.lang/Final.out +++ /dev/null @@ -1 +0,0 @@ -NullPointerException - ok diff --git a/libjava/testsuite/libjava.lang/Final.xfail b/libjava/testsuite/libjava.lang/Final.xfail deleted file mode 100644 index c999f8ee0ca..00000000000 --- a/libjava/testsuite/libjava.lang/Final.xfail +++ /dev/null @@ -1 +0,0 @@ -xfail-output diff --git a/libjava/testsuite/libjava.lang/Float_1.java b/libjava/testsuite/libjava.lang/Float_1.java deleted file mode 100644 index cb147ee8aca..00000000000 --- a/libjava/testsuite/libjava.lang/Float_1.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - -Date: 25 Aug 1998 16:04:00 -0000 -From: Andrew Haley <aph@pasanda.cygnus.co.uk> -To: java-project@cygnus.com -Subject: Help: vtable problem? - -My little program: - ------------------------------------------------------------------------ -import java.lang.*; - - public class widget - { - public static void main (String argv[]) - { - int test = Float.floatToIntBits((float)2.0); - String s = Integer.toHexString(test); - - System.out.print (s+"\n"); - } - - } ------------------------------------------------------------------------ -prints out - -40000000 - -with Sun's interpreter, but prints out - -true - -when compiled with gcj; PrintStream dispatches a string arg as a -boolean rather than as a String. I've tried to rebuild everything. - -? - -Thanks, -Andrew. - -*/ - -public class Float_1 -{ - public static void main (String argv[]) - { - int test = Float.floatToIntBits((float)2.0); - String s = Integer.toHexString(test); - - System.out.print (s+"\n"); - } -} diff --git a/libjava/testsuite/libjava.lang/Float_1.out b/libjava/testsuite/libjava.lang/Float_1.out deleted file mode 100644 index 52f3f6a7451..00000000000 --- a/libjava/testsuite/libjava.lang/Float_1.out +++ /dev/null @@ -1 +0,0 @@ -40000000 diff --git a/libjava/testsuite/libjava.lang/G19990301_01.java b/libjava/testsuite/libjava.lang/G19990301_01.java deleted file mode 100644 index abd38cef4a2..00000000000 --- a/libjava/testsuite/libjava.lang/G19990301_01.java +++ /dev/null @@ -1,12 +0,0 @@ -public class G19990301_01 { - public static void main(String args[]) { - foo pd = new foo(); - System.out.println ("Pass 1"); - pd.s = "test"; - System.out.println ("Pass 2"); - } -} -class foo { - static String s = "test"; -} - diff --git a/libjava/testsuite/libjava.lang/G19990301_01.out b/libjava/testsuite/libjava.lang/G19990301_01.out deleted file mode 100644 index 337175ef706..00000000000 --- a/libjava/testsuite/libjava.lang/G19990301_01.out +++ /dev/null @@ -1,2 +0,0 @@ -Pass 1 -Pass 2 diff --git a/libjava/testsuite/libjava.lang/G19990302_02.java b/libjava/testsuite/libjava.lang/G19990302_02.java deleted file mode 100644 index ecf6f295ec9..00000000000 --- a/libjava/testsuite/libjava.lang/G19990302_02.java +++ /dev/null @@ -1,15 +0,0 @@ -public class G19990302_02 { - public static void main(String args[]) { - try { - Object[] arrayObj = new String[3]; - String[] arrayStr = new String[3]; - System.out.println ("Pass 1"); - arrayObj[0] = arrayStr; // String object <-- String array object - System.out.println ("Pass 2"); - } catch (ArrayStoreException e) { - System.out.println ("ArrayStoreException"); - } - System.out.println ("Pass 3"); - } -} - diff --git a/libjava/testsuite/libjava.lang/G19990302_02.out b/libjava/testsuite/libjava.lang/G19990302_02.out deleted file mode 100644 index c254b310e43..00000000000 --- a/libjava/testsuite/libjava.lang/G19990302_02.out +++ /dev/null @@ -1,3 +0,0 @@ -Pass 1 -ArrayStoreException -Pass 3 diff --git a/libjava/testsuite/libjava.lang/G19990303_01.java b/libjava/testsuite/libjava.lang/G19990303_01.java deleted file mode 100644 index fc3ca55281c..00000000000 --- a/libjava/testsuite/libjava.lang/G19990303_01.java +++ /dev/null @@ -1,19 +0,0 @@ -public class G19990303_01 -{ - public static void main (String[] args) - { - try - { - Object[] ar = new String[3]; - String[] as = new String[3]; - System.out.println("1"); - ar[0] = as; - System.out.println("2"); - } - catch (Exception _) - { - System.out.println("X"); - } - System.out.println("3"); - } -} diff --git a/libjava/testsuite/libjava.lang/G19990303_01.out b/libjava/testsuite/libjava.lang/G19990303_01.out deleted file mode 100644 index f081db642ff..00000000000 --- a/libjava/testsuite/libjava.lang/G19990303_01.out +++ /dev/null @@ -1,3 +0,0 @@ -1 -X -3 diff --git a/libjava/testsuite/libjava.lang/G19990303_02.java b/libjava/testsuite/libjava.lang/G19990303_02.java deleted file mode 100644 index 19c8e305e2a..00000000000 --- a/libjava/testsuite/libjava.lang/G19990303_02.java +++ /dev/null @@ -1,19 +0,0 @@ -public class G19990303_02 -{ - public static void main (String[] args) - { - int i = -1; - try - { - System.out.println ("Pass 1"); - int[][][] arrayInt = new int[i][1][1]; - int ii = arrayInt[i - 1][0][0]; - System.out.println ("Pass 2"); - } - catch (NegativeArraySizeException e) - { - System.out.println ("Pass NegativeArraySizeException"); - } - System.out.println ("Pass 3"); - } -} diff --git a/libjava/testsuite/libjava.lang/G19990303_02.out b/libjava/testsuite/libjava.lang/G19990303_02.out deleted file mode 100644 index 940225527e5..00000000000 --- a/libjava/testsuite/libjava.lang/G19990303_02.out +++ /dev/null @@ -1,3 +0,0 @@ -Pass 1 -Pass NegativeArraySizeException -Pass 3 diff --git a/libjava/testsuite/libjava.lang/G19990304_01.java b/libjava/testsuite/libjava.lang/G19990304_01.java deleted file mode 100644 index f937089e1c4..00000000000 --- a/libjava/testsuite/libjava.lang/G19990304_01.java +++ /dev/null @@ -1,18 +0,0 @@ -public class G19990304_01 -{ - public static void main (String[] args) - { - Object[] arrayObj = new String[3]; - String[] arrayStr = new String[3]; - try - { - System.out.println ("pass 1"); - arrayObj[0] = arrayStr; - } - catch (RuntimeException e) - { - System.out.println ("RuntimeException"); - } - System.out.println ("pass 2"); - } -} diff --git a/libjava/testsuite/libjava.lang/G19990304_01.out b/libjava/testsuite/libjava.lang/G19990304_01.out deleted file mode 100644 index 6fe123eea2b..00000000000 --- a/libjava/testsuite/libjava.lang/G19990304_01.out +++ /dev/null @@ -1,3 +0,0 @@ -pass 1 -RuntimeException -pass 2 diff --git a/libjava/testsuite/libjava.lang/G19990310_01.java b/libjava/testsuite/libjava.lang/G19990310_01.java deleted file mode 100644 index 72caece57f4..00000000000 --- a/libjava/testsuite/libjava.lang/G19990310_01.java +++ /dev/null @@ -1,21 +0,0 @@ -public class G19990310_01 -{ - public static void main (String[] args) - { - int i = 0; - try - { - System.out.println ("pass 1"); - i++; - } - finally - { - System.out.println ("pass 2"); - i++; - } - if (i == 2) - System.out.println ("OK"); - else - System.out.println ("NG i = " + i); - } -} diff --git a/libjava/testsuite/libjava.lang/G19990310_01.out b/libjava/testsuite/libjava.lang/G19990310_01.out deleted file mode 100644 index 36a538b4a90..00000000000 --- a/libjava/testsuite/libjava.lang/G19990310_01.out +++ /dev/null @@ -1,3 +0,0 @@ -pass 1 -pass 2 -OK diff --git a/libjava/testsuite/libjava.lang/InterfaceDispatch.java b/libjava/testsuite/libjava.lang/InterfaceDispatch.java deleted file mode 100644 index 17f5c46946f..00000000000 --- a/libjava/testsuite/libjava.lang/InterfaceDispatch.java +++ /dev/null @@ -1,403 +0,0 @@ -/* Test interface dispatch, type checking (instanceof), and casting. */ - -interface IA -{ - String a(); -} - -interface IB extends IA -{ - String b(); -} - -interface IC extends IB -{ - void c(); - int d(); - IB e(int i); -} - -interface ID -{ - String z(); - String a(); -} - -class CA -{ - String a() - { - return "CA a()"; - } -} - -class CB implements IB -{ - public String a() - { - return "CB a()"; - } - - public String b() - { - return "CB b()"; - } -} - -class CC extends CB -{ - public int d() - { - return 99; - } -} - -class CD extends CC implements IC -{ - public String a() - { - return "CD a()"; - } - - public void c() - { - System.out.println("CD c()"); - } - - public int d() - { - return 6; - } - - public IB e(int i) - { - if (i == 1) - return new CB(); - else - return new CD(); - } -} - -class CE extends CB implements IB, ID -{ - public String a() - { - return ("CE a()"); - } - - public String b() - { - return ("CE b()"); - } - - public String z() - { - return("CE z()"); - } -} - - -public class InterfaceDispatch -{ - public static void main(String args[]) - { - new InterfaceDispatch(); - } - - public InterfaceDispatch() - { - /* _Jv_InstanceOf */ - - /* Object instanceof CLASS */ - Object obj = new CA(); - - if (obj instanceof CA) - { - System.out.println ("ok 1"); - } - else - { - System.out.println ("FAIL 1"); - } - - obj = new CD(); - - if (!(obj instanceof CA)) - { - System.out.println ("ok 2a"); - } - else - { - System.out.println ("FAIL 2a"); - } - - if (obj instanceof CB) - { - System.out.println ("ok 2b"); - } - else - { - System.out.println ("FAIL 2b"); - } - - - /* Object instanceof INTERFACE */ - obj = new CB(); - - if (!(obj instanceof IC)) - { - System.out.println("ok 3"); - } - else - { - System.out.println ("FAIL 3"); - } - - if (obj instanceof IB) - { - System.out.println("ok 4"); - } - else - { - System.out.println ("FAIL 4"); - } - - /* InterfaceRef instanceof INTERFACE */ - - IA ia = new CB(); - - if (ia instanceof IB) - { - System.out.println("ok 5"); - } - else - { - System.out.println ("FAIL 5"); - } - - - if (!(ia instanceof IC)) - { - System.out.println("ok 6"); - } - else - { - System.out.println ("FAIL 6"); - } - - /* InterfaceRef instanceof CLASS */ - - if (ia instanceof CB) - { - System.out.println("ok 7"); - } - else - { - System.out.println ("FAIL 7"); - } - - - if (!(ia instanceof CD)) - { - System.out.println("ok 8"); - } - else - { - System.out.println ("FAIL 8"); - } - - - /* _Jv_CheckCast */ - Object obj_ca = new CA(); - Object obj_cc = new CC(); - - IA ia2; - - try - { - ia2 = (IA) obj_cc; - System.out.println("ok 9"); - } - catch (ClassCastException x) - { - System.out.println("FAIL 9"); - } - - CD cd; - - try - { - cd = (CD) obj_ca; - System.out.println("FAIL 10"); - } - catch (ClassCastException x) - { - System.out.println("ok 10"); - } - - IA ia3; - - try - { - ia3 = (IB) obj_ca; - System.out.println("FAIL 11"); - } - catch (ClassCastException x) - { - System.out.println("ok 11"); - } - - /* _Jv_LookupInterfaceMethod */ - Object obj_cb = new CB(); - - IB ib = (IB) obj_cb; - ib.b(); - if (ib.a().equalsIgnoreCase("CB a()")) - System.out.println("ok 12"); - else - System.out.println("FAIL 12"); - - IC ic = new CD(); - if (ic.a().equalsIgnoreCase("CD a()")) - System.out.println("ok 13"); - else - System.out.println("FAIL 13"); - - if (ic.d() == 6) - System.out.println("ok 14"); - else - System.out.println("FAIL 14"); - - Object ce = new CE(); - - ib = (IB) ce; - ID id = (ID) ce; - - if (ib.b().equals("CE b()") && id.a().equals("CE a()")) - System.out.println("ok 15"); - else - System.out.println("FAIL 15"); - - String t = ((ID)ce).z(); - - if (t.equalsIgnoreCase("CE z()")) - System.out.println("ok 16"); - else - System.out.println("FAIL 16"); - - /* Array types */ - - Object[] obj_a = new CC[10]; - try - { - CB[] ca_a = (CB[]) obj_a; - System.out.println("ok 17"); - } - catch (ClassCastException x) - { - System.out.println("FAIL 17"); - } - - if (obj_a instanceof IB[]) - { - System.out.println("ok 18"); - } - else - { - System.out.println("FAIL 18"); - } - - IB[] ib_a = new CD[5]; - try - { - CD[] cd_a = (CD[]) ib_a; - System.out.println("ok 19"); - } - catch (ClassCastException x) - { - System.out.println("FAIL 19"); - } - - CA[] ca_a; - - try - { - ca_a = (CA[]) ib_a; - System.out.println("FAIL 20"); - } - catch (ClassCastException x) - { - System.out.println("ok 20"); - } - - - /* Primitive types */ - - short[] short_a = new short[100]; - - try - { - obj = short_a; - System.out.println("ok 21"); - } - catch (ClassCastException x) - { - System.out.println("FAIL 21"); - } - - try - { - short[] short_b = (short[]) obj; - System.out.println("ok 22"); - } - catch (ClassCastException x) - { - System.out.println("FAIL 22"); - } - - int[] short_b; - - try - { - short_b = (int[]) obj; - System.out.println("FAIL 23"); - } - catch (ClassCastException x) - { - System.out.println("ok 23"); - } - - Object obj1 = new int[25]; - - if (obj1 instanceof short[]) - { - System.out.println("FAIL 24"); - } - else - { - System.out.println("ok 24"); - } - - if (obj1 instanceof int[]) - { - System.out.println("ok 25"); - } - else - { - System.out.println("FAIL 25"); - } - - /* null assignment */ - - CA obj_ca2 = null; - - if (obj_ca2 instanceof CA) - { - System.out.println("FAIL 26"); - } - else - { - System.out.println("ok 26"); - } - } -} diff --git a/libjava/testsuite/libjava.lang/InterfaceDispatch.out b/libjava/testsuite/libjava.lang/InterfaceDispatch.out deleted file mode 100644 index 1582e3afa04..00000000000 --- a/libjava/testsuite/libjava.lang/InterfaceDispatch.out +++ /dev/null @@ -1,27 +0,0 @@ -ok 1 -ok 2a -ok 2b -ok 3 -ok 4 -ok 5 -ok 6 -ok 7 -ok 8 -ok 9 -ok 10 -ok 11 -ok 12 -ok 13 -ok 14 -ok 15 -ok 16 -ok 17 -ok 18 -ok 19 -ok 20 -ok 21 -ok 22 -ok 23 -ok 24 -ok 25 -ok 26 diff --git a/libjava/testsuite/libjava.lang/Invoke_1.java b/libjava/testsuite/libjava.lang/Invoke_1.java deleted file mode 100644 index bc4678301ce..00000000000 --- a/libjava/testsuite/libjava.lang/Invoke_1.java +++ /dev/null @@ -1,27 +0,0 @@ -// Test of failing method invocation. - -public class Invoke_1 -{ - public void call_me () - { - System.out.println ("no"); - } - - public static Invoke_1 get_i () - { - return null; - } - - public static void main (String[] args) - { - Invoke_1 i = get_i (); - try - { - i.call_me (); - } - catch (NullPointerException ok) - { - System.out.println ("ok"); - } - } -} diff --git a/libjava/testsuite/libjava.lang/Invoke_1.out b/libjava/testsuite/libjava.lang/Invoke_1.out deleted file mode 100644 index 9766475a418..00000000000 --- a/libjava/testsuite/libjava.lang/Invoke_1.out +++ /dev/null @@ -1 +0,0 @@ -ok diff --git a/libjava/testsuite/libjava.lang/Invoke_2.java b/libjava/testsuite/libjava.lang/Invoke_2.java deleted file mode 100644 index a2d1407b31b..00000000000 --- a/libjava/testsuite/libjava.lang/Invoke_2.java +++ /dev/null @@ -1,20 +0,0 @@ -public class Invoke_2 -{ - static int s; - - public static void foo (int a, int b) - { - System.out.println(a + " " + b); - } - - public static void main(String[] args) { - foo (bar(), s); - } - - public static int bar() - { - s = 33; - return 99; - } -} - diff --git a/libjava/testsuite/libjava.lang/Invoke_2.out b/libjava/testsuite/libjava.lang/Invoke_2.out deleted file mode 100644 index 39501553b7b..00000000000 --- a/libjava/testsuite/libjava.lang/Invoke_2.out +++ /dev/null @@ -1 +0,0 @@ -99 33 diff --git a/libjava/testsuite/libjava.lang/N19990310_02.java b/libjava/testsuite/libjava.lang/N19990310_02.java deleted file mode 100644 index 0c5bd03e95f..00000000000 --- a/libjava/testsuite/libjava.lang/N19990310_02.java +++ /dev/null @@ -1,22 +0,0 @@ -/*--------------------------------------------------------------------------*/ -/* Name : N19990310_02 */ -/* : */ -/* Cause : Array value calculation in for,while,do while loop is not */ -/* : correct */ -/* : */ -/* Message : NG:[3]-->[2] */ -/*--------------------------------------------------------------------------*/ - -public class N19990310_02 { - public static void main(String[] args) { - int y[] = {2}; - for ( int i = 0; i < 1; i++ ) { - y[i] += 1; - if ( y[i] != 3 ) { - System.out.println("NG:[3]-->[" +y[i]+ "]"); - } - else - System.out.println("OK"); - } - } -} diff --git a/libjava/testsuite/libjava.lang/N19990310_02.out b/libjava/testsuite/libjava.lang/N19990310_02.out deleted file mode 100644 index d86bac9de59..00000000000 --- a/libjava/testsuite/libjava.lang/N19990310_02.out +++ /dev/null @@ -1 +0,0 @@ -OK diff --git a/libjava/testsuite/libjava.lang/N19990310_3.java b/libjava/testsuite/libjava.lang/N19990310_3.java deleted file mode 100644 index b6dfac28749..00000000000 --- a/libjava/testsuite/libjava.lang/N19990310_3.java +++ /dev/null @@ -1,24 +0,0 @@ -/*--------------------------------------------------------------------------*/ -/* Name : N19990310_3 */ -/* : */ -/* Cause : Evaluation order miss, when make integer array. */ -/* : */ -/* Message : NG:[4]-->[1] */ -/*--------------------------------------------------------------------------*/ - -public class N19990310_3 { - public static void main(String[] args) { - - int x = 4; - - int ary[][] = new int[x][x=1]; - - if ( ary.length == 4 ) { - System.out.println("OK"); - } else { - System.out.println("NG:[4]-->[" +ary.length+ "]"); - } - } -} - - diff --git a/libjava/testsuite/libjava.lang/N19990310_3.out b/libjava/testsuite/libjava.lang/N19990310_3.out deleted file mode 100644 index d86bac9de59..00000000000 --- a/libjava/testsuite/libjava.lang/N19990310_3.out +++ /dev/null @@ -1 +0,0 @@ -OK diff --git a/libjava/testsuite/libjava.lang/N19990310_4.java b/libjava/testsuite/libjava.lang/N19990310_4.java deleted file mode 100644 index ad89a505bc7..00000000000 --- a/libjava/testsuite/libjava.lang/N19990310_4.java +++ /dev/null @@ -1,27 +0,0 @@ -/*--------------------------------------------------------------------------*/ -/* Name : N19990310_4.java */ -/* : */ -/* Cause : assignment operator makes error in char,byte,short variable */ -/* : */ -/* Message : In class `N19990310_4': */ -/* : In method `main(java.lang.String[])': */ -/* : Incompatible type for `='. Explicit cast needed to convert `*/ -/* : `int' to `char'. */ -/* : x += (x = 3); */ -/* : ^ */ -/* : 1 error */ -/*--------------------------------------------------------------------------*/ - -public class N19990310_4 { - public static void main(String[] args) { - char x = 9; - - x += (x = 3); - if ( x == 12 ) { - System.out.println("OK"); - } else { - System.out.println("NG"); - } - } -} - diff --git a/libjava/testsuite/libjava.lang/N19990310_4.out b/libjava/testsuite/libjava.lang/N19990310_4.out deleted file mode 100644 index d86bac9de59..00000000000 --- a/libjava/testsuite/libjava.lang/N19990310_4.out +++ /dev/null @@ -1 +0,0 @@ -OK diff --git a/libjava/testsuite/libjava.lang/N19990310_5.java b/libjava/testsuite/libjava.lang/N19990310_5.java deleted file mode 100644 index 61ccc5b9f3a..00000000000 --- a/libjava/testsuite/libjava.lang/N19990310_5.java +++ /dev/null @@ -1,29 +0,0 @@ -/*--------------------------------------------------------------------------*/ -/* Name : N19990310_5.java */ -/* : */ -/* Cause : A assignment operator makes error in char,byte,short array */ -/* : element */ -/* : */ -/* Message : In class `N19990310_5': */ -/* : In method `main(java.lang.String[])': */ -/* : Incompatible type for `='. Explicit cast needed to convert `*/ -/* : `int' to `char'. */ -/* : a[0] += (a[0] = 3); */ -/* : ^ */ -/* : 1 error */ -/*--------------------------------------------------------------------------*/ - -public class N19990310_5 { - public static void main(String[] args) { - char[] a = {9}; - a[0] += (a[0] = 3); - - if ( a[0] == 12 ) { - System.out.println("OK"); - } else { - System.out.println("NG"); - } - } -} - - diff --git a/libjava/testsuite/libjava.lang/N19990310_5.out b/libjava/testsuite/libjava.lang/N19990310_5.out deleted file mode 100644 index d86bac9de59..00000000000 --- a/libjava/testsuite/libjava.lang/N19990310_5.out +++ /dev/null @@ -1 +0,0 @@ -OK diff --git a/libjava/testsuite/libjava.lang/PR141.java b/libjava/testsuite/libjava.lang/PR141.java deleted file mode 100644 index c3314f2af76..00000000000 --- a/libjava/testsuite/libjava.lang/PR141.java +++ /dev/null @@ -1,41 +0,0 @@ -import java.io.IOException; -import java.io.StreamTokenizer; -import java.io.StringReader; - -public class PR141 { - public static void test(String str) throws IOException { - StringReader reader = new StringReader(str); - StreamTokenizer st = new StreamTokenizer(reader); - int t = 0; - - do { - t = st.nextToken(); - - switch (t) { - case StreamTokenizer.TT_WORD: - System.out.println("[TT_WORD]: " + st.sval); - break; - case StreamTokenizer.TT_NUMBER: - System.out.println("[TT_NUMBER]: " + st.nval); - break; - case StreamTokenizer.TT_EOL: - System.out.println("[TT_EOL]"); - break; - case StreamTokenizer.TT_EOF: - System.out.println("[TT_EOF]"); - break; - default: - System.out.println((char)t); - break; - } - } while (t != StreamTokenizer.TT_EOF); - } - - public static void main(String[] args) { - try { - test("(a).(b)"); - } catch (Throwable t) { - t.printStackTrace(); - } - } -} diff --git a/libjava/testsuite/libjava.lang/PR141.out b/libjava/testsuite/libjava.lang/PR141.out deleted file mode 100644 index 37cb87c6de2..00000000000 --- a/libjava/testsuite/libjava.lang/PR141.out +++ /dev/null @@ -1,8 +0,0 @@ -( -[TT_WORD]: a -) -[TT_NUMBER]: 0.0 -( -[TT_WORD]: b -) -[TT_EOF] diff --git a/libjava/testsuite/libjava.lang/PR160.java b/libjava/testsuite/libjava.lang/PR160.java deleted file mode 100644 index 77526ef5219..00000000000 --- a/libjava/testsuite/libjava.lang/PR160.java +++ /dev/null @@ -1,34 +0,0 @@ -public class PR160 -{ - static final int len = 100; - - public static void main(String args[]) - { - - double[] a = new double[len]; - double[] b = new double[len]; - - for (int i = 0; i < len ; i++) - { - a[i] = 0.65; - } - - System.arraycopy(a, 0, b, 0, len); - - boolean errors = false; - - for (int i = 0; i < len ; i++) - { - if (a[i] != b[i]) - { - System.out.println("ERROR! " + a[i] + " != " - + b[i] + " at index " + i); - errors = true; - } - } - - if (!errors) - System.out.println("ok"); - - } -} diff --git a/libjava/testsuite/libjava.lang/PR160.out b/libjava/testsuite/libjava.lang/PR160.out deleted file mode 100644 index 9766475a418..00000000000 --- a/libjava/testsuite/libjava.lang/PR160.out +++ /dev/null @@ -1 +0,0 @@ -ok diff --git a/libjava/testsuite/libjava.lang/PR162.java b/libjava/testsuite/libjava.lang/PR162.java deleted file mode 100644 index ffabce0e091..00000000000 --- a/libjava/testsuite/libjava.lang/PR162.java +++ /dev/null @@ -1,29 +0,0 @@ -interface I -{ - int i = 1, ii = PR162.out ("ii", 2); -} - -interface J extends I -{ - int j = PR162.out ("j", 3), jj = PR162.out ("jj", 4); -} - -interface K extends J -{ - int k = PR162.out ("k", 5); -} - -public class PR162 -{ - public static void main (String[] args) - { - System.out.println (J.i); - System.out.println (K.j); - } - - public static int out (String s, int i) - { - System.out.println (s + "=" + i); - return i; - } -} diff --git a/libjava/testsuite/libjava.lang/PR162.out b/libjava/testsuite/libjava.lang/PR162.out deleted file mode 100644 index 6510a2d5921..00000000000 --- a/libjava/testsuite/libjava.lang/PR162.out +++ /dev/null @@ -1,4 +0,0 @@ -1 -j=3 -jj=4 -3 diff --git a/libjava/testsuite/libjava.lang/PR218.java b/libjava/testsuite/libjava.lang/PR218.java deleted file mode 100644 index 14486dfad0a..00000000000 --- a/libjava/testsuite/libjava.lang/PR218.java +++ /dev/null @@ -1,28 +0,0 @@ -// Bug in gcj 20000427: Java executables can abort trying to access a null -// pointer in a leaf function. - -public class PR218 -{ - private int i = 5; - - public static void main(String[] args) - { - try - { - new PR218().foo(null); - } - catch (NullPointerException x) - { - System.out.println(x); - } - } - - void foo(PR218 e) - { - e.i += 4; - }; -} - -// Expected output: -// -// java.lang.NullPointerException diff --git a/libjava/testsuite/libjava.lang/PR218.out b/libjava/testsuite/libjava.lang/PR218.out deleted file mode 100644 index 7a72d865c98..00000000000 --- a/libjava/testsuite/libjava.lang/PR218.out +++ /dev/null @@ -1 +0,0 @@ -java.lang.NullPointerException diff --git a/libjava/testsuite/libjava.lang/PR242.java b/libjava/testsuite/libjava.lang/PR242.java deleted file mode 100644 index 6f74b462082..00000000000 --- a/libjava/testsuite/libjava.lang/PR242.java +++ /dev/null @@ -1,36 +0,0 @@ -class Base -{ - int someNum() - { - System.out.println ("ok"); - return 0; - } -} - -public class PR242 extends Base -{ - public static void main(String args[]) - { - new PR242(); - } - - PR242() - { - new Inner().a(); - } - - class Inner - { - public int dummy() - { - System.out.println ("wrong method called!!"); - return -1; - } - - public void a() - { - System.out.println ("..."); - System.out.println (someNum()); - } - } -} diff --git a/libjava/testsuite/libjava.lang/PR242.out b/libjava/testsuite/libjava.lang/PR242.out deleted file mode 100644 index 98b7db3968c..00000000000 --- a/libjava/testsuite/libjava.lang/PR242.out +++ /dev/null @@ -1,3 +0,0 @@ -... -ok -0 diff --git a/libjava/testsuite/libjava.lang/PR260.java b/libjava/testsuite/libjava.lang/PR260.java deleted file mode 100644 index 7bd49eb90a9..00000000000 --- a/libjava/testsuite/libjava.lang/PR260.java +++ /dev/null @@ -1,15 +0,0 @@ -class A -{ - static - { - System.out.println ("A initialized"); - } -} - -public class PR260 -{ - public static void main(String args[]) - { - Class klass = A.class; - } -} diff --git a/libjava/testsuite/libjava.lang/PR260.out b/libjava/testsuite/libjava.lang/PR260.out deleted file mode 100644 index cba223424e6..00000000000 --- a/libjava/testsuite/libjava.lang/PR260.out +++ /dev/null @@ -1 +0,0 @@ -A initialized diff --git a/libjava/testsuite/libjava.lang/PR55.java b/libjava/testsuite/libjava.lang/PR55.java deleted file mode 100644 index 66619bf2c51..00000000000 --- a/libjava/testsuite/libjava.lang/PR55.java +++ /dev/null @@ -1,9 +0,0 @@ -public class PR55 { - - // This demonstrates a bug in gcj - - public static void main(String[] argv){ - int i = 666; - System.out.println("The number "+i+" is "+ (""+i).length() +" digits wide"); - } -} diff --git a/libjava/testsuite/libjava.lang/PR55.out b/libjava/testsuite/libjava.lang/PR55.out deleted file mode 100644 index 510a24206f5..00000000000 --- a/libjava/testsuite/libjava.lang/PR55.out +++ /dev/null @@ -1 +0,0 @@ -The number 666 is 3 digits wide diff --git a/libjava/testsuite/libjava.lang/PR56.java b/libjava/testsuite/libjava.lang/PR56.java deleted file mode 100644 index 27f7c3021cd..00000000000 --- a/libjava/testsuite/libjava.lang/PR56.java +++ /dev/null @@ -1,8 +0,0 @@ -public final class PR56 { - public static void main(String[] args) { - Object o = args; - int[] a; - if (!(o instanceof int[]) || (a = (int[])o).length != 2) { - } - } -} diff --git a/libjava/testsuite/libjava.lang/PR56.out b/libjava/testsuite/libjava.lang/PR56.out deleted file mode 100644 index e69de29bb2d..00000000000 --- a/libjava/testsuite/libjava.lang/PR56.out +++ /dev/null diff --git a/libjava/testsuite/libjava.lang/Primes.java b/libjava/testsuite/libjava.lang/Primes.java deleted file mode 100644 index d6e4336726a..00000000000 --- a/libjava/testsuite/libjava.lang/Primes.java +++ /dev/null @@ -1,213 +0,0 @@ -// Primes.java
-
-/** Copyright 1998
- * Roedy Green
- * Canadian Mind Products
- * 5317 Barker Avenue
- * Burnaby, BC Canada V5H 2N6
- * tel: (604) 435-3016
- * mailto:roedy@mindprod.com
- * http://mindprod.com
- */
-// May be freely distributed for any purpose but military
-
-import java.util.BitSet;
-
-/**
- * @author Roedy Green
- * @version 1.10 1998 November 10
- * Calculate primes using Eratostheses Sieve.
- * Tell if a given number is prime.
- * Find a prime just below a given number.
- * Find a prime just above a given number.
- */
-
-/*
- * version 1.1 1998 November 10 - new address and phone.
- */
-class Primes
- {
-
- /**
- * constructors
- */
- Primes()
- {
- ensureCapacity(1000);
- }
-
- /**
- * @param capacity - largest number you will be asking if prime.
- * If give too small a number, it will automatically grow by
- * recomputing the sieve array.
- */
- Primes (int capacity)
- {
- ensureCapacity(capacity);
- }
-
- /**
- * @param candidate - is this a prime?
- */
- public boolean isPrime(int candidate)
- {
- ensureCapacity(candidate);
- if (candidate < 3) return candidate != 0;
- if (candidate % 2 == 0 ) return false;
- return !b.get(candidate/2);
- }
-
- /**
- * @return first prime higher than candidate
- */
- public int above(int candidate)
- {
- do
- {
- // see what we can find in the existing sieve
- for (int i=candidate+1; i<= sieveCapacity; i++)
- {
- if (isPrime(i)) return i;
- }
- // Keep building ever bigger sieves till we succeed.
- // The next prime P' is between P+2 and P^2 - 2.
- // However that is a rather pessimistic upper bound.
- // Ideally some theorem would tell us how big we need to build
- // to find one.
- ensureCapacity(Math.max(candidate*2, sieveCapacity*2));
- } // end do
- while (true);
- } // end above
-
- /**
- * @param return first prime less than candidate
- */
- public int below (int candidate)
- {
- for (candidate--; candidate > 0; candidate--)
- {
- if (isPrime(candidate)) return candidate;
- }
- // candidate was 1 or 0 or -ve
- return 0;
- }
-
- /**
- * calc all primes in the range 1..n,
- * not the first n primes.
- * @param n, highest candidate, not necessarily prime.
- * @return list of primes 1..n in an array
- */
- public final int[] getPrimes(int n)
- {
- // calculate the primes
- ensureCapacity(n);
-
- // pass 1: count primes
- int countPrimes = 0;
- for (int i = 0; i <= n; i++)
- {
- if (isPrime(i)) countPrimes++;
- }
-
- // pass 2: construct array of primes
- int [] primes = new int[countPrimes];
- countPrimes = 0;
- for (int i = 0; i <= n; i++)
- {
- if (isPrime(i)) primes[countPrimes++] = i;
- }
- return primes;
- } // end getPrimes
-
- /**
- * calculate the sieve, bit map of all primes 0..n
- * @param n highest number evalutated by the sieve, not necessarily prime.
- */
- private final void sieve ( int n )
- {
- // Presume BitSet b set is big enough for our purposes.
- // Presume all even numbers are already marked composite, effectively.
- // Presume all odd numbers are already marked prime (0 in bit map).
- int last = (int)(Math.sqrt(n))+1;
- for (int candidate = 3; candidate <= last; candidate += 2)
- {
- // only look at odd numbers
- if (!b.get(candidate/2) /* if candidate is prime */)
- {
- // Our candidate is prime.
- // Only bother to mark multiples of primes. Others already done.
- // no need to mark even multiples, already done
- int incr = candidate*2;
- for ( int multiple = candidate + incr; multiple < n; multiple += incr)
- {
- b.set(multiple/2); // mark multiple as composite
- } // end for multiple
- } // end if
- } // end for candidate
- // at this point our sieve b is correct, except for 0..2
- } // end sieve
-
- /**
- * Ensure have a sieve to tackle primes as big as n.
- * If we don't allocate a sieve big enough and calculate it.
- * @param n - ensure sieve big enough to evaluate n for primality.
- */
- private void ensureCapacity (int n)
- {
- if ( n > sieveCapacity )
- {
- b = new BitSet((n+1)/2);
- // starts out all 0, presume all numbers prime
- sieveCapacity = n;
- sieve(n);
- }
- // otherwise existing sieve is fine
- } // end ensureCapacity
-
- private int sieveCapacity;
- // biggest number we have computed in our sieve.
- // our BitSet array is indexed 0..N (odd only)
-
- private BitSet b; /* true for each odd number if is composite */
-
- /**
- * Demonstrate and test the methods
- */
- public static void main (String[] args)
- {
- // print primes 1..101
- Primes calc = new Primes(106);
- int[] primes = calc.getPrimes(101);
- for (int i=0; i<primes.length; i++)
- {
- System.out.println(primes[i]);
- }
-
- // demonstrate isPrime, above, below
- System.out.println(calc.isPrime(149));
- System.out.println(calc.below(149));
- System.out.println(calc.above(149));
-
- // print all the primes just greater than powers of 2
- calc = new Primes(10000000);
- for (int pow=8; pow < 10000000; pow*=2)
- System.out.println(calc.above(pow));
-
- // Validate that isPrime works by comparing it with brute force
- for (int i=3; i<=151; i++)
- {
- boolean prime = true;
- for (int j=2; j<i; j++)
- {
- if (i % j == 0 )
- {
- prime = false;
- break;
- }
- } // end for j
- if ( calc.isPrime(i) != prime ) System.out.println(i + " oops");
- } // end for i
-
- } // end main
-} // end Primes
diff --git a/libjava/testsuite/libjava.lang/Primes.out b/libjava/testsuite/libjava.lang/Primes.out deleted file mode 100644 index 279398b6233..00000000000 --- a/libjava/testsuite/libjava.lang/Primes.out +++ /dev/null @@ -1,51 +0,0 @@ -1 -2 -3 -5 -7 -11 -13 -17 -19 -23 -29 -31 -37 -41 -43 -47 -53 -59 -61 -67 -71 -73 -79 -83 -89 -97 -101 -true -139 -151 -11 -17 -37 -67 -131 -257 -521 -1031 -2053 -4099 -8209 -16411 -32771 -65537 -131101 -262147 -524309 -1048583 -2097169 -4194319 -8388617 diff --git a/libjava/testsuite/libjava.lang/Shazam.java b/libjava/testsuite/libjava.lang/Shazam.java deleted file mode 100644 index d3defc0652c..00000000000 --- a/libjava/testsuite/libjava.lang/Shazam.java +++ /dev/null @@ -1,18 +0,0 @@ -import java.io.*; - -public class Shazam { - - private static String shazam () - { - try { - return "shazam"; - } finally { - System.out.println ("The next line should say \"shazam\""); - } - } - - public static void main (String[] args) - { - System.out.println (shazam ()); - } -} diff --git a/libjava/testsuite/libjava.lang/Shazam.out b/libjava/testsuite/libjava.lang/Shazam.out deleted file mode 100644 index 42cc30d7239..00000000000 --- a/libjava/testsuite/libjava.lang/Shazam.out +++ /dev/null @@ -1,2 +0,0 @@ -The next line should say "shazam" -shazam diff --git a/libjava/testsuite/libjava.lang/StringBuffer_1.java b/libjava/testsuite/libjava.lang/StringBuffer_1.java deleted file mode 100644 index 14291225976..00000000000 --- a/libjava/testsuite/libjava.lang/StringBuffer_1.java +++ /dev/null @@ -1,124 +0,0 @@ -// Test StringBuffer.replace(), reverse(), insert(String), append(String), -// and delete(). - -public class StringBuffer_1 -{ - public static void main(String args[]) - { - StringBuffer sb = new StringBuffer("45"); - sb.insert(0, "123"); - sb.append("89"); - sb.insert(5, "6"); - sb.insert(6, '7'); - System.out.println (sb); - - sb.delete (3, 99); - - String foo = sb.toString(); - - System.out.println (foo); - sb.reverse(); - System.out.println (foo); - - System.out.println (sb); - sb = new StringBuffer("1234"); - System.out.println(sb.reverse()); - - sb = new StringBuffer("123456789"); - sb.append ("0"); - System.out.println(sb); - - sb.replace (2, 99, "foo"); - System.out.println (sb); - - sb = new StringBuffer("123456789"); - sb.replace (1, 1, "XX"); - System.out.println (sb); - - sb = new StringBuffer("123456789"); - sb.replace (0, 2, "XX"); - System.out.println (sb); - - sb = new StringBuffer("123456789"); - sb.replace (5, 9, "54321"); - System.out.println (sb); - - sb = new StringBuffer("123456789"); - - sb.delete (1,4); - System.out.println (sb); - - // Test bounds checks - try - { - sb.insert (-2, "x"); - } - catch (StringIndexOutOfBoundsException x) - { - System.out.println (x.getClass()); - } - - try - { - sb.insert (96, "x"); - } - catch (StringIndexOutOfBoundsException x) - { - System.out.println (x.getClass()); - } - - try - { - sb.delete (-2, 2); - } - catch (StringIndexOutOfBoundsException x) - { - System.out.println (x.getClass()); - } - - try - { - sb.delete (96, 418); - } - catch (StringIndexOutOfBoundsException x) - { - System.out.println (x.getClass()); - } - - try - { - sb.delete (4, 2); - } - catch (StringIndexOutOfBoundsException x) - { - System.out.println (x.getClass()); - } - - try - { - sb.replace (-2, 2, "54321"); - } - catch (StringIndexOutOfBoundsException x) - { - System.out.println (x.getClass()); - } - - try - { - sb.replace (4, 2, "54321"); - } - catch (StringIndexOutOfBoundsException x) - { - System.out.println (x.getClass()); - } - - try - { - sb.replace (12, 18, "54321"); - } - catch (StringIndexOutOfBoundsException x) - { - System.out.println (x.getClass()); - } - } -} diff --git a/libjava/testsuite/libjava.lang/StringBuffer_1.out b/libjava/testsuite/libjava.lang/StringBuffer_1.out deleted file mode 100644 index cdc78ff0be7..00000000000 --- a/libjava/testsuite/libjava.lang/StringBuffer_1.out +++ /dev/null @@ -1,19 +0,0 @@ -123456789 -123 -123 -321 -4321 -1234567890 -12foo -1XX23456789 -XX3456789 -1234554321 -156789 -class java.lang.StringIndexOutOfBoundsException -class java.lang.StringIndexOutOfBoundsException -class java.lang.StringIndexOutOfBoundsException -class java.lang.StringIndexOutOfBoundsException -class java.lang.StringIndexOutOfBoundsException -class java.lang.StringIndexOutOfBoundsException -class java.lang.StringIndexOutOfBoundsException -class java.lang.StringIndexOutOfBoundsException diff --git a/libjava/testsuite/libjava.lang/Synch.java b/libjava/testsuite/libjava.lang/Synch.java deleted file mode 100644 index 15e2d26b4a5..00000000000 --- a/libjava/testsuite/libjava.lang/Synch.java +++ /dev/null @@ -1,17 +0,0 @@ -public class Synch -{ - public synchronized void s() - { - // This call to notify() isn't supposed to cause a - // java.lang.IllegalMonitorStateException. - notify (); - } - - public static void main (String[] args) - { - (new Synch()).s(); - System.out.println ("Ok"); - } -} - - diff --git a/libjava/testsuite/libjava.lang/Synch.out b/libjava/testsuite/libjava.lang/Synch.out deleted file mode 100644 index 7326d960397..00000000000 --- a/libjava/testsuite/libjava.lang/Synch.out +++ /dev/null @@ -1 +0,0 @@ -Ok diff --git a/libjava/testsuite/libjava.lang/Thread_1.java b/libjava/testsuite/libjava.lang/Thread_1.java deleted file mode 100644 index 42f8c840000..00000000000 --- a/libjava/testsuite/libjava.lang/Thread_1.java +++ /dev/null @@ -1,184 +0,0 @@ -// Various thread tests. - -public class Thread_1 extends Thread -{ - // The group for the workers. - static ThreadGroup subgroup; - - // Which piece of test code to try. - static int test_case; - - // Names of the tests. - static final int JOIN_GOOD = 0; - static final int JOIN_TIMEOUT = 1; - static final int JOIN_INTERRUPTED = 2; - static final int THREAD_EXIT = 3; - - // True if this is normal; false if daemon. - boolean normal; - // The other thread in the test. - Thread_1 other; - // True when the thread has entered run(). - boolean started; - - public void run () - { - try - { - if (normal) - { - System.out.println ("test " + test_case); - // Tell the main thread to start the daemon thread. - synchronized (this) - { - started = true; - notify (); - } - // Now wait for daemon to start. - synchronized (other) - { - while (! other.started) - other.wait (); - } - switch (test_case) - { - case JOIN_GOOD: - other.join (); - System.out.println ("joined"); - break; - case JOIN_TIMEOUT: - other.join (10); - System.out.println (other.isAlive()); - other.join (); - break; - case JOIN_INTERRUPTED: - other.join (); - System.out.println ("joined"); - break; - case THREAD_EXIT: - // Nothing. - break; - - default: - System.out.println ("failure"); - break; - } - } - else - { - // Let the normal thread start first. - synchronized (other) - { - while (! other.started) - other.wait(); - } - // Tell normal thread that we've started. - synchronized (this) - { - started = true; - notify (); - } - switch (test_case) - { - case JOIN_GOOD: - System.out.println ("daemon done"); - break; - case JOIN_TIMEOUT: - sleep (50); - break; - case JOIN_INTERRUPTED: - other.interrupt (); - break; - case THREAD_EXIT: - // Wait for a while. However, don't wait indefinitely - // -- we want this thread to terminate so that the - // process won't hang if there is a bug. - sleep (10000); - System.out.println ("daemon still alive"); - break; - - default: - System.out.println ("failure"); - break; - } - } - } - catch (InterruptedException e) - { - System.out.println ("interrupted"); - } - } - - public void setOther (Thread_1 x) - { - other = x; - } - - Thread_1 (String name, boolean x) - { - super (subgroup, name); - normal = x; - started = false; - setDaemon (! normal); - } - - // Run a single test. - static Thread_1 doit (int what) - { - // FIXME: we used to just use the same threads each time. That - // didn't work -- must debug. - Thread_1 dt = new Thread_1 ("daemon", false); - Thread_1 nt = new Thread_1 ("normal", true); - - dt.setOther(nt); - nt.setOther(dt); - - test_case = what; - try - { - nt.start(); - dt.start(); - - // Don't wait for the threads if we're doing the exit test. - if (what != THREAD_EXIT) - { - nt.join (); - dt.join (); - } - } - catch (InterruptedException e) - { - System.out.println ("caught bad exception"); - } - - return dt; - } - - public static void main (String[] args) - { - subgroup = new ThreadGroup ("sub"); - - doit (JOIN_GOOD); - - System.out.println ("active count = " + subgroup.activeCount ()); - - Thread_1 dt = doit (JOIN_TIMEOUT); - // Make sure that joining a dead thread works. - System.out.println ("still alive: " + dt.isAlive ()); - try - { - dt.join (); - } - catch (InterruptedException e) - { - System.out.println ("exception caught"); - } - - doit (JOIN_INTERRUPTED); - - // Note: this test has a race conditoin. So we don't run it any - // more. - // This test must come last. - // doit (THREAD_EXIT); - } -} diff --git a/libjava/testsuite/libjava.lang/Thread_1.out b/libjava/testsuite/libjava.lang/Thread_1.out deleted file mode 100644 index 78ac58a843b..00000000000 --- a/libjava/testsuite/libjava.lang/Thread_1.out +++ /dev/null @@ -1,9 +0,0 @@ -test 0 -daemon done -joined -active count = 2 -test 1 -true -still alive: false -test 2 -interrupted diff --git a/libjava/testsuite/libjava.lang/Thread_Alive.java b/libjava/testsuite/libjava.lang/Thread_Alive.java deleted file mode 100644 index d97ea25c5d3..00000000000 --- a/libjava/testsuite/libjava.lang/Thread_Alive.java +++ /dev/null @@ -1,47 +0,0 @@ -// Test the status of the isAlive() flag before, during, and after thread -// execution. Check that thread's threadgroup is null after thread exits. -// Origin: Bryce McKinlay <bryce@albatross.co.nz> - -public class Thread_Alive implements Runnable -{ - public static void main(String args[]) throws InterruptedException - { - Thread_Alive ta = new Thread_Alive(); - Thread t = new Thread(ta); - System.out.println(t.isAlive()); - t.start(); - System.out.println(t.isAlive()); - - Thread.sleep(100); - - synchronized (ta) - { - ta.notifyAll(); - } - - t.join(); - System.out.println(t.isAlive()); - - try - { - t.start(); - System.out.println("Error: dead thread can be restarted."); - } - catch (IllegalThreadStateException x) - { - System.out.println ("ok"); - } - - System.out.println(t.getThreadGroup()); - } - - public synchronized void run() - { - try - { - wait(); - } - catch (InterruptedException x) {} - } - -} diff --git a/libjava/testsuite/libjava.lang/Thread_Alive.out b/libjava/testsuite/libjava.lang/Thread_Alive.out deleted file mode 100644 index 1d1790d9207..00000000000 --- a/libjava/testsuite/libjava.lang/Thread_Alive.out +++ /dev/null @@ -1,5 +0,0 @@ -false -true -false -ok -null diff --git a/libjava/testsuite/libjava.lang/Thread_Interrupt.java b/libjava/testsuite/libjava.lang/Thread_Interrupt.java deleted file mode 100644 index 5412549e713..00000000000 --- a/libjava/testsuite/libjava.lang/Thread_Interrupt.java +++ /dev/null @@ -1,134 +0,0 @@ -// Test interrupt() behaviour on a thread in wait(), sleep(), and spinning -// in a loop. -// Origin: Bryce McKinlay <bryce@albatross.co.nz> - -class Waiter extends Thread -{ - public synchronized void run() - { - System.out.println ("wait()"); - try - { - wait(); - System.out.println("Error: wait() completed normally."); - } - catch (InterruptedException x) - { - if (isInterrupted() || interrupted()) - System.out.println("Error: interrupt flag is still set."); - - } - System.out.println("interrupted - ok"); - } -} - -class Sleeper extends Thread -{ - public void run() - { - System.out.println ("sleep()"); - try - { - sleep(2000); - System.out.println("Error: sleep() completed normally."); - } - catch (InterruptedException x) - { - if (isInterrupted() || interrupted()) - System.out.println("Error: interrupt flag is still set."); - - System.out.println("interrupted - ok"); - } - } -} - -class Looper extends Thread -{ - public void run() - { - System.out.println ("Busy waiting"); - - int count = 0; - for (int i=0; i < 1000000; i++) - { - Thread.yield(); - count += 5; - if (isInterrupted ()) - break; - } - synchronized (this) - { - if (interrupted ()) - { - System.out.println ("interrupted - ok"); - if (isInterrupted () || interrupted ()) - System.out.println("Error: interrupt flag is still set."); - } - else - System.out.println ("Error: Busy wait was not interrupted."); - } - } -} - -class Joiner extends Thread -{ - public void run() - { - System.out.println("join()"); - try - { - join(2000); - System.out.println("Error: join() completed normally??!"); - } - catch (InterruptedException x) - { - if (isInterrupted() || interrupted()) - System.out.println("Error: interrupt flag is still set."); - - System.out.println("interrupted - ok"); - } - - } -} - -public class Thread_Interrupt -{ - public static void main(String args[]) - { - Waiter w = new Waiter(); - w.start (); - sleep_and_interrupt (w); - - Sleeper s = new Sleeper(); - s.start (); - sleep_and_interrupt (s); - - Looper l = new Looper (); - l.start (); - sleep_and_interrupt (l); - - Joiner j = new Joiner (); - j.start (); - sleep_and_interrupt (j); - } - - public static void sleep_and_interrupt(Thread t) - { - try - { - Thread.sleep (250); - t.interrupt (); - long t1 = System.currentTimeMillis(); - t.join (5000); - long time = System.currentTimeMillis() - t1; - if (time > 2900) - { - System.out.println ("Error: join() from main thread timed out"); - } - } - catch (InterruptedException x) - { - System.out.println("Error: main thread interrupted."); - } - } -} diff --git a/libjava/testsuite/libjava.lang/Thread_Interrupt.out b/libjava/testsuite/libjava.lang/Thread_Interrupt.out deleted file mode 100644 index b3a5c3100b4..00000000000 --- a/libjava/testsuite/libjava.lang/Thread_Interrupt.out +++ /dev/null @@ -1,8 +0,0 @@ -wait() -interrupted - ok -sleep() -interrupted - ok -Busy waiting -interrupted - ok -join() -interrupted - ok diff --git a/libjava/testsuite/libjava.lang/Thread_Join.java b/libjava/testsuite/libjava.lang/Thread_Join.java deleted file mode 100644 index 711b05cf0f8..00000000000 --- a/libjava/testsuite/libjava.lang/Thread_Join.java +++ /dev/null @@ -1,68 +0,0 @@ -// Many threads join a single thread. -// Origin: Bryce McKinlay <bryce@albatross.co.nz> - -class Sleeper implements Runnable -{ - int num = -1; - - public Sleeper(int num) - { - this.num = num; - } - - public void run() - { - System.out.println("sleeping"); - try - { - Thread.sleep(500); - } - catch (InterruptedException x) - { - System.out.println("sleep() interrupted"); - } - System.out.println("done"); - } -} - -class Joiner implements Runnable -{ - Thread join_target; - - public Joiner(Thread t) - { - this.join_target = t; - } - - public void run() - { - try - { - long start = System.currentTimeMillis(); - join_target.join(2000); - if ((System.currentTimeMillis() - start) > 1900) - System.out.println("Error: Join timed out"); - else - System.out.println("ok"); - } - catch (InterruptedException x) - { - System.out.println("join() interrupted"); - } - } - -} - -public class Thread_Join -{ - public static void main(String[] args) - { - Thread primary = new Thread(new Sleeper(1)); - primary.start(); - for (int i=0; i < 10; i++) - { - Thread t = new Thread(new Joiner(primary)); - t.start(); - } - } -} diff --git a/libjava/testsuite/libjava.lang/Thread_Join.out b/libjava/testsuite/libjava.lang/Thread_Join.out deleted file mode 100644 index ac72ef3f942..00000000000 --- a/libjava/testsuite/libjava.lang/Thread_Join.out +++ /dev/null @@ -1,12 +0,0 @@ -sleeping -done -ok -ok -ok -ok -ok -ok -ok -ok -ok -ok diff --git a/libjava/testsuite/libjava.lang/Thread_Monitor.java b/libjava/testsuite/libjava.lang/Thread_Monitor.java deleted file mode 100644 index f1ffa674c37..00000000000 --- a/libjava/testsuite/libjava.lang/Thread_Monitor.java +++ /dev/null @@ -1,65 +0,0 @@ -// Test that monitor locks work and are recursive. -// Origin: Bryce McKinlay <bryce@albatross.co.nz> - -class T implements Runnable -{ - public int count = 0; - Counter c; - - public T (Counter c) - { - this.c = c; - } - - public void run() - { - while (true) - { - // NOTE: double-synchronization here. - synchronized (c) - { - if (c.getCount() <= 100000) - count++; - else - break; - } - } - } -} - -class Counter -{ - int i = 0; - public synchronized int getCount () - { - return ++i; - } -} - -public class Thread_Monitor -{ - public static void main(String args[]) - { - Counter c = new Counter(); - T t1 = new T(c); - T t2 = new T(c); - - Thread th1 = new Thread(t1); - Thread th2 = new Thread(t2); - th1.start(); - th2.start(); - try - { - th1.join(); - th2.join(); - } - catch (InterruptedException x) - { - System.out.println("failed: Interrupted"); - } - if (t1.count + t2.count == 100000) - System.out.println ("ok"); - else - System.out.println ("failed: total count incorrect"); - } -} diff --git a/libjava/testsuite/libjava.lang/Thread_Monitor.out b/libjava/testsuite/libjava.lang/Thread_Monitor.out deleted file mode 100644 index 9766475a418..00000000000 --- a/libjava/testsuite/libjava.lang/Thread_Monitor.out +++ /dev/null @@ -1 +0,0 @@ -ok diff --git a/libjava/testsuite/libjava.lang/Thread_Sleep.java b/libjava/testsuite/libjava.lang/Thread_Sleep.java deleted file mode 100644 index e7f4a81532c..00000000000 --- a/libjava/testsuite/libjava.lang/Thread_Sleep.java +++ /dev/null @@ -1,24 +0,0 @@ -// Test that Thread.sleep() works. -// Origin: Bryce McKinlay <bryce@albatross.co.nz> - -public class Thread_Sleep -{ - public static void main(String args[]) - { - try - { - long start = System.currentTimeMillis(); - System.out.println("sleeping"); - Thread.sleep(1000); - long end = System.currentTimeMillis(); - if ((end - start) > 1100 || (end - start) < 990) - System.out.println ("failed"); - else - System.out.println("ok"); - } - catch (InterruptedException x) - { - System.out.println("error: Thread interrupted."); - } - } -} diff --git a/libjava/testsuite/libjava.lang/Thread_Sleep.out b/libjava/testsuite/libjava.lang/Thread_Sleep.out deleted file mode 100644 index 1622a213afa..00000000000 --- a/libjava/testsuite/libjava.lang/Thread_Sleep.out +++ /dev/null @@ -1,2 +0,0 @@ -sleeping -ok diff --git a/libjava/testsuite/libjava.lang/Thread_Wait.java b/libjava/testsuite/libjava.lang/Thread_Wait.java deleted file mode 100644 index 5ca12ed5d4b..00000000000 --- a/libjava/testsuite/libjava.lang/Thread_Wait.java +++ /dev/null @@ -1,49 +0,0 @@ -// Test basic thread creation and wait/notify functionality. -// Origin: Bryce McKinlay <bryce@albatross.co.nz> - -public class Thread_Wait implements Runnable -{ - public static void main(String args[]) - { - new Thread_Wait(); - } - - public Thread_Wait() - { - System.out.println("creating thread"); - Thread t = new Thread(this); - t.start(); - - try - { - Thread.sleep(100); - } - catch (Exception x) - { - System.out.println("exception occured: " + x); - } - - synchronized (this) - { - System.out.println("notifying other thread"); - notify(); - } - } - - public void run() - { - System.out.println ("new thread running"); - synchronized (this) - { - try - { - wait(); - } - catch (Exception x) - { - System.out.println("exception occured: " + x); - } - } - System.out.println ("thread notified okay"); - } -} diff --git a/libjava/testsuite/libjava.lang/Thread_Wait.out b/libjava/testsuite/libjava.lang/Thread_Wait.out deleted file mode 100644 index 09cbb785c04..00000000000 --- a/libjava/testsuite/libjava.lang/Thread_Wait.out +++ /dev/null @@ -1,4 +0,0 @@ -creating thread -new thread running -notifying other thread -thread notified okay diff --git a/libjava/testsuite/libjava.lang/Thread_Wait_2.java b/libjava/testsuite/libjava.lang/Thread_Wait_2.java deleted file mode 100644 index a03cb943812..00000000000 --- a/libjava/testsuite/libjava.lang/Thread_Wait_2.java +++ /dev/null @@ -1,144 +0,0 @@ -// Create many threads waiting on a monitor. Interrupt some of them. Do the -// others wake up correctly with notify() and/or notifyAll()? -// Origin: Bryce McKinlay <bryce@albatross.co.nz> - -import java.util.Vector; - -class Waiter extends Thread -{ - Object monitor; - int thread_num; - boolean interrupted = false; - boolean notified = false; - - Waiter (Object monitor, int thread_num) - { - this.monitor = monitor; - this.thread_num = thread_num; - } - - public void run() - { - synchronized (monitor) - { - try - { - monitor.wait(); - notified = true; - } - catch (InterruptedException x) - { - interrupted = true; - } - } - - } -} - -public class Thread_Wait_2 -{ - static Vector threads; - static Object monitor = new Object(); - - static final int NUM_THREADS = 10; - - public static void main(String args[]) - { - - - try - { - makeThreads (); - - Thread.sleep(250); - - // Interrupt a few threads... - Waiter i1 = (Waiter) threads.elementAt(3); - Waiter i2 = (Waiter) threads.elementAt(4); - Waiter i3 = (Waiter) threads.elementAt(9); - i1.interrupt(); - i2.interrupt(); - i3.interrupt(); - - // Call notify the exact number of times required to wake the remaining - // threads. - synchronized (monitor) - { - for (int i=0; i < NUM_THREADS -3 ; i++) - { - monitor.notify (); - } - } - - joinAll(); - printStatus(); - - // Repeat all the above, but use notifyAll() instead. - makeThreads(); - - Thread.sleep(250); - - // Interrupt a few threads... - i1 = (Waiter) threads.elementAt(0); - i2 = (Waiter) threads.elementAt(1); - i3 = (Waiter) threads.elementAt(9); - i1.interrupt(); - i2.interrupt(); - i3.interrupt(); - - // Call notifyAll to wake the remaining threads. - synchronized (monitor) - { - monitor.notifyAll (); - } - - joinAll(); - printStatus(); - - } - catch (InterruptedException x) - { - System.out.println (x); - } - - - } - - static void makeThreads() - { - threads = new Vector(NUM_THREADS); - - for (int i=0; i < NUM_THREADS; i++) - { - Waiter w = new Waiter(monitor, i); - w.start(); - threads.addElement(w); - } - } - - static void joinAll() - { - try - { - for (int i=0; i < threads.size(); i++) - { - Thread t = (Thread) threads.elementAt(i); - t.join(); - } - } - catch (InterruptedException x) {} - } - - static void printStatus() - { - for (int i=0; i < threads.size(); i++) - { - Waiter w = (Waiter) threads.elementAt(i); - if (w.interrupted) - System.out.println (i + " interrupted."); - if (w.notified) - System.out.println (i + " notified."); - } - } - -} diff --git a/libjava/testsuite/libjava.lang/Thread_Wait_2.out b/libjava/testsuite/libjava.lang/Thread_Wait_2.out deleted file mode 100644 index 4a71f07f900..00000000000 --- a/libjava/testsuite/libjava.lang/Thread_Wait_2.out +++ /dev/null @@ -1,20 +0,0 @@ -0 notified. -1 notified. -2 notified. -3 interrupted. -4 interrupted. -5 notified. -6 notified. -7 notified. -8 notified. -9 interrupted. -0 interrupted. -1 interrupted. -2 notified. -3 notified. -4 notified. -5 notified. -6 notified. -7 notified. -8 notified. -9 interrupted. diff --git a/libjava/testsuite/libjava.lang/Thread_Wait_Interrupt.java b/libjava/testsuite/libjava.lang/Thread_Wait_Interrupt.java deleted file mode 100644 index be7b5551614..00000000000 --- a/libjava/testsuite/libjava.lang/Thread_Wait_Interrupt.java +++ /dev/null @@ -1,76 +0,0 @@ -// Create two threads waiting on a monitor. Interrupt one of them. Does the -// other wake up correctly? -// Origin: Bryce McKinlay <bryce@albatross.co.nz> - -class Waiter extends Thread -{ - Object monitor; - int thread_num; - boolean interrupted = false; - boolean notified = false; - - Waiter (Object monitor, int thread_num) - { - this.monitor = monitor; - this.thread_num = thread_num; - } - - public void run() - { - synchronized (monitor) - { - System.out.println ("Thread waiting."); - try - { - long start = System.currentTimeMillis(); - monitor.wait(1000); - long time = System.currentTimeMillis() - start; - if (time > 990) - System.out.println ("Error: wait on thread " + thread_num - + " timed out."); - else - notified = true; - } - catch (InterruptedException x) - { - interrupted = true; - } - } - - } -} - -public class Thread_Wait_Interrupt -{ - public static void main(String args[]) - { - Object monitor = new Object(); - Waiter w1 = new Waiter(monitor, 1); - Waiter w2 = new Waiter(monitor, 2); - w1.start(); - w2.start(); - try - { - Thread.sleep(250); - - synchronized (monitor) - { - w1.interrupt(); - monitor.notify(); - } - - w1.join(); - w2.join(); - System.out.println("join ok"); - System.out.println("Thread 1 " + - (w1.interrupted ? "interrupted ok" : "error")); - System.out.println("Thread 2 " + - (w2.notified ? "notified ok" : "error")); - - } - catch (InterruptedException x) - { - System.out.println (x); - } - } -} diff --git a/libjava/testsuite/libjava.lang/Thread_Wait_Interrupt.out b/libjava/testsuite/libjava.lang/Thread_Wait_Interrupt.out deleted file mode 100644 index 4f3b1667814..00000000000 --- a/libjava/testsuite/libjava.lang/Thread_Wait_Interrupt.out +++ /dev/null @@ -1,5 +0,0 @@ -Thread waiting. -Thread waiting. -join ok -Thread 1 interrupted ok -Thread 2 notified ok diff --git a/libjava/testsuite/libjava.lang/Throw_1.java b/libjava/testsuite/libjava.lang/Throw_1.java deleted file mode 100644 index 4a0780aec06..00000000000 --- a/libjava/testsuite/libjava.lang/Throw_1.java +++ /dev/null @@ -1,25 +0,0 @@ -// Some tests of `throw'. - -public class Throw_1 -{ - public static Throwable get () - { - return null; - } - - public static void main (String[] args) - { - Throwable t = get (); - try - { - throw t; - } - catch (NullPointerException y) - { - } - catch (Throwable x) - { - System.out.println ("no"); - } - } -} diff --git a/libjava/testsuite/libjava.lang/Throw_1.out b/libjava/testsuite/libjava.lang/Throw_1.out deleted file mode 100644 index e69de29bb2d..00000000000 --- a/libjava/testsuite/libjava.lang/Throw_1.out +++ /dev/null diff --git a/libjava/testsuite/libjava.lang/anfi.java b/libjava/testsuite/libjava.lang/anfi.java deleted file mode 100644 index d9e7de75286..00000000000 --- a/libjava/testsuite/libjava.lang/anfi.java +++ /dev/null @@ -1,33 +0,0 @@ -// Class anfi -// Generated on Sat Jan 29 16:06:33 PST 2000 -// Anonymous with access to outer context locals - -class anfi { - - itf foo (final String s, final int i) { - return new itf () { - String buff = s+" "+i; - public void setString (String s) { buff = s+" "+i; } - public String getString () { return buff; } - }; - } - - void test () { - itf x = foo ("Hello", 123); - System.out.println (x.getString ()); - x.setString ("Frinkahedron"); - System.out.println (x.getString ()); - } - - public static void main (String[] arg) - { - System.out.println ("Testing class `anfi'..."); - new anfi().test(); - } -} - -interface itf { - void setString (String s); - String getString(); - String buff = null; -} diff --git a/libjava/testsuite/libjava.lang/anfi.out b/libjava/testsuite/libjava.lang/anfi.out deleted file mode 100644 index 52ac97cf992..00000000000 --- a/libjava/testsuite/libjava.lang/anfi.out +++ /dev/null @@ -1,3 +0,0 @@ -Testing class `anfi'... -Hello 123 -Frinkahedron 123 diff --git a/libjava/testsuite/libjava.lang/anon.java b/libjava/testsuite/libjava.lang/anon.java deleted file mode 100644 index c24b4f0a2ba..00000000000 --- a/libjava/testsuite/libjava.lang/anon.java +++ /dev/null @@ -1,52 +0,0 @@ -// Class anon -// Generated on Wed Dec 29 10:07:09 PST 1999 -// - - -interface itf {int count = 0;void setCount (int i);int getCount ();} - -class anon { - - int count = 34; - - class x implements itf { - int count = 3; - public void setCount (int j) { } - public int getCount () { return count*3; } - } - - - itf foo () { - class y implements itf { - int count = 3; - public void setCount (int j) { count = j; } - public int getCount () { return count+1; } - } - return new y (); - } - - itf bar () { - return new itf () { - // The class defined right here will implement `itf' - int count = 5; - public void setCount (int j) { count = j; } - public int getCount () { return count+1; } - } ; - } - - void test () { - itf a = foo (); - itf b = bar (); - x c = this.new x (); - System.out.println (a.getCount ()); - System.out.println (b.getCount ()); - System.out.println (c.getCount ()); - System.out.println (this.count); - } - - public static void main (String[] arg) - { - System.out.println ("Testing class `anon'..."); - new anon ().test (); - } -} diff --git a/libjava/testsuite/libjava.lang/anon.out b/libjava/testsuite/libjava.lang/anon.out deleted file mode 100644 index 3b397bbe5aa..00000000000 --- a/libjava/testsuite/libjava.lang/anon.out +++ /dev/null @@ -1,5 +0,0 @@ -Testing class `anon'... -4 -6 -9 -34 diff --git a/libjava/testsuite/libjava.lang/anon2.java b/libjava/testsuite/libjava.lang/anon2.java deleted file mode 100644 index a14eef88e05..00000000000 --- a/libjava/testsuite/libjava.lang/anon2.java +++ /dev/null @@ -1,50 +0,0 @@ -// Class anon2 -// Generated on Wed Dec 29 10:07:09 PST 1999 -// - - -class anon2 { - - int count = 34; - int field; - - anon2 () { System.out.println ("anon2()"); } - - anon2 (foobar x) { - System.out.println ("Yikes!"+x.zoink()); - } - - anon2 foo () { - class y extends anon2 { - int count = 3; - public void setCount (int j) { count = j; } - public int getCount () { return count+1; } - y (int i) { System.out.println ("y(int)"); } - } - return new y (3); - } - - anon2 bar () { - foobar xyz = new foobar (); - return new anon2 (xyz) { - int count = 5; - public void setCount (int j) { field = 3; count = j; } - public int getCount () { return count+1; } - } ; - } - - void test () { - anon2 b = bar (); - anon2 c = foo (); - } - - public static void main (String[] arg) - { - System.out.println ("Testing class `anon2'..."); - new anon2 ().test (); - } -} - -class foobar { - public String zoink() { return " zoinked"; } -} diff --git a/libjava/testsuite/libjava.lang/anon2.out b/libjava/testsuite/libjava.lang/anon2.out deleted file mode 100644 index 2a125749190..00000000000 --- a/libjava/testsuite/libjava.lang/anon2.out +++ /dev/null @@ -1,5 +0,0 @@ -Testing class `anon2'... -anon2() -Yikes! zoinked -anon2() -y(int) diff --git a/libjava/testsuite/libjava.lang/anon3.java b/libjava/testsuite/libjava.lang/anon3.java deleted file mode 100644 index 0af8804d801..00000000000 --- a/libjava/testsuite/libjava.lang/anon3.java +++ /dev/null @@ -1,28 +0,0 @@ -// Class anon3 -// Generated on Wed Dec 29 10:07:09 PST 1999 -// - - -class anon3 { - - itf bar () { - return new itf () { - int count = 5; - public void setCount (int j) { count = 3; } - public int getCount () { return count; } - } ; - } - - void test () { - itf x = bar (); - System.out.println (x.getCount ()); - } - - public static void main (String[] arg) - { - System.out.println ("Testing class `anon3'..."); - new anon3 ().test (); - } -} - -interface itf { void setCount (int j); int getCount(); int count = 0; } diff --git a/libjava/testsuite/libjava.lang/anon3.out b/libjava/testsuite/libjava.lang/anon3.out deleted file mode 100644 index 2e59ff3c4ac..00000000000 --- a/libjava/testsuite/libjava.lang/anon3.out +++ /dev/null @@ -1,2 +0,0 @@ -Testing class `annon3'... -5 diff --git a/libjava/testsuite/libjava.lang/anon4.java b/libjava/testsuite/libjava.lang/anon4.java deleted file mode 100644 index 4fd5262272e..00000000000 --- a/libjava/testsuite/libjava.lang/anon4.java +++ /dev/null @@ -1,30 +0,0 @@ -// Class anon4 -// Generated on Wed Dec 29 10:07:09 PST 1999 -// - - -class anon4 { - - private int field = 3; - - itf bar () { - return new itf () { - int count = 5; - public void setCount (int j) { count = 3+field; } - public int getCount () { return count+field; } - } ; - } - - void test () { - itf x = bar (); - System.out.println (x.getCount ()); - } - - public static void main (String[] arg) - { - System.out.println ("Testing class `anon4'..."); - new anon4 ().test (); - } -} - -interface itf { void setCount (int j); int getCount(); int count = 0; } diff --git a/libjava/testsuite/libjava.lang/anon4.out b/libjava/testsuite/libjava.lang/anon4.out deleted file mode 100644 index ff8b8916e98..00000000000 --- a/libjava/testsuite/libjava.lang/anon4.out +++ /dev/null @@ -1,2 +0,0 @@ -Testing class `anon4'... -8 diff --git a/libjava/testsuite/libjava.lang/anonarray.java b/libjava/testsuite/libjava.lang/anonarray.java deleted file mode 100644 index 8239c51f932..00000000000 --- a/libjava/testsuite/libjava.lang/anonarray.java +++ /dev/null @@ -1,22 +0,0 @@ -// Class anonarray -// Generated on Tue Feb 1 16:11:29 PST 2000 -// Simple anonymous array, of primitive types. - -class anonarray { - - static void foo (int [][] x) { - for (int i = 0; i < x.length; i++) - { - for (int j = 0; j < x[i].length; j++) - System.out.print (x[i][j]); - System.out.println(); - } - } - - public static void main (String[] arg) - { - foo (new int[][] {{2,3},{5,7}}); - System.out.println ((new int [][] {{11,13},{17,19}}).length); - System.out.println ((new int [][] {{23,29},{31,37}})[0][1]); - } -} diff --git a/libjava/testsuite/libjava.lang/anonarray.out b/libjava/testsuite/libjava.lang/anonarray.out deleted file mode 100644 index 4ad3f56ef2f..00000000000 --- a/libjava/testsuite/libjava.lang/anonarray.out +++ /dev/null @@ -1,4 +0,0 @@ -23 -57 -2 -29 diff --git a/libjava/testsuite/libjava.lang/anonarray2.java b/libjava/testsuite/libjava.lang/anonarray2.java deleted file mode 100644 index 46df5e71130..00000000000 --- a/libjava/testsuite/libjava.lang/anonarray2.java +++ /dev/null @@ -1,22 +0,0 @@ -// Class anonarray2 -// Generated on Tue Feb 1 21:14:06 PST 2000 -// Anonymous array, with a non primitive type. - -class anonarray2 { - - static void foo (String [][] x) { - for (int i = 0; i < x.length; i++) - { - for (int j = 0; j < x[i].length; j++) - System.out.print (x[i][j]); - System.out.println(); - } - } - - public static void main (String[] arg) - { - foo (new String[][] {{"2","3"},{"5","7"}}); - System.out.println ((new String [][] {{"11","13"},{"17","19"}}).length); - System.out.println ((new String [][] {{"23","29"},{"31","37"}})[0][1]); - } -} diff --git a/libjava/testsuite/libjava.lang/anonarray2.out b/libjava/testsuite/libjava.lang/anonarray2.out deleted file mode 100644 index 4ad3f56ef2f..00000000000 --- a/libjava/testsuite/libjava.lang/anonarray2.out +++ /dev/null @@ -1,4 +0,0 @@ -23 -57 -2 -29 diff --git a/libjava/testsuite/libjava.lang/anonarray3.java b/libjava/testsuite/libjava.lang/anonarray3.java deleted file mode 100644 index 264365b1359..00000000000 --- a/libjava/testsuite/libjava.lang/anonarray3.java +++ /dev/null @@ -1,13 +0,0 @@ -// Class anonarray3 -// Generated on Tue Feb 8 19:18:10 PST 2000 -// - -class anonarray3 { - private static final int[] foo (int x) { - return new int[] { x+1 }; - } - public static void main (String[] arg) - { - System.out.println (foo (34)[0]); - } -} diff --git a/libjava/testsuite/libjava.lang/anonarray3.out b/libjava/testsuite/libjava.lang/anonarray3.out deleted file mode 100644 index 8f92bfdd497..00000000000 --- a/libjava/testsuite/libjava.lang/anonarray3.out +++ /dev/null @@ -1 +0,0 @@ -35 diff --git a/libjava/testsuite/libjava.lang/direct_read.java b/libjava/testsuite/libjava.lang/direct_read.java deleted file mode 100644 index 57342849353..00000000000 --- a/libjava/testsuite/libjava.lang/direct_read.java +++ /dev/null @@ -1,27 +0,0 @@ -// Class direct_read -// Generated on Sat Nov 13 23:26:34 UTC 1999 -// - -class direct_read { - - int foo; - - class direct_read_inner { - void test () { - int x = foo; - System.out.println ("x="+x); - } - } - - void foo () - { - foo = 670; - direct_read_inner inn = this.new direct_read_inner (); - inn.test (); - } - public static void main (String[] arg) - { - System.out.println ("Testing class `direct_read'..."); - new direct_read().foo (); - } -} diff --git a/libjava/testsuite/libjava.lang/direct_read.out b/libjava/testsuite/libjava.lang/direct_read.out deleted file mode 100644 index f8f3c647521..00000000000 --- a/libjava/testsuite/libjava.lang/direct_read.out +++ /dev/null @@ -1,2 +0,0 @@ -Testing class `direct_read'... -x=670 diff --git a/libjava/testsuite/libjava.lang/direct_write.java b/libjava/testsuite/libjava.lang/direct_write.java deleted file mode 100644 index 2745f8601c8..00000000000 --- a/libjava/testsuite/libjava.lang/direct_write.java +++ /dev/null @@ -1,27 +0,0 @@ -// Class direct_write -// Generated on Mon Nov 15 17:10:56 UTC 1999 -// - -class direct_write { - - int foo; - - class direct_write_inner { - void test () { - foo = 670; - } - } - - void foo () - { - foo = 650; - direct_write_inner inn = this.new direct_write_inner (); - inn.test (); - System.out.println ("foo="+foo); - } - public static void main (String[] arg) - { - System.out.println ("Testing class `direct_write'..."); - new direct_write().foo (); - } -} diff --git a/libjava/testsuite/libjava.lang/direct_write.out b/libjava/testsuite/libjava.lang/direct_write.out deleted file mode 100644 index b4ff636ee97..00000000000 --- a/libjava/testsuite/libjava.lang/direct_write.out +++ /dev/null @@ -1,2 +0,0 @@ -Testing class `direct_write'... -foo=670 diff --git a/libjava/testsuite/libjava.lang/err1.java b/libjava/testsuite/libjava.lang/err1.java deleted file mode 100644 index 7530252c86f..00000000000 --- a/libjava/testsuite/libjava.lang/err1.java +++ /dev/null @@ -1,25 +0,0 @@ -/*-------------------------------------------------------------------------*/ -/* File name : err1.java */ -/* : */ -/* Cause : When I make class-type Object. */ -/* : */ -/* Message : Internal compiler error: program jc1 got */ -/* : fatal signal 11 */ -/*-------------------------------------------------------------------------*/ - -class A { - int counter = 100; -} - -public class err1 { - public static void main(String[] args) { - A array[] = new A[10]; //err - array[0] = new A(); - - if ( array[0].counter == 100 ) { - System.out.println("OK"); - } else { - System.out.println("NG:[100]-->[" +array[0].counter+ "]"); - } - } -} diff --git a/libjava/testsuite/libjava.lang/err1.out b/libjava/testsuite/libjava.lang/err1.out deleted file mode 100644 index d86bac9de59..00000000000 --- a/libjava/testsuite/libjava.lang/err1.out +++ /dev/null @@ -1 +0,0 @@ -OK diff --git a/libjava/testsuite/libjava.lang/err10.java b/libjava/testsuite/libjava.lang/err10.java deleted file mode 100644 index afdb4e05504..00000000000 --- a/libjava/testsuite/libjava.lang/err10.java +++ /dev/null @@ -1,23 +0,0 @@ -/*--------------------------------------------------------------------------*/ -/* File name : err10.java */ -/* : */ -/* Cause : Operator >>> doesn't work correctly when value is negative. */ -/* : */ -/* Message : NG : a = -2 */ -/*--------------------------------------------------------------------------*/ - -public class err10 { - public static void main(String[] args) { - int a = -3; - - a = a>>>1; - - if ( a == 2147483646 ) { - System.out.println("OK"); - } else { - System.out.println("NG:[2147483646]-->[" +a+ "]"); - } - - } -} - diff --git a/libjava/testsuite/libjava.lang/err10.out b/libjava/testsuite/libjava.lang/err10.out deleted file mode 100644 index d86bac9de59..00000000000 --- a/libjava/testsuite/libjava.lang/err10.out +++ /dev/null @@ -1 +0,0 @@ -OK diff --git a/libjava/testsuite/libjava.lang/err11.java b/libjava/testsuite/libjava.lang/err11.java deleted file mode 100644 index 7b1d0c7f14e..00000000000 --- a/libjava/testsuite/libjava.lang/err11.java +++ /dev/null @@ -1,30 +0,0 @@ -/*--------------------------------------------------------------------------*/ -/* File name : err11.java */ -/* : */ -/* Cause : If I declare both array which have more than 10 element */ -/* : and switch statement, make error. */ -/* : */ -/* Message : err11.java:1: Missing class name. */ -/* : public class err11 */ -/* : ^ */ -/* : err11.java:1: Class or interface declaration expected. */ -/* : public class err11 */ -/* : ^ */ -/* : 2 errors */ -/*--------------------------------------------------------------------------*/ - -public class err11 -{ - public static void main(String args[]) - { - int i; - short ary1[] = {12,23,34,45,56,67,78,89,90,111}; - - for(i=0; i<10; i++) { - switch(ary1[i]) { - case 111 : System.out.println("OK"); - default : break; - } - } - } -} diff --git a/libjava/testsuite/libjava.lang/err11.out b/libjava/testsuite/libjava.lang/err11.out deleted file mode 100644 index d86bac9de59..00000000000 --- a/libjava/testsuite/libjava.lang/err11.out +++ /dev/null @@ -1 +0,0 @@ -OK diff --git a/libjava/testsuite/libjava.lang/err12.java b/libjava/testsuite/libjava.lang/err12.java deleted file mode 100644 index 9631b3de6af..00000000000 --- a/libjava/testsuite/libjava.lang/err12.java +++ /dev/null @@ -1,27 +0,0 @@ -/*--------------------------------------------------------------------------*/ -/* File name : err12.java */ -/* : */ -/* Cause : Cast negative floating point to char makes error */ -/* : */ -/* Message : Internal compiler error in functi on convert_move */ -/*--------------------------------------------------------------------------*/ - -public class err12 { - public static void main(String[] args){ - char x1, x2; - - float y = -10000f; - - x1 = (char)y; // err - x2 = (char)-10000f; // ok - - if ( x1 == x2 ) { - System.out.println("OK"); - } else { - System.out.println("NG"); - System.out.println("x1:[65520]-->[" +(x1-0)+"]"); - System.out.println("x2:[65520]-->[" +(x2-0)+"]"); - } - } -} - diff --git a/libjava/testsuite/libjava.lang/err12.out b/libjava/testsuite/libjava.lang/err12.out deleted file mode 100644 index d86bac9de59..00000000000 --- a/libjava/testsuite/libjava.lang/err12.out +++ /dev/null @@ -1 +0,0 @@ -OK diff --git a/libjava/testsuite/libjava.lang/err13.java b/libjava/testsuite/libjava.lang/err13.java deleted file mode 100644 index d946d610488..00000000000 --- a/libjava/testsuite/libjava.lang/err13.java +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------------------------------------------------*/ -/* File name : err13.java */ -/* : */ -/* Cause : Conversion from zero to String type is not correct. */ -/* : */ -/* Message : NG : test */ -/*--------------------------------------------------------------------------*/ - -public class err13 { - public static void main(String[] args) { - String s = "test"; - s += 0; - - if ( s.equals("test0") ) { - System.out.println("OK"); - } else { - System.out.println("NG : " +s); - } - } -} - diff --git a/libjava/testsuite/libjava.lang/err13.out b/libjava/testsuite/libjava.lang/err13.out deleted file mode 100644 index d86bac9de59..00000000000 --- a/libjava/testsuite/libjava.lang/err13.out +++ /dev/null @@ -1 +0,0 @@ -OK diff --git a/libjava/testsuite/libjava.lang/err2.java b/libjava/testsuite/libjava.lang/err2.java deleted file mode 100644 index deeddf633e9..00000000000 --- a/libjava/testsuite/libjava.lang/err2.java +++ /dev/null @@ -1,28 +0,0 @@ -/*--------------------------------------------------------------------------*/ -/* File name : err2.java */ -/* : */ -/* Cause : Operator "+=" error in char,byte,short type */ -/* : */ -/* Message : err2.java: In class `err2': */ -/* : err2.java: In method `main(java.lang.String[])': */ -/* : err2.java:22: Incompatible type for `='. Explicit cast */ -/* : needed to convert `int' to `byte'. */ -/* : a %= b; */ -/* : ^ */ -/* : 1 error */ -/*--------------------------------------------------------------------------*/ - -public class err2 { - public static void main(String[] args) { - byte a = -16; - byte b = 10; - - a %= b; - - if ( a == -6 ) { - System.out.println("OK"); - } else { - System.out.println("a = " +a); - } - } -} diff --git a/libjava/testsuite/libjava.lang/err2.out b/libjava/testsuite/libjava.lang/err2.out deleted file mode 100644 index d86bac9de59..00000000000 --- a/libjava/testsuite/libjava.lang/err2.out +++ /dev/null @@ -1 +0,0 @@ -OK diff --git a/libjava/testsuite/libjava.lang/err3.java b/libjava/testsuite/libjava.lang/err3.java deleted file mode 100644 index 17535b8500f..00000000000 --- a/libjava/testsuite/libjava.lang/err3.java +++ /dev/null @@ -1,34 +0,0 @@ -/*--------------------------------------------------------------------------*/ -/* File name : err3.java */ -/* : */ -/* Cause : Evaluation sequence of the formula which used */ -/* : the substitution operator is not performed correctly. */ -/* : */ -/* Message : NG1:[27]-->[9] */ -/* : NG2:[27]-->[9] */ -/* : */ -/* Note : JLS 15.6 Evaluation Order (p305) */ -/* S15.6.1 Evaluate Left-Hand Operand First */ -/* : A formula should be evaluated to 9*3 instead of 3*3. */ -/*--------------------------------------------------------------------------*/ - -public class err3 { - public static void main(String[] args) { - int x = 9; - x *= (x = 3); - if ( x == 27 ) { - System.out.println("OK1"); - } else { - System.out.println("NG1:[27]-->["+x+"]"); - } - - int y = 9; - y = y * (y = 3); - if ( y == 27 ) { - System.out.println("OK2"); - } else { - System.out.println("NG2:[27]-->["+y+"]"); - } - } -} - diff --git a/libjava/testsuite/libjava.lang/err3.out b/libjava/testsuite/libjava.lang/err3.out deleted file mode 100644 index dfa480ce6e5..00000000000 --- a/libjava/testsuite/libjava.lang/err3.out +++ /dev/null @@ -1,2 +0,0 @@ -OK1 -OK2 diff --git a/libjava/testsuite/libjava.lang/err4.java b/libjava/testsuite/libjava.lang/err4.java deleted file mode 100644 index ad908e27531..00000000000 --- a/libjava/testsuite/libjava.lang/err4.java +++ /dev/null @@ -1,34 +0,0 @@ -/*--------------------------------------------------------------------------*/ -/* file_name : err4.java */ -/* : */ -/* Cause : Evaluation of the array which used the substitution */ -/* : operator is not performed correctly. */ -/* : */ -/* Message : NG1:[27}-->[9.0] */ -/* : NG1:[27}-->[9.0] */ -/*--------------------------------------------------------------------------*/ - -public class err4 { - public static void main(String[] args) { - - // TEST1 - float []a = {9f}; - a[0] *= (a[0] = 3f); - - if ( a[0] == 27 ) { - System.out.println("OK1"); - } else { - System.out.println("NG1:[27}-->["+a[0]+"]"); - } - - //TEST2 - float [] b = {9f}; - b[0] = (float)(b[0] * (b[0] = 3f)); - if ( b[0] == 27 ) { - System.out.println("OK1"); - } else { - System.out.println("NG1:[27}-->["+b[0]+"]"); - } - } -} - diff --git a/libjava/testsuite/libjava.lang/err4.out b/libjava/testsuite/libjava.lang/err4.out deleted file mode 100644 index f6e108f6d0c..00000000000 --- a/libjava/testsuite/libjava.lang/err4.out +++ /dev/null @@ -1,2 +0,0 @@ -OK1 -OK1 diff --git a/libjava/testsuite/libjava.lang/err5.java b/libjava/testsuite/libjava.lang/err5.java deleted file mode 100644 index f9e95b63504..00000000000 --- a/libjava/testsuite/libjava.lang/err5.java +++ /dev/null @@ -1,35 +0,0 @@ -/*--------------------------------------------------------------------------*/ -/* file_name : err5.java */ -/* : */ -/* Cause : Evaluation order of method argument is not correct. */ -/* : */ -/* Message : NG */ -/* : a:[1]-->[2] */ -/* : b:[3]-->[3] */ -/* : c:[2]-->[2] */ -/* : */ -/* Note : JLS 15.6 Evaluation Order */ -/* S15.6.4 Argument Lists are Evaluated Left-to-Right(p309) */ -/* [Each argument expression appears to be fully evaluated */ -/* before any part of any argument expression to its right.] */ -/*--------------------------------------------------------------------------*/ - -public class err5 { - public static void main(String[] args) { - int x = 1; - - err5 obj = new err5(); - obj.print(x, x = 3, x = 2); - } - - void print(int a, int b, int c) { - if ( a == 1 && b == 3 && c == 2 ) { - System.out.println("OK"); - } else { - System.out.println("NG"); - System.out.println("a:[1]-->["+a+"]"); - System.out.println("b:[3]-->["+b+"]"); - System.out.println("c:[2]-->["+c+"]"); - } - } -} diff --git a/libjava/testsuite/libjava.lang/err5.out b/libjava/testsuite/libjava.lang/err5.out deleted file mode 100644 index d86bac9de59..00000000000 --- a/libjava/testsuite/libjava.lang/err5.out +++ /dev/null @@ -1 +0,0 @@ -OK diff --git a/libjava/testsuite/libjava.lang/err6.java b/libjava/testsuite/libjava.lang/err6.java deleted file mode 100644 index 4b06c6caa7a..00000000000 --- a/libjava/testsuite/libjava.lang/err6.java +++ /dev/null @@ -1,26 +0,0 @@ -/*--------------------------------------------------------------------------*/ -/* File name : err6.java */ -/* : */ -/* Cause : Array evaluation order */ -/* : */ -/* Message : NG:[1]-->[4] */ -/* : */ -/* Note : JLS 15.9 Array Creation Expressions (p315--) */ -/* : p318 line3 */ -/* :[Each dimension expression is fully evaluated */ -/* : before any part of any dimension expression to its right.] */ -/*--------------------------------------------------------------------------*/ - -public class err6 { - public static void main(String[] args) { - int[] x = { 10, 11, 12, 1, 14 }; - int[] y = { 1, 2, 3, 4, 5, 6 }; - - if ( x[(x=y)[2]] == 1 ) { - System.out.println("OK"); - } else { - System.out.println("NG:[1]-->[" +x[(x=y)[2]]+ "]"); - } - } -} - diff --git a/libjava/testsuite/libjava.lang/err6.out b/libjava/testsuite/libjava.lang/err6.out deleted file mode 100644 index d86bac9de59..00000000000 --- a/libjava/testsuite/libjava.lang/err6.out +++ /dev/null @@ -1 +0,0 @@ -OK diff --git a/libjava/testsuite/libjava.lang/err7.java b/libjava/testsuite/libjava.lang/err7.java deleted file mode 100644 index 11f4e8d0b18..00000000000 --- a/libjava/testsuite/libjava.lang/err7.java +++ /dev/null @@ -1,23 +0,0 @@ -/*--------------------------------------------------------------------------*/ -/* File name : err7.java */ -/* : */ -/* Cause : When exists both array (more than 10 elements) and */ -/* "for" or "while" or "do while" statement , error. */ -/* : */ -/* Message : /var/tmp/cc1oQM8i.s: Assembler messages: */ -/* : /var/tmp/cc1oQM8i.s:243: Fatal error: Symbol $L2 already def*/ -/* : fined. */ -/*--------------------------------------------------------------------------*/ - -public class err7 { - public static void main(String[] args) { - int[] ary = {0,1,2,3,4,5,6,7,8,9}; - - while ( true ) { - break; - } - - System.out.println("OK"); - } -} - diff --git a/libjava/testsuite/libjava.lang/err7.out b/libjava/testsuite/libjava.lang/err7.out deleted file mode 100644 index d86bac9de59..00000000000 --- a/libjava/testsuite/libjava.lang/err7.out +++ /dev/null @@ -1 +0,0 @@ -OK diff --git a/libjava/testsuite/libjava.lang/err8.java b/libjava/testsuite/libjava.lang/err8.java deleted file mode 100644 index 220b2ac4fad..00000000000 --- a/libjava/testsuite/libjava.lang/err8.java +++ /dev/null @@ -1,23 +0,0 @@ -/*--------------------------------------------------------------------------*/ -/* File name : err8.java */ -/* : */ -/* Cause : When "do while" statement has only "break", error. */ -/* : */ -/* Message : err8.java: In class `err8': xxxxxx */ -/* : err8.java: In method `main(java.lang.String[])': */ -/* : err8.java:20: Unreachable statement. */ -/* : } while (true) ; */ -/* : ^ */ -/* : 1 error */ -/*--------------------------------------------------------------------------*/ - -public class err8 { - public static void main(String[] args) { - do { - break; - } while (true) ; - - System.out.println("OK"); - } -} - diff --git a/libjava/testsuite/libjava.lang/err8.out b/libjava/testsuite/libjava.lang/err8.out deleted file mode 100644 index d86bac9de59..00000000000 --- a/libjava/testsuite/libjava.lang/err8.out +++ /dev/null @@ -1 +0,0 @@ -OK diff --git a/libjava/testsuite/libjava.lang/err9.java b/libjava/testsuite/libjava.lang/err9.java deleted file mode 100644 index a6edd71980e..00000000000 --- a/libjava/testsuite/libjava.lang/err9.java +++ /dev/null @@ -1,32 +0,0 @@ -/*--------------------------------------------------------------------------*/ -/* File name : err9.java */ -/* : */ -/* Cause : When I use "labeled continue" in "for"statement, error */ -/* : */ -/* Message : In class `err9': */ -/* : In method `main(java.lang.String[])': */ -/* : 22: `continue' must be in loop. */ -/* : continue movehere; */ -/* : ^ */ -/* : 1 error */ -/*--------------------------------------------------------------------------*/ - -public class err9 { - public static void main(String[] args) { - int y = 0; - - movehere: for ( int x = 0; x < 10; x++ ) { - if ( x > 2 ) { - continue movehere; - } - y++; - } - - if ( y == 3 ) { - System.out.println("OK"); - } else { - System.out.println("NG:[3]-->[" +y+ "]"); - } - } -} - diff --git a/libjava/testsuite/libjava.lang/err9.out b/libjava/testsuite/libjava.lang/err9.out deleted file mode 100644 index d86bac9de59..00000000000 --- a/libjava/testsuite/libjava.lang/err9.out +++ /dev/null @@ -1 +0,0 @@ -OK diff --git a/libjava/testsuite/libjava.lang/final_inner.java b/libjava/testsuite/libjava.lang/final_inner.java deleted file mode 100644 index 40905b1fa7e..00000000000 --- a/libjava/testsuite/libjava.lang/final_inner.java +++ /dev/null @@ -1,19 +0,0 @@ -// Class final_inner -// Generated on Tue Jan 18 13:35:19 PST 2000 -// - -class final_inner { - - void foo (final String s, final int i) { - class bar { - void printI () { System.out.println (s+i); } - } - new bar ().printI (); - } - - public static void main (String[] arg) - { - System.out.println ("Testing class `final_inner'..."); - new final_inner ().foo ("The Number ", 666); - } -} diff --git a/libjava/testsuite/libjava.lang/final_inner.out b/libjava/testsuite/libjava.lang/final_inner.out deleted file mode 100644 index 8ac46cfcc82..00000000000 --- a/libjava/testsuite/libjava.lang/final_inner.out +++ /dev/null @@ -1,2 +0,0 @@ -Testing class `final_inner'... -The Number 666 diff --git a/libjava/testsuite/libjava.lang/final_int.java b/libjava/testsuite/libjava.lang/final_int.java deleted file mode 100644 index e225c7b2822..00000000000 --- a/libjava/testsuite/libjava.lang/final_int.java +++ /dev/null @@ -1,22 +0,0 @@ -// Class final_int -// Generated on Sat Feb 12 01:27:46 PST 2000 - -class final_int { - - final int x = 30; - - class foo { - int bar () { - return x; - } - } - void bar () { - int x = this.new foo ().bar (); - System.out.println (x); - } - public static void main (String[] arg) - { - System.out.println ("Testing class `final_int'..."); - new final_int().bar (); - } -} diff --git a/libjava/testsuite/libjava.lang/final_int.out b/libjava/testsuite/libjava.lang/final_int.out deleted file mode 100644 index a7cbe2c9a41..00000000000 --- a/libjava/testsuite/libjava.lang/final_int.out +++ /dev/null @@ -1,2 +0,0 @@ -Testing class `final_int'... -30 diff --git a/libjava/testsuite/libjava.lang/final_static_and_friend.java b/libjava/testsuite/libjava.lang/final_static_and_friend.java deleted file mode 100644 index b5ca6100db6..00000000000 --- a/libjava/testsuite/libjava.lang/final_static_and_friend.java +++ /dev/null @@ -1,17 +0,0 @@ -// Class final_static_and_friend -// Generated on Sat Feb 12 01:58:38 PST 2000 - -class final_static_and_friend { - final int a = 34; - static int b = 34; - int c = 34; - void foo () - { - System.out.println (a+b+c); - } - public static void main (String[] arg) - { - new final_static_and_friend ().foo (); - } - -} diff --git a/libjava/testsuite/libjava.lang/final_static_and_friend.out b/libjava/testsuite/libjava.lang/final_static_and_friend.out deleted file mode 100644 index 257e563266b..00000000000 --- a/libjava/testsuite/libjava.lang/final_static_and_friend.out +++ /dev/null @@ -1 +0,0 @@ -102 diff --git a/libjava/testsuite/libjava.lang/indirect.java b/libjava/testsuite/libjava.lang/indirect.java deleted file mode 100644 index 22bdebc5bb8..00000000000 --- a/libjava/testsuite/libjava.lang/indirect.java +++ /dev/null @@ -1,33 +0,0 @@ -// Class indirect -// Generated on Tue Nov 16 15:53:14 UTC 1999 -// Several indirection to enclosing class - -class indirect { - - private int foo; - - class indirect_inner { - class other { - class inner { - void test () { - int x = foo; - System.out.println ("x="+foo); - foo = 671; - } - } - } - - } - void foo () - { - foo = 670; - indirect_inner inn = this.new indirect_inner (); - this.new indirect_inner().new other().new inner ().test (); - System.out.println ("foo="+foo); - } - public static void main (String[] arg) - { - System.out.println ("Testing class `indirect'..."); - new indirect().foo (); - } -} diff --git a/libjava/testsuite/libjava.lang/indirect.out b/libjava/testsuite/libjava.lang/indirect.out deleted file mode 100644 index 7eb96f765a3..00000000000 --- a/libjava/testsuite/libjava.lang/indirect.out +++ /dev/null @@ -1,3 +0,0 @@ -Testing class `indirect'... -x=670 -foo=671 diff --git a/libjava/testsuite/libjava.lang/indirect_read.java b/libjava/testsuite/libjava.lang/indirect_read.java deleted file mode 100644 index 48c53a8d015..00000000000 --- a/libjava/testsuite/libjava.lang/indirect_read.java +++ /dev/null @@ -1,33 +0,0 @@ -// Class indirect_read -// Generated on Mon Nov 15 17:20:40 UTC 1999 -// - -class indirect_read { - - int foo; - - class indirect_read_inner { - void test () { - } - - class other { - void testx () { - int x = foo; - System.out.println ("x="+x); - } - } - - } - void foo () - { - foo = 670; - indirect_read_inner inn = this.new indirect_read_inner (); - indirect_read_inner.other o = inn.new other (); - o.testx (); - } - public static void main (String[] arg) - { - System.out.println ("Testing class `indirect_read'..."); - new indirect_read().foo (); - } -} diff --git a/libjava/testsuite/libjava.lang/indirect_read.out b/libjava/testsuite/libjava.lang/indirect_read.out deleted file mode 100644 index bf9d42ad7f8..00000000000 --- a/libjava/testsuite/libjava.lang/indirect_read.out +++ /dev/null @@ -1,2 +0,0 @@ -Testing class `indirect_read'... -x=670 diff --git a/libjava/testsuite/libjava.lang/indirect_write.java b/libjava/testsuite/libjava.lang/indirect_write.java deleted file mode 100644 index 2f2bb74435d..00000000000 --- a/libjava/testsuite/libjava.lang/indirect_write.java +++ /dev/null @@ -1,32 +0,0 @@ -// Class indirect_write -// Generated on Tue Nov 16 15:01:24 UTC 1999 -// - -class indirect_write { - - int foo; - - class indirect_write_inner { - void test () { - } - - class other { - void testx () { - foo = 670; - } - } - - } - void foo () - { - indirect_write_inner inn = this.new indirect_write_inner (); - indirect_write_inner.other x = inn.new other (); - x.testx(); - System.out.println ("foo="+foo); - } - public static void main (String[] arg) - { - System.out.println ("Testing class `indirect_write'..."); - new indirect_write().foo (); - } -} diff --git a/libjava/testsuite/libjava.lang/indirect_write.out b/libjava/testsuite/libjava.lang/indirect_write.out deleted file mode 100644 index 92b293337b3..00000000000 --- a/libjava/testsuite/libjava.lang/indirect_write.out +++ /dev/null @@ -1,2 +0,0 @@ -Testing class `indirect_write'... -foo=670 diff --git a/libjava/testsuite/libjava.lang/inner1.java b/libjava/testsuite/libjava.lang/inner1.java deleted file mode 100644 index 820edf8026c..00000000000 --- a/libjava/testsuite/libjava.lang/inner1.java +++ /dev/null @@ -1,36 +0,0 @@ -// Class inner1 -// Generated on Thu Nov 4 16:35:03 PST 1999 -// - -class inner1 { - int i; - void foo () { - inner1.z x1 = new z(); - inner1.z.y x = x1.new y(); - x.bar (); - x.print(); - } - public static void main (String[] arg) - { - System.out.println ("Testing class `inner1'..."); - new inner1 ().foo(); - } - class z { - int j; - void foo () { - inner1.this.i = 3; - } - class y { - int k; - void bar () { - inner1.this.i = 3; - z.this.j = 4; - y.this.k = 34; - } - void print () { - System.out.println ("i="+i+", j="+j+", k="+k); - } - } - } -} - diff --git a/libjava/testsuite/libjava.lang/inner1.out b/libjava/testsuite/libjava.lang/inner1.out deleted file mode 100644 index d1f9ac81551..00000000000 --- a/libjava/testsuite/libjava.lang/inner1.out +++ /dev/null @@ -1,2 +0,0 @@ -Testing class `inner1'... -i=3, j=4, k=34 diff --git a/libjava/testsuite/libjava.lang/inner2.java b/libjava/testsuite/libjava.lang/inner2.java deleted file mode 100644 index 8ecb6f5f7ed..00000000000 --- a/libjava/testsuite/libjava.lang/inner2.java +++ /dev/null @@ -1,18 +0,0 @@ -// Class inner2 -// Generated on Mon Dec 6 14:32:34 PST 1999 -// - -class inner2 { - int foo = 1999; - void foo () - { - inner2.this.foo = 666; - System.out.println (inner2.this.foo); - } - void print () {System.out.println (foo);} - public static void main (String[] arg) - { - System.out.println ("Testing class `inner2'..."); - new inner2().foo (); - } -} diff --git a/libjava/testsuite/libjava.lang/inner2.out b/libjava/testsuite/libjava.lang/inner2.out deleted file mode 100644 index cd24c8659d7..00000000000 --- a/libjava/testsuite/libjava.lang/inner2.out +++ /dev/null @@ -1,2 +0,0 @@ -Testing class `inner2'... -666 diff --git a/libjava/testsuite/libjava.lang/inner3.java b/libjava/testsuite/libjava.lang/inner3.java deleted file mode 100644 index e1cf9da376c..00000000000 --- a/libjava/testsuite/libjava.lang/inner3.java +++ /dev/null @@ -1,23 +0,0 @@ -// Class inner3 -// Generated on Tue Dec 7 11:37:43 PST 1999 -// - -class inner3 { - int bar; - public static void main (String[] arg) - { - System.out.println ("Testing class `inner3'..."); - new inner3().bar (); - } - void bar () { - t xx = this.new t (); - xx.bar (); - } - void foo () { bar = 3; } - class t { - void bar () { - inner3.this.foo (); - System.out.println (inner3.this.bar); - } - } -} diff --git a/libjava/testsuite/libjava.lang/inner3.out b/libjava/testsuite/libjava.lang/inner3.out deleted file mode 100644 index a7ce991dee1..00000000000 --- a/libjava/testsuite/libjava.lang/inner3.out +++ /dev/null @@ -1,2 +0,0 @@ -Testing class `inner3'... -3 diff --git a/libjava/testsuite/libjava.lang/inner4.java b/libjava/testsuite/libjava.lang/inner4.java deleted file mode 100644 index 983e668dc16..00000000000 --- a/libjava/testsuite/libjava.lang/inner4.java +++ /dev/null @@ -1,34 +0,0 @@ -// Class inner4 -// Generated on Tue Dec 7 11:43:48 PST 1999 -// - -class inner4 { - static private int xyz () { return 3; } - private String f; - - String p () { - return "public String p()"; - } - - private String pp (int x, byte y, char c) { - return "private String pp("+x+", "+y+", "+c+")"; - } - - void foo () { - t xxx = this.new t(); - xxx.bar (); - pp (3, (byte)34, 'C'); - } - public static void main (String[] arg) - { - System.out.println ("Testing class `inner4'..."); - new inner4().foo(); - } - class t { - void bar () { - System.out.println (p ()); - System.out.println (pp (3, (byte)34, 'C')); - System.out.println (xyz ()); - } - } -} diff --git a/libjava/testsuite/libjava.lang/inner4.out b/libjava/testsuite/libjava.lang/inner4.out deleted file mode 100644 index db879b58f00..00000000000 --- a/libjava/testsuite/libjava.lang/inner4.out +++ /dev/null @@ -1,4 +0,0 @@ -Testing class `inner4'... -public String p() -private String pp(3, 34, C) -3 diff --git a/libjava/testsuite/libjava.lang/inner_array.java b/libjava/testsuite/libjava.lang/inner_array.java deleted file mode 100644 index 69f31f026c5..00000000000 --- a/libjava/testsuite/libjava.lang/inner_array.java +++ /dev/null @@ -1,30 +0,0 @@ -// Class inner_array -// Generated on Fri Nov 19 13:19:47 PST 1999 -// - -class inner_array { - - private int[] foo; - - class array_inner { - void test () { - int x = foo[2]; - System.out.println ("x="+x); - foo [1] = 34; - foo [1]++; - } - } - void foo () - { - foo = new int [3]; - foo[2]=670; - array_inner inn = this.new array_inner (); - inn.test (); - System.out.println ("foo[1]="+foo[1]); - } - public static void main (String[] arg) - { - System.out.println ("Testing class `inner_array'..."); - new inner_array().foo (); - } -} diff --git a/libjava/testsuite/libjava.lang/inner_array.out b/libjava/testsuite/libjava.lang/inner_array.out deleted file mode 100644 index 88b92874a56..00000000000 --- a/libjava/testsuite/libjava.lang/inner_array.out +++ /dev/null @@ -1,3 +0,0 @@ -Testing class `inner_array'... -x=670 -foo[1]=35 diff --git a/libjava/testsuite/libjava.lang/inner_interface.java b/libjava/testsuite/libjava.lang/inner_interface.java deleted file mode 100644 index b1e6789a99e..00000000000 --- a/libjava/testsuite/libjava.lang/inner_interface.java +++ /dev/null @@ -1,27 +0,0 @@ -// Class inner_interface -// Generated on Fri Feb 11 16:29:04 PST 2000 -// Simple inner interface example. - -class inner_interface { - interface bar { - static final int field = 14022000; - public void inner_interface (); - } - - class baz implements inner_interface.bar { - public void inner_interface () - { - System.out.println ("This is baz.inner_interface "+field); - } - } - - void x () { - this.new baz ().inner_interface (); - } - - public static void main (String[] arg) - { - System.out.println ("Testing class `inner_interface'..."); - new inner_interface ().x(); - } -} diff --git a/libjava/testsuite/libjava.lang/inner_interface.out b/libjava/testsuite/libjava.lang/inner_interface.out deleted file mode 100644 index 0c977d54a48..00000000000 --- a/libjava/testsuite/libjava.lang/inner_interface.out +++ /dev/null @@ -1,2 +0,0 @@ -Testing class `inner_interface'... -This is baz.inner_interface 14022000 diff --git a/libjava/testsuite/libjava.lang/instance.java b/libjava/testsuite/libjava.lang/instance.java deleted file mode 100644 index a509cb3857c..00000000000 --- a/libjava/testsuite/libjava.lang/instance.java +++ /dev/null @@ -1,48 +0,0 @@ -// instance.java -- test the `instanceof' operator. - -import java.util.EventListener; - -public class instance implements EventListener -{ - public static void main (String[] args) - { - Object x1 = new instance (); - EventListener x2 = new instance (); - IllegalArgumentException iae - = new IllegalArgumentException ("any random class"); - String x3 = "zardoz"; - Object x4 = "zardoz"; - - // Test simple object stuff - System.out.println (x1 instanceof Object); - System.out.println (x1 instanceof IllegalArgumentException); - System.out.println (x1 instanceof EventListener); - System.out.println (x1 instanceof String); - System.out.println ("="); - - // Test with value which is an interface. - System.out.println (x2 instanceof Object); - System.out.println (x2 instanceof IllegalArgumentException); - System.out.println (x2 instanceof EventListener); - System.out.println ("="); - - // Test with value which is a final class. - System.out.println (x3 instanceof Object); - System.out.println (x3 instanceof String); - System.out.println ("="); - - // Test with value which is a random class. - System.out.println (iae instanceof Object); - System.out.println (iae instanceof IllegalArgumentException); - System.out.println (iae instanceof EventListener); - System.out.println ("="); - - // Test with value which is a final class, but not known - // statically. - System.out.println (x4 instanceof Object); - System.out.println (x4 instanceof IllegalArgumentException); - System.out.println (x4 instanceof EventListener); - System.out.println (x4 instanceof String); - System.out.println (x4 instanceof int[]); - } -} diff --git a/libjava/testsuite/libjava.lang/instance.out b/libjava/testsuite/libjava.lang/instance.out deleted file mode 100644 index 03988156063..00000000000 --- a/libjava/testsuite/libjava.lang/instance.out +++ /dev/null @@ -1,21 +0,0 @@ -true -false -true -false -= -true -false -true -= -true -true -= -true -true -false -= -true -false -false -true -false diff --git a/libjava/testsuite/libjava.lang/instinit.java b/libjava/testsuite/libjava.lang/instinit.java deleted file mode 100644 index 9a02b6699bc..00000000000 --- a/libjava/testsuite/libjava.lang/instinit.java +++ /dev/null @@ -1,22 +0,0 @@ -// Class instinit -// Generated on Wed Feb 2 12:31:16 PST 2000 -// Simple instance initializer test case. - -class instinit extends foo { - - String buffer = "No Oink! Oink!"; - - /* Instance initializer */ - { - System.out.println ("Oinking..."); - } - { - buffer = "Oink! Oink!"; - } - - public static void main (String[] arg) - { - System.out.println ("Testing class `instinit'..."); - System.out.println (new instinit ().buffer); - } -} diff --git a/libjava/testsuite/libjava.lang/instinit.out b/libjava/testsuite/libjava.lang/instinit.out deleted file mode 100644 index 503af0fd626..00000000000 --- a/libjava/testsuite/libjava.lang/instinit.out +++ /dev/null @@ -1,4 +0,0 @@ -Testing class `instinit'... -Plain old boring foo -Oinking... -Oink! Oink! diff --git a/libjava/testsuite/libjava.lang/instinit2.java b/libjava/testsuite/libjava.lang/instinit2.java deleted file mode 100644 index 4acb157fa64..00000000000 --- a/libjava/testsuite/libjava.lang/instinit2.java +++ /dev/null @@ -1,31 +0,0 @@ -// Class ii2 -// Generated on Wed Feb 2 17:52:49 PST 2000 -// The instance initializer throws a checked exception. This is OK -// since the constructors declares it in its `throws' clause -- at -// least that's what the specs are saying. - -class ii2 { - - String buffer = "Oink Oink!"; - - { - System.out.println ("Checking the oink..."); - if (buffer != null) - throw new Exception ("It just oinked"); - } - - ii2 () throws Exception - { - System.out.println ("Ctor"); - } - - public static void main (String[] arg) - { - System.out.println ("Testing class `ii2'..."); - try { - System.out.println (new ii2 ().buffer); - } catch (Exception e) { - System.out.println (e.toString()); - } - } -} diff --git a/libjava/testsuite/libjava.lang/instinit2.out b/libjava/testsuite/libjava.lang/instinit2.out deleted file mode 100644 index 01efac10d7e..00000000000 --- a/libjava/testsuite/libjava.lang/instinit2.out +++ /dev/null @@ -1,4 +0,0 @@ -Testing class `instinit2'... -Ctor -Checking the oink... -java.lang.Exception: It just oinked diff --git a/libjava/testsuite/libjava.lang/klass.java b/libjava/testsuite/libjava.lang/klass.java deleted file mode 100644 index 1578e6f4240..00000000000 --- a/libjava/testsuite/libjava.lang/klass.java +++ /dev/null @@ -1,10 +0,0 @@ -public class klass -{ - public static void main (String[] args) - { - Class ic1 = Integer.TYPE; - int[] foo = new int[3]; - Class ic2 = foo.getClass().getComponentType(); - System.out.println(ic1.equals(ic2)); - } -} diff --git a/libjava/testsuite/libjava.lang/klass.out b/libjava/testsuite/libjava.lang/klass.out deleted file mode 100644 index 27ba77ddaf6..00000000000 --- a/libjava/testsuite/libjava.lang/klass.out +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/libjava/testsuite/libjava.lang/lang.exp b/libjava/testsuite/libjava.lang/lang.exp deleted file mode 100644 index c0b8570403f..00000000000 --- a/libjava/testsuite/libjava.lang/lang.exp +++ /dev/null @@ -1,35 +0,0 @@ -global srcdir subdir - -catch "glob -nocomplain ${srcdir}/${subdir}/*.out" srcfiles -verbose "srcfiles are $srcfiles" - -set prefix "" -foreach x $srcfiles { - regsub "\\.out$" $x "" prefix - set bname [file tail $prefix] - - if [file exists $srcdir/$subdir/${bname}.xpo] { - set resfile "$srcdir/$subdir/${bname}.xpo" - set options "regexp_match" - } else { - set resfile "${prefix}.out" - set options "" - } - - if [file exists ${prefix}.inp] { - set inpfile ${prefix}.inp - } else { - set inpfile "" - } - - set args [libjava_read_xfail $srcdir/$subdir/$bname.xfail] - - verbose "inpfile is $inpfile" - - test_libjava $options "${prefix}.java" "" $inpfile $resfile $args - test_libjava $options "${prefix}.java" "-O" $inpfile $resfile $args -} - -# Local Variables: -# tcl-indent-level:4 -# End: diff --git a/libjava/testsuite/libjava.lang/multiple_finit.java b/libjava/testsuite/libjava.lang/multiple_finit.java deleted file mode 100644 index a05ecb38132..00000000000 --- a/libjava/testsuite/libjava.lang/multiple_finit.java +++ /dev/null @@ -1,28 +0,0 @@ -// Class multiple_finit -// Generated on Mon Jan 3 20:07:18 PST 2000 -// - -class multiple_finit { - - int foo = 99; - - class multiple_finit_inner { - int inner = 34; - void test () { - System.out.println (inner); - System.out.println (foo); - } - } - void foo (String s) - { - multiple_finit_inner inn = this.new multiple_finit_inner (); - inn.test (); - System.out.println (foo); - } - void testx () { } - public static void main (String[] arg) - { - System.out.println ("Testing class `multiple_finit'..."); - new multiple_finit().foo (""); - } -} diff --git a/libjava/testsuite/libjava.lang/multiple_finit.out b/libjava/testsuite/libjava.lang/multiple_finit.out deleted file mode 100644 index 65ee05ff140..00000000000 --- a/libjava/testsuite/libjava.lang/multiple_finit.out +++ /dev/null @@ -1,4 +0,0 @@ -Testing class `multiple_finit'... -34 -99 -99 diff --git a/libjava/testsuite/libjava.lang/nested_with_ctor.java b/libjava/testsuite/libjava.lang/nested_with_ctor.java deleted file mode 100644 index 4560dc3993f..00000000000 --- a/libjava/testsuite/libjava.lang/nested_with_ctor.java +++ /dev/null @@ -1,27 +0,0 @@ -// Class nested_with_ctor -// Generated on Mon Jan 31 18:31:47 PST 2000 -// The nested class contains explicit constructors. Their argument -// lists should be augmented with the alias initializer values when -// the ctors are seen declared (as opposed to generated.) - -class nested_with_ctor { - - void fct(final String s, final int i) - { - class nested { - String buffer = s+i; - String getString () { return buffer; } - nested (int i) { buffer = "(int)"+i; } - nested () {} - } - nested x = new nested (); - System.out.println (x.getString ()); - nested y = new nested (123); - System.out.println (y.getString ()); - } - public static void main (String[] arg) - { - System.out.println ("Testing class `nested_with_ctor'..."); - new nested_with_ctor ().fct ("Yikes!", 321); - } -} diff --git a/libjava/testsuite/libjava.lang/nested_with_ctor.out b/libjava/testsuite/libjava.lang/nested_with_ctor.out deleted file mode 100644 index d130f1f8893..00000000000 --- a/libjava/testsuite/libjava.lang/nested_with_ctor.out +++ /dev/null @@ -1,3 +0,0 @@ -Testing class `nested_with_ctor'... -Yikes!321 -(int)123 diff --git a/libjava/testsuite/libjava.lang/pr100.java b/libjava/testsuite/libjava.lang/pr100.java deleted file mode 100644 index a9f3685cf4a..00000000000 --- a/libjava/testsuite/libjava.lang/pr100.java +++ /dev/null @@ -1,13 +0,0 @@ -// PR 100 - -// Second call to hashcode causes SEGV when dynamically linking. - -public class pr100 -{ - public static void main(String[] args) { - pr100 ht = new pr100(); - - System.err.println(ht.hashCode()); - System.err.println(ht.getClass().hashCode()); - } -} diff --git a/libjava/testsuite/libjava.lang/pr100.xpo b/libjava/testsuite/libjava.lang/pr100.xpo deleted file mode 100644 index d87ea2e8889..00000000000 --- a/libjava/testsuite/libjava.lang/pr100.xpo +++ /dev/null @@ -1,2 +0,0 @@ -[0-9]+ -[0-9]+ diff --git a/libjava/testsuite/libjava.lang/pr109.java b/libjava/testsuite/libjava.lang/pr109.java deleted file mode 100644 index 17c4b2301bb..00000000000 --- a/libjava/testsuite/libjava.lang/pr109.java +++ /dev/null @@ -1,29 +0,0 @@ -// PR 109 - -// Running the test code produces the output "0" instead of the -// expected "01234". - -// The break statement exits both for-loops (not just the innermost -// one) if the (single statement) body of the outer for-loop is not -// enclosed in braces. Affects more deeply nested loops in the same -// way. - -public class pr109 -{ - public static void main (String argv[]) - { - int i, j; - - for (i = 0; i < 5; i++) - for (j = 0; j < 2; j++) - { - if (j == 1) - break; - System.out.print (i); - } - - // We print a newline here because otherwise the DejaGNU log - // file is screwed up. - System.out.println (); - } -} diff --git a/libjava/testsuite/libjava.lang/pr109.out b/libjava/testsuite/libjava.lang/pr109.out deleted file mode 100644 index 3521a84d083..00000000000 --- a/libjava/testsuite/libjava.lang/pr109.out +++ /dev/null @@ -1 +0,0 @@ -01234 diff --git a/libjava/testsuite/libjava.lang/pr133.java b/libjava/testsuite/libjava.lang/pr133.java deleted file mode 100644 index 42009f4c851..00000000000 --- a/libjava/testsuite/libjava.lang/pr133.java +++ /dev/null @@ -1,34 +0,0 @@ -// PR 133 - -// System.exit(0) appears to hang the program. - -public class pr133 { - public static void main(String argv[]) - { - String name; - - if (argv.length == 0) { - name = "Rocket J. Squirrel"; - } else { - name = argv[0]; - } - - new pr133(name).identifySelf(); - System.out.println("goodbye"); - - System.exit(0); - } - - public pr133 (String name) - { - v_name = name; - } - - public void identifySelf() - { - System.out.println("This is a pr133 instance named " + v_name); - System.out.println("Leaving identifySelf()..."); - } - - private String v_name; -} diff --git a/libjava/testsuite/libjava.lang/pr133.out b/libjava/testsuite/libjava.lang/pr133.out deleted file mode 100644 index 52098d8075a..00000000000 --- a/libjava/testsuite/libjava.lang/pr133.out +++ /dev/null @@ -1,3 +0,0 @@ -This is a pr133 instance named Rocket J. Squirrel -Leaving identifySelf()... -goodbye diff --git a/libjava/testsuite/libjava.lang/pr179.java b/libjava/testsuite/libjava.lang/pr179.java deleted file mode 100644 index ec99efc1a79..00000000000 --- a/libjava/testsuite/libjava.lang/pr179.java +++ /dev/null @@ -1,61 +0,0 @@ -// Extended regression test for the PR 179. -// -// This tests the ".class" language syntax, initialization behaviour for -// 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. -// -// Bryce McKinlay <bryce@albatross.co.nz> - -class A -{ - static - { - System.out.println("A initialized"); - } -} - -interface IA {} - -class B implements IA -{ - static - { - System.out.println("B initialized"); - } -} - -class C -{ - static - { - System.out.println("C initialized"); - } -} - -interface IB {} - -public class pr179 -{ - public static void main(String[] args) - { - System.out.println (A.class.isAssignableFrom (Object.class)); - System.out.println (IB.class.isAssignableFrom (B.class)); - System.out.println (IA.class.isAssignableFrom (B.class)); - A a = new A(); - System.out.println (C.class.isInstance (a)); - C c = new C(); - 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 deleted file mode 100644 index 3a63ad6a52e..00000000000 --- a/libjava/testsuite/libjava.lang/pr179.out +++ /dev/null @@ -1,8 +0,0 @@ -A initialized -false -B initialized -false -true -C initialized -false -true diff --git a/libjava/testsuite/libjava.lang/pr184.java b/libjava/testsuite/libjava.lang/pr184.java deleted file mode 100644 index 42175b38e9d..00000000000 --- a/libjava/testsuite/libjava.lang/pr184.java +++ /dev/null @@ -1,22 +0,0 @@ -public class pr184 -{ - public static void main(String[] args) - { - pr184 n = null; - try - { - n.foo(); - } - catch (NullPointerException x) - { - System.out.println(x); - } - } - - int x = 2; - - final int foo() - { - return x; - }; -} diff --git a/libjava/testsuite/libjava.lang/pr184.out b/libjava/testsuite/libjava.lang/pr184.out deleted file mode 100644 index 7a72d865c98..00000000000 --- a/libjava/testsuite/libjava.lang/pr184.out +++ /dev/null @@ -1 +0,0 @@ -java.lang.NullPointerException diff --git a/libjava/testsuite/libjava.lang/pr83.java b/libjava/testsuite/libjava.lang/pr83.java deleted file mode 100644 index b209aff28b4..00000000000 --- a/libjava/testsuite/libjava.lang/pr83.java +++ /dev/null @@ -1,39 +0,0 @@ -// PR 83 - -/* - * test that caught null pointers exceptions in finalizers work correctly - * and that local variables are accessible in null pointer exception handlers. - */ -import java.io.*; - -public class pr83 { - - static String s; - - public static void main(String[] args) { - System.out.println(tryfinally() + s); - } - - public static String tryfinally() { - String yuck = null; - String local_s = null; - - try { - return "This is "; - } finally { - try { - local_s = "Perfect"; - /* trigger null pointer exception */ - String x = yuck.toLowerCase(); - } catch (Exception _) { - /* - * when the null pointer exception is caught, we must still - * be able to access local_s. - * Our return address for the finally clause must also still - * be intact. - */ - s = local_s; - } - } - } -} diff --git a/libjava/testsuite/libjava.lang/pr83.out b/libjava/testsuite/libjava.lang/pr83.out deleted file mode 100644 index 6a87582a8dc..00000000000 --- a/libjava/testsuite/libjava.lang/pr83.out +++ /dev/null @@ -1 +0,0 @@ -This is Perfect diff --git a/libjava/testsuite/libjava.lang/private_direct_read.java b/libjava/testsuite/libjava.lang/private_direct_read.java deleted file mode 100644 index 46d8fc3004b..00000000000 --- a/libjava/testsuite/libjava.lang/private_direct_read.java +++ /dev/null @@ -1,26 +0,0 @@ -// Class private_direct_read -// Generated on Tue Nov 16 15:04:13 UTC 1999 -// - -class private_direct_read { - - private int foo; - - class private_direct_read_inner { - void test () { - int x = foo; - System.out.println ("x="+x); - } - } - void foo () - { - foo = 670; - private_direct_read_inner inn = this.new private_direct_read_inner (); - inn.test (); - } - public static void main (String[] arg) - { - System.out.println ("Testing class `private_direct_read'..."); - new private_direct_read().foo (); - } -} diff --git a/libjava/testsuite/libjava.lang/private_direct_read.out b/libjava/testsuite/libjava.lang/private_direct_read.out deleted file mode 100644 index 11d665d6120..00000000000 --- a/libjava/testsuite/libjava.lang/private_direct_read.out +++ /dev/null @@ -1,2 +0,0 @@ -Testing class `private_direct_read'... -x=670 diff --git a/libjava/testsuite/libjava.lang/private_direct_write.java b/libjava/testsuite/libjava.lang/private_direct_write.java deleted file mode 100644 index 3c7a887f461..00000000000 --- a/libjava/testsuite/libjava.lang/private_direct_write.java +++ /dev/null @@ -1,25 +0,0 @@ -// Class private_direct_write -// Generated on Tue Nov 16 15:05:54 UTC 1999 -// - -class private_direct_write { - - private int foo; - - class private_direct_write_inner { - void test () { - foo = 670; - } - } - void foo () - { - private_direct_write_inner inn = this.new private_direct_write_inner (); - inn.test (); - System.out.println ("foo="+foo); - } - public static void main (String[] arg) - { - System.out.println ("Testing class `private_direct_write'..."); - new private_direct_write().foo (); - } -} diff --git a/libjava/testsuite/libjava.lang/private_indirect_read.java b/libjava/testsuite/libjava.lang/private_indirect_read.java deleted file mode 100644 index 9a37bfdac11..00000000000 --- a/libjava/testsuite/libjava.lang/private_indirect_read.java +++ /dev/null @@ -1,32 +0,0 @@ -// Class private_indirect_read -// Generated on Tue Nov 16 15:34:56 UTC 1999 -// - -class private_indirect_read { - - private int foo; - - class private_indirect_read_inner { - void test () { - } - class other { - void testx () { - int x = foo; - System.out.println ("x="+x); - } - } - - } - void foo () - { - foo=670; - private_indirect_read_inner inn = this.new private_indirect_read_inner (); - private_indirect_read_inner.other o = inn.new other (); - o.testx(); - } - public static void main (String[] arg) - { - System.out.println ("Testing class `private_indirect_read'..."); - new private_indirect_read().foo (); - } -} diff --git a/libjava/testsuite/libjava.lang/private_indirect_write.java b/libjava/testsuite/libjava.lang/private_indirect_write.java deleted file mode 100644 index f706b20c9a5..00000000000 --- a/libjava/testsuite/libjava.lang/private_indirect_write.java +++ /dev/null @@ -1,32 +0,0 @@ -// Class private_indirect_write -// Generated on Tue Nov 16 15:44:49 UTC 1999 -// - -class private_indirect_write { - - private int foo; - - class private_indirect_write_inner { - void test () { - } - - class other { - void test () { - foo = 670; - } - } - - } - void foo () - { - private_indirect_write_inner inn = this.new private_indirect_write_inner (); - private_indirect_write_inner.other x = inn.new other (); - x.test (); - System.out.println ("foo="+foo); - } - public static void main (String[] arg) - { - System.out.println ("Testing class `private_indirect_write'..."); - new private_indirect_write().foo (); - } -} diff --git a/libjava/testsuite/libjava.lang/search_outer.java b/libjava/testsuite/libjava.lang/search_outer.java deleted file mode 100644 index 66567df8b6d..00000000000 --- a/libjava/testsuite/libjava.lang/search_outer.java +++ /dev/null @@ -1,28 +0,0 @@ -// Class search_outer.java -// Generated on Thu Nov 18 18:40:43 UTC 1999 -// - -class search_outer { - - private int foo; - - class search_outer_inner { - void test () { - foo++; - System.out.println ("foo="+foo); - foo += 3; - System.out.println ("foo="+foo); - } - } - void foo () - { - foo = 3; - search_outer_inner inn = this.new search_outer_inner (); - inn.test (); - } - public static void main (String[] arg) - { - System.out.println ("Testing class `search_outer'..."); - new search_outer().foo (); - } -} diff --git a/libjava/testsuite/libjava.lang/search_outer.out b/libjava/testsuite/libjava.lang/search_outer.out deleted file mode 100644 index df2862d680b..00000000000 --- a/libjava/testsuite/libjava.lang/search_outer.out +++ /dev/null @@ -1,3 +0,0 @@ -Testing class `search_outer'... -foo=4 -foo=7 diff --git a/libjava/testsuite/libjava.lang/stringconst.java b/libjava/testsuite/libjava.lang/stringconst.java deleted file mode 100644 index 62857494317..00000000000 --- a/libjava/testsuite/libjava.lang/stringconst.java +++ /dev/null @@ -1,22 +0,0 @@ -// A reference to a String shouldn't cause an interface to be -// initialized. - -interface I -{ - String z = "zardoz"; - int q = stringconst.out ("q", 0); -} - -public class stringconst -{ - public static int out (String s, int i) - { - System.out.println (s + "=" + i); - return i; - } - - public static void main (String[] args) - { - System.out.println (I.z); - } -} diff --git a/libjava/testsuite/libjava.lang/stringconst.out b/libjava/testsuite/libjava.lang/stringconst.out deleted file mode 100644 index 1f0ac89bf77..00000000000 --- a/libjava/testsuite/libjava.lang/stringconst.out +++ /dev/null @@ -1 +0,0 @@ -zardoz diff --git a/libjava/testsuite/libjava.lang/stringconst2.java b/libjava/testsuite/libjava.lang/stringconst2.java deleted file mode 100644 index f33ee9c5b3e..00000000000 --- a/libjava/testsuite/libjava.lang/stringconst2.java +++ /dev/null @@ -1,21 +0,0 @@ -// Test to make sure a string constant is correctly initialized. - -import java.lang.reflect.*; - -public class stringconst2 -{ - public static final String q = "zardoz"; - - public static void main (String[] args) - { - try - { - Class k = Class.forName ("stringconst2"); - Field f = k.getField ("q"); - System.out.println (f.get (null)); - } - catch (Throwable _) - { - } - } -} diff --git a/libjava/testsuite/libjava.lang/stringconst2.out b/libjava/testsuite/libjava.lang/stringconst2.out deleted file mode 100644 index 1f0ac89bf77..00000000000 --- a/libjava/testsuite/libjava.lang/stringconst2.out +++ /dev/null @@ -1 +0,0 @@ -zardoz diff --git a/libjava/testsuite/libjava.lang/stub.java b/libjava/testsuite/libjava.lang/stub.java deleted file mode 100644 index dfda004b3b1..00000000000 --- a/libjava/testsuite/libjava.lang/stub.java +++ /dev/null @@ -1,101 +0,0 @@ -// Class stub -// Generated on Fri Feb 4 20:23:47 PST 2000 -// A somewhat thorough test of function invocator generated stubs. - -class stub { - - String ok; - - void OK () {System.out.println (ok);} - void OK (int i) {System.out.println (ok+" "+i);} - static void testOK () {System.out.println ("OK");} - static void testOK (int i) {System.out.println ("OK "+i); } - - // STATIC PRIVATE R_VALUE ARGS - // No No No No - void t1 () {OK();} - // Yes No No No - static void t2 () {testOK();} - // No Yes No No - private void t3 () {OK();} - // Yes Yes No No - static private void t4 () {testOK();} - // No No Yes No - int t5 () {return 5;} - // Yes No Yes No - static int t6 () {return 6;} - // No Yes Yes No - private int t7 () {return 7;} - // Yes Yes Yes No - static private int t8 () {return 8;} - - // No No No Yes - void t9 (int i) {OK(i);} - // Yes No No Yes - static void t10 (int i) {testOK(i);} - // No Yes No Yes - private void t11 (int i) {OK(i);} - // Yes Yes No Yes - static private void t12 (int i) {testOK(i);} - // No No Yes Yes - int t13 (int i) {return i*2;} - // Yes No Yes Yes - static int t14 (int i) {return i*3;} - // No Yes Yes Yes - private int t15 (int i) {return i*4;} - // Yes Yes Yes Yes - static private int t16 (int i) {return i*5;} - - void foo () - { - this.new bar ().test (); - } - class bar { - void test () { - ok = "OK"; - t1 (); - t2 (); - t3 (); - t4 (); - System.out.println (t5()); - System.out.println (t6()); - System.out.println (t7()); - System.out.println (t8()); - t9 (9); - t10 (10); - t11 (11); - t12 (12); - System.out.println (t13(13)); - System.out.println (t14(14)); - System.out.println (t15(15)); - System.out.println (t16(16)); - this.new baz ().test (); - } - class baz { - void test () { - ok = "OKOK"; - t1 (); - t2 (); - t3 (); - t4 (); - System.out.println (t5()); - System.out.println (t6()); - System.out.println (t7()); - System.out.println (t8()); - t9 (9); - t10 (10); - t11 (11); - t12 (12); - System.out.println (t13(13)); - System.out.println (t14(14)); - System.out.println (t15(15)); - System.out.println (t16(16)); - } - } - } - public static void main (String[] arg) - { - System.out.println ("Testing class `stub'..."); - new stub ().foo (); - } -} diff --git a/libjava/testsuite/libjava.lang/stub.out b/libjava/testsuite/libjava.lang/stub.out deleted file mode 100644 index 90937c6da95..00000000000 --- a/libjava/testsuite/libjava.lang/stub.out +++ /dev/null @@ -1,33 +0,0 @@ -Testing class `stub'... -OK -OK -OK -OK -5 -6 -7 -8 -OK 9 -OK 10 -OK 11 -OK 12 -26 -42 -60 -80 -OKOK -OK -OKOK -OK -5 -6 -7 -8 -OKOK 9 -OK 10 -OKOK 11 -OK 12 -26 -42 -60 -80 diff --git a/libjava/testsuite/libjava.lang/test_long.java b/libjava/testsuite/libjava.lang/test_long.java deleted file mode 100644 index 3e876ac34e3..00000000000 --- a/libjava/testsuite/libjava.lang/test_long.java +++ /dev/null @@ -1,13 +0,0 @@ -class test_long { - - public static void main (String[] arg) - { - long a, b, c, d, e; - e = 234L; - d = 0x8888888888888888L; - a = 0x0123456789ABCDEFL; - b = 0xFEDCBA9876543210L; - c = 0xF096A5B4C3B2E187L; - System.out.println (a+" "+b+" "+c+" "+d+" "+e); - } -} diff --git a/libjava/testsuite/libjava.lang/test_long.out b/libjava/testsuite/libjava.lang/test_long.out deleted file mode 100644 index 1f10f0cf806..00000000000 --- a/libjava/testsuite/libjava.lang/test_long.out +++ /dev/null @@ -1 +0,0 @@ -81985529216486895 -81985529216486896 -1110518062304271993 -8608480567731124088 234 diff --git a/libjava/testsuite/libjava.lang/tmi.java b/libjava/testsuite/libjava.lang/tmi.java deleted file mode 100644 index be2395a965b..00000000000 --- a/libjava/testsuite/libjava.lang/tmi.java +++ /dev/null @@ -1,43 +0,0 @@ -// Class t -// Generated on Thu Nov 4 16:35:03 PST 1999 -// - -class tmi { - int i; - void foo () { - tmi.z x1 = new z(); - tmi.z.y x = x1.new y(); - x.bar (); - x.print(); - tmi.this.i = 666; - x.print(); - tmi.this.print(); - } - void print () { - System.out.println ("tmi.print()"); - } - public static void main (String[] arg) - { - System.out.println ("Testing class `tmi'..."); - new tmi ().foo(); - } - class z { - int j; - void foo () { - tmi.this.i = 3; - } - class y { - int k; - void bar () { - tmi.this.i = 3; - tmi.this.print (); - z.this.j = 4; - y.this.k = 34; - } - void print () { - System.out.println ("i="+i+", j="+j+", k="+k); - } - } - } -} - diff --git a/libjava/testsuite/libjava.lang/tmi.out b/libjava/testsuite/libjava.lang/tmi.out deleted file mode 100644 index 7c87756fd00..00000000000 --- a/libjava/testsuite/libjava.lang/tmi.out +++ /dev/null @@ -1,5 +0,0 @@ -Testing class `tmi'... -tmi.print() -i=3, j=4, k=34 -i=666, j=4, k=34 -tmi.print() diff --git a/libjava/testsuite/libjava.lang/tp.java b/libjava/testsuite/libjava.lang/tp.java deleted file mode 100644 index b6d9fbec48f..00000000000 --- a/libjava/testsuite/libjava.lang/tp.java +++ /dev/null @@ -1,36 +0,0 @@ -// Class tp -// Generated on Thu Nov 4 16:35:03 PST 1999 -// - -class tp { - private int i; - void foo () { - tp.z x1 = new z(); - tp.z.y x = x1.new y(); - x.bar (); - x.print(); - } - public static void main (String[] arg) - { - System.out.println ("Testing class `tp'..."); - new tp ().foo(); - } - class z { - private int j; - void foo () { - tp.this.i = 3; - } - class y { - private int k; - void bar () { - tp.this.i = 3; - z.this.j = 4; - y.this.k = 34; - } - void print () { - System.out.println ("i="+i+", j="+j+", k="+k); - } - } - } -} - diff --git a/libjava/testsuite/libjava.lang/tp.out b/libjava/testsuite/libjava.lang/tp.out deleted file mode 100644 index f89aac653d9..00000000000 --- a/libjava/testsuite/libjava.lang/tp.out +++ /dev/null @@ -1,2 +0,0 @@ -Testing class `tp'... -i=3, j=4, k=34 diff --git a/libjava/testsuite/libjava.lang/update_outer.java b/libjava/testsuite/libjava.lang/update_outer.java deleted file mode 100644 index b2e84370395..00000000000 --- a/libjava/testsuite/libjava.lang/update_outer.java +++ /dev/null @@ -1,28 +0,0 @@ -// Class update_outer -// Generated on Thu Nov 18 21:37:21 UTC 1999 -// - -class update_outer { - - private String foo; - - class update_outer_inner { - void test () { - foo += " M$"; - System.out.println ("foo=`"+foo+"'"); - } - - - } - void foo () - { - foo = "780"; - update_outer_inner inn = this.new update_outer_inner (); - inn.test (); - } - public static void main (String[] arg) - { - System.out.println ("Testing class `update_outer'..."); - new update_outer().foo (); - } -} diff --git a/libjava/testsuite/libjava.lang/update_outer.out b/libjava/testsuite/libjava.lang/update_outer.out deleted file mode 100644 index cff7c5d5b3d..00000000000 --- a/libjava/testsuite/libjava.lang/update_outer.out +++ /dev/null @@ -1,2 +0,0 @@ -Testing class `update_outer'... -foo=`780 M$' diff --git a/libjava/testsuite/libjava.mauve/DejaGNUTestHarness.java b/libjava/testsuite/libjava.mauve/DejaGNUTestHarness.java deleted file mode 100644 index 91817e6fa1d..00000000000 --- a/libjava/testsuite/libjava.mauve/DejaGNUTestHarness.java +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright (c) 1998, 1999 Free Software Foundation - -// Written by Tom Tromey <tromey@cygnus.com> - -import gnu.testlet.*; - -public class DejaGNUTestHarness extends SimpleTestHarness -{ - static String dejasrcdir; - - public String getSourceDirectory () - { - return dejasrcdir; - } - - private DejaGNUTestHarness () - { - super (/* verbose */ true, /* debug */ false); - } - - public static void main (String[] args) - { - dejasrcdir = args.length > 0 ? args[0] : ""; - DejaGNUTestHarness harness = new DejaGNUTestHarness (); - // This might seem weird, given that we check args.length above. - // However, in some cases the expect code rewrites this runtest - // invocation to have an explicit name for the test to run. - harness.runtest (args[1]); - System.exit(harness.done()); - } -} diff --git a/libjava/testsuite/libjava.mauve/mauve.exp b/libjava/testsuite/libjava.mauve/mauve.exp deleted file mode 100644 index 04f637a747d..00000000000 --- a/libjava/testsuite/libjava.mauve/mauve.exp +++ /dev/null @@ -1,389 +0,0 @@ -# Copyright (C) 1998, 1999, 2000 Free Software Foundation. -# Written by Tom Tromey <tromey@cygnus.com>. -# Incorporate Mauve into libjava's DejaGNU test suite framework. - -# FIXME: should be able to compile from source as well as from .class. - - -# Compute list of files to compile. Returns list of all files -# representing classes that must be tested. Result parameter `uses' -# maps source file names onto list of objects required for link. -proc mauve_compute_uses {aName} { - upvar $aName uses - global env runtests - - set fd [open classes r] - set line [read $fd] - close $fd - - foreach item [split $line] { - if {$item == ""} then { - continue - } - set item [join [split $item .] /].java - - # User might have specified "mauve.exp=something.java". - if {! [runtest_file_p $runtests $item]} { - continue - } - - # Look for Uses line in source file. - set fd [open $env(MAUVEDIR)/$item r] - set ufiles [list $item] - set dir [file dirname $item] - while {[gets $fd sline] != -1} { - if {[regsub -- {^// Uses:} $sline {} sline]} then { - foreach uf [split $sline] { - if {$uf != ""} then { - lappend ufiles $dir/$uf - } - } - } - } - close $fd - - set uses($item) {} - foreach file $ufiles { - set file [file rootname $file].o - lappend uses($item) $file - } - } - - return [lsort [array names uses]] -} - -# Run all the Mauve tests. -proc test_mauve {} { - global srcdir objdir subdir env - - if {! [info exists env(MAUVEDIR)]} then { - verbose "MAUVEDIR not set; not running Mauve tests" - return - } - - # Run in subdir so we don't overwrite our own Makefile. - catch {system "rm -rf mauve-build"} - file mkdir mauve-build - # Some weirdness to set srcdir correctly. - set here [pwd] - cd $srcdir - set full_srcdir [pwd] - cd $here/mauve-build - - global env - global GCJ_UNDER_TEST - global TOOL_EXECUTABLE - - if ![info exists GCJ_UNDER_TEST] { - if [info exists TOOL_EXECUTABLE] { - set GCJ_UNDER_TEST $TOOL_EXECUTABLE; - } else { - if [info exists env(GCJ)] { - set GCJ_UNDER_TEST env(GCJ) - } else { - set GCJ_UNDER_TEST "[find_gcj]" - } - } - } - - # Append -B and -I so that libgcj.spec and libgcj.zip are found - # before they're installed. - set env(GCJ) "$GCJ_UNDER_TEST -B$objdir/../ -I$objdir/../libgcj.zip" - - if {[catch { - system "$env(MAUVEDIR)/configure --with-gcj 2>@ stdout" - } msg]} then { - fail "Mauve configure" - verbose "configure failed with $msg" - return - } - pass "Mauve configure" - - # Copy appropriate tags file locally. - set fd [open $full_srcdir/../mauve-libgcj r] - set c [read $fd] - close $fd - set fd [open mauve-libgcj w] - puts -nonewline $fd $c - close $fd - - if {[catch { - system "make KEYS=libgcj classes.stamp 2>&1" - } msg]} then { - fail "Mauve build" - verbose "build failed with $msg" - return - } - pass "Mauve build" - - set srcfile $full_srcdir/$subdir/DejaGNUTestHarness.java - if {! [bytecompile_file $srcfile [pwd] $env(MAUVEDIR):[pwd]]} then { - fail "Compile DejaGNUTestHarness.java" - return - } - pass "Compile DejaGNUTestHarness.java" - - # Compute list of files to test, and also all files to build. - set choices [mauve_compute_uses uses] - - # Compute flags to use to do the build. - set compile_args [libjava_arguments] - set link_args [concat [libjava_arguments link] \ - [list "additional_flags=--main=DejaGNUTestHarness"]] - - set ok 1 - set objlist {} - foreach base {DejaGNUTestHarness gnu/testlet/SimpleTestHarness gnu/testlet/TestHarness gnu/testlet/Testlet gnu/testlet/ResourceNotFoundException gnu/testlet/config} { - set file $base.class - set obj $base.o - set x [prune_warnings \ - [target_compile [pwd]/$file $obj object $compile_args]] - if {$x != ""} then { - fail "Compile $obj" - set ok 0 - } else { - pass "Compile $obj" - } - lappend objlist $obj - } - if {! $ok} then { - return - } - - set Executable DejaGNUTestHarness - foreach file $choices { - # Turn `java/lang/Foo.java' into `java.lang.Foo'. - set class [file rootname $file] - regsub -all -- / $class . class - - set ok 1 - foreach obj $uses($file) { - if {! [file exists $obj]} then { - verbose "compiling $obj for test of $class" - set srcfile [file rootname $obj].class - set x [prune_warnings \ - [target_compile [pwd]/$srcfile $obj object $compile_args]] - if {$x != ""} then { - fail "Compile $obj for $class" - set ok 0 - break - } - pass "Compile $obj for $class" - } - } - if {! $ok} then { - continue - } - - set x [prune_warnings [target_compile [concat $uses($file) $objlist] \ - $Executable executable $link_args]] - if {$x != ""} then { - fail "Link for $class" - continue - } - pass "Link for $class" - - set result [libjava_load [pwd]/DejaGNUTestHarness \ - "$env(MAUVEDIR) $class" ""] - - # Test for an exception thrown in the test harness itself. This - # isn't enough to test for all faults in the test harness, but - # it's better than nothing. - set output [lindex $result 1]; - if [regexp "Exception: " $output] then { - fail $output - continue - } - - pass "Execute for $class" - - # Extract pass/failure info from output. - foreach line [split [lindex $result 1] \n] { - if {[regexp -- {^(PASS|FAIL): (.*)$} $line ignore what msg]} then { - if {$what == "PASS"} then { - pass $msg - } else { - fail $msg - } - } - } - } -} - -# Run all the Mauve tests in a sim environment. In this case, the -# program cannot use argv[] because there's no way to pass in the -# command line, so tha name of the class to test is substituted by -# patching the source of the DejaGNUTestHarness. -proc test_mauve_sim {} { - global srcdir subdir env - - if {! [info exists env(MAUVEDIR)]} then { - verbose "MAUVEDIR not set; not running Mauve tests" - return - } - - # Run in subdir so we don't overwrite our own Makefile. - catch {system "rm -rf mauve-build"} - file mkdir mauve-build - # Some weirdness to set srcdir correctly. - set here [pwd] - cd $srcdir - set full_srcdir [pwd] - cd $here/mauve-build - - if {[catch { - system "$env(MAUVEDIR)/configure --with-gcj 2>&1" - } msg]} then { - fail "Mauve configure" - verbose "configure failed with $msg" - return - } - pass "Mauve configure" - - # Copy appropriate tags file locally. - set fd [open $full_srcdir/../mauve-libgcj r] - set c [read $fd] - close $fd - set fd [open mauve-libgcj w] - puts -nonewline $fd $c - close $fd - - if {[catch { - system "make KEYS=libgcj classes.stamp 2>&1" - } msg]} then { - fail "Mauve build" - verbose "build failed with $msg" - return - } - pass "Mauve build" - - # Compute list of files to test, and also all files to build. - set choices [mauve_compute_uses uses] - - # Compute flags to use to do the build. - set compile_args [libjava_arguments] - set link_args [concat [libjava_arguments link] \ - [list "additional_flags=--main=DejaGNUTestHarness"]] - - set ok 1 - set objlist {} - foreach base {gnu/testlet/SimpleTestHarness gnu/testlet/TestHarness \ - gnu/testlet/Testlet gnu/testlet/ResourceNotFoundException \ - gnu/testlet/config} { - set file $base.class - set obj $base.o - set x [prune_warnings \ - [target_compile [pwd]/$file $obj object $compile_args]] - if {$x != ""} then { - fail "Compile $obj" - set ok 0 - } else { - pass "Compile $obj" - } - lappend objlist $obj - } - if {! $ok} then { - return - } - - lappend objlist gnu/testlet/DejaGNUTestHarness.o - - set Executable DejaGNUTestHarness - foreach file $choices { - # Turn `java/lang/Foo.java' into `java.lang.Foo'. - - set class [file rootname $file] - regsub -all -- / $class . class - - set ok 1 - foreach obj $uses($file) { - if {! [file exists $obj]} then { - verbose "compiling $obj for test of $class" - set srcfile [file rootname $obj].class - set x [prune_warnings \ - [target_compile [pwd]/$srcfile $obj object $compile_args]] - if {$x != ""} then { - fail "Compile $obj for $class" - set ok 0 - break - } - pass "Compile $obj for $class" - } - } - if {! $ok} then { - continue - } - - set infile $full_srcdir/$subdir/DejaGNUTestHarness.java - set srcfile DejaGNUTestHarness.java - set f [open $infile r] - set d [open gnu/testlet/$srcfile w] - while {[gets $f line] >= 0} { - if [regexp {harness\.runtest \(args\[1\]\)} $line] then { - regsub {args\[1\]} $line "\"$class\"" out - } else { - set out $line - } - puts $d $out - } - close $f - close $d - - if {! [bytecompile_file [pwd]/gnu/testlet/$srcfile [pwd]/gnu/testlet \ - $env(MAUVEDIR):[pwd]]} then { - fail "Compile DejaGNUTestHarness.java" - return - } - - set x [prune_warnings \ - [target_compile gnu/testlet/DejaGNUTestHarness.class \ - gnu/testlet/DejaGNUTestHarness.o object $compile_args]] - if {$x != ""} then { - fail "Compile DejaGNUTestHarness.java" - continue - } - - set x [prune_warnings [target_compile [concat $uses($file) $objlist] \ - $Executable executable $link_args]] - if {$x != ""} then { - fail "Link for $class" - continue - } - pass "Link for $class" - - set result [libjava_load [pwd]/DejaGNUTestHarness \ - "$env(MAUVEDIR) $class" ""] - - # Test for an exception thrown in the test harness itself. This - # isn't enough to test for all faults in the test harness, but - # it's better than nothing. - set output [lindex $result 1]; - if [regexp "Exception: " $output] then { - fail $output - continue - } - - pass "Execute for $class" - - # Extract pass/failure info from output. - foreach line [split [lindex $result 1] \n] { - if {[regexp -- {^(PASS|FAIL): (.*)$} $line ignore what msg]} then { - if {$what == "PASS"} then { - pass $msg - } else { - fail $msg - } - } - } - } -} - -# The test_mauve* procs will change the current directory. It's -# simpler to fix this up here than to keep track of this in the procs. -set here [pwd] -if { [board_info target exists is_simulator] } { - test_mauve_sim -} else { - test_mauve -} -cd $here |