diff options
| author | Ranjit Mathew <rmathew@hotmail.com> | 2005-08-16 18:32:14 +0000 |
|---|---|---|
| committer | Ranjit Mathew <rmathew@gcc.gnu.org> | 2005-08-16 18:32:14 +0000 |
| commit | 8a14e6e1acc041e07a8a94d6e6f355729efc6cda (patch) | |
| tree | b6a73ac24f5e7bc25248e1ebcc6be2cbc1f3364a | |
| parent | 355a9e437d6bffe505a1d5757f71dccd7f6e74f7 (diff) | |
| download | gcc-8a14e6e1acc041e07a8a94d6e6f355729efc6cda.zip gcc-8a14e6e1acc041e07a8a94d6e6f355729efc6cda.tar.gz gcc-8a14e6e1acc041e07a8a94d6e6f355729efc6cda.tar.bz2 | |
More testsuite adjustments for PR java/19870.
* testsuite/libjava.lang/PR19870_2.java: New testcase.
* testsuite/libjava.lang/PR19870_2.out: Expected output for the
new testcase.
* testsuite/libjava.jacks/jacks.xfail: Remove
8.5.2-non-static-member-usage-2 and add 15.12.3-explicit-constructor-9.
From-SVN: r103165
| -rw-r--r-- | libjava/ChangeLog | 9 | ||||
| -rw-r--r-- | libjava/testsuite/libjava.jacks/jacks.xfail | 2 | ||||
| -rw-r--r-- | libjava/testsuite/libjava.lang/PR19870_2.java | 39 | ||||
| -rw-r--r-- | libjava/testsuite/libjava.lang/PR19870_2.out | 5 |
4 files changed, 54 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 574d211..b58b012 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,12 @@ +2005-08-16 Ranjit Mathew <rmathew@hotmail.com> + + More testsuite adjustments for PR java/19870. + * testsuite/libjava.lang/PR19870_2.java: New testcase. + * testsuite/libjava.lang/PR19870_2.out: Expected output for the + new testcase. + * testsuite/libjava.jacks/jacks.xfail: Remove + 8.5.2-non-static-member-usage-2 and add 15.12.3-explicit-constructor-9. + 2005-08-16 Tom Tromey <tromey@redhat.com> * gnu/xml/xpath/XPathParser.y: Removed. diff --git a/libjava/testsuite/libjava.jacks/jacks.xfail b/libjava/testsuite/libjava.jacks/jacks.xfail index 0472b55..eb5cd9c 100644 --- a/libjava/testsuite/libjava.jacks/jacks.xfail +++ b/libjava/testsuite/libjava.jacks/jacks.xfail @@ -174,6 +174,7 @@ 15.12.3-explicit-constructor-4 15.12.3-explicit-constructor-5 15.12.3-explicit-constructor-7 +15.12.3-explicit-constructor-9 15.12.3-runtime-mode-1 15.12.3-runtime-mode-2 15.12.3-runtime-mode-3 @@ -608,7 +609,6 @@ 8.5-inheritance-3 8.5-inheritance-6 8.5.2-accessible-static-member-usage-3 -8.5.2-non-static-member-usage-2 8.5.2-non-static-member-usage-4 8.5.2-non-static-member-usage-5 8.6-abrupt-1 diff --git a/libjava/testsuite/libjava.lang/PR19870_2.java b/libjava/testsuite/libjava.lang/PR19870_2.java new file mode 100644 index 0000000..4dd7c7f --- /dev/null +++ b/libjava/testsuite/libjava.lang/PR19870_2.java @@ -0,0 +1,39 @@ +// PR19870: Test synthetic accessor generation for private static methods +// accessed across nested class boundaries. +public class PR19870_2 +{ + static class A + { + private static void foo( ) + { + System.out.println( "1"); + } + + private static void bar( int x) + { + System.out.println( x); + snafu( ); + PR19870_2.snafu( ); + } + } + + static class B + { + private static void foo( ) + { + A.foo( ); + } + } + + private static void snafu( ) + { + System.out.println( "3"); + } + + public static void main( String[] args) + { + A.foo( ); + A.bar( 2); + B.foo( ); + } +} diff --git a/libjava/testsuite/libjava.lang/PR19870_2.out b/libjava/testsuite/libjava.lang/PR19870_2.out new file mode 100644 index 0000000..bab3945 --- /dev/null +++ b/libjava/testsuite/libjava.lang/PR19870_2.out @@ -0,0 +1,5 @@ +1 +2 +3 +3 +1 |