GDB copyright headers update after running GDB's copyright.py script.

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.java / jmain.exp

diff --git a/gdb/testsuite/gdb.java/jmain.exp b/gdb/testsuite/gdb.java/jmain.exp
index cdb3c9940788fb08ed2740c10f8ffd098a9d4f85..de9a6d3e700208b1f4f055c7afe814049c2a71ff 100644 (file)
--- a/gdb/testsuite/gdb.java/jmain.exp
+++ b/gdb/testsuite/gdb.java/jmain.exp
@@ -1,4 +1,4 @@
-# Copyright 2000, 2004, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# Copyright 2000-2016 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
@@ -16,18 +16,12 @@
 # This file was based on jmisc.exp which in turn was written by
 # Anthony Green. (green@redhat.com)
 
-if $tracelevel then {
-       strace $tracelevel
-}
-
 load_lib "java.exp"
 
 if { [skip_java_tests] } { continue }
 
-set testfile "jmain"
-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
 }
 
@@ -52,13 +46,13 @@ set bpmain "Breakpoint .* file .*jmain.java, line 5\."
 set earlybpmain "Breakpoint .* file .*jmain.java, line 4\."
 
 gdb_load "${binfile}"
-setup_kfail *-*-* java/1567
+setup_kfail java/1567 *-*-*
 gdb_test "break main" "${bpmain}"
 
 # Check that an unqualified "main" works.
 
 gdb_load "${binfile}"
-setup_kfail *-*-* java/1565
+setup_kfail java/1565 *-*-*
 gdb_test "break jmain.main" "${bpmain}"
 
 # Check that a fully qualified "main" works.