* elf64-ppc.c (dec_dynrel_count): Don't error when elf_gc_sweep_symbol

[external/binutils.git] / gdb / testsuite / gdb.java / jmisc.exp

diff --git a/gdb/testsuite/gdb.java/jmisc.exp b/gdb/testsuite/gdb.java/jmisc.exp
index d1cf2cb..7eb7530 100644 (file)
--- a/gdb/testsuite/gdb.java/jmisc.exp
+++ b/gdb/testsuite/gdb.java/jmisc.exp
@@ -1,5 +1,4 @@
-# Copyright 2000, 2004, 2006, 2007, 2008, 2009, 2010
-# Free Software Foundation, Inc.
+# Copyright 2000-2013 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,47 +16,26 @@
 # This file was written by Anthony Green. (green@redhat.com)
 #
 
-if $tracelevel then {
-       strace $tracelevel
-}
-
 load_lib "java.exp"
 
 if { [skip_java_tests] } { continue }
 
-set testfile "jmisc"
-set srcfile ${srcdir}/$subdir/${testfile}.java
-set binfile ${objdir}/${subdir}/${testfile}
-if {[compile_java_from_source ${srcfile} ${binfile} "-g"] != ""} {
+standard_testfile .java
+if {[compile_java_from_source $srcdir/$subdir/$srcfile $binfile "-g"] != ""} {
     continue
 }
 
-# Set the current language to java.  This counts as a test.  If it
-# fails, then we skip the other tests.
-
-proc set_lang_java {} {
-    global gdb_prompt
-    global binfile objdir subdir
-
-    verbose "loading file '$binfile'"
-    gdb_load $binfile
-
-    gdb_test_no_output "set language java"
-
-    return [gdb_test "show language" ".* source language is \"java\".*" \
-       "set language to \"java\""]
-}
-
 
 # Start with a fresh gdb.
 
 gdb_exit
 gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
+gdb_load $binfile
 
 gdb_test "set print sevenbit-strings" ".*"
 
-if ![set_lang_java] then {
+if [set_lang_java] then {
     # Ref PR gdb:java/1565.  Don't use the simpler "break jmisc.main".
     # As of 2004-02-24 it wasn't working and is being tested separatly.
     # Before GCJ 4.1 (approximately) the demangled name did not include
@@ -65,8 +43,8 @@ if ![set_lang_java] then {
     # signature.
     runto_main
     set function "${testfile}.main(java.lang.String\[\])"
-    gdb_breakpoint "$function" { allow-pending }
-    gdb_breakpoint "${function}void" { allow-pending }
+    gdb_breakpoint "$function" allow-pending
+    gdb_breakpoint "${function}void" allow-pending
     gdb_continue_to_breakpoint $function
 
     gdb_test_multiple "ptype jmisc" "ptype jmisc" {
@@ -81,7 +59,7 @@ if ![set_lang_java] then {
     gdb_test "p args" \
        "\\\$1 = java\.lang\.String\\\[]@\[a-f0-9]+"
 
-    gdb_test_multiple "p *args\n" "p *args\n" {
+    gdb_test_multiple "p *args" "p *args" {
        -re "\\\$2 = \{length: 0\}\[\r\n\ \t]+$gdb_prompt $" {
            pass "p *args"
        }
@@ -119,4 +97,8 @@ if ![set_lang_java] then {
            }
        }
     }
+
+    # Test a non-mathing return type really fails the look up.
+    gdb_test_no_output "set breakpoint pending off"
+    gdb_test {break jmisc.main(java.lang.String[])int} {Function "jmisc\.main\(java\.lang\.String\[\]\)int" not defined\.}
 }