Testsuite adjustments for PR java/19870.

	* testsuite/libjava.lang/PR19870.java: New testcase.
	* testsuite/libjava.lang/PR19870.out: Expected output for the
	testcase.
	* testsuite/libjava.jacks/jacks.xfail: Add
	8.5.2-accessible-static-member-usage-3 and 15.8.4-static-2

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@100245 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 3fdf9e1..7d1c29c 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,13 @@
+2005-05-26  Ranjit Mathew  <rmathew@hotmail.com>
+
+       Testsuite adjustments for PR java/19870.
+       * testsuite/libjava.lang/PR19870.java: New testcase.
+       * testsuite/libjava.lang/PR19870.out: Expected output for the
+       testcase.
+       * testsuite/libjava.jacks/jacks.xfail: Add
+       8.5.2-accessible-static-member-usage-3 and 15.8.4-static-2
+
+
 2005-05-26  Bryce McKinlay  <mckinlay@redhat.com>
 
        * include/jvm.h (FLAG_BINARYCOMPAT_ABI, FLAG_BOOTSTRAP_LOADER): New.

diff --git a/libjava/testsuite/libjava.jacks/jacks.xfail b/libjava/testsuite/libjava.jacks/jacks.xfail
index cd53787..4524e95 100644 (file)
--- a/libjava/testsuite/libjava.jacks/jacks.xfail
+++ b/libjava/testsuite/libjava.jacks/jacks.xfail
@@ -306,6 +306,7 @@
 15.8.2-type-12
 15.8.2-type-13
 15.8.2-type-14
+15.8.4-static-2
 15.8.5-field-expression-6
 15.8.5-method-expression-8
 15.8.5-variable-5
@@ -633,6 +634,7 @@
 8.5-inheritance-2
 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

diff --git a/libjava/testsuite/libjava.lang/PR19870.java b/libjava/testsuite/libjava.lang/PR19870.java
new file mode 100644 (file)
index 0000000..f9e6bc3
--- /dev/null
+++ b/libjava/testsuite/libjava.lang/PR19870.java
@@ -0,0 +1,44 @@
+// PR19870: Test static field access across nested class boundaries.
+//
+public class PR19870
+{
+  private static int x = 123;
+
+  static class Foo
+  {
+    private static int junk = 1000;
+
+    static void snafu( )
+    {
+      System.out.println( x);
+      x = 456;
+      System.out.println( PR19870.x);
+      PR19870.x = 789;
+      System.out.println( PR19870.x);
+
+      System.out.println( Bar.junk);
+    }
+  }
+
+  static class Bar
+  {
+    private static int junk = 1984;
+
+    static void snafu( )
+    {
+      System.out.println( Foo.junk);
+      Foo.junk = 2000;
+      System.out.println( Foo.junk);
+    }
+  }
+
+  public static void main( String[] args)
+  {
+    Foo.snafu( );
+    Bar.snafu( );
+
+    System.out.println( Foo.junk);
+    Foo.junk = 3000;
+    System.out.println( Foo.junk);
+  }
+}

diff --git a/libjava/testsuite/libjava.lang/PR19870.out b/libjava/testsuite/libjava.lang/PR19870.out
new file mode 100644 (file)
index 0000000..ab58915
--- /dev/null
+++ b/libjava/testsuite/libjava.lang/PR19870.out
@@ -0,0 +1,8 @@
+123
+456
+789
+1984
+1000
+2000
+2000
+3000