GDB 7.6.50

gdb/testsuite/lib/java.exp

Index: gdb/testsuite/lib/java.exp
diff --git a/gdb/testsuite/lib/java.exp b/gdb/testsuite/lib/java.exp
index 57ff1e6559a9d2ea70dbf0660f04917ab2a737a0..19b1eee8ff46bdf898fc2f81f8b6887247e2edf9 100644
--- a/gdb/testsuite/lib/java.exp
+++ b/gdb/testsuite/lib/java.exp
@@ -1,7 +1,6 @@
 # This test code is part of GDB, the GNU debugger.
 
-# Copyright 1998-2000, 2003-2004, 2006-2012 Free Software Foundation,
-# Inc.
+# Copyright 1998-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
@@ -32,8 +31,8 @@ set java_initialized 0
 # Build the status wrapper library as needed.
 #
 proc java_init { args } {
-    global wrapper_file;
-    global wrap_compile_flags;
+    global wrapper_file
+    global wrap_compile_flags
     global java_initialized
     global GCJ_UNDER_TEST
     global TOOL_EXECUTABLE
@@ -43,7 +42,7 @@ proc java_init { args } {
 
     if ![info exists GCJ_UNDER_TEST] {
 	if [info exists TOOL_EXECUTABLE] {
-	    set GCJ_UNDER_TEST $TOOL_EXECUTABLE;
+	    set GCJ_UNDER_TEST $TOOL_EXECUTABLE
 	} else {
 	    if { [info exists env(GCJ)] && $env(GCJ) != "" } {
 		set GCJ_UNDER_TEST $env(GCJ)
@@ -52,14 +51,14 @@ proc java_init { args } {
 		global target_alias
 		
 		if ![is_remote host] {
-		    set file [lookfor_file $tool_root_dir gcj];
+		    set file [lookfor_file $tool_root_dir gcj]
 		    if { $file == "" } {
-			set file [lookfor_file $tool_root_dir gcc/gcj];
+			set file [lookfor_file $tool_root_dir gcc/gcj]
 		    }
 		    if { $file != "" } {
-			set CC "$file -B[file dirname $file]/ --specs=$tool_root_dir/$target_alias/libjava/libgcj-test.spec";
+			set CC "$file -B[file dirname $file]/ --specs=$tool_root_dir/$target_alias/libjava/libgcj-test.spec"
 		    } else {
-			set CC [transform gcj];
+			set CC [transform gcj]
 		    }
 		} else {
 		    set CC [transform gcj]
@@ -69,13 +68,13 @@ proc java_init { args } {
 	}
     }
 
-    set wrapper_file "";
-    set wrap_compile_flags "";
+    set wrapper_file ""
+    set wrap_compile_flags ""
     if [target_info exists needs_status_wrapper] {
-	set result [build_wrapper "testglue.o"];
+	set result [build_wrapper "testglue.o"]
 	if { $result != "" } {
-	    set wrapper_file [lindex $result 0];
-	    set wrap_compile_flags [lindex $result 1];
+	    set wrapper_file [lindex $result 0]
+	    set wrap_compile_flags [lindex $result 1]
 	} else {
 	    warning "Status wrapper failed to build."
 	}
@@ -94,7 +93,7 @@ proc compile_java_from_source { srcfile binfile compile_args } {
 
     if { $java_initialized != 1 } { java_init }
 
-    set args "compiler=$GCJ_UNDER_TEST"
+    set args [list "compiler=$GCJ_UNDER_TEST"]
     lappend args "additional_flags=--main=[file rootname [file tail $srcfile]]"
     if { $compile_args != "" } {
 	lappend args "additional_flags=$compile_args"
@@ -116,7 +115,7 @@ proc set_lang_java {} {
 	   "set language to \"java\""] {
 	return 0
     }
-    return 1;
+    return 1
 }
 
 # Local Variables: