gdb/testsuite/

	* gdb.java/jprint.exp (print a java.lang.String): xfail without system
	debug info.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 276f60b..1f43ffe 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-07  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+       * gdb.java/jprint.exp (print a java.lang.String): xfail without system
+       debug info.
+
 2011-07-06  Matt Rice  <ratmice@gmail.com>
 
        * gdb.python/python.exp: Update filename paths.

diff --git a/gdb/testsuite/gdb.java/jprint.exp b/gdb/testsuite/gdb.java/jprint.exp
index 81d8ad1..f6ae7ab 100644 (file)
--- a/gdb/testsuite/gdb.java/jprint.exp
+++ b/gdb/testsuite/gdb.java/jprint.exp
@@ -71,5 +71,14 @@ if [set_lang_java] then {
     setup_xfail *-*-* gcc/43260
     gdb_test "print *jprint.props" " = .*" "print a java.util.Properties"
 
-    gdb_test "print jprint.hi" "= java.lang.String \"hi maude\"" "print a java.lang.String"
+    set test "print a java.lang.String"
+    gdb_test_multiple "print jprint.hi" $test {
+       -re " = java.lang.String \"hi maude\"\r\n$gdb_prompt $" {
+           pass $test
+       }
+       -re "There is no member named data\\.\r\n$gdb_prompt $" {
+           # GCJ system debug info for java.lang.String is not installed.
+           xfail $test
+       }
+    }
 }