run copyright.sh for 2011.

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

diff --git a/gdb/testsuite/gdb.java/jv-exp.exp b/gdb/testsuite/gdb.java/jv-exp.exp
index 3a54e50afa85ee3753d16afbbd7f9b9cb7baaf8d..b20a05cda6b4c20c9c84d5594e2ac56064e905c4 100644 (file)
--- a/gdb/testsuite/gdb.java/jv-exp.exp
+++ b/gdb/testsuite/gdb.java/jv-exp.exp
@@ -1,44 +1,23 @@
-# Copyright (C) 2000 Free Software Foundation, Inc.
+# Copyright 2000, 2007, 2008, 2009, 2010, 2011 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
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
-
-# Please email any bugs, comments, and/or additions to this file to:
-# bug-gdb@prep.ai.mit.edu
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 if $tracelevel then {
     strace $tracelevel
 }
 
-set prms_id 0
-set bug_id 0
-
-# 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
-
-    if [gdb_test "set language java" "" "set language java"] {
-       return 0
-    }
-
-    if [gdb_test "show language" ".* source language is \"java\".*"] {
-       return 0
-    }
-    return 1;
-}
+load_lib "java.exp"
 
 proc test_comparisons {} {
     global gdb_prompt
@@ -62,5 +41,5 @@ gdb_test "set width 0" ""
 if [set_lang_java] then {
     test_comparisons
 } else {
-    fail "Java expression tests suppressed"
+    warning "Java expression tests suppressed"
 }