Ignore:
Timestamp:
Apr 27, 2004, 8:39:34 PM (21 years ago)
Author:
bird
Message:

GCC v3.3.3 sources.

Location:
branches/GNU/src/gcc
Files:
26 edited

Legend:

Unmodified
Added
Removed

  • branches/GNU/src/gcc

    • Property svn:ignore

      •  

        old new  
        2626configure.vr
        2727configure.vrs
         28dir.info
        2829Makefile
        29 dir.info
        3030lost+found
        3131update.out

  • branches/GNU/src/gcc/libjava/testsuite/ChangeLog

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.1.1.2
    r1390 r1391  
    1 2003-02-05  Release Manager
    2 
    3         * GCC 3.2.2 Released.
    4 
    5 2002-11-19  Release Manager
    6 
    7         * GCC 3.2.1 Released.
    8 
    9 2002-11-19  Release Manager
    10 
    11         * GCC 3.2.1 Released.
    12 
    13 2002-11-18  Release Manager
    14 
    15         * GCC 3.2.1 Released.
     12004-02-14  Release Manager
     2
     3        * GCC 3.3.3 Released.
     4
     52003-10-16  Release Manager
     6
     7        * GCC 3.3.2 Released.
     8
     92003-08-04  Release Manager
     10
     11        * GCC 3.3.1 Released.
     12
     132003-08-04  Release Manager
     14
     15        * GCC 3.3.1 Released.
     16
     172003-05-13  Release Manager
     18
     19        * GCC 3.3 Released.
     20
     212003-05-13  Release Manager
     22
     23        * GCC 3.3 Released.
     24
     252003-05-13  Release Manager
     26
     27        * GCC 3.3 Released.
     28
     292003-05-06  Tom Tromey  <tromey@redhat.com>
     30
     31        * libjava.lang/verify.java: New file.
     32        * libjava.lang/verify.out: New file.
     33
     342003-05-02  Tom Tromey  <tromey@redhat.com>
     35
     36        PR java/10459:
     37        * libjava.compile/pr10459_2.java: New file.
     38        * libjava.compile/pr10459.java: New file.
     39
     402003-05-01  Tom Tromey  <tromey@redhat.com>
     41
     42        PR libgcj/10582:
     43        * libjava.lang/assign.java: New file.
     44        * libjava.lang/assign.out: New file.
     45
     462003-04-16  Tom Tromey  <tromey@redhat.com>
     47
     48        * libjava.mauve/xfails: Added some more failing tests.
     49
     502003-04-16  Mark Mitchell  <mark@codesourcery.com>
     51
     52        PR middle-end/8866
     53        * libjava.lang/PR8866.java: New test.
     54
     552003-04-16  Andrew Haley  <aph@redhat.com>
     56
     57        * libjava.lang/Throw_2.java (main): Make a successful test produce
     58        some output.
     59
     602003-03-10  Tom Tromey  <tromey@redhat.com>
     61
     62        * libjava.lang/initfield.java: New file.
     63        * libjava.lang/initfield.out: New file.
     64
     652003-03-10  Tom Tromey  <tromey@redhat.com>
     66
     67        * libjava.jacks/jacks.xfail: Updated to reflect reality.
     68
     692003-03-02  Mark Wielaard  <mark@klomp.org>
     70
     71        * libjava.mauve/xfails: Remove all AcuniaPropertiesTest failures
     72
     732003-02-16  Mark Wielaard  <mark@klomp.org>
     74
     75        * libjava.mauve/xfails: Add Class.reflect2 and String.getBytes FAILs.
     76
     772003-02-15  Mark Wielaard  <mark@klomp.org>
     78
     79       * lib/libjava.exp (test_libjava_from_javac): Use regsub not string map.
     80       * libjava.mauve/mauve.exp (mauve_compute_uses): Likewise.
     81       (test_mauve): Likewise.
     82
     832003-02-14  Mark Wielaard  <mark@klomp.org>
     84
     85        * lib/libjava.exp (test_libjava_from_javac): Don't create .o files
     86        containing $ characters and always quote class files with "'"s.
     87
     882003-02-14  Mark Wielaard  <mark@klomp.org>
     89
     90        * libjava.mauve/mauve.exp (mauve_compute_uses): Add inner class
     91        object files by changing all occurances of $ to ^.
     92        (test_mauve): Replace ^ with $ for class file names and quote
     93        them with "'"s.
     94
     952003-02-13  Tom Tromey  <tromey@redhat.com>
     96
     97        * libjava.mauve/xfails: Added entries for an unimplemented Class
     98        method.
     99
     1002003-02-07  Mark Wielaard  <mark@klomp.org>
     101
     102        * libjava.mauve/xfails: Add new entries for
     103        gnu.testlet.java.text.CollationElementIterator.jdk11
     104
     1052003-02-03  Ulrich Weigand  <uweigand@de.ibm.com>
     106
     107        * libjava.jacks/jacks.exp (gcj_jacks_write): Set LD_LIBRARY_PATH
     108        to find libgcc_s.  Set JAVA_CLASSPATH to find libgcj.jar.
     109
     1102003-01-31  Mark Wielaard  <mark@klomp.org>
     111 
     112        * lib/libjava.exp (libjava_prune_warnings): Remove all unreachable
     113        bytecode warnings.
     114
     1152003-01-28  Tom Tromey  <tromey@redhat.com>
     116
     117        * libjava.jacks/jacks.xfail: More lexer tests now pass.
     118
     1192003-01-27  Tom Tromey  <tromey@redhat.com>
     120
     121        * libjava.compile/consthrow.java: New file.
     122        * libjava.compile/consthrow.xfail: New file.
     123
     1242003-01-27  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
     125
     126        * libjava.lang/pr8823.xfail: New file, add "xfail-byte".
     127
     1282003-01-24  Ranjit Mathew  <rmathew@hotmail.com>
     129
     130        * libjava.jni/calls.c (Java_calls_docall): Define with
     131        JNIEXPORT and JNICALL method attributes.
     132        * libjava.jni/field.c (Java_field_fetch): Likewise.
     133        * libjava.jni/final_method.c (Java_final_1method_meth): Likewise.
     134        * libjava.jni/findclass.c (Java_findclass_doit): Likewise.
     135        * libjava.jni/invoke.c (Java_invoke_val): Likewise.
     136        * libjava.jni/martin.c (Java_martin_myNative): Likewise.
     137        * libjava.jni/noclass.c (Java_noclass_find_1it): Likewise.
     138        * libjava.jni/overload.c (Java_overload_over__I): Likewise.
     139        (Java_overload_over__II): Likewise.
     140        * libjava.jni/register.c (JNI_OnLoad): Likewise.
     141        * libjava.jni/simple_int.c (Java_simple_1int_nat): Likewise.
     142        * libjava.jni/throwit.c (Java_throwit_throwit): Likewise.
     143        * libjava.jni/virtual.c (Java_virtual_equals): Likewise.
     144
     1452003-01-21  Tom Tromey  <tromey@redhat.com>
     146
     147        * libjava.jacks/jacks.xfail: All 8.4.3 tests and 9.4-modifier-10
     148        now pass.
     149
     1502003-01-12  Tom Tromey  <tromey@redhat.com>
     151
     152        Fix for PR libgcj/9139:
     153        * lib/libjava.exp (find_javac): Put value of libgcj_jar into
     154        return value when gcj is used.
     155        * libjava.mauve/mauve.exp (test_mauve): Use libgcj_jar global.
     156
     1572003-01-03  Tom Tromey  <tromey@redhat.com>
     158
     159        * libjava.compile/pr8712.java: New file, for PR java/8712.
     160
     1612003-01-01  Tom Tromey  <tromey@redhat.com>
     162
     163        * libjava.compile/pr8955.java: New test, for PR java/8955.
     164
     1652002-12-19  Tom Tromey  <tromey@redhat.com>
     166
     167        * libjava.jacks/jacks.xfail: Updated.
     168
     1692002-12-18  Tom Tromey  <tromey@redhat.com>
     170
     171        * libjava.lang/pr8945.java: New file.
     172        * libjava.lang/pr8945.out: New file.
     173
     1742002-12-12  Tom Tromey  <tromey@redhat.com>
     175
     176        * libjava.loader/loader.exp (gcj_loader_test_one): Use
     177        libjava_prune_warnings.
     178        (gcj_loader_run): Likewise.
     179        * libjava.mauve/mauve.exp (test_mauve): Use
     180        libjava_prune_warnings.
     181        (test_mauve_sim): Likewise.
     182        * libjava.jni/jni.exp (gcj_jni_compile_c_to_so): Use
     183        libjava_prune_warnings.
     184        (gcj_jni_build_header): Likewise.
     185        * lib/libjava.exp (libjava_prune_warnings): New proc.
     186        (gcj_link): Use it.
     187        (test_libjava_from_source): Likewise.
     188        (test_libjava_from_javac): Likewise.
     189
     1902002-12-08  Tom Tromey  <tromey@redhat.com>
     191
     192        Test for PR libgcj/8823:
     193        * libjava.lang/pr8823.java: New file.
     194        * libjava.lang/pr8823.out: New file.
     195
     1962002-12-05  Tom Tromey  <tromey@redhat.com>
     197
     198        * libjava.lang/override.java: New file.
     199        * libjava.lang/override.out: New file.
     200
     2012002-12-01  Tom Tromey  <tromey@redhat.com>
     202
     203        * libjava.jacks/jacks.exp (gcj_jacks_setup_xfail): New function.
     204        (gcj_jacks_parse): Use it; set up xfails.
     205        * libjava.jacks/jacks.xfail: New file.
     206
     2072002-12-01  Mark Wielaard  <mark@klomp.org>
     208
     209        * libjava.mauve/xfails: Remove Inspector FAILs that now PASS.
     210
     2112002-11-21  Tom Tromey  <tromey@redhat.com>
     212
     213        For PR java/8676:
     214        * libjava.lang/pr8676.java: New file.
     215        * libjava.lang/pr8676.out: New file.
     216
     2172002-11-21  Ulrich Weigand  <uweigand@de.ibm.com>
     218
     219        * libjava.loader/loader.exp (gcj_loader_test_one): Fix typo in
     220        'type' argument to libjava_tcompile.
     221        (gcj_loader_run): Use libjava_tcompile instead of running
     222        GCJ_UNDER_TEST directly.
     223
     2242002-11-05  Tom Tromey  <tromey@redhat.com>
     225
     226        * libjava.jacks/jacks.exp: New file.
     227
     2282002-11-04  Tom Tromey  <tromey@redhat.com>
     229
     230        * libjava.compile/pr7912.java: New file.
     231
     2322002-11-04  Andrew Haley  <aph@redhat.com>
     233
     234        * libjava.lang/utilTest.java: New.
     235        * libjava.lang/utilTest.out: New.
     236
     2372002-11-04  Anthony Green  <green@redhat.com>
     238
     239        * libjava.loader/MyLoader.java: New constructor.
     240        * libjava.loader/TestParent.java: New file.
     241        * libjava.loader/TestParent.out: New file.
     242
     2432002-11-04  Anthony Green  <green@redhat.com>
     244
     245        * libjava.loader/TestEarlyGC.java,
     246        libjava.loader/TestEarlyGC.out: New files (from
     247        Jeff Sturm).
     248
     2492002-11-04  Anthony Green  <green@redhat.com>
     250
     251        * libjava.loader/dummy.java, libjava.loader/loader.exp,
     252        libjava.loader/MyLoader.java, libjava.loader/TestLeak.java,
     253        libjava.loader/TestLeak.out, libjava.loader/TestMultiple.java,
     254        libjava.loader/TestMultiple.out: New files.
     255
     2562002-11-02  Tom Tromey  <tromey@redhat.com>
     257
     258        * libjava.lang/initexc.java (fail): Static initializers must be
     259        able to complete normally.  From Eric Blake.
     260
     261        * libjava.lang/initexc.java: New file.
     262        * libjava.lang/initexc.out: New file.
     263
     2642002-11-01  Tom Tromey  <tromey@redhat.com>
     265
     266        For PR java/8415:
     267        * libjava.lang/pr8415.java: New file.
     268        * libjava.lang/pr8415.out: New file.
     269
     270        * libjava.mauve/mauve.exp (find_mauve_sources): New proc.
     271        (test_mauve): Use it.
     272        (test_mauve_sim): Likewise.
    16273
    172742002-10-24  Tom Tromey  <tromey@redhat.com>
    … …  
    19276        * libjava.lang/Primes.java: Removed.
    20277        * libjava.lang/Primes.out: Removed.
     278
     2792002-10-23  Tom Tromey  <tromey@redhat.com>
     280
     281        For PR java/6388:
     282        * libjava.lang/pr6388.java: New file.
     283        * libjava.lang/pr6388.out: New file.
     284
     2852002-10-15  Andrew Haley  <aph@redhat.com>
     286
     287        * libjava.lang/EvaluationOrder.java (EvaluationOrder): New.
     288        * libjava.lang/EvaluationOrder.out (EvaluationOrder): New.
     289
     2902002-10-14  Andrew Haley  <aph@redhat.com>
     291
     292        * libjava.lang/StaticConstructor.java: New.
     293        * libjava.lang/StaticConstructor.out: New.
     294
     2952002-10-13  Mark Wielaard  <mark@klomp.org>
     296
     297        * libjava.mauve/xfails: Remove tests that now XPASS.
     298
     2992002-10-03  Andrew Haley  <aph@redhat.com>
     300
     301        * libjava.lang/Array_3.java (baz): New.
     302        (main): Call baz.
     303
     3042002-09-29  Anthony Green  <green@redhat.com>
     305
     306        * libjava.lang/TestProxy.java: New file.
     307        * libjava.lang/TestProxy.out: Ditto.
     308
     3092002-09-29  Anthony Green  <green@redhat.com>
     310
     311        * libjava.lang/utf8concat.java: New file.
     312        * libjava.lang/utf8concat.out: Ditto.
     313
     3142002-08-26  Tom Tromey  <tromey@redhat.com>
     315
     316        * libjava.compile/narrow_case.java: New file.
     317
     3182002-08-25  Adam Megacz <adam@xwt.org>
     319
     320        * lib/libjava.exp: don't apply -no-install when platform is mingw.
    21321
    223222002-08-16  H.J. Lu <hjl@gnu.org>
    … …  
    27327        (libjava_arguments): Use libgcj_jar.
    28328
    29 2002-08-14  Release Manager
    30 
    31         * GCC 3.2 Released.
    32 
    33 2002-07-25  Release Manager
    34 
    35         * GCC 3.1.1 Released.
    36 
    37 2002-04-12  Anthony Green  <green@redhat.com>
    38 
    39         * lib/libjava.exp: Use libgcj-VERSION.jar, not libgcj-3.1.jar.
    40 
    41 2002-05-14  Release Manager
    42 
    43         * GCC 3.1 Released.
    44 
    45 2002-05-14  Release Manager
    46 
    47         * GCC 3.1 Released.
     3292002-07-22  Tom Tromey  <tromey@redhat.com>
     330
     331        * libjava.compile/zeroexp.java: New file.
     332
     3332002-07-18  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
     334
     335        * libjava.compile/compile.exp: Sort sources.
     336        * libjava.jni/jni.exp (gcj_jni_run): Likewise.
     337        * libjava.lang/lang.exp: Likewise.
     338
     3392002-07-02  Andrew Haley  <aph@redhat.com>
     340
     341        * libjava.lang/inline.java: New file.
     342        * libjava.lang/inline.out: Likewise.
     343
     344        * libjava.lang/Array_3.java: Add another case.
     345
     3462002-06-23  Tom Tromey  <tromey@redhat.com>
     347
     348        * Makefile.in: Rebuilt.
     349        * Makefile.am (RUNTEST): Added AM_RUNTESTFLAGS.
     350        (AM_RUNTESTFLAGS): New variable.
     351        (RUNTESTFLAGS): Don't define.
     352        * lib/libjava.exp (libjava_invoke): New proc.
     353        (test_libjava_from_source): Use it.
     354        (test_libjava_from_javac): Likewise.
     355        (libjava_find_gij): New proc.
     356
     3572002-06-12  Tom Tromey  <tromey@redhat.com>
     358
     359        * lib/libjava.exp (test_libjava): Fixed typo.
     360        * libjava.compile/PR6865.xfail: New file.
     361
     3622002-06-11  Tom Tromey  <tromey@redhat.com>
     363
     364        * libjava.compile/PR6865.java: New file.  For PR java/6865.
     365
     366        * libjava.lang/PR6520.java: Fixed typo.
     367
     3682002-06-10  Tom Tromey  <tromey@redhat.com>
     369
     370        * libjava.lang/PR6520.java: New file.  For PR java/6520.
     371
     3722002-06-04  Tom Tromey  <tromey@redhat.com>
     373
     374        * libjava.compile/T20020604.java: New file.
     375
     376        For PR libgcj/6389:
     377        * libjava.mauve/xfails: Now passes System.getProperty test.
     378
     379        For PR java/1343 and PR java/6336:
     380        * libjava.compile/PR1343.java: New file.
     381
     382        For PR java/5913:
     383        * libjava.compile/PR5913.xfail: Removed.
     384
     3852002-05-29  Bryce McKinlay  <bryce@waitaki.otago.ac.nz>
     386
     387        * libjava.compile/T20020529.java: New file.
     388
     3892002-05-27  Bryce McKinlay  <bryce@waitaki.otago.ac.nz>
     390
     391        * libjava.lang/PR6820.java: New file.
     392        * libjava.lang/PR6820.out: New file.
     393
     3942002-05-23  Bryce McKinlay  <bryce@waitaki.otago.ac.nz>
     395
     396        * libjava.lang/PR6729.java: New file.
     397        * libjava.lang/PR6729.out: New file.
     398
     3992002-05-04  Mark Wielaard  <mark@klomp.org>
     400
     401        For PR java/6519:
     402        * libjava.lang/emptystring.java: New.
     403        * libjava.lang/emptystring.out: New.
    48404
    494052002-04-21  Mark Wielaard  <mark@klomp.org>
    … …  
    594152002-04-14  Mark Wielaard  <mark@klomp.org>
    60416
    61         * libjava.mauve/xfails: Expect failures for PR libgcj/6302 and
    62         libgcj/6298.
     417        * libjava.mauve/xfails: Expect failures for PR libgcj/6302 and
     418        libgcj/6298.
    63419
    644202002-04-14  Mark Wielaard  <mark@klomp.org>
    … …  
    67423        libgcj/6295, libgcj/6296 and libgcj/6297.
    68424
    69 2002-04-11  Anthony Green  <green@redhat.com>
    70 
    71         * lib/libjava.exp: Use libgcj-3.1.jar, not libgcj.jar.
     4252002-04-12  Anthony Green  <green@redhat.com>
     426
     427        * lib/libjava.exp: Use libgcj-VERSION.jar, not libgcj.jar.
     428
     4292002-04-12  Loren J. Rittle <ljrittle@acm.org>
     430
     431        * libjava.lang/SyncGlobal.java, libjava.lang/SyncGlobal.out:
     432        New test case.
     433
     4342002-04-09  Bryce McKinlay  <bryce@waitaki.otago.ac.nz>
     435
     436        * libjava.lang/PR6204.java, libjava.lang/PR6204.out: New test case.
     437        * libjava.lang/PR6085.java, libjava.lang/PR6085.out: Likewise.
    72438
    734392002-04-07  Mark Wielaard  <mark@klomp.org>

  • branches/GNU/src/gcc/libjava/testsuite/Makefile.am

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.1.1.2
    r1390 r1391  
    88          else echo expect ; fi`
    99
    10 RUNTEST = `if [ -f $(top_srcdir)/../dejagnu/runtest ] ; then \
     10RUNTEST = "`if [ -f $(top_srcdir)/../dejagnu/runtest ] ; then \
    1111               echo $(top_srcdir)/../dejagnu/runtest ; \
    12             else echo runtest; fi`
     12            else echo runtest; fi` $(AM_RUNTESTFLAGS)"
    1313
    14 RUNTESTFLAGS = @AM_RUNTESTFLAGS@
    15 
     14## Tell dejagnu whether the interpreter is enabled.
     15AM_RUNTESTFLAGS = INTERPRETER=$(INTERPRETER)

  • branches/GNU/src/gcc/libjava/testsuite/Makefile.in

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.1.1.2
    r1390 r1391  
    1 # Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
    2 
    3 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
     1# Makefile.in generated automatically by automake 1.4 from Makefile.am
     2
     3# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
    44# This Makefile.in is free software; the Free Software Foundation
    55# gives unlimited permission to copy and/or distribute it,
    … …  
    6464target_alias = @target_alias@
    6565target_triplet = @target@
    66 AM_RUNTESTFLAGS = @AM_RUNTESTFLAGS@
    6766AR = @AR@
    6867AS = @AS@
     68BACKTRACESPEC = @BACKTRACESPEC@
    6969CC = @CC@
    7070CHECKREFSPEC = @CHECKREFSPEC@
    … …  
    8888GCTESTSPEC = @GCTESTSPEC@
    8989HASH_SYNC_SPEC = @HASH_SYNC_SPEC@
     90IEEESPEC = @IEEESPEC@
    9091INCLTDL = @INCLTDL@
     92INTERPRETER = @INTERPRETER@
    9193JC1GCSPEC = @JC1GCSPEC@
    9294LIBFFI = @LIBFFI@
    … …  
    130132mkinstalldirs = @mkinstalldirs@
    131133tool_include_dir = @tool_include_dir@
     134toolexecdir = @toolexecdir@
     135toolexeclibdir = @toolexeclibdir@
     136toolexecmainlibdir = @toolexecmainlibdir@
    132137
    133138AUTOMAKE_OPTIONS = foreign dejagnu
    … …  
    139144
    140145
    141 RUNTEST = `if [ -f $(top_srcdir)/../dejagnu/runtest ] ; then \
     146RUNTEST = "`if [ -f $(top_srcdir)/../dejagnu/runtest ] ; then \
    142147               echo $(top_srcdir)/../dejagnu/runtest ; \
    143             else echo runtest; fi`
    144 
    145 
    146 RUNTESTFLAGS = @AM_RUNTESTFLAGS@
     148            else echo runtest; fi` $(AM_RUNTESTFLAGS)"
     149
     150
     151AM_RUNTESTFLAGS = INTERPRETER=$(INTERPRETER)
    147152CONFIG_HEADER = ../include/config.h ../gcj/libgcj-config.h
    148153CONFIG_CLEAN_FILES =
    … …  
    187192          fi; \
    188193        done
     194
     195RUNTESTFLAGS =
    189196
    190197DEJATOOL = $(PACKAGE)

  • branches/GNU/src/gcc/libjava/testsuite/lib/libjava.exp

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.1.1.2
    r1390 r1391  
    1 # Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation
     1# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation
    22
    33load_lib "libgloss.exp"
    … …  
    99if ![info exists tmpdir] {
    1010    set tmpdir "/tmp"
     11}
     12
     13# This is like `prune_warnings', but it also prunes away a warning
     14# from the bytecode front end that we don't care about.
     15proc libjava_prune_warnings {text} {
     16    set text [prune_warnings $text]
     17    set tlist [split $text \n]
     18    set len [llength $tlist]
     19    for {set i [expr {$len - 1}]} {$i >= 2} {incr i -1} {
     20        if {[string match "*unreachable bytecode*" [lindex $tlist $i]]} {
     21            # Delete this line, all other unreachable warnings and the previous
     22            # two lines containing the method and class.
     23            set j [expr {$i - 1}]
     24            while {[string match "*unreachable bytecode*" [lindex $tlist $j]]} {
     25                incr j -1
     26            }
     27            incr j -1
     28            set tlist [lreplace $tlist $j $i]
     29            set i $j
     30        }
     31    }
     32    return [join $tlist \n]
    1133}
    1234
    … …  
    5981
    6082proc find_javac {} {
    61     global SUN_JAVAC GCJ_UNDER_TEST env
     83    global SUN_JAVAC GCJ_UNDER_TEST env libgcj_jar
    6284    # If JDK doesn't run on your platform but some other
    6385    # JDK-compatible javac does, you may set SUN_JAVAC to point to it.
    … …  
    7294            set SUN_JAVAC $env(SUN_JAVAC)
    7395        } else {
    74             set SUN_JAVAC "$GCJ_UNDER_TEST -C"
     96            set SUN_JAVAC "$GCJ_UNDER_TEST -C -I$libgcj_jar"
    7597        }
    7698    }
    … …  
    205227# paths.  However we can't simply use those libraries; we still need
    206228# libtool for linking.
     229# Don't return the the lib${name}.la files here, since this causes the
     230# libraries to be linked twice: once as lib${name}.so and another time
     231# via gcj's implicit -l${name}.  This is both unnecessary and causes the
     232# Solaris ld to warn: attempted multiple inclusion of file.  This warning
     233# is not ignored by the dejagnu framework and cannot be disabled.
    207234proc libjava_find_lib {dir name} {
    208235    global base_dir
    … …  
    239266    }
    240267    return "$objdir/../"
     268}
     269
     270# Find `gij'.
     271proc libjava_find_gij {} {
     272    global base_dir
     273    set gp [get_multilibs]
     274    if {$gp != ""} {
     275        set file $gp/libjava/gij
     276    } else {
     277        set file $base_dir/../gij
     278    }
     279
     280    if {[file exists $file]} {
     281        return $file
     282    }
     283    return gij
    241284}
    242285
    … …  
    383426
    384427    # Avoid libtool wrapper scripts when possible.
     428    # but not if libtool warnings results in FAILs
    385429    if {$mode == "link"} {
    386         lappend args "additional_flags=-no-install"
     430        if {! [istarget "*-*-cygwin*"] && ! [istarget "*-*-mingw*"] } {
     431            lappend args "additional_flags=-no-install"
     432        }
    387433    }
    388434
    … …  
    398444    }
    399445    lappend arguments "additional_flags=--main=$main"
    400     set x [prune_warnings [libjava_tcompile $files $program executable \
    401                             $arguments]]
     446    set x [libjava_prune_warnings \
     447             [libjava_tcompile $files $program executable $arguments]]
    402448    if {$x != ""} {
    403449        verbose "link failure: $x" 2
    … …  
    412458}
    413459
    414 #
    415 # Run the test specified by srcfile and resultfile. compile_args and
    416 # exec_args are options telling this proc how to work.
    417 #
    418 proc test_libjava_from_source { options srcfile compile_args inpfile resultfile exec_args } {
    419     global base_dir
    420     global LIBJAVA
    421     global LIBGC
    422     global srcdir subdir objdir
    423     global TOOL_OPTIONS
    424     global GCJ_UNDER_TEST
    425     global tmpdir
    426     global runtests
    427 
    428     # Make opts into an array.
    429     set opts(_) x
    430     unset opts(_)
    431     foreach item $exec_args {
    432         set opts($item) x
    433     }
    434 
    435     # If we need threads and we don't have them then set the `no-exec'
    436     # flag.  This is case is also handled specially later.
    437     if {[info exists opts(need-threads)]} {
    438         global libjava_uses_threads
    439         if {! $libjava_uses_threads} {
    440             set opts(no-exec) x
    441         }
    442     }
    443 
    444     set errname [file rootname [file tail $srcfile]]
    445     if {! [runtest_file_p $runtests $errname]} {
    446         return
    447     }
    448 
    449     if {[info exists opts(no-link)]} {
    450         set mode compile
    451     } else {
    452         set mode link
    453     }
    454     set args [libjava_arguments $mode]
    455     if {! [info exists opts(no-link)]} {
    456         # Add the --main flag
    457         lappend args "additional_flags=--main=[file rootname [file tail $srcfile]]"
    458         if { $compile_args != "" } {
    459             lappend args "additional_flags=$compile_args"
    460         }
    461     }
    462 
    463     regsub "^.*/(\[^/.\]+)\[.\]\[^/]*$" "$srcfile" "\\1" out
    464     set executable "${objdir}/$out"
    465     if {[info exists opts(no-link)]} {
    466         append executable ".o"
    467         set target object
    468     } else {
    469         set target executable
    470     }
    471     if { $compile_args != "" } {
    472         set errname "$errname $compile_args"
    473     }
    474 
    475     set removeList [list $executable]
    476 
    477     set x [prune_warnings \
    478              [libjava_tcompile $srcfile "$executable" $target $args]]
    479     if {[info exists opts(xfail-gcj)]} {
    480         setup_xfail *-*-*
    481     }
    482     if { $x != "" } {
    483         verbose "target_compile failed: $x" 2
    484 
    485         if {[info exists opts(shouldfail)]} {
    486             pass "$errname compilation from source"
    487             eval gcj_cleanup $removeList
    488             return
    489         }
    490 
    491         fail "$errname compilation from source"
    492         if {[info exists opts(xfail-gcj)]
    493             || ! [info exists opts(no-exec)]
    494             || [info exists opts(need-threads)]} {
    495             untested "$errname execution from source compiled test"
    496             untested "$errname output from source compiled test"
    497         }
    498         return
    499     }
    500     if {[info exists opts(shouldfail)]} {
    501         fail "$errname compilation from source"
    502         return
    503     }
    504     pass "$errname compilation from source"
     460# Invoke a program and check its output.  EXECUTABLE is the program;
     461# ARGS are the arguments to the program.  Returns 1 if tests passed
     462# (or things were left untested), 0 otherwise.
     463proc libjava_invoke {errname testName optName executable inpfile resultfile args} {
     464    upvar $optName opts
    505465
    506466    if {[info exists opts(no-exec)]} {
    … …  
    509469            # because threads aren't supported.  So we have to
    510470            # generate an `untested'.
    511             untested "$errname execution from source compiled test"
    512             untested "$errname output from source compiled test"
    513         }
    514         eval gcj_cleanup $removeList
    515         return
    516     }
    517     if {[info exists opts(no-link)]} {
    518         eval gcj_cleanup $removeList
    519         return
    520     }
    521 
    522     set result [libjava_load $executable "" "$inpfile"];
    523     set status [lindex $result 0];
    524     set output [lindex $result 1];
     471            untested "$errname execution - $testName"
     472            untested "$errname output - $testName"
     473        }
     474        return 1
     475    }
     476
     477    set result [libjava_load $executable $args "$inpfile"]
     478    set status [lindex $result 0]
     479    set output [lindex $result 1]
    525480    if {[info exists opts(xfail-exec)]} then {
    526481        setup_xfail *-*-*
    527482    }
    528     $status "$errname execution from source compiled test"
     483    $status "$errname execution - $testName"
    529484    if { $status != "pass" } {
    530         untested "$errname output from source compiled test"
    531         return;
     485        untested "$errname output - $testName"
     486        return 0
    532487    }
    533488
    534489    verbose "resultfile is $resultfile"
    535     set id [open $resultfile r];
     490    set id [open $resultfile r]
    536491    set expected ""
    537     append expected [read $id];
    538     regsub -all "\r" "$output" "" output;
     492    append expected [read $id]
     493    regsub -all "\r" "$output" "" output
    539494    regsub "\n*$" $expected "" expected
    540495    regsub "\n*$" $output "" output
    … …  
    547502    verbose "expected is $expected"
    548503    verbose "actual is $output"
    549     set passed 0;
    550     if {$options == "regexp_match"} {
     504    set passed 0
     505    if {[info exists opts(regexp_match)]} {
    551506        if [regexp $expected $output] {
    552             set passed 1;
     507            set passed 1
    553508        }
    554509    } else {
    555510        if { $expected == $output } {
    556             set passed 1;
     511            set passed 1
    557512        }
    558513    }
    … …  
    560515        setup_xfail *-*-*
    561516    }
     517    if { $passed == 1 } {
     518        pass "$errname output - $testName"
     519    } else {
     520        fail "$errname output - $testName"
     521    }
     522    close $id
     523
     524    return $passed
     525}
     526
     527#
     528# Run the test specified by srcfile and resultfile. compile_args and
     529# exec_args are options telling this proc how to work.
     530#
     531proc test_libjava_from_source { options srcfile compile_args inpfile resultfile exec_args } {
     532    global base_dir
     533    global LIBJAVA
     534    global LIBGC
     535    global srcdir subdir objdir
     536    global TOOL_OPTIONS
     537    global GCJ_UNDER_TEST
     538    global tmpdir
     539    global runtests
     540
     541    # Make opts into an array.
     542    set opts(_) x
     543    unset opts(_)
     544    foreach item $exec_args {
     545        set opts($item) x
     546    }
     547
     548    # If we need threads and we don't have them then set the `no-exec'
     549    # flag.  This is case is also handled specially later.
     550    if {[info exists opts(need-threads)]} {
     551        global libjava_uses_threads
     552        if {! $libjava_uses_threads} {
     553            set opts(no-exec) x
     554        }
     555    }
     556
     557    set errname [file rootname [file tail $srcfile]]
     558    if {! [runtest_file_p $runtests $errname]} {
     559        return
     560    }
     561
     562    if {[info exists opts(no-link)]} {
     563        set mode compile
     564    } else {
     565        set mode link
     566    }
     567    set args [libjava_arguments $mode]
     568    if {! [info exists opts(no-link)]} {
     569        # Add the --main flag
     570        lappend args "additional_flags=--main=[file rootname [file tail $srcfile]]"
     571        if { $compile_args != "" } {
     572            lappend args "additional_flags=$compile_args"
     573        }
     574    }
     575
     576    regsub "^.*/(\[^/.\]+)\[.\]\[^/]*$" "$srcfile" "\\1" out
     577    set executable "${objdir}/$out"
     578    if {[info exists opts(no-link)]} {
     579        append executable ".o"
     580        set target object
     581    } else {
     582        # DOS/win32 targets default to .exe if no suffix is given
     583        # We then try to delete a file that doesn't exist.  It is
     584        # simpler to add the suffix everywhere.
     585        append executable ".exe"
     586        set target executable
     587    }
     588    if { $compile_args != "" } {
     589        set errname "$errname $compile_args"
     590    }
     591
     592    set removeList [list $executable]
     593
     594    set x [libjava_prune_warnings \
     595             [libjava_tcompile $srcfile "$executable" $target $args]]
     596    if {[info exists opts(xfail-gcj)]} {
     597        setup_xfail *-*-*
     598    }
     599    if { $x != "" } {
     600        verbose "target_compile failed: $x" 2
     601
     602        if {[info exists opts(shouldfail)]} {
     603            pass "$errname compilation from source"
     604            eval gcj_cleanup $removeList
     605            return
     606        }
     607
     608        fail "$errname compilation from source"
     609        if {[info exists opts(xfail-gcj)]
     610            || ! [info exists opts(no-exec)]
     611            || [info exists opts(need-threads)]} {
     612            untested "$errname execution from source compiled test"
     613            untested "$errname output from source compiled test"
     614        }
     615        return
     616    }
     617    if {[info exists opts(shouldfail)]} {
     618        fail "$errname compilation from source"
     619        return
     620    }
     621    pass "$errname compilation from source"
     622
     623    # Set up the options the way they are expected by libjava_invoke.
    562624    if {[info exists opts(xfail-source-output)]} {
    563         setup_xfail *-*-*
    564     }
    565     if { $passed == 1 } {
    566         pass "$errname output from source compiled test"
     625        set opts(xfail-output) x
     626    }
     627    if {[libjava_invoke $errname "source compiled test" opts $executable \
     628           $inpfile $resultfile]} {
     629        # Everything ok, so clean up.
    567630        eval gcj_cleanup $removeList
    568     } else {
    569         fail "$errname output from source compiled test"
    570     }
    571     close $id;
     631    }
    572632}
    573633
    … …  
    585645    global tmpdir
    586646    global runtests
     647    global INTERPRETER
    587648
    588649    # Make opts into an array.
    … …  
    645706    verbose "jvscan is $jvscan"
    646707    set main_name [string trim \
    647                      [prune_warnings \
     708                     [libjava_prune_warnings \
    648709                        [lindex [local_exec "$jvscan --encoding=UTF-8 $srcfile --print-main" "" "" 300] 1]]]
    649710    verbose "main name is $main_name"
    650711    set class_out [string trim \
    651                      [prune_warnings \
     712                     [libjava_prune_warnings \
    652713                        [lindex [local_exec "$jvscan --encoding=UTF-8 $srcfile --list-class" "" "" 300] 1]]]
    653714    verbose "class list is $class_out"
    … …  
    691752        set type executable
    692753        lappend largs "additional_flags=--main=$main_name"
    693         set executable "${objdir}/$main_name"
     754        # DOS/win32 targets default to .exe if no suffix is given
     755        # We then try to delete a file that doesn't exist.  It is
     756        # simpler to add the suffix everywhere.
     757        set executable "${objdir}/${main_name}.exe"
    694758        set mode link
     759    }
     760
     761    # We purposely ignore errors here; we still want to run the other
     762    # appropriate tests.
     763    set gij [libjava_find_gij]
     764    # libjava_find_gij will return `gij' if it couldn't find the
     765    # program; in this case we want to skip the test.
     766    if {$INTERPRETER == "yes" && $gij != "gij"} {
     767        libjava_invoke $errname "gij test" opts $gij \
     768          $inpfile $resultfile $main_name
    695769    }
    696770
    … …  
    714788        foreach c_file $class_files {
    715789            set executable [file rootname [file tail $c_file]].o
    716             set x [prune_warnings \
    717                      [libjava_tcompile $c_file "$executable" $type $args]]
     790            # Don't write files which contain $ chars.
     791            regsub -all "\\$" $executable "\^" executable
     792            set x [libjava_prune_warnings \
     793                     [libjava_tcompile '$c_file' "$executable" $type $args]]
    718794            lappend removeList $executable
    719795            if {$x != ""} {
    … …  
    730806        }
    731807        lappend removeList $executable
    732         set x [prune_warnings \
     808        set x [libjava_prune_warnings \
    733809                 [libjava_tcompile $hack "$executable" $type $args]]
    734810    }
    … …  
    748824    pass "$errname compilation from bytecode"
    749825
    750     if {[info exists opts(no-exec)]} {
    751         if {[info exists opts(need-threads)]} {
    752             untested "$errname execution from bytecode->native test"
    753             untested "$errname output from bytecode->native test"
    754         }
     826    # Set up the options the way they are expected by libjava_invoke.
     827    if {[info exists opts(xfail-byte-output)]} {
     828        set opts(xfail-output) x
     829    }
     830    if {[libjava_invoke $errname "bytecode->native test" opts $executable \
     831           $inpfile $resultfile]} {
     832        # Everything ok, so clean up.
    755833        eval gcj_cleanup $removeList
    756         return
    757     }
    758 
    759     set result [libjava_load $executable "" "$inpfile"];
    760     set status [lindex $result 0];
    761     set output [lindex $result 1];
    762     if {[info exists opts(xfail-exec)]} {
    763         setup_xfail *-*-*
    764     }
    765     $status "$errname execution from bytecode->native test"
    766     if { $status != "pass" } {
    767         untested "$errname output from bytecode->native test"
    768         return
    769     }
    770 
    771     verbose "resultfile is $resultfile"
    772     set id [open $resultfile r];
    773     set expected ""
    774     append expected [read $id];
    775     regsub -all "\r" "$output" "" output;
    776     regsub "\n*$" $expected "" expected
    777     regsub "\n*$" $output "" output
    778     regsub "^\n*" $expected "" expected
    779     regsub "^\n*" $output "" output
    780     regsub -all "\[ \t\]\[ \t\]*" $expected " " expected
    781     regsub -all "\[ \t\]*\n\n*" $expected "\n" expected
    782     regsub -all "\[ \t\]\[ \t\]*" $output " " output
    783     regsub -all "\[ \t\]*\n\n*" $output "\n" output
    784     verbose "expected is $expected"
    785     verbose "actual is $output"
    786     set passed 0;
    787     if {[info exists opts(xfail-output)]} {
    788         setup_xfail *-*-*
    789     }
    790     if {[info exists opts(xfail-byte-output)]} {
    791         setup_xfail *-*-*
    792     }
    793     if {$options == "regexp_match"} {
    794         if [regexp $expected $output] {
    795             set passed 1;
    796         }
    797     } else {
    798         if { $expected == $output } {
    799             set passed 1;
    800         }
    801     }
    802     if { $passed == 1 } {
    803         pass "$errname output from bytecode->native test"
    804         eval gcj_cleanup $removeList
    805     } else {
    806         fail "$errname output from bytecode->native test"
    807     }
    808     close $id;
     834    }
    809835}
    810836
    … …  
    819845#   `shouldfail'  compilation from source is supposed to fail
    820846#                 This is different from xfail, which marks a known
    821 #                 failure that we just havne't fixed.
     847#                 failure that we just haven't fixed.
    822848#                 A compilation marked this way should fail with any
    823849#                 front end.

  • branches/GNU/src/gcc/libjava/testsuite/libjava.compile/compile.exp

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.1.1.2
    r1390 r1391  
    11global srcdir subdir
    22
    3 catch "glob -nocomplain ${srcdir}/${subdir}/*.java" srcfiles
     3catch { lsort [glob -nocomplain ${srcdir}/${subdir}/*.java] } srcfiles
    44verbose "srcfiles are $srcfiles"
    55

  • branches/GNU/src/gcc/libjava/testsuite/libjava.jni/calls.c

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.1.1.2
    r1390 r1391  
    22#include <calls.h>
    33
    4 jint
     4JNIEXPORT jint JNICALL
    55Java_calls_docall (JNIEnv *env, jobject _this)
    66{
    … …  
    4848    ++fails;
    4949
     50  method = (*env)->GetStaticMethodID (env, klass, "longpb_f", "(BJBJBJ)J");
     51  l = (*env)->CallStaticLongMethod (env, klass, method, (jbyte) 13, (jlong) 3,
     52                                   (jbyte) 13, (jlong) 3, (jbyte) 13, (jlong) 4);
     53  if (l != 3033)
     54    ++fails;
     55
    5056  method = (*env)->GetMethodID (env, klass, "void_f", "()V");
    5157  (*env)->CallVoidMethod (env, _this, method);

  • branches/GNU/src/gcc/libjava/testsuite/libjava.jni/calls.java

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.1.1.2
    r1390 r1391  
    3838  }
    3939
     40  public static long longpb_f (byte b1, long q1, byte b2, long q2,
     41                               byte b3, long q3)
     42  {
     43    return q1 + q2 + q3 + 3023;
     44  }
     45
    4046  public void void_f ()
    4147  {

  • branches/GNU/src/gcc/libjava/testsuite/libjava.jni/field.c

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.1.1.2
    r1390 r1391  
    22#include <field.h>
    33
    4 jobjectArray
     4JNIEXPORT jobjectArray JNICALL
    55Java_field_fetch (JNIEnv *env, jobject this)
    66{

  • branches/GNU/src/gcc/libjava/testsuite/libjava.jni/final_method.c

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.1.1.2
    r1390 r1391  
    11#include <final_method.h>
    22
    3 jstring
     3JNIEXPORT jstring JNICALL
    44Java_final_1method_meth (JNIEnv *env, jobject thisv)
    55{

  • branches/GNU/src/gcc/libjava/testsuite/libjava.jni/findclass.c

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.1.1.2
    r1390 r1391  
    33#include <findclass.h>
    44
    5 jclass
     5JNIEXPORT jclass JNICALL
    66Java_findclass_doit (JNIEnv *env, jclass klass, jstring name)
    77{

  • branches/GNU/src/gcc/libjava/testsuite/libjava.jni/invoke.c

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.1.1.2
    r1390 r1391  
    11#include <invoke.h>
    22
    3 jint
     3JNIEXPORT jint JNICALL
    44Java_invoke_val (JNIEnv *env, jclass klass)
    55{

  • branches/GNU/src/gcc/libjava/testsuite/libjava.jni/jni.exp

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.1.1.2
    r1390 r1391  
    1616  lappend options "additional_flags=-I$srcdir/../include"
    1717
    18   set x [prune_warnings [target_compile $file $soname executable $options]]
     18  set x [libjava_prune_warnings \
     19           [target_compile $file $soname executable $options]]
    1920  if {$x != ""} {
    2021    verbose "target_compile failed: $x" 2
    … …  
    3132  set gcjh [find_gcjh]
    3233  set file [file rootname $file]
    33   set x [string trim [prune_warnings \
     34  set x [string trim [libjava_prune_warnings \
    3435                        [lindex [local_exec "$gcjh -jni $file" "" "" 300] 1]]]
    3536  if {$x != ""} {
    … …  
    168169  # For now we only test JNI on native builds.
    169170  if {$build_triplet == $host_triplet} {
    170     catch "glob -nocomplain ${srcdir}/${subdir}/*.java" srcfiles
     171    catch { lsort [glob -nocomplain ${srcdir}/${subdir}/*.java] } srcfiles
    171172
    172173    foreach x $srcfiles {

  • branches/GNU/src/gcc/libjava/testsuite/libjava.jni/martin.c

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.1.1.2
    r1390 r1391  
    33#include <stdio.h>
    44
    5 void Java_martin_myNative(JNIEnv* env, jobject this, jstring s)
     5JNIEXPORT void JNICALL
     6Java_martin_myNative(JNIEnv* env, jobject this, jstring s)
    67{
    78  jclass cls;

  • branches/GNU/src/gcc/libjava/testsuite/libjava.jni/noclass.c

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.1.1.2
    r1390 r1391  
    11#include <noclass.h>
    22
    3 void
     3JNIEXPORT void JNICALL
    44Java_noclass_find_1it (JNIEnv *env, jclass k)
    55{

  • branches/GNU/src/gcc/libjava/testsuite/libjava.jni/overload.c

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.1.1.2
    r1390 r1391  
    11#include <overload.h>
    22
    3 jint
     3JNIEXPORT jint JNICALL
    44Java_overload_over__I (JNIEnv *env, jclass klass, jint val)
    55{
    … …  
    88
    99
    10 jint
     10JNIEXPORT jint JNICALL
    1111Java_overload_over__II (JNIEnv *env, jclass klass, jint one, jint two)
    1212{

  • branches/GNU/src/gcc/libjava/testsuite/libjava.jni/register.c

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.1.1.2
    r1390 r1391  
    99}
    1010
    11 jint
     11JNIEXPORT jint JNICALL
    1212JNI_OnLoad (JavaVM *vm, void *nothing)
    1313{

  • branches/GNU/src/gcc/libjava/testsuite/libjava.jni/simple_int.c

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.1.1.2
    r1390 r1391  
    11#include <simple_int.h>
    22
    3 jint
     3JNIEXPORT jint JNICALL
    44Java_simple_1int_nat (JNIEnv *env, jclass klass, jint val)
    55{

  • branches/GNU/src/gcc/libjava/testsuite/libjava.jni/throwit.c

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.1.1.2
    r1390 r1391  
    22#include <throwit.h>
    33
    4 void
     4JNIEXPORT void JNICALL
    55Java_throwit_throwit (JNIEnv *env, jclass klass, jstring name,
    66                      jboolean is_new)

  • branches/GNU/src/gcc/libjava/testsuite/libjava.jni/virtual.c

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.1.1.2
    r1390 r1391  
    11#include <virtual.h>
    22
    3 jboolean
     3JNIEXPORT jboolean JNICALL
    44Java_virtual_equals (JNIEnv *env, jobject thisv, jobject other)
    55{

  • branches/GNU/src/gcc/libjava/testsuite/libjava.lang/Array_3.java

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.1.1.2
    r1390 r1391  
    1111  {
    1212    return null;
     13  }
     14
     15  static int baz ()
     16  {
     17    int[] x = (int[])null;
     18    int nn = x.length;
     19    return 5;
    1320  }
    1421
    … …  
    2835      }
    2936    if (!ok)
    30       throw new RuntimeException("test failed");
     37      throw new RuntimeException("test failed:1");
    3138
    3239    ok = false;
    … …  
    4148      }
    4249    if (!ok)
    43       throw new RuntimeException("test failed");
     50      throw new RuntimeException("test failed:2");
    4451
    4552    ok = false;
    … …  
    5562
    5663    if (!ok || nn != 0)
    57       throw new RuntimeException("test failed");
     64      throw new RuntimeException("test failed:3");
     65
     66    ok = false;
     67    try
     68      {
     69        int[] x = (int[])null;
     70        nn = x.length;
     71      }
     72    catch (NullPointerException _)
     73      {
     74        ok = true;
     75      }
     76    if (!ok)
     77      throw new RuntimeException("test failed:4");
     78
     79    ok = false;
     80    try
     81      {
     82        nn = baz ();
     83      }
     84    catch (NullPointerException _)
     85      {
     86        ok = true;
     87      }
     88    if (!ok)
     89      throw new RuntimeException("test failed:5");
    5890  }
    5991}

  • branches/GNU/src/gcc/libjava/testsuite/libjava.lang/Throw_2.java

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.1.1.2
    r1390 r1391  
    3535      catch (NullPointerException _)
    3636        {
     37          System.out.println ("1");
    3738        }
    3839      catch (Throwable _)
    … …  
    4950      catch (NullPointerException _)
    5051        {
     52          System.out.println ("2");
    5153        }
    5254      catch (Throwable _)

  • branches/GNU/src/gcc/libjava/testsuite/libjava.lang/Throw_2.out

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.1.1.2
    r1390 r1391  
     11
     22

  • branches/GNU/src/gcc/libjava/testsuite/libjava.lang/lang.exp

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.1.1.2
    r1390 r1391  
    11global srcdir subdir
    22
    3 catch "glob -nocomplain ${srcdir}/${subdir}/*.out" srcfiles
     3catch { lsort [glob -nocomplain ${srcdir}/${subdir}/*.out] } srcfiles
    44verbose "srcfiles are $srcfiles"
    55

  • branches/GNU/src/gcc/libjava/testsuite/libjava.mauve/mauve.exp

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.1.1.2
    r1390 r1391  
    1 # Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation.
     1# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation.
    22# Written by Tom Tromey <tromey@cygnus.com>.
    33# Incorporate Mauve into libjava's DejaGNU test suite framework.
    … …  
    4747      set file [file rootname $file].o
    4848      lappend uses($item) $file
     49      # Now add all inner classes
     50      foreach inner [glob -nocomplain [file rootname $file]$*.class] {
     51        # Prevent excessive escaping by replacing $ with a ^ in the .o name
     52        set inner [file rootname $inner].o
     53        regsub -all "\\$" $inner "\^" inner
     54        lappend uses($item) $inner
     55      }
    4956    }
    5057  }
    5158
    5259  return [lsort [array names uses]]
     60}
     61
     62# Find Mauve sources.  At end, env(MAUVEDIR) points to sources.
     63# Returns 0 if sources not found, 1 otherwise.
     64proc find_mauve_sources {} {
     65  global env srcdir
     66
     67  if {[info exists env(MAUVEDIR)]} {
     68    return 1
     69  } elseif {[file isdirectory $srcdir/libjava.mauve/mauve]} {
     70    set env(MAUVEDIR) $srcdir/libjava.mauve/mauve
     71    return 1
     72  }
     73
     74  return 0
    5375}
    5476
    … …  
    5880  global srcdir objdir subdir env
    5981
    60   if {! [info exists env(MAUVEDIR)]} then {
     82  if {! [find_mauve_sources]} then {
    6183    verbose "MAUVEDIR not set; not running Mauve tests"
    6284    return 1
    … …  
    7294  cd $here/mauve-build
    7395
    74     global env
    75     global GCJ_UNDER_TEST
    76     global TOOL_EXECUTABLE
    77 
    78     if ![info exists GCJ_UNDER_TEST] {
    79         if [info exists TOOL_EXECUTABLE] {
    80             set GCJ_UNDER_TEST $TOOL_EXECUTABLE;
    81         } else {
    82             if [info exists env(GCJ)] {
    83                 set GCJ_UNDER_TEST env(GCJ)
    84             } else {
    85                 set GCJ_UNDER_TEST "[find_gcj]"
    86             }
    87         }
    88     }
    89 
    90     # Append -B and -I so that libgcj.spec and libgcj.zip are found
    91     # before they're installed.
    92     set env(GCJ) "$GCJ_UNDER_TEST -B$objdir/../ -I$objdir/../libgcj.jar"
     96  global env libgcj_jar
     97  global GCJ_UNDER_TEST
     98  global TOOL_EXECUTABLE
     99
     100  if ![info exists GCJ_UNDER_TEST] {
     101    if [info exists TOOL_EXECUTABLE] {
     102      set GCJ_UNDER_TEST $TOOL_EXECUTABLE;
     103    } else {
     104      if [info exists env(GCJ)] {
     105        set GCJ_UNDER_TEST env(GCJ)
     106      } else {
     107        set GCJ_UNDER_TEST "[find_gcj]"
     108      }
     109    }
     110  }
     111
     112  # Append -B and -I so that libgcj.spec and libgcj.jar are found
     113  # before they're installed.
     114  set env(GCJ) "$GCJ_UNDER_TEST -B$objdir/../ -I$libgcj_jar"
    93115
    94116  if {[catch {
    … …  
    140162    set file $base.class
    141163    set obj $base.o
    142     set x [prune_warnings \
     164    set x [libjava_prune_warnings \
    143165             [target_compile [pwd]/$file $obj object $compile_args]]
    144166    if {$x != ""} then {
    … …  
    165187      if {! [file exists $obj]} then {
    166188        verbose "compiling $obj for test of $class"
     189        # The .class file does contain a $, but we can quote it between "'"s.
    167190        set srcfile [file rootname $obj].class
    168         set x [prune_warnings \
    169                  [target_compile [pwd]/$srcfile $obj object $compile_args]]
     191        regsub -all "\\^" $srcfile "\$" srcfile
     192        set x [libjava_prune_warnings \
     193                 [libjava_tcompile '[pwd]/$srcfile' $obj object $compile_args]]
    170194        if {$x != ""} then {
    171195          fail "Compile $obj for $class"
    … …  
    181205    }
    182206
    183     set x [prune_warnings [target_compile [concat $uses($file) $objlist] \
    184                              $Executable executable $link_args]]
     207    set x [libjava_prune_warnings \
     208             [libjava_tcompile [concat $uses($file) $objlist] \
     209                $Executable executable $link_args]]
    185210    if {$x != ""} then {
    186211      set proc_ok 0
    … …  
    221246  global srcdir subdir env
    222247
    223   if {! [info exists env(MAUVEDIR)]} then {
     248  if {! [find_mauve_sources]} then {
    224249    verbose "MAUVEDIR not set; not running Mauve tests"
    225250    return 1
    … …  
    278303    set file $base.class
    279304    set obj $base.o
    280     set x [prune_warnings \
     305    set x [libjava_prune_warnings \
    281306             [target_compile [pwd]/$file $obj object $compile_args]]
    282307    if {$x != ""} then {
    … …  
    307332        verbose "compiling $obj for test of $class"
    308333        set srcfile [file rootname $obj].class
    309         set x [prune_warnings \
     334        set x [libjava_prune_warnings \
    310335                 [target_compile [pwd]/$srcfile $obj object $compile_args]]
    311336        if {$x != ""} then {
    … …  
    343368    }
    344369
    345     set x [prune_warnings \
     370    set x [libjava_prune_warnings \
    346371             [target_compile gnu/testlet/DejaGNUTestHarness.class \
    347372                gnu/testlet/DejaGNUTestHarness.o object $compile_args]]
    … …  
    352377    }
    353378
    354     set x [prune_warnings [target_compile [concat $uses($file) $objlist] \
    355                              $Executable executable $link_args]]
     379    set x [libjava_prune_warnings \
     380             [target_compile [concat $uses($file) $objlist] \
     381                $Executable executable $link_args]]
    356382    if {$x != ""} then {
    357383      set proc_ok 0

  • branches/GNU/src/gcc/libjava/testsuite/libjava.mauve/xfails

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.1.1.2
    r1390 r1391  
    1 FAIL: gnu.testlet.java.beans.Introspector.jdk11: getBeanInfo (number 1)
    2 FAIL: gnu.testlet.java.beans.Introspector.jdk11: getBeanInfo (number 2)
    3 FAIL: gnu.testlet.java.beans.Introspector.jdk11: getBeanInfo (number 4)
    4 FAIL: gnu.testlet.java.beans.Introspector.jdk11: getBeanInfo (number 9)
    5 FAIL: gnu.testlet.java.beans.Introspector.jdk11: getBeanInfo (number 10)
    6 FAIL: gnu.testlet.java.beans.Introspector.jdk11: getBeanInfo (number 12)
    7 FAIL: gnu.testlet.java.beans.Introspector.jdk11: getBeanInfo (number 13)
    8 FAIL: gnu.testlet.java.beans.Introspector.jdk11: getBeanInfo (number 14)
    9 FAIL: gnu.testlet.java.beans.Introspector.jdk11: getBeanInfo (number 15)
    101FAIL: gnu.testlet.java.beans.Introspector.jdk11: getBeanInfo (number 16)
    112FAIL: gnu.testlet.java.beans.Introspector.jdk11: getBeanInfo (number 17)
    … …  
    3526FAIL: gnu.testlet.java.lang.Class.ClassTest: Error: test_getClassLoader failed - 1 (number 1)
    3627FAIL: gnu.testlet.java.lang.Class.ClassTest: Error: test_getClassLoader failed - 2 (number 1)
     28FAIL: gnu.testlet.java.lang.Class.reflect2: getClasses (number 2)
     29FAIL: gnu.testlet.java.lang.Class.reflect2: getClasses (number 3)
     30FAIL: gnu.testlet.java.lang.Class.reflect2: getClasses (number 5)
     31FAIL: gnu.testlet.java.lang.Class.reflect2: getDeclaringClass (number 3)
     32FAIL: gnu.testlet.java.lang.Class.reflect2: getDeclaringClass (number 4)
     33FAIL: gnu.testlet.java.lang.Class.reflect2: getDeclaringClass (number 5)
     34FAIL: gnu.testlet.java.lang.Class.reflect2: getDeclaredClasses (number 1)
     35FAIL: gnu.testlet.java.lang.Class.reflect2: getDeclaredClasses (number 2)
     36FAIL: gnu.testlet.java.lang.Class.reflect2: getDeclaredClasses (number 3)
    3737FAIL: gnu.testlet.java.lang.Double.DoubleTest: Error: test_intValue returned wrong results CYGNUS: Float to int conversions - 1 (number 1)
    38 FAIL: gnu.testlet.java.lang.Double.DoubleTest: Error: test_longValue returned wrong results CYGNUS: Float to int conversions - 1 (number 1)
    3938FAIL: gnu.testlet.java.lang.Float.FloatTest: Error: test_intValue returned wrong results - 1 (number 1)
    40 FAIL: gnu.testlet.java.lang.String.CASE_INSENSITIVE_ORDER: unicode mappings (number 1)
    41 FAIL: gnu.testlet.java.lang.String.CASE_INSENSITIVE_ORDER: unicode mappings (number 2)
    42 FAIL: gnu.testlet.java.lang.System.getProperty: '' (number 1)
     39FAIL: gnu.testlet.java.lang.String.getBytes13: String.getBytes("UTF-16") (number 1)
     40FAIL: gnu.testlet.java.lang.String.getBytes13: String.getBytes("UnicodeBig") (number 1)
     41FAIL: gnu.testlet.java.lang.String.getBytes13: String.getBytes("UnicodeBigUnmarked") (number 1)
     42FAIL: gnu.testlet.java.lang.String.getBytes13: String.getBytes("UnicodeLittle") (number 1)
     43FAIL: gnu.testlet.java.lang.String.getBytes13: String.getBytes("UnicodeLittleUnmarked") (number 1)
     44FAIL: gnu.testlet.java.lang.String.getBytes14: String.getBytes("ISO8859_15") (number 1)
     45FAIL: gnu.testlet.java.lang.String.getBytes14: String.getBytes("UTF-16BE") (number 1)
     46FAIL: gnu.testlet.java.lang.String.getBytes14: String.getBytes("UTF-16LE") (number 1)
    4347FAIL: gnu.testlet.java.text.AttributedString.Test: Attribute key count (number 1)
    4448FAIL: gnu.testlet.java.text.DateFormatSymbols.Test: patterns (number 2)
    … …  
    5155FAIL: gnu.testlet.java.text.SimpleDateFormat.regress: PDT (number 1)
    5256FAIL: gnu.testlet.java.text.DateFormatSymbols.Test: invalid locale (number 1)
     57FAIL: gnu.testlet.java.text.CollationElementIterator.jdk11: CollationElementIterator (number 1)
     58FAIL: gnu.testlet.java.text.CollationElementIterator.jdk11: next() 0 (number 1)
     59FAIL: gnu.testlet.java.text.CollationElementIterator.jdk11: next() 1 (number 1)
     60FAIL: gnu.testlet.java.text.CollationElementIterator.jdk11: next() 10 (number 1)
     61FAIL: gnu.testlet.java.text.CollationElementIterator.jdk11: next() 11 (number 1)
     62FAIL: gnu.testlet.java.text.CollationElementIterator.jdk11: next() 12 (number 1)
     63FAIL: gnu.testlet.java.text.CollationElementIterator.jdk11: next() 13 (number 1)
     64FAIL: gnu.testlet.java.text.CollationElementIterator.jdk11: next() 2 (number 1)
     65FAIL: gnu.testlet.java.text.CollationElementIterator.jdk11: next() 3 (number 1)
     66FAIL: gnu.testlet.java.text.CollationElementIterator.jdk11: next() 4 (number 1)
     67FAIL: gnu.testlet.java.text.CollationElementIterator.jdk11: next() 5 (number 1)
     68FAIL: gnu.testlet.java.text.CollationElementIterator.jdk11: next() 6 (number 1)
     69FAIL: gnu.testlet.java.text.CollationElementIterator.jdk11: next() 7 (number 1)
     70FAIL: gnu.testlet.java.text.CollationElementIterator.jdk11: next() 8 (number 1)
     71FAIL: gnu.testlet.java.text.CollationElementIterator.jdk11: next() 9 (number 1)
     72FAIL: gnu.testlet.java.text.CollationElementIterator.jdk11: primaryOrder() 0 (number 1)
     73FAIL: gnu.testlet.java.text.CollationElementIterator.jdk11: primaryOrder() 1 (number 1)
     74FAIL: gnu.testlet.java.text.CollationElementIterator.jdk11: primaryOrder() 10 (number 1)
     75FAIL: gnu.testlet.java.text.CollationElementIterator.jdk11: primaryOrder() 11 (number 1)
     76FAIL: gnu.testlet.java.text.CollationElementIterator.jdk11: primaryOrder() 12 (number 1)
     77FAIL: gnu.testlet.java.text.CollationElementIterator.jdk11: primaryOrder() 13 (number 1)
     78FAIL: gnu.testlet.java.text.CollationElementIterator.jdk11: primaryOrder() 2 (number 1)
     79FAIL: gnu.testlet.java.text.CollationElementIterator.jdk11: primaryOrder() 3 (number 1)
     80FAIL: gnu.testlet.java.text.CollationElementIterator.jdk11: primaryOrder() 4 (number 1)
     81FAIL: gnu.testlet.java.text.CollationElementIterator.jdk11: primaryOrder() 5 (number 1)
     82FAIL: gnu.testlet.java.text.CollationElementIterator.jdk11: primaryOrder() 6 (number 1)
     83FAIL: gnu.testlet.java.text.CollationElementIterator.jdk11: primaryOrder() 7 (number 1)
     84FAIL: gnu.testlet.java.text.CollationElementIterator.jdk11: primaryOrder() 8 (number 1)
     85FAIL: gnu.testlet.java.text.CollationElementIterator.jdk11: secondaryOrder() 12 (number 1)
     86FAIL: gnu.testlet.java.text.CollationElementIterator.jdk11: secondaryOrder() 4 (number 1)
     87FAIL: gnu.testlet.java.text.CollationElementIterator.jdk11: secondaryOrder() 5 (number 1)
     88FAIL: gnu.testlet.java.text.CollationElementIterator.jdk11: secondaryOrder() 7 (number 1)
     89FAIL: gnu.testlet.java.text.CollationElementIterator.jdk11: secondaryOrder() 9 (number 1)
     90FAIL: gnu.testlet.java.text.CollationElementIterator.jdk11: tertiaryOrder() 10 (number 1)
    5391FAIL: gnu.testlet.java.net.ServerSocket.ServerSocketTest: Error : test_params failed - 5getInetAddress did not return proper values  (number 1)
    5492FAIL: gnu.testlet.java.net.Socket.SocketTest: Error : test_BasicServer failed - 11 exception was thrown :Illegal seek (number 1)
    … …  
    63101FAIL: gnu.testlet.java.net.URL.URLTest: new URL(protocol, host, file) (number 54)
    64102FAIL: gnu.testlet.java.net.MulticastSocket.MulticastSocketTest: joinGroup() twice. (number 1)
    65 FAIL: gnu.testlet.java.util.Properties.AcuniaPropertiesTest: should throw NullPointerException -- 1 (number 1)
    66 FAIL: gnu.testlet.java.util.Properties.AcuniaPropertiesTest: v does not contain:$longvalue=I'mtryingtogiveavaluelongerthen40characters$ (number 1)
    67 FAIL: gnu.testlet.java.util.Properties.AcuniaPropertiesTest: should throw NullPointerException -- 1 (number 1)
    68 FAIL: gnu.testlet.java.util.Properties.AcuniaPropertiesTest: all elements are the same (number 1)
    69 FAIL: gnu.testlet.java.util.Properties.AcuniaPropertiesTest: checkvalue -- got:$ents=$ (number 1)
    70 FAIL: gnu.testlet.java.util.Properties.AcuniaPropertiesTest: checkvalue -- got:$dog=nocat   $ (number 1)
    71 FAIL: gnu.testlet.java.util.Properties.AcuniaPropertiesTest: check if all elements were found -- got: [dog=no\cat   ] (number 1)
     103FAIL: gnu.testlet.java.io.File.jdk11: getCanonicalPath () (number 1)
     104FAIL: gnu.testlet.java.io.ObjectInputOutput.InputTest: gnu.testlet.java.io.ObjectInputOutput.Test$GetPutField (number 1)
     105FAIL: gnu.testlet.java.io.ObjectInputOutput.OutputTest: Serializable: gnu.testlet.java.io.ObjectInputOutput.Test$Extern () (number 2)
     106FAIL: gnu.testlet.java.io.ObjectInputOutput.OutputTest: Serializable: test(str=null, x=0) (number 2)
     107FAIL: gnu.testlet.java.io.OutputStreamWriter.jdk11: OutputStreamWriter(writer, encoding) (number 1)
     108FAIL: gnu.testlet.java.io.OutputStreamWriter.jdk11: OutputStreamWriter(writer, encoding) // alias (number 1)
     109FAIL: gnu.testlet.java.lang.Double.DoubleTest: Error: test_shortbyteValue failed - 5 (number 1)
     110FAIL: gnu.testlet.java.lang.Float.FloatTest: Error: test_shortbyteValue failed - 5 (number 1)
     111FAIL: gnu.testlet.java.net.DatagramSocket.DatagramSocketTest2: Expected IOException (number 1)
     112FAIL: gnu.testlet.java.net.Socket.SocketTest: Error : test_params failed - 1 get port did not return proper values (number 1)
     113FAIL: gnu.testlet.java.net.Socket.jdk13: unexpected error: Success (number 1)
     114FAIL: gnu.testlet.java.sql.Date.DateTest: getHours (number 1)
     115FAIL: gnu.testlet.java.sql.Date.DateTest: getMinutes (number 1)
     116FAIL: gnu.testlet.java.sql.Date.DateTest: getSeconds (number 1)
     117FAIL: gnu.testlet.java.sql.Date.DateTest: setHours (number 1)
     118FAIL: gnu.testlet.java.sql.Date.DateTest: setMinutes (number 1)
     119FAIL: gnu.testlet.java.sql.Date.DateTest: setSeconds (number 1)
     120FAIL: gnu.testlet.java.sql.Date.DateTest: valueOf (number 1)
     121FAIL: gnu.testlet.java.sql.DriverManager.DriverManagerTest: getDriver (number 1)
     122FAIL: gnu.testlet.java.sql.Time.TimeTest: getDate (number 1)
     123FAIL: gnu.testlet.java.sql.Time.TimeTest: getDay (number 1)
     124FAIL: gnu.testlet.java.sql.Time.TimeTest: getMonth (number 1)
     125FAIL: gnu.testlet.java.sql.Time.TimeTest: getYear (number 1)
     126FAIL: gnu.testlet.java.sql.Time.TimeTest: setDate (number 1)
     127FAIL: gnu.testlet.java.sql.Time.TimeTest: setMonth (number 1)
     128FAIL: gnu.testlet.java.sql.Time.TimeTest: setYear (number 1)
     129FAIL: gnu.testlet.java.sql.Time.TimeTest: valueOf (number 1)
     130FAIL: gnu.testlet.java.sql.Timestamp.TimestampTest: valueOf (number 1)
Note: See TracChangeset for help on using the changeset viewer.