Commit fc159ae1 by Tom Tromey Committed by Tom Tromey

re GNATS gcj/124 (protected constructor for InvocationTargetException still visible)

	* 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.

From-SVN: r32353
parent 8cf870df
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> 2000-03-05 Anthony Green <green@redhat.com>
* libjava.lang/PR141.java: New file. * libjava.lang/PR141.java: New file.
......
...@@ -136,7 +136,7 @@ DIST_COMMON = ChangeLog Makefile.am Makefile.in ...@@ -136,7 +136,7 @@ DIST_COMMON = ChangeLog Makefile.am Makefile.in
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
TAR = gtar TAR = tar
GZIP_ENV = --best GZIP_ENV = --best
all: all-redirect all: all-redirect
.SUFFIXES: .SUFFIXES:
...@@ -164,7 +164,7 @@ distdir: $(DISTFILES) ...@@ -164,7 +164,7 @@ distdir: $(DISTFILES)
@for file in $(DISTFILES); do \ @for file in $(DISTFILES); do \
d=$(srcdir); \ d=$(srcdir); \
if test -d $$d/$$file; then \ if test -d $$d/$$file; then \
cp -pr $$d/$$file $(distdir)/$$file; \ cp -pr $$/$$file $(distdir)/$$file; \
else \ else \
test -f $(distdir)/$$file \ test -f $(distdir)/$$file \
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
......
# Copyright (C) 1998, 1999 Red Hat, Inc. # Copyright (C) 1998, 1999, 2000 Red Hat, Inc.
load_lib "libgloss.exp" load_lib "libgloss.exp"
...@@ -275,6 +275,11 @@ proc libjava_arguments {{mode compile}} { ...@@ -275,6 +275,11 @@ proc libjava_arguments {{mode compile}} {
# `xfail-gcj' compilation from source will fail # `xfail-gcj' compilation from source will fail
# `xfail-javac' compilation with javac will fail # `xfail-javac' compilation with javac will fail
# `xfail-gcjC' compilation with gcj -C 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-byte' compilation from bytecode will fail
# `xfail-exec' exec will fail # `xfail-exec' exec will fail
# `xfail-output' output will be wrong # `xfail-output' output will be wrong
...@@ -334,6 +339,12 @@ proc test_libjava_from_source { options srcfile compile_args inpfile resultfile ...@@ -334,6 +339,12 @@ proc test_libjava_from_source { options srcfile compile_args inpfile resultfile
} }
if { $x != "" } { if { $x != "" } {
verbose "target_compile failed: $x" 2 verbose "target_compile failed: $x" 2
if {[info exists opts(shouldfail)]} {
pass "$errname compilation from source"
return
}
fail "$errname compilation from source" fail "$errname compilation from source"
if {[info exists opts(xfail-gcj)] || ! [info exists opts(no-exec)]} { if {[info exists opts(xfail-gcj)] || ! [info exists opts(no-exec)]} {
setup_xfail "*-*-*" setup_xfail "*-*-*"
...@@ -341,7 +352,11 @@ proc test_libjava_from_source { options srcfile compile_args inpfile resultfile ...@@ -341,7 +352,11 @@ proc test_libjava_from_source { options srcfile compile_args inpfile resultfile
setup_xfail "*-*-*" setup_xfail "*-*-*"
fail "$errname output from source compiled test" fail "$errname output from source compiled test"
} }
return; return
}
if {[info exists opts(shouldfail)]} {
fail "$errname compilation from source"
return
} }
pass "$errname compilation from source" pass "$errname compilation from source"
...@@ -409,6 +424,11 @@ proc test_libjava_from_source { options srcfile compile_args inpfile resultfile ...@@ -409,6 +424,11 @@ proc test_libjava_from_source { options srcfile compile_args inpfile resultfile
# `xfail-gcj' compilation from source will fail # `xfail-gcj' compilation from source will fail
# `xfail-javac' compilation with javac will fail # `xfail-javac' compilation with javac will fail
# `xfail-gcjC' compilation with gcj -C 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-byte' compilation from bytecode will fail
# `xfail-exec' exec will fail # `xfail-exec' exec will fail
# `xfail-output' output will be wrong # `xfail-output' output will be wrong
...@@ -443,6 +463,10 @@ proc test_libjava_from_javac { options srcfile compile_args inpfile resultfile e ...@@ -443,6 +463,10 @@ proc test_libjava_from_javac { options srcfile compile_args inpfile resultfile e
setup_xfail *-*-* setup_xfail *-*-*
} }
if {! $bc_ok} then { if {! $bc_ok} then {
if {[info exists opts(shouldfail)]} {
pass "$errname byte compilation"
return
}
fail "$errname byte compilation" fail "$errname byte compilation"
setup_xfail "*-*-*" setup_xfail "*-*-*"
fail "$errname compilation from bytecode" fail "$errname compilation from bytecode"
...@@ -454,6 +478,10 @@ proc test_libjava_from_javac { options srcfile compile_args inpfile resultfile e ...@@ -454,6 +478,10 @@ proc test_libjava_from_javac { options srcfile compile_args inpfile resultfile e
} }
return return
} }
if {[info exists opts(shouldfail)]} {
fail "$errname byte compilation"
return
}
pass "$errname byte compilation" pass "$errname byte compilation"
# Find name to use for --main, and name of all class files. # Find name to use for --main, and name of all class files.
...@@ -607,10 +635,15 @@ proc test_libjava_from_javac { options srcfile compile_args inpfile resultfile e ...@@ -607,10 +635,15 @@ proc test_libjava_from_javac { options srcfile compile_args inpfile resultfile e
# Run the test specified by srcfile and resultfile. compile_args and # Run the test specified by srcfile and resultfile. compile_args and
# exec_args are options telling this proc how to work. # exec_args are options telling this proc how to work.
# `no-link' don't try to link the program # `no-link' don't try to link the program
# `no-exec' don't try to run the test # `no-exec' don't try to run the test
# `xfail-gcj' compilation from source will fail # `xfail-gcj' compilation from source will fail
# `xfail-javac' compilation with javac will fail # `xfail-javac' compilation with javac will fail
# `xfail-gcjC' compilation with gcj -C 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-byte' compilation from bytecode will fail
# `xfail-exec' exec will fail # `xfail-exec' exec will fail
# `xfail-output' output will be wrong # `xfail-output' output will be wrong
......
import java.lang.reflect.*;
public class PR124
{
public static void main (String[] args)
{
System.out.println (new InvocationTargetException ());
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment