From: Yao Qi <yao@codesourcery.com>
Date: Thu, 14 Mar 2013 13:34:06 +0000 (+0000)
Subject: gdb/testsuite/
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ae59b1da2198f9bcbf43a9c9a936d155d36c300a;p=binutils-gdb.git

gdb/testsuite/

	* config/monitor.exp (gdb_target_cmd): Remove semicolon after
	'return'.
	(gdb_target_monitor, gdb_load): Likewise.
	* config/sid.exp (gdb_load): Likewise.
	* config/slite.exp (gdb_load): Likewise.
	* config/vx.exp (gdb_start, spawn_vxgdb): Likewise.
	* gdb.ada/arrayidx.exp, gdb.ada/null_array.exp: Likewise.
	* gdb.arch/mips-octeon-bbit.exp (single_step): Likewise.
	(single_step_until): Likewise.
	* gdb.arch/powerpc-d128-regs.exp: Likewise.
	* gdb.arch/system-gcore.exp: Likewise.
	* gdb.base/bigcore.exp (extract_heap): Likewise.
	* gdb.base/break-on-linker-gcd-function.exp: Likewise.
	* gdb.base/call-ar-st.exp: Likewise.
	* gdb.base/call-rt-st.exp: Likewise.
	* gdb.base/call-sc.exp, gdb.base/call-strs.exp: Likewise.
	* gdb.base/callfuncs.exp, gdb.base/completion.exp: Likewise.
	* gdb.base/condbreak.exp, gdb.base/constvars.exp: Likewise.
	* gdb.base/corefile.exp: Likewise.
	* gdb.base/dbx.exp (gdb_file_cmd): Likewise.
	* gdb.base/exprs.exp, gdb.base/fileio.exp: Likewise.
	* gdb.base/fixsection.exp: Likewise.
	* gdb.base/funcargs.exp: Likewise.
	* gdb.base/gcore-buffer-overflow.exp: Likewise.
	* gdb.base/gcore-relro.exp: Likewise.
	* gdb.base/gcore.exp, gdb.base/gdb11530.exp: Likewise.
	* gdb.base/gdb11531.exp, gdb.base/gnu-ifunc.exp: Likewise.
	* gdb.base/info-os.exp, gdb.base/info-proc.exp: Likewise.
	* gdb.base/interp.exp, gdb.base/langs.exp:: Likewise.
	* gdb.base/list.exp: Likewise.
	(set_listsize): Likewise.
	* gdb.base/logical.exp, gdb.base/mips_pro.exp: Likewise.
	* gdb.base/miscexprs.exp, gdb.base/nodebug.exp: Likewise.
	* gdb.base/opaque.exp, gdb.base/pointers.exp: Likewise.
	* gdb.base/psymtab.exp, gdb.base/ptype.exp: Likewise.
	* gdb.base/relational.exp, gdb.base/scope.exp: Likewise.
	* gdb.base/setvar.exp: Likewise.
	(test_set): Likewise.
	* gdb.base/signals.exp, gdb.base/sizeof.exp: Likewise.
	* gdb.base/solib-overlap.exp: Likewise.
	* gdb.base/store.exp, gdb.base/structs.exp: Likewise.
	* gdb.base/structs2.exp, gdb.base/volatile.exp: Likewise.
	* gdb.base/watchpoint.exp (initialize): Likewise.
	(test_simple_watchpoint): Likewise.
	(test_disabling_watchpoints): Likewise.
	(test_watchpoint_triggered_in_syscall): Likewise.
	* gdb.base/whatis.exp, gdb.cp/ambiguous.exp: Likewise.
	* gdb.cp/casts.exp, gdb.cp/ctti.exp: Likewise.
	* gdb.cp/namespace.exp, gdb.cp/nsdecl.exp: Likewise.
	* gdb.cp/psmang.exp, gdb.dwarf2/dw2-ranges.exp: Likewise.
	* gdb.hp/gdb.aCC/optimize.exp: Likewise.
	* gdb.hp/gdb.aCC/watch-cmd.exp: Likewise.
	* gdb.hp/gdb.base-hp/callfwmall.exp: Likewise.
	* gdb.hp/gdb.base-hp/pxdb.exp: Likewise.
	* gdb.hp/gdb.compat/xdb1.exp: Likewise.
	* gdb.hp/gdb.compat/xdb2.exp: Likewise.
	* gdb.hp/gdb.compat/xdb3.exp: Likewise.
	* gdb.hp/gdb.defects/bs14602.exp: Likewise.
	* gdb.hp/gdb.defects/solib-d.exp: Likewise.
	* gdb.mi/gdb792.exp: Likewise.
	* gdb.mi/mi-inheritance-syntax-error.exp: Likewise.
	* gdb.mi/mi-logging.exp, gdb.mi/mi-var-cp.exp : Likewise.
	* gdb.mi/mi-var-rtti.exp, gdb.python/py-type.exp: Likewise.
	* gdb.threads/gcore-thread.exp: Likewise.
	(load_core): Likewise.
	* gdb.threads/pthreads.exp (all_threads_running): Likewise.
	(test_startup, check_control_c): Likewise.
	* gdb.threads/sigstep-threads.exp: Likewise.
	* gdb.threads/thread_check.exp: Likewise.
	* gdb.trace/backtrace.exp, gdb.trace/change-loc.exp: Likewise.
	* gdb.trace/circ.exp (run_trace_experiment): Likewise.
	(set_a_tracepoint, trace_buffer_normal): Likewise.
	(gdb_trace_circular_tests): Likewise.
	* gdb.trace/collection.exp: Likewise.
	* gdb.trace/disconnected-tracing.exp: Likewise.
	* gdb.trace/infotrace.exp: Likewise.
	* gdb.trace/mi-traceframe-changed.exp: Likewise.
	* gdb.trace/mi-tracepoint-changed.exp: Likewise.
	* gdb.trace/mi-tsv-changed.exp (test_create_delete_modify_tsv): Likewise.
	* gdb.trace/packetlen.exp, gdb.trace/passc-dyn.exp: Likewise.
	* gdb.trace/pending.exp, gdb.trace/report.exp: Likewise.
	* gdb.trace/stap-trace.exp: Likewise.
	* gdb.trace/status-stop.exp,gdb.trace/strace.exp: Likewise.
	* gdb.trace/tfind.exp, gdb.trace/trace-break.exp: Likewise.
	* gdb.trace/trace-buffer-size.exp: Likewise.
	* gdb.trace/tspeed.exp, gdb.trace/tsv.exp: Likewise.
	* gdb.trace/unavailable.exp: Likewise.
	* gdb.trace/while-dyn.exp: Likewise.
	* lib/fortran.exp (set_lang_fortran): Likewise.
	* lib/gdb.exp (default_gdb_version, gdb_start_cmd): Likewise.
	(gdb_breakpoint, gdb_reinitialize_dir): Likewise.
	(default_gdb_start, get_compiler_info): Likewise.
	(gdb_compile, gdb_compile_objc, gdb_reload, gdb_init): Likewise.
	(get_debug_format, setup_xfail_format): Likewise.
	(rerun_to_main, gdb_skip_float_test): Likewise.
	(build_id_debug_filename_get, get_remotetimeout): Likewise.
	* lib/java.exp (set_lang_java): Likewise.
	* lib/mi-support.exp (default_mi_gdb_start): Likewise.
	(mi_gdb_reinitialize_dir, mi_gdb_target_cmd): Likewise.
	(mi_gdb_file_cmd, mi_gdb_test): Likewise.
	(mi_run_cmd_full, mi_expect_interrupt): Likewise.
	* lib/objc.exp (set_lang_objc): Likewise.
	* lib/pascal.exp (set_lang_pascal): Likewise.
	* lib/prompt.exp (default_prompt_gdb_start): Likewise.
	* lib/trace-support.exp (gdb_trace_setactions, gdb_tfind_test): Likewise.
	(gdb_readexpr, gdb_gettpnum, gdb_find_recursion_test_baseline): Likewise.
---

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 8dac760424f..b0139d0e9d0 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,112 @@
+2013-03-14  Yao Qi  <yao@codesourcery.com>
+
+	* config/monitor.exp (gdb_target_cmd): Remove semicolon after
+	'return'.
+	(gdb_target_monitor, gdb_load): Likewise.
+	* config/sid.exp (gdb_load): Likewise.
+	* config/slite.exp (gdb_load): Likewise.
+	* config/vx.exp (gdb_start, spawn_vxgdb): Likewise.
+	* gdb.ada/arrayidx.exp, gdb.ada/null_array.exp: Likewise.
+	* gdb.arch/mips-octeon-bbit.exp (single_step): Likewise.
+	(single_step_until): Likewise.
+	* gdb.arch/powerpc-d128-regs.exp: Likewise.
+	* gdb.arch/system-gcore.exp: Likewise.
+	* gdb.base/bigcore.exp (extract_heap): Likewise.
+	* gdb.base/break-on-linker-gcd-function.exp: Likewise.
+	* gdb.base/call-ar-st.exp: Likewise.
+	* gdb.base/call-rt-st.exp: Likewise.
+	* gdb.base/call-sc.exp, gdb.base/call-strs.exp: Likewise.
+	* gdb.base/callfuncs.exp, gdb.base/completion.exp: Likewise.
+	* gdb.base/condbreak.exp, gdb.base/constvars.exp: Likewise.
+	* gdb.base/corefile.exp: Likewise.
+	* gdb.base/dbx.exp (gdb_file_cmd): Likewise.
+	* gdb.base/exprs.exp, gdb.base/fileio.exp: Likewise.
+	* gdb.base/fixsection.exp: Likewise.
+	* gdb.base/funcargs.exp: Likewise.
+	* gdb.base/gcore-buffer-overflow.exp: Likewise.
+	* gdb.base/gcore-relro.exp: Likewise.
+	* gdb.base/gcore.exp, gdb.base/gdb11530.exp: Likewise.
+	* gdb.base/gdb11531.exp, gdb.base/gnu-ifunc.exp: Likewise.
+	* gdb.base/info-os.exp, gdb.base/info-proc.exp: Likewise.
+	* gdb.base/interp.exp, gdb.base/langs.exp:: Likewise.
+	* gdb.base/list.exp: Likewise.
+	(set_listsize): Likewise.
+	* gdb.base/logical.exp, gdb.base/mips_pro.exp: Likewise.
+	* gdb.base/miscexprs.exp, gdb.base/nodebug.exp: Likewise.
+	* gdb.base/opaque.exp, gdb.base/pointers.exp: Likewise.
+	* gdb.base/psymtab.exp, gdb.base/ptype.exp: Likewise.
+	* gdb.base/relational.exp, gdb.base/scope.exp: Likewise.
+	* gdb.base/setvar.exp: Likewise.
+	(test_set): Likewise.
+	* gdb.base/signals.exp, gdb.base/sizeof.exp: Likewise.
+	* gdb.base/solib-overlap.exp: Likewise.
+	* gdb.base/store.exp, gdb.base/structs.exp: Likewise.
+	* gdb.base/structs2.exp, gdb.base/volatile.exp: Likewise.
+	* gdb.base/watchpoint.exp (initialize): Likewise.
+	(test_simple_watchpoint): Likewise.
+	(test_disabling_watchpoints): Likewise.
+	(test_watchpoint_triggered_in_syscall): Likewise.
+	* gdb.base/whatis.exp, gdb.cp/ambiguous.exp: Likewise.
+	* gdb.cp/casts.exp, gdb.cp/ctti.exp: Likewise.
+	* gdb.cp/namespace.exp, gdb.cp/nsdecl.exp: Likewise.
+	* gdb.cp/psmang.exp, gdb.dwarf2/dw2-ranges.exp: Likewise.
+	* gdb.hp/gdb.aCC/optimize.exp: Likewise.
+	* gdb.hp/gdb.aCC/watch-cmd.exp: Likewise.
+	* gdb.hp/gdb.base-hp/callfwmall.exp: Likewise.
+	* gdb.hp/gdb.base-hp/pxdb.exp: Likewise.
+	* gdb.hp/gdb.compat/xdb1.exp: Likewise.
+	* gdb.hp/gdb.compat/xdb2.exp: Likewise.
+	* gdb.hp/gdb.compat/xdb3.exp: Likewise.
+	* gdb.hp/gdb.defects/bs14602.exp: Likewise.
+	* gdb.hp/gdb.defects/solib-d.exp: Likewise.
+	* gdb.mi/gdb792.exp: Likewise.
+	* gdb.mi/mi-inheritance-syntax-error.exp: Likewise.
+	* gdb.mi/mi-logging.exp, gdb.mi/mi-var-cp.exp : Likewise.
+	* gdb.mi/mi-var-rtti.exp, gdb.python/py-type.exp: Likewise.
+	* gdb.threads/gcore-thread.exp: Likewise.
+	(load_core): Likewise.
+	* gdb.threads/pthreads.exp (all_threads_running): Likewise.
+	(test_startup, check_control_c): Likewise.
+	* gdb.threads/sigstep-threads.exp: Likewise.
+	* gdb.threads/thread_check.exp: Likewise.
+	* gdb.trace/backtrace.exp, gdb.trace/change-loc.exp: Likewise.
+	* gdb.trace/circ.exp (run_trace_experiment): Likewise.
+	(set_a_tracepoint, trace_buffer_normal): Likewise.
+	(gdb_trace_circular_tests): Likewise.
+	* gdb.trace/collection.exp: Likewise.
+	* gdb.trace/disconnected-tracing.exp: Likewise.
+	* gdb.trace/infotrace.exp: Likewise.
+	* gdb.trace/mi-traceframe-changed.exp: Likewise.
+	* gdb.trace/mi-tracepoint-changed.exp: Likewise.
+	* gdb.trace/mi-tsv-changed.exp (test_create_delete_modify_tsv): Likewise.
+	* gdb.trace/packetlen.exp, gdb.trace/passc-dyn.exp: Likewise.
+	* gdb.trace/pending.exp, gdb.trace/report.exp: Likewise.
+	* gdb.trace/stap-trace.exp: Likewise.
+	* gdb.trace/status-stop.exp,gdb.trace/strace.exp: Likewise.
+	* gdb.trace/tfind.exp, gdb.trace/trace-break.exp: Likewise.
+	* gdb.trace/trace-buffer-size.exp: Likewise.
+	* gdb.trace/tspeed.exp, gdb.trace/tsv.exp: Likewise.
+	* gdb.trace/unavailable.exp: Likewise.
+	* gdb.trace/while-dyn.exp: Likewise.
+	* lib/fortran.exp (set_lang_fortran): Likewise.
+	* lib/gdb.exp (default_gdb_version, gdb_start_cmd): Likewise.
+	(gdb_breakpoint, gdb_reinitialize_dir): Likewise.
+	(default_gdb_start, get_compiler_info): Likewise.
+	(gdb_compile, gdb_compile_objc, gdb_reload, gdb_init): Likewise.
+	(get_debug_format, setup_xfail_format): Likewise.
+	(rerun_to_main, gdb_skip_float_test): Likewise.
+	(build_id_debug_filename_get, get_remotetimeout): Likewise.
+	* lib/java.exp (set_lang_java): Likewise.
+	* lib/mi-support.exp (default_mi_gdb_start): Likewise.
+	(mi_gdb_reinitialize_dir, mi_gdb_target_cmd): Likewise.
+	(mi_gdb_file_cmd, mi_gdb_test): Likewise.
+	(mi_run_cmd_full, mi_expect_interrupt): Likewise.
+	* lib/objc.exp (set_lang_objc): Likewise.
+	* lib/pascal.exp (set_lang_pascal): Likewise.
+	* lib/prompt.exp (default_prompt_gdb_start): Likewise.
+	* lib/trace-support.exp (gdb_trace_setactions, gdb_tfind_test): Likewise.
+	(gdb_readexpr, gdb_gettpnum, gdb_find_recursion_test_baseline): Likewise.
+
 2013-03-14  Sergio Durigan Junior  <sergiodj@redhat.com>
 
 	PR c++/15203
diff --git a/gdb/testsuite/config/monitor.exp b/gdb/testsuite/config/monitor.exp
index 95dda09fc62..5e229ee5cf7 100644
--- a/gdb/testsuite/config/monitor.exp
+++ b/gdb/testsuite/config/monitor.exp
@@ -36,19 +36,19 @@ proc gdb_target_cmd { targetname serialport } {
 	    }
 	    -re "Remote MIPS debugging.*$gdb_prompt" {
 		verbose "Set target to $targetname";
-		return 0;
+		return 0
 	    }
 	    -re "Remote debugging using .*$serialport.*$gdb_prompt" {
 		verbose "Set target to $targetname";
-		return 0;
+		return 0
 	    }
 	    -re "Remote target $targetname connected to.*$gdb_prompt" {
 		verbose "Set target to $targetname";
-		return 0;
+		return 0
 	    }
 	    -re "Connected to.*$gdb_prompt" { 
 		verbose "Set target to $targetname";
-		return 0;
+		return 0
 	    }
 	    -re "Ending remote.*$gdb_prompt" { }
 	    -re "Connection refused.*$gdb_prompt" {
@@ -83,7 +83,7 @@ proc gdb_target_monitor { exec_file } {
 	set targetname "[target_info gdb_protocol]"
     } else {
 	perror "No protocol specified for [target_info name].";
-	return -1;
+	return -1
     }
     if [target_info exists baud] {
 	gdb_test "set remotebaud [target_info baud]" "" ""
@@ -106,9 +106,9 @@ proc gdb_target_monitor { exec_file } {
     }
 
     for {set j 1} {$j <= 2} {incr j} {
-	if [gdb_file_cmd $exec_file] { return -1; }
+	if [gdb_file_cmd $exec_file] { return -1 }
 
-	if ![gdb_target_cmd $targetname $serialport] { return 0; }
+	if ![gdb_target_cmd $targetname $serialport] { return 0 }
 
 	gdb_target_exec;
 
@@ -118,7 +118,7 @@ proc gdb_target_monitor { exec_file } {
     }
 
     perror "Couldn't set target for $targetname, port is $serialport.";
-    return -1;
+    return -1
 }
 
 proc gdb_target_exec { } {
@@ -171,10 +171,10 @@ proc gdb_load { arg } {
 		remote_pop_conn host;
 	    }
 	    if { $state == "pass" } {
-		if [gdb_target_monitor $arg] { return -1; }
+		if [gdb_target_monitor $arg] { return -1 }
 		gdb_test "list main" ".*" ""
 		verbose "Loaded $arg into $GDB\n";
-		return 0;
+		return 0
 	    }
 	} else {
 
@@ -254,7 +254,7 @@ proc gdb_load { arg } {
 	    }
 
 	    if { $load_ok == 1 } {
-		return 0;
+		return 0
 	    }
 	}
 
@@ -268,5 +268,5 @@ proc gdb_load { arg } {
 	}
     }
     perror "Couldn't load file into GDB.";
-    return -1;
+    return -1
 }
diff --git a/gdb/testsuite/config/sid.exp b/gdb/testsuite/config/sid.exp
index 7633bd30315..cc04568ae37 100644
--- a/gdb/testsuite/config/sid.exp
+++ b/gdb/testsuite/config/sid.exp
@@ -213,5 +213,5 @@ proc gdb_load { arg } {
     }
     set timeout $prev_timeout
     verbose "Timeout is now $timeout seconds" 2
-    return $retval;
+    return $retval
 }
diff --git a/gdb/testsuite/config/slite.exp b/gdb/testsuite/config/slite.exp
index c33ba85f267..fefd799825e 100644
--- a/gdb/testsuite/config/slite.exp
+++ b/gdb/testsuite/config/slite.exp
@@ -60,7 +60,7 @@ proc gdb_load { arg } {
     } else {
 	if ![target_info exists netport] {
 	    perror "Need either netport or gdb_serial entry for [target_info name].";
-	    return -1;
+	    return -1
 	}
 	set targetname [target_info netport];
 	set command "target $protocol udp [target_info netport]\n";
@@ -105,7 +105,7 @@ proc gdb_load { arg } {
 	    set arg [remote_download host $arg];
 	    if { $arg == "" } {
 		error "download failed"
-		return -1;
+		return -1
 	    }
 	}
 	send_gdb "load $arg $offset\n"
diff --git a/gdb/testsuite/config/vx.exp b/gdb/testsuite/config/vx.exp
index 50cd7087668..1cf7df2f3e0 100644
--- a/gdb/testsuite/config/vx.exp
+++ b/gdb/testsuite/config/vx.exp
@@ -68,10 +68,10 @@ proc gdb_start { } {
 
 	    set state [spawn_vxgdb];
 	    if { $state == "pass" } {
-		return 0;
+		return 0
 	    }
 	    if { $state == "fail" } {
-		return -1;
+		return -1
 	    }
 	}
 	remote_reboot target;
@@ -97,7 +97,7 @@ proc spawn_vxgdb { } {
 	-re "Done\..*$gdb_prompt $"	{
 	    verbose "Set target to [target_info hostname]" 1
 	    set timeout 10;
-	    return "pass";
+	    return "pass"
 	}
 	-re "net_connect: RPC: (Program not registered|.*Timed out).*$" {
 	    warning "Couldn't set GDB to target [target_info netport]."
@@ -106,7 +106,7 @@ proc spawn_vxgdb { } {
 	    warning "Couldn't set target for vxworks."
 	}
     }
-    return "retry";
+    return "retry"
 }
 
 proc gdb_exit { } {
diff --git a/gdb/testsuite/gdb.ada/arrayidx.exp b/gdb/testsuite/gdb.ada/arrayidx.exp
index c0f35db8e72..5dd1dd2925c 100644
--- a/gdb/testsuite/gdb.ada/arrayidx.exp
+++ b/gdb/testsuite/gdb.ada/arrayidx.exp
@@ -24,7 +24,7 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable {debug}] != ""} {
 }
 
 if [get_compiler_info] {
-    return -1;
+    return -1
 }
 set old_gcc [expr [test_compiler_info {gcc-[0-3]-*}] \
 	     || [test_compiler_info {gcc-4-[0-6]-*}]]
diff --git a/gdb/testsuite/gdb.ada/null_array.exp b/gdb/testsuite/gdb.ada/null_array.exp
index ef6738e6b30..a7cb06beead 100644
--- a/gdb/testsuite/gdb.ada/null_array.exp
+++ b/gdb/testsuite/gdb.ada/null_array.exp
@@ -27,7 +27,7 @@ set bp_location [gdb_get_line_number "START" ${testdir}/foo.adb]
 runto "foo.adb:$bp_location"
 
 if [get_compiler_info] {
-    return -1;
+    return -1
 }
 
 if {[test_compiler_info {gcc-[0-3]-*}]
diff --git a/gdb/testsuite/gdb.arch/mips-octeon-bbit.exp b/gdb/testsuite/gdb.arch/mips-octeon-bbit.exp
index 0d255223249..850b1544a0a 100644
--- a/gdb/testsuite/gdb.arch/mips-octeon-bbit.exp
+++ b/gdb/testsuite/gdb.arch/mips-octeon-bbit.exp
@@ -41,7 +41,7 @@ proc single_step {} {
 	    return 1
 	}
     }
-    return 0;
+    return 0
 }
 
 proc single_step_until { match } {
@@ -58,7 +58,7 @@ proc single_step_until { match } {
 	}
 	set insn [current_insn]
     }
-    return 0;
+    return 0
 }
 
 proc test_bbit { name taken } {
diff --git a/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp b/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp
index 8f7a912e113..a54793361ca 100644
--- a/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp
+++ b/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp
@@ -47,7 +47,7 @@ if { ![runto main] } then {
 }
 
 if [gdb_test "show arch" ".*currently powerpc:common.*" "Checking for PPC arch"] {
-    return -1;
+    return -1
 }
 
 gdb_test "next" ""
diff --git a/gdb/testsuite/gdb.arch/system-gcore.exp b/gdb/testsuite/gdb.arch/system-gcore.exp
index 721e381aa77..08551e003bb 100644
--- a/gdb/testsuite/gdb.arch/system-gcore.exp
+++ b/gdb/testsuite/gdb.arch/system-gcore.exp
@@ -41,7 +41,7 @@ gdb_expect {
     -re "Undefined command: .gcore.*$gdb_prompt $" {
 	# gcore command not supported -- nothing to test here.
 	unsupported "gdb does not support gcore on this target"
-	return -1;
+	return -1
     }
     -re "Save a core file .*$gdb_prompt $" {
 	pass "help gcore"
diff --git a/gdb/testsuite/gdb.base/bigcore.exp b/gdb/testsuite/gdb.base/bigcore.exp
index a5e48169a05..6c4a93f8918 100644
--- a/gdb/testsuite/gdb.base/bigcore.exp
+++ b/gdb/testsuite/gdb.base/bigcore.exp
@@ -103,7 +103,7 @@ proc extract_heap { dir } {
 	    fail "$test (timeout)"
 	}
     }
-    return $heap;
+    return $heap
 }
 set next_heap [extract_heap next]
 set prev_heap [extract_heap prev]
diff --git a/gdb/testsuite/gdb.base/break-on-linker-gcd-function.exp b/gdb/testsuite/gdb.base/break-on-linker-gcd-function.exp
index ba9966a2184..13db34708ed 100644
--- a/gdb/testsuite/gdb.base/break-on-linker-gcd-function.exp
+++ b/gdb/testsuite/gdb.base/break-on-linker-gcd-function.exp
@@ -30,7 +30,7 @@ set srcfile ${testfile}.cc
 set binfile ${objdir}/${subdir}/${testfile}
 
 if [get_compiler_info "c++"] {
-    return -1;
+    return -1
 }
 
 set additional_flags {-ffunction-sections -Wl,--gc-sections}
diff --git a/gdb/testsuite/gdb.base/call-ar-st.exp b/gdb/testsuite/gdb.base/call-ar-st.exp
index 1414b9a8303..925d2af3379 100644
--- a/gdb/testsuite/gdb.base/call-ar-st.exp
+++ b/gdb/testsuite/gdb.base/call-ar-st.exp
@@ -23,7 +23,7 @@ set binfile ${objdir}/${subdir}/${testfile}
 
 # Test depends on printf, which the sparclet stub doesn't support.  
 if { [istarget "sparclet-*-*"] } {
-    return 0;
+    return 0
 }
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
@@ -36,7 +36,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
 # used to compile the test case.
 
 if [get_compiler_info] {
-    return -1;
+    return -1
 }
 
 # Some targets can't call functions, so don't even bother with this
diff --git a/gdb/testsuite/gdb.base/call-rt-st.exp b/gdb/testsuite/gdb.base/call-rt-st.exp
index f6e091ff5ce..d71824c4f23 100644
--- a/gdb/testsuite/gdb.base/call-rt-st.exp
+++ b/gdb/testsuite/gdb.base/call-rt-st.exp
@@ -28,7 +28,7 @@ set binfile ${objdir}/${subdir}/${testfile}
 
 # Test depends on printf, which the sparclet stub doesn't support.  
 if { [istarget "sparclet-*-*"] } {
-    return 0;
+    return 0
 }
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
@@ -42,7 +42,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
 # used to compile the test case.
 
 if [get_compiler_info] {
-    return -1;
+    return -1
 }
 
 # Some targets can't do function calls, so don't even bother with this
diff --git a/gdb/testsuite/gdb.base/call-sc.exp b/gdb/testsuite/gdb.base/call-sc.exp
index 24478a443b5..7f6afd81c5b 100644
--- a/gdb/testsuite/gdb.base/call-sc.exp
+++ b/gdb/testsuite/gdb.base/call-sc.exp
@@ -36,7 +36,7 @@ set binfile ${objdir}/${subdir}/${testfile}
 # compiler used to compile the test case.
 
 if [get_compiler_info] {
-    return -1;
+    return -1
 }
 
 # Compile a variant of scalars.c using TYPE to specify the type of the
diff --git a/gdb/testsuite/gdb.base/call-strs.exp b/gdb/testsuite/gdb.base/call-strs.exp
index b1982763489..37a282889f0 100644
--- a/gdb/testsuite/gdb.base/call-strs.exp
+++ b/gdb/testsuite/gdb.base/call-strs.exp
@@ -29,7 +29,7 @@ set binfile ${objdir}/${subdir}/${testfile}
 
 # Test depends on printf, which the sparclet stub doesn't support.  
 if { [istarget "sparclet-*-*"] } {
-    return 0;
+    return 0
 }
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
diff --git a/gdb/testsuite/gdb.base/callfuncs.exp b/gdb/testsuite/gdb.base/callfuncs.exp
index b416383a5f8..f2a742b4067 100644
--- a/gdb/testsuite/gdb.base/callfuncs.exp
+++ b/gdb/testsuite/gdb.base/callfuncs.exp
@@ -34,7 +34,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable $com
 # used to compile the test case.
 
 if [get_compiler_info] {
-    return -1;
+    return -1
 }
 
 if {$hp_aCC_compiler} {
diff --git a/gdb/testsuite/gdb.base/completion.exp b/gdb/testsuite/gdb.base/completion.exp
index fc90a20207e..cddc54898ad 100644
--- a/gdb/testsuite/gdb.base/completion.exp
+++ b/gdb/testsuite/gdb.base/completion.exp
@@ -71,7 +71,7 @@ if  { [gdb_compile "${binfile}0.o ${binfile}1.o" "${binfile}" executable {debug
 }
 
 if [get_compiler_info] {
-    return -1;
+    return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.base/condbreak.exp b/gdb/testsuite/gdb.base/condbreak.exp
index 53219100a37..1f28c256b4d 100644
--- a/gdb/testsuite/gdb.base/condbreak.exp
+++ b/gdb/testsuite/gdb.base/condbreak.exp
@@ -42,7 +42,7 @@ if  { [gdb_compile "${binfile}0.o ${binfile}1.o" "${binfile}" executable {debug
 }
 
 if [get_compiler_info] {
-    return -1;
+    return -1
 }
 
 gdb_exit
@@ -165,7 +165,7 @@ gdb_test "continue" "Continuing\\..*Breakpoint \[0-9\]+, main \\(argc=.*, argv=.
 # stop location, but avoids clutter when possible.
 #
 # Suppose you have a function written completely on one source line, like:
-#    int foo (int x) { return 0; }
+#    int foo (int x) { return 0 }
 # Setting a breakpoint at `foo' actually places the breakpoint after
 # foo's prologue.
 #
diff --git a/gdb/testsuite/gdb.base/constvars.exp b/gdb/testsuite/gdb.base/constvars.exp
index df1b4ddeb8b..0e073498bc7 100644
--- a/gdb/testsuite/gdb.base/constvars.exp
+++ b/gdb/testsuite/gdb.base/constvars.exp
@@ -34,7 +34,7 @@ set binfile ${objdir}/${subdir}/${testfile}
 # Create and source the file that provides information about the compiler
 # used to compile the test case.
 if [get_compiler_info] {
-    return -1;
+    return -1
 }
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable debug ] != "" } {
diff --git a/gdb/testsuite/gdb.base/corefile.exp b/gdb/testsuite/gdb.base/corefile.exp
index ab6af21aeaf..d5996baa423 100644
--- a/gdb/testsuite/gdb.base/corefile.exp
+++ b/gdb/testsuite/gdb.base/corefile.exp
@@ -32,7 +32,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
 # Create and source the file that provides information about the compiler
 # used to compile the test case.
 if [get_compiler_info] {
-    return -1;
+    return -1
 }
 
 set corefile [core_find $binfile {coremmap.data}]
diff --git a/gdb/testsuite/gdb.base/dbx.exp b/gdb/testsuite/gdb.base/dbx.exp
index c83444946be..48cf9b3f403 100644
--- a/gdb/testsuite/gdb.base/dbx.exp
+++ b/gdb/testsuite/gdb.base/dbx.exp
@@ -184,7 +184,7 @@ proc gdb_file_cmd {arg} {
         set arg [remote_download host $arg];
         if { $arg == "" } {
             error "download failed"
-            return -1;
+            return -1
         }
     }
 
diff --git a/gdb/testsuite/gdb.base/exprs.exp b/gdb/testsuite/gdb.base/exprs.exp
index 21544cd0fc3..fa3cdb44957 100644
--- a/gdb/testsuite/gdb.base/exprs.exp
+++ b/gdb/testsuite/gdb.base/exprs.exp
@@ -28,7 +28,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
 }
 
 if [get_compiler_info] {
-    return -1;
+    return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.base/fileio.exp b/gdb/testsuite/gdb.base/fileio.exp
index 85ba9f5c170..c93913e9681 100644
--- a/gdb/testsuite/gdb.base/fileio.exp
+++ b/gdb/testsuite/gdb.base/fileio.exp
@@ -34,7 +34,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
 # used to compile the test case.
 
 if [get_compiler_info] {
-    return -1;
+    return -1
 }
 
 remote_exec build {sh -xc test\ -r\ dir2.fileio.test\ &&\ chmod\ -f\ +w\ dir2.fileio.test}
diff --git a/gdb/testsuite/gdb.base/fixsection.exp b/gdb/testsuite/gdb.base/fixsection.exp
index 86caa60cac3..99871f9893e 100644
--- a/gdb/testsuite/gdb.base/fixsection.exp
+++ b/gdb/testsuite/gdb.base/fixsection.exp
@@ -49,7 +49,7 @@ gdb_load_shlibs ${lib_sl}
 
 if ![runto_main] then {
     fail "Can't run to main"
-    return 1;
+    return 1
 }
 
 #
diff --git a/gdb/testsuite/gdb.base/funcargs.exp b/gdb/testsuite/gdb.base/funcargs.exp
index 1b75cb9b590..45f2c4ff12e 100644
--- a/gdb/testsuite/gdb.base/funcargs.exp
+++ b/gdb/testsuite/gdb.base/funcargs.exp
@@ -33,7 +33,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable $com
 # Create and source the file that provides information about the compiler
 # used to compile the test case.
 if [get_compiler_info] {
-    return -1;
+    return -1
 }
 
 #
diff --git a/gdb/testsuite/gdb.base/gcore-buffer-overflow.exp b/gdb/testsuite/gdb.base/gcore-buffer-overflow.exp
index 0147f0ebbbd..7bb3ba82efd 100644
--- a/gdb/testsuite/gdb.base/gcore-buffer-overflow.exp
+++ b/gdb/testsuite/gdb.base/gcore-buffer-overflow.exp
@@ -40,7 +40,7 @@ gdb_test_multiple "help gcore" "help gcore" {
     -re "Undefined command: .gcore.*$gdb_prompt $" {
 	# gcore command not supported -- nothing to test here.
 	unsupported "gdb does not support gcore on this target"
-	return -1;
+	return -1
     }
     -re "Save a core file .*$gdb_prompt $" {
 	pass "help gcore"
diff --git a/gdb/testsuite/gdb.base/gcore-relro.exp b/gdb/testsuite/gdb.base/gcore-relro.exp
index 06f00e43bb6..6ab0699bf3d 100644
--- a/gdb/testsuite/gdb.base/gcore-relro.exp
+++ b/gdb/testsuite/gdb.base/gcore-relro.exp
@@ -44,7 +44,7 @@ gdb_test_multiple $test $test {
     -re "Undefined command: .gcore.*\r\n$gdb_prompt $" {
 	# gcore command not supported -- nothing to test here.
 	unsupported "gdb does not support gcore on this target"
-	return -1;
+	return -1
     }
     -re "Save a core file .*\r\n$gdb_prompt $" {
 	pass $test
diff --git a/gdb/testsuite/gdb.base/gcore.exp b/gdb/testsuite/gdb.base/gcore.exp
index d2219b285b5..33528fb97c9 100644
--- a/gdb/testsuite/gdb.base/gcore.exp
+++ b/gdb/testsuite/gdb.base/gcore.exp
@@ -38,7 +38,7 @@ gdb_test_multiple "help gcore" "help gcore" {
     -re "Undefined command: .gcore.*$gdb_prompt $" {
 	# gcore command not supported -- nothing to test here.
 	unsupported "gdb does not support gcore on this target"
-	return -1;
+	return -1
     }
     -re "Save a core file .*$gdb_prompt $" {
 	pass "help gcore"
diff --git a/gdb/testsuite/gdb.base/gdb11530.exp b/gdb/testsuite/gdb.base/gdb11530.exp
index 13299581162..09e69a176fe 100644
--- a/gdb/testsuite/gdb.base/gdb11530.exp
+++ b/gdb/testsuite/gdb.base/gdb11530.exp
@@ -25,15 +25,15 @@ set binfile ${testfile}${EXEEXT}
 # to gcc compiler.
 
 if [get_compiler_info] {
-    return -1;
+    return -1
 }
 
 if { ![test_compiler_info gcc*] } {
-    return 0;
+    return 0
 }
 
 if { [prepare_for_testing $testfile.exp $testfile $testfile.c {debug}] } {
-    return -1;
+    return -1
 }
 
 
diff --git a/gdb/testsuite/gdb.base/gdb11531.exp b/gdb/testsuite/gdb.base/gdb11531.exp
index 98930468be8..cf0678ba687 100644
--- a/gdb/testsuite/gdb.base/gdb11531.exp
+++ b/gdb/testsuite/gdb.base/gdb11531.exp
@@ -23,7 +23,7 @@
 set testfile "gdb11531"
 
 if { [prepare_for_testing $testfile.exp $testfile $testfile.c {debug}] } {
-    return -1;
+    return -1
 }
 
 # Disable hardware watchpoints if necessary.
diff --git a/gdb/testsuite/gdb.base/gnu-ifunc.exp b/gdb/testsuite/gdb.base/gnu-ifunc.exp
index bd5027c2a87..417ec0a9531 100644
--- a/gdb/testsuite/gdb.base/gnu-ifunc.exp
+++ b/gdb/testsuite/gdb.base/gnu-ifunc.exp
@@ -65,7 +65,7 @@ gdb_load_shlibs ${lib_so}
 
 if ![runto_main] then {
     fail "Can't run to main"
-    return 1;
+    return 1
 }
 
 # The "if" condition is artifical to test regression of a former patch.
diff --git a/gdb/testsuite/gdb.base/info-os.exp b/gdb/testsuite/gdb.base/info-os.exp
index 1889b997304..5ebc16f5d13 100644
--- a/gdb/testsuite/gdb.base/info-os.exp
+++ b/gdb/testsuite/gdb.base/info-os.exp
@@ -36,7 +36,7 @@ if { [prepare_for_testing ${testfile}.exp $testfile $srcfile {debug additional_f
 
 if ![runto_main] then {
     fail "cannot run to main"
-    return -1;
+    return -1
 }
 
 # Get PID of test program.
diff --git a/gdb/testsuite/gdb.base/info-proc.exp b/gdb/testsuite/gdb.base/info-proc.exp
index 6271200635a..6db6975a95f 100644
--- a/gdb/testsuite/gdb.base/info-proc.exp
+++ b/gdb/testsuite/gdb.base/info-proc.exp
@@ -54,7 +54,7 @@ gdb_test_multiple "info proc" "info proc without a process" {
     -re "Not supported on this target.*$gdb_prompt $" {
 	# info proc command not supported -- nothing to test here.
 	unsupported "gdb does not support info proc on this target"
-	return -1;
+	return -1
     }
 }
 
diff --git a/gdb/testsuite/gdb.base/interp.exp b/gdb/testsuite/gdb.base/interp.exp
index eb160f2574d..0b5df5c520a 100644
--- a/gdb/testsuite/gdb.base/interp.exp
+++ b/gdb/testsuite/gdb.base/interp.exp
@@ -86,7 +86,7 @@ gdb_test_multiple $cmd $cmd {
 
 if ![runto_main] then {
   fail "run to main"
-  return -1;
+  return -1
 }
 
 gdb_test "list" ".*\[0-9\].*main \\(int argc.*" "can list sources"
diff --git a/gdb/testsuite/gdb.base/langs.exp b/gdb/testsuite/gdb.base/langs.exp
index 52eb5978065..cbb0e31a84f 100644
--- a/gdb/testsuite/gdb.base/langs.exp
+++ b/gdb/testsuite/gdb.base/langs.exp
@@ -51,7 +51,7 @@ set timeout 10
 # Create and source the file that provides information about the compiler
 # used to compile the test case.
 if [get_compiler_info] {
-    return -1;
+    return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.base/list.exp b/gdb/testsuite/gdb.base/list.exp
index 353502bf923..d1bdeee7ea6 100644
--- a/gdb/testsuite/gdb.base/list.exp
+++ b/gdb/testsuite/gdb.base/list.exp
@@ -43,7 +43,7 @@ if  { [gdb_compile "${binfile}0.o ${binfile}1.o" ${binfile} executable {debug}]
 # Create and source the file that provides information about the compiler
 # used to compile the test case.
 if [get_compiler_info] {
-    return -1;
+    return -1
 }
 
 #
@@ -59,14 +59,14 @@ proc set_listsize { arg } {
 
     incr set_listsize_count;
     if [gdb_test "set listsize $arg" ".*" "setting listsize to $arg #$set_listsize_count"] {
-	return 0;
+	return 0
     }
     if { $arg < 0 } {
 	set arg "unlimited";
     }
 
     if [gdb_test "show listsize" "Number of source lines.* is ${arg}.*" "show listsize $arg #$set_listsize_count"] {
-	return 0;
+	return 0
     }
     return 1
 }
diff --git a/gdb/testsuite/gdb.base/logical.exp b/gdb/testsuite/gdb.base/logical.exp
index 4f9c21bd3f4..e228c08ef1f 100644
--- a/gdb/testsuite/gdb.base/logical.exp
+++ b/gdb/testsuite/gdb.base/logical.exp
@@ -35,7 +35,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
 }
 
 if [get_compiler_info] {
-    return -1;
+    return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.base/mips_pro.exp b/gdb/testsuite/gdb.base/mips_pro.exp
index 15eb4d75684..2c8e9967a90 100644
--- a/gdb/testsuite/gdb.base/mips_pro.exp
+++ b/gdb/testsuite/gdb.base/mips_pro.exp
@@ -21,7 +21,7 @@ set binfile ${objdir}/${subdir}/${testfile}
 # Create and source the file that provides information about the compiler
 # used to compile the test case.
 if [get_compiler_info] {
-    return -1;
+    return -1
 }
 
 
diff --git a/gdb/testsuite/gdb.base/miscexprs.exp b/gdb/testsuite/gdb.base/miscexprs.exp
index f000dc5ba2b..22f9e9c45bc 100644
--- a/gdb/testsuite/gdb.base/miscexprs.exp
+++ b/gdb/testsuite/gdb.base/miscexprs.exp
@@ -47,7 +47,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [lis
 }
 
 if [get_compiler_info] {
-    return -1;
+    return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.base/nodebug.exp b/gdb/testsuite/gdb.base/nodebug.exp
index b7619fa0b2e..e451b7b8031 100644
--- a/gdb/testsuite/gdb.base/nodebug.exp
+++ b/gdb/testsuite/gdb.base/nodebug.exp
@@ -21,7 +21,7 @@ set srcfile $srcdir/$subdir/$testfile.c
 set binfile $objdir/$subdir/$testfile
 
 if [get_compiler_info] {
-    return -1;
+    return -1
 }
 
 if [test_compiler_info "xlc-*"] {
diff --git a/gdb/testsuite/gdb.base/opaque.exp b/gdb/testsuite/gdb.base/opaque.exp
index 27017ee18bf..3628e5cc2b2 100644
--- a/gdb/testsuite/gdb.base/opaque.exp
+++ b/gdb/testsuite/gdb.base/opaque.exp
@@ -42,7 +42,7 @@ if  { [gdb_compile "${binfile}0.o ${binfile}1.o" ${binfile} executable {debug}]
 # Create and source the file that provides information about the compiler
 # used to compile the test case.
 if [get_compiler_info] {
-    return -1;
+    return -1
 }
 
 # Start with a fresh gdb.
diff --git a/gdb/testsuite/gdb.base/pointers.exp b/gdb/testsuite/gdb.base/pointers.exp
index f091c3e0e75..6b9c52d8c8d 100644
--- a/gdb/testsuite/gdb.base/pointers.exp
+++ b/gdb/testsuite/gdb.base/pointers.exp
@@ -35,7 +35,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
     }
 
 if [get_compiler_info] {
-    return -1;
+    return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.base/psymtab.exp b/gdb/testsuite/gdb.base/psymtab.exp
index 4fa01f79e24..9c96536ff3f 100644
--- a/gdb/testsuite/gdb.base/psymtab.exp
+++ b/gdb/testsuite/gdb.base/psymtab.exp
@@ -47,7 +47,7 @@ if  { [gdb_compile "${testfile}1.o ${testfile}2.o" ${binfile} executable {debug}
 # Create and source the file that provides information about the compiler
 # used to compile the test case.
 if [get_compiler_info] {
-    return -1;
+    return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.base/ptype.exp b/gdb/testsuite/gdb.base/ptype.exp
index 4739d73a3d5..bb186d3e8a0 100644
--- a/gdb/testsuite/gdb.base/ptype.exp
+++ b/gdb/testsuite/gdb.base/ptype.exp
@@ -40,7 +40,7 @@ if  { [gdb_compile "${binfile}0.o ${binfile}1.o" "${binfile}" executable {debug}
 # Create and source the file that provides information about the compiler
 # used to compile the test case.
 if [get_compiler_info] {
-    return -1;
+    return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.base/relational.exp b/gdb/testsuite/gdb.base/relational.exp
index 332bc0d6751..08c7b230426 100644
--- a/gdb/testsuite/gdb.base/relational.exp
+++ b/gdb/testsuite/gdb.base/relational.exp
@@ -30,7 +30,7 @@ if { [prepare_for_testing relational.exp relational int-type.c {debug nowarnings
 }
 
 if [get_compiler_info] {
-    return -1;
+    return -1
 }
 
 #
diff --git a/gdb/testsuite/gdb.base/scope.exp b/gdb/testsuite/gdb.base/scope.exp
index 0fa431051d1..0eba5e80a8c 100644
--- a/gdb/testsuite/gdb.base/scope.exp
+++ b/gdb/testsuite/gdb.base/scope.exp
@@ -38,7 +38,7 @@ if  { [gdb_compile "${binfile}0.o ${binfile}1.o" ${binfile} executable {debug}]
 # Create and source the file that provides information about the compiler
 # used to compile the test case.
 if [get_compiler_info] {
-    return -1;
+    return -1
 }
 
 # Test locating various things when stopped just inside main, after
diff --git a/gdb/testsuite/gdb.base/setvar.exp b/gdb/testsuite/gdb.base/setvar.exp
index dfebd6b05c9..a4d5764ed81 100644
--- a/gdb/testsuite/gdb.base/setvar.exp
+++ b/gdb/testsuite/gdb.base/setvar.exp
@@ -35,7 +35,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
 # Create and source the file that provides information about the compiler
 # used to compile the test case.
 if [get_compiler_info] {
-    return -1;
+    return -1
 }
 
 gdb_exit
@@ -95,11 +95,11 @@ proc test_set { args } {
 	    verbose "doing $arg $match"
 	    if [gdb_test "$arg" "$match" "$mess"] {
 		fail "$message -- $match";
-		return 1;
+		return 1
 	    }
 	}
     }
-    return 0;
+    return 0
 }
 
 #
diff --git a/gdb/testsuite/gdb.base/signals.exp b/gdb/testsuite/gdb.base/signals.exp
index b72c314dda1..7652ff0c198 100644
--- a/gdb/testsuite/gdb.base/signals.exp
+++ b/gdb/testsuite/gdb.base/signals.exp
@@ -30,7 +30,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
 # Create and source the file that provides information about the compiler
 # used to compile the test case.
 if [get_compiler_info] {
-    return -1;
+    return -1
 }
 
 if {$hp_cc_compiler} {
diff --git a/gdb/testsuite/gdb.base/sizeof.exp b/gdb/testsuite/gdb.base/sizeof.exp
index 77618d869bf..03972bbdaa2 100644
--- a/gdb/testsuite/gdb.base/sizeof.exp
+++ b/gdb/testsuite/gdb.base/sizeof.exp
@@ -33,7 +33,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
 }
 
 if [get_compiler_info] {
-    return -1;
+    return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.base/solib-overlap.exp b/gdb/testsuite/gdb.base/solib-overlap.exp
index 97401cc6b44..ba1e1adb4b1 100644
--- a/gdb/testsuite/gdb.base/solib-overlap.exp
+++ b/gdb/testsuite/gdb.base/solib-overlap.exp
@@ -37,7 +37,7 @@ if [is_remote target] {
 }
 
 if [get_compiler_info] {
-    return -1;
+    return -1
 }
 
 # Library file.
diff --git a/gdb/testsuite/gdb.base/store.exp b/gdb/testsuite/gdb.base/store.exp
index 292a3196131..2f3cbffe69f 100644
--- a/gdb/testsuite/gdb.base/store.exp
+++ b/gdb/testsuite/gdb.base/store.exp
@@ -23,7 +23,7 @@ if { [prepare_for_testing $testfile.exp $executable $srcfile] } {
 }
 
 if [get_compiler_info] {
-    return -1;
+    return -1
 }
 
 #
diff --git a/gdb/testsuite/gdb.base/structs.exp b/gdb/testsuite/gdb.base/structs.exp
index 23779324695..93b2ca13505 100644
--- a/gdb/testsuite/gdb.base/structs.exp
+++ b/gdb/testsuite/gdb.base/structs.exp
@@ -36,7 +36,7 @@ set anychar_re {-?[0-9]{1,3} '(.|\\([0-7]{3}|[a-z]|\\|'))'}
 # compiler used to compile the test case.
 
 if [get_compiler_info] {
-    return -1;
+    return -1
 }
 
 # Compile a variant of structs.c using TYPES to specify the type of
diff --git a/gdb/testsuite/gdb.base/structs2.exp b/gdb/testsuite/gdb.base/structs2.exp
index b2d31328f32..0753086ff33 100644
--- a/gdb/testsuite/gdb.base/structs2.exp
+++ b/gdb/testsuite/gdb.base/structs2.exp
@@ -21,7 +21,7 @@ set binfile ${objdir}/${subdir}/${testfile}
 # Create and source the file that provides information about the compiler
 # used to compile the test case.
 if [get_compiler_info] {
-    return -1;
+    return -1
 }
 
 # build the first test case
diff --git a/gdb/testsuite/gdb.base/volatile.exp b/gdb/testsuite/gdb.base/volatile.exp
index 10b07569e25..321d9ded56d 100644
--- a/gdb/testsuite/gdb.base/volatile.exp
+++ b/gdb/testsuite/gdb.base/volatile.exp
@@ -42,7 +42,7 @@ if { [prepare_for_testing volatile.exp volatile constvars.c] } {
 # Create and source the file that provides information about the compiler
 # used to compile the test case.
 if [get_compiler_info] {
-    return -1;
+    return -1
 }
 
 #
diff --git a/gdb/testsuite/gdb.base/watchpoint.exp b/gdb/testsuite/gdb.base/watchpoint.exp
index 3befbba163e..502742cb2eb 100644
--- a/gdb/testsuite/gdb.base/watchpoint.exp
+++ b/gdb/testsuite/gdb.base/watchpoint.exp
@@ -55,23 +55,23 @@ proc initialize {} {
     global srcfile
 
     if [gdb_test "break marker1" "Breakpoint 1 at $hex: file .*$srcfile, line $decimal.*" "set breakpoint at marker1" ] { 
-      return 0; 
+      return 0
     }
 
 
     if [gdb_test "break marker2" "Breakpoint 2 at $hex: file .*$srcfile, line $decimal.*" "set breakpoint at marker2" ] { 
-      return 0; 
+      return 0
     }
 
 
     if [gdb_test "info break" "1\[ \]*breakpoint.*marker1.*\r\n2\[ \]*breakpoint.*marker2.*" "info break in watchpoint.exp" ] { 
-      return 0; 
+      return 0
     }
 
     gdb_test "watch ival3" ".*\[Ww\]atchpoint 3: ival3.*" "set watchpoint on ival3"
 
     if [gdb_test "info watch" "3\[ \]*.*watchpoint.*ival3" "watchpoint found in watchpoint/breakpoint table" ] { 
-      return 0; 
+      return 0
     }
 
 
@@ -80,7 +80,7 @@ proc initialize {} {
     # we get to the first marker function.
 
     if [gdb_test "disable 3" "disable 3\[\r\n\]+" "disable watchpoint" ] { 
-      return 0; 
+      return 0
     }
 
 
@@ -99,7 +99,7 @@ proc test_simple_watchpoint {} {
     # Ensure that the watchpoint is disabled when we startup.
 
     if [gdb_test "disable 3" "^disable 3\[\r\n\]+" "disable watchpoint in test_simple_watchpoint" ] { 
-      return 0; 
+      return 0
     }
 
     # Run until we get to the first marker function.
@@ -120,7 +120,7 @@ proc test_simple_watchpoint {} {
     # After reaching the marker function, enable the watchpoint.
 
     if [gdb_test "enable 3" "^enable 3\[\r\n\]+" "enable watchpoint" ] { 
-      return ; 
+      return
     }
 
 
@@ -187,7 +187,7 @@ Continuing.*\[Ww\]atchpoint.*ival3.*Old value = -1.*New value = 0.*ival3 = count
     # Disable the watchpoint so we run at full speed until we exit.
 
     if [gdb_test "disable 3" "^disable 3\[\r\n\]+" "watchpoint disabled" ] { 
-      return ; 
+      return
     }
 
 
@@ -212,7 +212,7 @@ proc test_disabling_watchpoints {} {
     # Ensure that the watchpoint is disabled when we startup.
 
     if [gdb_test "disable 3" "^disable 3\[\r\n\]+" "disable watchpoint in test_disabling_watchpoints" ] { 
-      return 0; 
+      return 0
     }
 
 
@@ -234,7 +234,7 @@ proc test_disabling_watchpoints {} {
     # After reaching the marker function, enable the watchpoint.
 
     if [gdb_test "enable 3" "^enable 3\[\r\n\]+" "watchpoint enabled" ] { 
-      return ; 
+      return
     }
 
 
@@ -249,7 +249,7 @@ proc test_disabling_watchpoints {} {
     # Disable the watchpoint but leave breakpoints
 
     if [gdb_test "disable 3" "^disable 3\[\r\n\]+" "disable watchpoint #2 in test_disabling_watchpoints" ] { 
-      return 0; 
+      return 0
     }
 
 
@@ -371,7 +371,7 @@ proc test_watchpoint_triggered_in_syscall {} {
 	    }
 	    default {
 		fail "continue to read";
-		return ;
+		return
 	    }
 	}
 
diff --git a/gdb/testsuite/gdb.base/whatis.exp b/gdb/testsuite/gdb.base/whatis.exp
index 2cb85492ec5..40f317ad680 100644
--- a/gdb/testsuite/gdb.base/whatis.exp
+++ b/gdb/testsuite/gdb.base/whatis.exp
@@ -36,7 +36,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable $exe
 # Create and source the file that provides information about the compiler
 # used to compile the test case.
 if [get_compiler_info] {
-    return -1;
+    return -1
 }
 
 # Start with a fresh gdb.
diff --git a/gdb/testsuite/gdb.cp/ambiguous.exp b/gdb/testsuite/gdb.cp/ambiguous.exp
index 03b6e23afa9..e382b9b8931 100644
--- a/gdb/testsuite/gdb.cp/ambiguous.exp
+++ b/gdb/testsuite/gdb.cp/ambiguous.exp
@@ -30,7 +30,7 @@ if { [skip_cplus_tests] } { continue }
 standard_testfile .cc
 
 if [get_compiler_info "c++"] {
-    return -1;
+    return -1
 }
 
 if { [test_compiler_info gcc-*] } then { continue }
diff --git a/gdb/testsuite/gdb.cp/casts.exp b/gdb/testsuite/gdb.cp/casts.exp
index ca605dcc5ff..dea8dd7079c 100644
--- a/gdb/testsuite/gdb.cp/casts.exp
+++ b/gdb/testsuite/gdb.cp/casts.exp
@@ -30,7 +30,7 @@ if { [skip_cplus_tests] } { continue }
 standard_testfile .cc
 
 if [get_compiler_info "c++"] {
-    return -1;
+    return -1
 }
 
 if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} {
diff --git a/gdb/testsuite/gdb.cp/ctti.exp b/gdb/testsuite/gdb.cp/ctti.exp
index 17a3cc75fe0..01cd7dfa3c0 100644
--- a/gdb/testsuite/gdb.cp/ctti.exp
+++ b/gdb/testsuite/gdb.cp/ctti.exp
@@ -26,7 +26,7 @@ if { [skip_cplus_tests] } { continue }
 standard_testfile cttiadd.cc cttiadd1.cc cttiadd2.cc cttiadd3.cc
 
 if [get_compiler_info "c++"] {
-    return -1;
+    return -1
 }
 
 if {[prepare_for_testing $testfile.exp $testfile \
diff --git a/gdb/testsuite/gdb.cp/namespace.exp b/gdb/testsuite/gdb.cp/namespace.exp
index 3b42d5c8194..50c9124f664 100644
--- a/gdb/testsuite/gdb.cp/namespace.exp
+++ b/gdb/testsuite/gdb.cp/namespace.exp
@@ -30,7 +30,7 @@ if { [skip_cplus_tests] } { continue }
 standard_testfile .cc namespace1.cc
 
 if [get_compiler_info c++] {
-    return -1;
+    return -1
 }
 
 set xfail_class_types 0
diff --git a/gdb/testsuite/gdb.cp/nsdecl.exp b/gdb/testsuite/gdb.cp/nsdecl.exp
index 27d902d621e..a5ff62997dc 100644
--- a/gdb/testsuite/gdb.cp/nsdecl.exp
+++ b/gdb/testsuite/gdb.cp/nsdecl.exp
@@ -19,7 +19,7 @@
 standard_testfile .cc
 
 if [get_compiler_info] {
-    return -1;
+    return -1
 }
 
 if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} {
diff --git a/gdb/testsuite/gdb.cp/psmang.exp b/gdb/testsuite/gdb.cp/psmang.exp
index 8a1cf21fedd..f26430a11ac 100644
--- a/gdb/testsuite/gdb.cp/psmang.exp
+++ b/gdb/testsuite/gdb.cp/psmang.exp
@@ -181,7 +181,7 @@ if { [skip_cplus_tests] } { continue }
 standard_testfile psmang1.cc psmang2.cc
 
 if [get_compiler_info "c++"] {
-    return -1;
+    return -1
 }
 
 if {[prepare_for_testing $testfile.exp $testfile \
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-ranges.exp b/gdb/testsuite/gdb.dwarf2/dw2-ranges.exp
index 0e5ebf269ab..096c7085728 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-ranges.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-ranges.exp
@@ -25,7 +25,7 @@ if {![dwarf2_support]} {
 
 # The .c files use __attribute__.
 if [get_compiler_info] {
-    return -1;
+    return -1
 }
 if !$gcc_compiled {
     verbose "Skipping DW_AT_ranges test."
diff --git a/gdb/testsuite/gdb.hp/gdb.aCC/optimize.exp b/gdb/testsuite/gdb.hp/gdb.aCC/optimize.exp
index 2e83cce7508..650147bc8fb 100644
--- a/gdb/testsuite/gdb.hp/gdb.aCC/optimize.exp
+++ b/gdb/testsuite/gdb.hp/gdb.aCC/optimize.exp
@@ -31,7 +31,7 @@ set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 
 if [get_compiler_info] {
-    return -1;
+    return -1
 }
 
  
diff --git a/gdb/testsuite/gdb.hp/gdb.aCC/watch-cmd.exp b/gdb/testsuite/gdb.hp/gdb.aCC/watch-cmd.exp
index dba0b084a96..bf669599ec5 100644
--- a/gdb/testsuite/gdb.hp/gdb.aCC/watch-cmd.exp
+++ b/gdb/testsuite/gdb.hp/gdb.aCC/watch-cmd.exp
@@ -29,7 +29,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
 }
 
 if [get_compiler_info] {
-    return -1;
+    return -1
 }
 if { $gcc_compiled } then { continue }
 
diff --git a/gdb/testsuite/gdb.hp/gdb.base-hp/callfwmall.exp b/gdb/testsuite/gdb.hp/gdb.base-hp/callfwmall.exp
index 2279b6c2afd..c9facf00533 100644
--- a/gdb/testsuite/gdb.hp/gdb.base-hp/callfwmall.exp
+++ b/gdb/testsuite/gdb.hp/gdb.base-hp/callfwmall.exp
@@ -97,7 +97,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
 # used to compile the test case.
 
 if [get_compiler_info] {
-    return -1;
+    return -1
 }
 
 if {$hp_aCC_compiler} {
diff --git a/gdb/testsuite/gdb.hp/gdb.base-hp/pxdb.exp b/gdb/testsuite/gdb.hp/gdb.base-hp/pxdb.exp
index 4dbca02e286..f9d53a932d6 100644
--- a/gdb/testsuite/gdb.hp/gdb.base-hp/pxdb.exp
+++ b/gdb/testsuite/gdb.hp/gdb.base-hp/pxdb.exp
@@ -29,7 +29,7 @@ set objfile ${objdir}/${subdir}/${testfile}.o
 set binfile ${objdir}/${subdir}/${testfile}
 
 if [get_compiler_info "c++"] {
-    return -1;
+    return -1
 }
 
 if { $gcc_compiled } then { continue }
diff --git a/gdb/testsuite/gdb.hp/gdb.compat/xdb1.exp b/gdb/testsuite/gdb.hp/gdb.compat/xdb1.exp
index 30ee83e644e..af01c9a037a 100644
--- a/gdb/testsuite/gdb.hp/gdb.compat/xdb1.exp
+++ b/gdb/testsuite/gdb.hp/gdb.compat/xdb1.exp
@@ -30,7 +30,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
 }
 
 if [get_compiler_info] {
-    return -1;
+    return -1
 }
 if { $gcc_compiled } then { continue }
 
diff --git a/gdb/testsuite/gdb.hp/gdb.compat/xdb2.exp b/gdb/testsuite/gdb.hp/gdb.compat/xdb2.exp
index fc0cca65cd7..d6640c5be08 100644
--- a/gdb/testsuite/gdb.hp/gdb.compat/xdb2.exp
+++ b/gdb/testsuite/gdb.hp/gdb.compat/xdb2.exp
@@ -42,7 +42,7 @@ if  { [gdb_compile "${binfile}0.o ${binfile}1.o" ${binfile} executable {debug}]
 }
 
 if [get_compiler_info] {
-    return -1;
+    return -1
 }
 
 if { $gcc_compiled } then { continue }
diff --git a/gdb/testsuite/gdb.hp/gdb.compat/xdb3.exp b/gdb/testsuite/gdb.hp/gdb.compat/xdb3.exp
index 888c1f1de52..81304136cce 100644
--- a/gdb/testsuite/gdb.hp/gdb.compat/xdb3.exp
+++ b/gdb/testsuite/gdb.hp/gdb.compat/xdb3.exp
@@ -39,7 +39,7 @@ if  { [gdb_compile "${binfile1}.o ${binfile2}.o" ${binfile} executable {debug}]
 }
 
 if [get_compiler_info] {
-    return -1;
+    return -1
 }
 if { $gcc_compiled } then { continue }
 
diff --git a/gdb/testsuite/gdb.hp/gdb.defects/bs14602.exp b/gdb/testsuite/gdb.hp/gdb.defects/bs14602.exp
index 45dbf94bb9b..045892213ec 100644
--- a/gdb/testsuite/gdb.hp/gdb.defects/bs14602.exp
+++ b/gdb/testsuite/gdb.hp/gdb.defects/bs14602.exp
@@ -18,7 +18,7 @@ set binfile ${objdir}/${subdir}/${testfile}
 # Create and source the file that provides information about the compiler
 # used to compile the test case.
 if [get_compiler_info] {
-    return -1;
+    return -1
 }
 
 # set up appropriate compile option to recognize long double
diff --git a/gdb/testsuite/gdb.hp/gdb.defects/solib-d.exp b/gdb/testsuite/gdb.hp/gdb.defects/solib-d.exp
index 60d680c52c3..f6cb006d460 100644
--- a/gdb/testsuite/gdb.hp/gdb.defects/solib-d.exp
+++ b/gdb/testsuite/gdb.hp/gdb.defects/solib-d.exp
@@ -71,7 +71,7 @@ set libfile2 ${objdir}/${subdir}/${testfile}2.sl
 # Create and source the file that provides information about the compiler
 # used to compile the test case.
 if [get_compiler_info] {
-    return -1;
+    return -1
 }
 
 # set up appropriate compile option to recognize long double
diff --git a/gdb/testsuite/gdb.mi/gdb792.exp b/gdb/testsuite/gdb.mi/gdb792.exp
index c34153920d5..d36cf30d35b 100644
--- a/gdb/testsuite/gdb.mi/gdb792.exp
+++ b/gdb/testsuite/gdb.mi/gdb792.exp
@@ -30,7 +30,7 @@ if [mi_gdb_start] {
 standard_testfile .cc
 
 if [get_compiler_info "c++"] {
-    return -1;
+    return -1
 }
 
 if {[gdb_compile $srcdir/$subdir/$srcfile $binfile executable {debug c++}] != ""} {
diff --git a/gdb/testsuite/gdb.mi/mi-inheritance-syntax-error.exp b/gdb/testsuite/gdb.mi/mi-inheritance-syntax-error.exp
index 3ae31b094e9..d3c56815c4f 100644
--- a/gdb/testsuite/gdb.mi/mi-inheritance-syntax-error.exp
+++ b/gdb/testsuite/gdb.mi/mi-inheritance-syntax-error.exp
@@ -26,7 +26,7 @@ if [mi_gdb_start] {
 standard_testfile .cc
 
 if [get_compiler_info "c++"] {
-    return -1;
+    return -1
 }
 
 if {[gdb_compile $srcdir/$subdir/$srcfile $binfile executable {debug c++}] != ""} {
diff --git a/gdb/testsuite/gdb.mi/mi-logging.exp b/gdb/testsuite/gdb.mi/mi-logging.exp
index a340c613192..87f3e1b3c43 100644
--- a/gdb/testsuite/gdb.mi/mi-logging.exp
+++ b/gdb/testsuite/gdb.mi/mi-logging.exp
@@ -26,7 +26,7 @@ set opts {debug}
 
 if [build_executable $testfile.exp $testfile $srcfile $opts] {
     untested mi-logging.exp
-    return -1;
+    return -1
 }
 
 if {[mi_run_to_main] < 0} {
diff --git a/gdb/testsuite/gdb.mi/mi-var-cp.exp b/gdb/testsuite/gdb.mi/mi-var-cp.exp
index 2657f830c10..5dad1d300ad 100644
--- a/gdb/testsuite/gdb.mi/mi-var-cp.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-cp.exp
@@ -26,7 +26,7 @@ if [mi_gdb_start] {
 standard_testfile .cc
 
 if [get_compiler_info "c++"] {
-    return -1;
+    return -1
 }
 
 if {[gdb_compile $srcdir/$subdir/$srcfile $binfile executable {debug c++}] != ""} {
diff --git a/gdb/testsuite/gdb.mi/mi-var-rtti.exp b/gdb/testsuite/gdb.mi/mi-var-rtti.exp
index cafe340e65e..84cd6c8007e 100644
--- a/gdb/testsuite/gdb.mi/mi-var-rtti.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-rtti.exp
@@ -27,7 +27,7 @@ standard_testfile .cc
 set opts {debug c++}
 
 if [build_executable $testfile.exp $testfile $srcfile $opts] {
-    return -1;
+    return -1
 }
 
 mi_gdb_load ${binfile}
diff --git a/gdb/testsuite/gdb.python/py-type.exp b/gdb/testsuite/gdb.python/py-type.exp
index 16b2de21bad..8e1f9ed9249 100644
--- a/gdb/testsuite/gdb.python/py-type.exp
+++ b/gdb/testsuite/gdb.python/py-type.exp
@@ -21,7 +21,7 @@ load_lib gdb-python.exp
 standard_testfile
 
 if [get_compiler_info c++] {
-    return -1;
+    return -1
 }
 
 # Build inferior to language specification.
diff --git a/gdb/testsuite/gdb.threads/gcore-thread.exp b/gdb/testsuite/gdb.threads/gcore-thread.exp
index 05375c53c68..31714c8944b 100644
--- a/gdb/testsuite/gdb.threads/gcore-thread.exp
+++ b/gdb/testsuite/gdb.threads/gcore-thread.exp
@@ -59,7 +59,7 @@ gdb_test_multiple "help gcore" "help gcore" {
     -re "Undefined command: .gcore.*$gdb_prompt $" {
 	# gcore command not supported -- nothing to test here.
 	unsupported "gdb does not support gcore on this target"
-	return -1;
+	return -1
     }
     -re "Save a core file .*$gdb_prompt $" {
 	pass "help gcore"
@@ -77,7 +77,7 @@ gdb_test_multiple "info threads" "threads are supported" {
     }
     -re "${nl}$gdb_prompt $" {
 	unsupported "gdb does not support threads on this target"
-	return -1;
+	return -1
     }
 }
 
@@ -137,12 +137,12 @@ proc load_core { corefile } {
 	    -re " is not a core dump:.*\r\n$gdb_prompt $" {
 		fail "re-load generated corefile (bad file format)"
 		# No use proceeding from here.
-		return 0;
+		return 0
 	    }
 	    -re ": No such file or directory.*\r\n$gdb_prompt $" {
 		fail "re-load generated corefile (file not found)"
 		# No use proceeding from here.
-		return 0;
+		return 0
 	    }
 	    -re "Couldn't find .* registers in core file.*\r\n$gdb_prompt $" {
 		fail "re-load generated corefile (incomplete note section)"
diff --git a/gdb/testsuite/gdb.threads/pthreads.exp b/gdb/testsuite/gdb.threads/pthreads.exp
index 96652775b83..51ad7d9a824 100644
--- a/gdb/testsuite/gdb.threads/pthreads.exp
+++ b/gdb/testsuite/gdb.threads/pthreads.exp
@@ -79,7 +79,7 @@ proc all_threads_running {} {
     }
 
     if { $return_me == 1 } then {
-	return 0;
+	return 0
     }
 
     # Check that we stopped when we actually expected to stop, by
@@ -139,7 +139,7 @@ proc test_startup {} {
     }
 
     if { $return_me == 1 } then {
-	return 0;
+	return 0
     }
 
     # Extract the thread id number of main thread from "info threads" output.
@@ -209,7 +209,7 @@ proc check_control_c {} {
 	}
 	timeout {
 	    fail "$description (timeout)"
-	    return 1;
+	    return 1
 	}
     }
     gdb_test "bt" ".*"
@@ -218,7 +218,7 @@ proc check_control_c {} {
     if [all_threads_running] then {
 	pass "All threads running after continuing from ^C stop"
     }
-    return 0;
+    return 0
 }
 
 proc check_backtraces {} {
diff --git a/gdb/testsuite/gdb.threads/sigstep-threads.exp b/gdb/testsuite/gdb.threads/sigstep-threads.exp
index d352ac20f4f..4bdc0e2b0ae 100644
--- a/gdb/testsuite/gdb.threads/sigstep-threads.exp
+++ b/gdb/testsuite/gdb.threads/sigstep-threads.exp
@@ -24,7 +24,7 @@ if { [gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executa
 clean_restart $executable
 
 if ![runto_main] {
-    return -1;
+    return -1
 }
 
 # `noprint' would not test the full logic of GDB.
diff --git a/gdb/testsuite/gdb.threads/thread_check.exp b/gdb/testsuite/gdb.threads/thread_check.exp
index 47202361132..51cb7320af7 100644
--- a/gdb/testsuite/gdb.threads/thread_check.exp
+++ b/gdb/testsuite/gdb.threads/thread_check.exp
@@ -43,7 +43,7 @@ clean_restart ${binfile}
 
 if ![runto_main] then {
    fail "Can't run to main"
-      return 1;
+      return 1
 }
 
 
diff --git a/gdb/testsuite/gdb.trace/backtrace.exp b/gdb/testsuite/gdb.trace/backtrace.exp
index 50a8883ccce..54c6ba41b0e 100644
--- a/gdb/testsuite/gdb.trace/backtrace.exp
+++ b/gdb/testsuite/gdb.trace/backtrace.exp
@@ -35,7 +35,7 @@ gdb_reinitialize_dir $srcdir/$subdir
 
 if { ![gdb_target_supports_trace] } then {
     unsupported "Current target does not support trace"
-    return 1;
+    return 1
 
 }
 
@@ -105,7 +105,7 @@ all tests in this module will fail."
 }
 
 if { $return_me == 1 } then {
-    return -1;
+    return -1
 }
 
 #
diff --git a/gdb/testsuite/gdb.trace/change-loc.exp b/gdb/testsuite/gdb.trace/change-loc.exp
index 6e05da1d226..b02cf2735d8 100644
--- a/gdb/testsuite/gdb.trace/change-loc.exp
+++ b/gdb/testsuite/gdb.trace/change-loc.exp
@@ -55,7 +55,7 @@ if ![runto_main] {
 
 if { ![gdb_target_supports_trace] } then {
     unsupported "Current target does not support trace"
-    return -1;
+    return -1
 }
 
 if [is_amd64_regs_target] {
diff --git a/gdb/testsuite/gdb.trace/circ.exp b/gdb/testsuite/gdb.trace/circ.exp
index 92e26f60baf..4c47228ebbd 100644
--- a/gdb/testsuite/gdb.trace/circ.exp
+++ b/gdb/testsuite/gdb.trace/circ.exp
@@ -41,14 +41,14 @@ proc run_trace_experiment { pass } {
 
     if [gdb_test "tstart" \
 	    "\[\r\n\]*" \
-	    "start trace experiment, pass $pass"] then { return 1; }
+	    "start trace experiment, pass $pass"] then { return 1 }
     if [gdb_test "continue" \
 	    "Continuing.*Breakpoint \[0-9\]+, end.*" \
-	    "run to end, pass $pass"] then { return 1; }
+	    "run to end, pass $pass"] then { return 1 }
     if [gdb_test "tstop" \
 	    "\[\r\n\]*" \
-	    "stop trace experiment, pass $pass"] then { return 1; }
-    return 0;
+	    "stop trace experiment, pass $pass"] then { return 1 }
+    return 0
 }
 
 # return 0 for success, 1 for failure
@@ -56,30 +56,30 @@ proc set_a_tracepoint { func } {
     if [gdb_test "trace $func" \
 	    "Tracepoint \[0-9\]+ at .*" \
 	    "set tracepoint at $func"] then {
-	return 1;
+	return 1
     }
     if [gdb_trace_setactions "set actions for $func" \
 	    "" \
 	    "collect testload" "^$"] then {
-	return 1;
+	return 1
     }
-    return 0;
+    return 0
 }
 
 # return 0 for success, 1 for failure
 proc setup_tracepoints { } {
     gdb_delete_tracepoints
-    if [set_a_tracepoint func0] then { return 1; }
-    if [set_a_tracepoint func1] then { return 1; }
-    if [set_a_tracepoint func2] then { return 1; }
-    if [set_a_tracepoint func3] then { return 1; }
-    if [set_a_tracepoint func4] then { return 1; }
-    if [set_a_tracepoint func5] then { return 1; }
-    if [set_a_tracepoint func6] then { return 1; }
-    if [set_a_tracepoint func7] then { return 1; }
-    if [set_a_tracepoint func8] then { return 1; }
-    if [set_a_tracepoint func9] then { return 1; }
-    return 0;
+    if [set_a_tracepoint func0] then { return 1 }
+    if [set_a_tracepoint func1] then { return 1 }
+    if [set_a_tracepoint func2] then { return 1 }
+    if [set_a_tracepoint func3] then { return 1 }
+    if [set_a_tracepoint func4] then { return 1 }
+    if [set_a_tracepoint func5] then { return 1 }
+    if [set_a_tracepoint func6] then { return 1 }
+    if [set_a_tracepoint func7] then { return 1 }
+    if [set_a_tracepoint func8] then { return 1 }
+    if [set_a_tracepoint func9] then { return 1 }
+    return 0
 }
 
 # return 0 for success, 1 for failure
@@ -98,7 +98,7 @@ proc trace_buffer_normal { } {
     }
     if { !$ok } {
 	unsupported $test
-	return 1;
+	return 1
     }
 
     set ok 0
@@ -113,62 +113,62 @@ proc trace_buffer_normal { } {
     }
     if { !$ok } {
 	unsupported $test
-	return 1;
+	return 1
     }
 
-    return 0;
+    return 0
 }
 
 # return 0 for success, 1 for failure
 proc gdb_trace_circular_tests { } {
     if { ![gdb_target_supports_trace] } then { 
 	unsupported "Current target does not support trace"
-	return 1;
+	return 1
     }
 
-    if [trace_buffer_normal] then { return 1; }
+    if [trace_buffer_normal] then { return 1 }
 
     gdb_test "break begin" ".*" ""
     gdb_test "break end"   ".*" ""
     gdb_test "tstop"       ".*" ""
     gdb_test "tfind none"  ".*" ""
 
-    if [setup_tracepoints] then { return 1; }
+    if [setup_tracepoints] then { return 1 }
 
     # First, run the trace experiment with default attributes:
     # Make sure it behaves as expected.
-    if [run_trace_experiment 1] then { return 1; }
+    if [run_trace_experiment 1] then { return 1 }
     if [gdb_test "tfind start" \
 	    "#0  func0 .*" \
-	    "find frame zero, pass 1"] then { return 1; }
+	    "find frame zero, pass 1"] then { return 1 }
 
     if [gdb_test "tfind 9" \
 	    "#0  func9 .*" \
-	    "find frame nine, pass 1"] then { return 1; }
+	    "find frame nine, pass 1"] then { return 1 }
 
     if [gdb_test "tfind none" \
 	    "#0  end .*" \
-	    "quit trace debugging, pass 1"] then { return 1; }
+	    "quit trace debugging, pass 1"] then { return 1 }
 
     # Then, shrink the trace buffer so that it will not hold
     # all ten trace frames.  Verify that frame zero is still
     # collected, but frame nine is not.
     if [gdb_test "maint packet QTBuffer:size:200" \
 	    "received: .OK." "shrink the target trace buffer"] then { 
-	return 1;
+	return 1
     }
-    if [run_trace_experiment 2] then { return 1; }
+    if [run_trace_experiment 2] then { return 1 }
     if [gdb_test "tfind start" \
 	    "#0  func0 .*" \
-	    "find frame zero, pass 2"] then { return 1; }
+	    "find frame zero, pass 2"] then { return 1 }
 
     if [gdb_test "tfind 9" \
 	    ".* failed to find .*" \
-	    "fail to find frame nine, pass 2"] then { return 1; }
+	    "fail to find frame nine, pass 2"] then { return 1 }
 
     if [gdb_test "tfind none" \
 	    "#0  end .*" \
-	    "quit trace debugging, pass 2"] then { return 1; }
+	    "quit trace debugging, pass 2"] then { return 1 }
 
     # Finally, make the buffer circular.  Now when it runs out of
     # space, it should wrap around and overwrite the earliest frames.
@@ -178,22 +178,22 @@ proc gdb_trace_circular_tests { } {
     #   3) frame nine will be available (unlike on pass 2).
     if [gdb_test "maint packet QTBuffer:circular:1" \
 	    "received: .OK." "make the target trace buffer circular"] then { 
-	return 1;
+	return 1
     }
-    if [run_trace_experiment 3] then { return 1; }
+    if [run_trace_experiment 3] then { return 1 }
     if [gdb_test "tfind start" \
 	    "#0  func\[1-9\] .*" \
-	    "first frame is NOT frame zero, pass 3"] then { return 1; }
+	    "first frame is NOT frame zero, pass 3"] then { return 1 }
 
     if [gdb_test "tfind 9" \
 	    "#0  func9 .*" \
-	    "find frame nine, pass 3"] then { return 1; }
+	    "find frame nine, pass 3"] then { return 1 }
 
     if [gdb_test "tfind none" \
 	    "#0  end .*" \
-	    "quit trace debugging, pass 3"] then { return 1; }
+	    "quit trace debugging, pass 3"] then { return 1 }
 
-    return 0;
+    return 0
 }
 
 gdb_test_no_output "set circular-trace-buffer on" \
diff --git a/gdb/testsuite/gdb.trace/collection.exp b/gdb/testsuite/gdb.trace/collection.exp
index ed7149d28d1..f6d44ced7e1 100644
--- a/gdb/testsuite/gdb.trace/collection.exp
+++ b/gdb/testsuite/gdb.trace/collection.exp
@@ -776,7 +776,7 @@ runto_main
 
 if { ![gdb_target_supports_trace] } then {
     unsupported "Current target does not support trace"
-    return 1;
+    return 1
 }
 
 # Body of test encased in a proc so we can return prematurely.
diff --git a/gdb/testsuite/gdb.trace/disconnected-tracing.exp b/gdb/testsuite/gdb.trace/disconnected-tracing.exp
index bb73581ea4e..bec016ea55f 100644
--- a/gdb/testsuite/gdb.trace/disconnected-tracing.exp
+++ b/gdb/testsuite/gdb.trace/disconnected-tracing.exp
@@ -40,7 +40,7 @@ if ![runto_main] {
 
 if ![gdb_target_supports_trace] {
     unsupported "target does not support trace"
-    return -1;
+    return -1
 }
 
 # Disconnect in tracing.
diff --git a/gdb/testsuite/gdb.trace/infotrace.exp b/gdb/testsuite/gdb.trace/infotrace.exp
index 7c0f7170605..49b77be966c 100644
--- a/gdb/testsuite/gdb.trace/infotrace.exp
+++ b/gdb/testsuite/gdb.trace/infotrace.exp
@@ -99,7 +99,7 @@ gdb_test "" "Breakpoint ${decimal}, main.*"
 
 if { ![gdb_target_supports_trace] } then {
     unsupported "Current target does not support trace"
-    return 1;
+    return 1
 }
 
 gdb_test "break end" "Breakpoint \[0-9\] at .*"
diff --git a/gdb/testsuite/gdb.trace/mi-traceframe-changed.exp b/gdb/testsuite/gdb.trace/mi-traceframe-changed.exp
index 8c1e108d16d..42dbe19d03e 100644
--- a/gdb/testsuite/gdb.trace/mi-traceframe-changed.exp
+++ b/gdb/testsuite/gdb.trace/mi-traceframe-changed.exp
@@ -94,7 +94,7 @@ if ![runto_main] {
 
 if ![gdb_target_supports_trace] {
     unsupported "Current target does not support trace"
-    return -1;
+    return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp b/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp
index c15dce11157..c70697943e0 100644
--- a/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp
+++ b/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp
@@ -250,7 +250,7 @@ if ![runto_main] {
 
 if ![gdb_target_supports_trace] {
     unsupported "Current target does not support trace"
-    return -1;
+    return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.trace/mi-tsv-changed.exp b/gdb/testsuite/gdb.trace/mi-tsv-changed.exp
index 0b9475ed74f..a8ed9fcd224 100644
--- a/gdb/testsuite/gdb.trace/mi-tsv-changed.exp
+++ b/gdb/testsuite/gdb.trace/mi-tsv-changed.exp
@@ -70,7 +70,7 @@ proc test_create_delete_modify_tsv { } {with_test_prefix "create delete modify"
 
     if ![gdb_target_supports_trace] {
 	unsupported "Current target does not support trace"
-	return -1;
+	return -1
     }
     gdb_exit
     if [mi_gdb_start] {
@@ -235,7 +235,7 @@ if ![runto_main] {
 
 if ![gdb_target_supports_trace] {
     unsupported "Current target does not support trace"
-    return -1;
+    return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.trace/packetlen.exp b/gdb/testsuite/gdb.trace/packetlen.exp
index cf321700bd3..20d7f76e16f 100644
--- a/gdb/testsuite/gdb.trace/packetlen.exp
+++ b/gdb/testsuite/gdb.trace/packetlen.exp
@@ -35,7 +35,7 @@ gdb_reinitialize_dir $srcdir/$subdir
 
 if { ![gdb_target_supports_trace] } then {
     unsupported "Current target does not support trace"
-    return 1;
+    return 1
 
 }
 
diff --git a/gdb/testsuite/gdb.trace/passc-dyn.exp b/gdb/testsuite/gdb.trace/passc-dyn.exp
index a670e0a0ff4..6ac44dd95c3 100644
--- a/gdb/testsuite/gdb.trace/passc-dyn.exp
+++ b/gdb/testsuite/gdb.trace/passc-dyn.exp
@@ -34,7 +34,7 @@ gdb_reinitialize_dir $srcdir/$subdir
 
 if { ![gdb_target_supports_trace] } then {
     unsupported "Current target does not support trace"
-    return 1;
+    return 1
 
 }
 
diff --git a/gdb/testsuite/gdb.trace/pending.exp b/gdb/testsuite/gdb.trace/pending.exp
index 0b73bfebf66..c70600a69ac 100644
--- a/gdb/testsuite/gdb.trace/pending.exp
+++ b/gdb/testsuite/gdb.trace/pending.exp
@@ -53,7 +53,7 @@ if ![runto_main] {
 
 if ![gdb_target_supports_trace] {
     unsupported "Current target does not support trace"
-    return -1;
+    return -1
 }
 
 # Verify pending tracepoint is resolved to running to main.
diff --git a/gdb/testsuite/gdb.trace/report.exp b/gdb/testsuite/gdb.trace/report.exp
index b32bca1fb49..527b470f100 100644
--- a/gdb/testsuite/gdb.trace/report.exp
+++ b/gdb/testsuite/gdb.trace/report.exp
@@ -35,7 +35,7 @@ gdb_reinitialize_dir $srcdir/$subdir
 
 if { ![gdb_target_supports_trace] } then {
     unsupported "Current target does not support trace"
-    return 1;
+    return 1
 
 }
 
@@ -110,7 +110,7 @@ all tests in this module will fail."
 }
 
 if { $return_me == 1 } then {
-    return -1;
+    return -1
 }
 
 #
diff --git a/gdb/testsuite/gdb.trace/stap-trace.exp b/gdb/testsuite/gdb.trace/stap-trace.exp
index 37064803adf..00da1ec7f4f 100644
--- a/gdb/testsuite/gdb.trace/stap-trace.exp
+++ b/gdb/testsuite/gdb.trace/stap-trace.exp
@@ -117,7 +117,7 @@ if { ![runto_main] } {
 
 if { ![gdb_target_supports_trace] } {
     # Test cannot run on this target.
-    return 1;
+    return 1
 }
 
 gdb_collect_probe_arg "probe args without semaphore" "-probe-stap user" "23"
diff --git a/gdb/testsuite/gdb.trace/status-stop.exp b/gdb/testsuite/gdb.trace/status-stop.exp
index 5ddcbabde05..044e18f8a12 100644
--- a/gdb/testsuite/gdb.trace/status-stop.exp
+++ b/gdb/testsuite/gdb.trace/status-stop.exp
@@ -32,7 +32,7 @@ if ![runto_main] {
 
 if ![gdb_target_supports_trace] {
     unsupported "target does not support trace"
-    return -1; 
+    return -1 
 }
 
 # Verify that the sequence of commands "tstart tstop tstart" works well.
diff --git a/gdb/testsuite/gdb.trace/strace.exp b/gdb/testsuite/gdb.trace/strace.exp
index b0b04d7d6c2..b330ee9af0f 100644
--- a/gdb/testsuite/gdb.trace/strace.exp
+++ b/gdb/testsuite/gdb.trace/strace.exp
@@ -242,7 +242,7 @@ with_test_prefix "trace_same_addr $type" {
 	    if [string equal $type "ftrace"] {
 		# The instruction may be not long enough to set a fast
 		# tracepoint.  Skip the rest of this test.
-		return -1;
+		return -1
 	    } else {
 		fail $test
 	    }
@@ -257,7 +257,7 @@ with_test_prefix "trace_same_addr $type" {
 	    if [string equal $type "ftrace"] {
 		# The instruction may be not long enough to set a fast
 		# tracepoint.  Skip the rest of this test.
-		return -1;
+		return -1
 	    } else {
 		fail $test
 	    }
@@ -365,7 +365,7 @@ if { ![gdb_target_supports_trace] } then {
     # the socket file.
     gdb_test "detach" "Detaching .*, process .*"
     unsupported "Current target does not support trace"
-    return -1;
+    return -1
 }
 
 strace_probe_marker
diff --git a/gdb/testsuite/gdb.trace/tfind.exp b/gdb/testsuite/gdb.trace/tfind.exp
index 843c2fb5f1e..9ecc6796263 100644
--- a/gdb/testsuite/gdb.trace/tfind.exp
+++ b/gdb/testsuite/gdb.trace/tfind.exp
@@ -64,7 +64,7 @@ gdb_reinitialize_dir $srcdir/$subdir
 
 if { ![gdb_target_supports_trace] } then {
     unsupported "Current target does not support trace"
-    return 1;
+    return 1
 
 }
 
@@ -121,7 +121,7 @@ gdb_test_multiple "tstart" "6.1: tstart" {
 }
 
 if { $return_me == 1 } then {
-    return -1;
+    return -1
 }
 
 # test tstatus (when trace on)
@@ -152,7 +152,7 @@ gdb_test_multiple "tstop" "7.1: tstop" {
 }
 
 if { $return_me == 1 } then {
-    return -1;
+    return -1
 }
 
 # test tstatus (when trace off)
diff --git a/gdb/testsuite/gdb.trace/trace-break.exp b/gdb/testsuite/gdb.trace/trace-break.exp
index 828b08c007b..0a7c9968b18 100644
--- a/gdb/testsuite/gdb.trace/trace-break.exp
+++ b/gdb/testsuite/gdb.trace/trace-break.exp
@@ -34,7 +34,7 @@ if ![runto_main] {
 
 if ![gdb_target_supports_trace] {
     unsupported "target does not support trace"
-    return -1;
+    return -1
 }
 
 set fpreg "fp"
diff --git a/gdb/testsuite/gdb.trace/trace-buffer-size.exp b/gdb/testsuite/gdb.trace/trace-buffer-size.exp
index e124d7d00c3..e85fbc62adb 100644
--- a/gdb/testsuite/gdb.trace/trace-buffer-size.exp
+++ b/gdb/testsuite/gdb.trace/trace-buffer-size.exp
@@ -30,7 +30,7 @@ if ![runto_main] {
 
 if ![gdb_target_supports_trace] {
     unsupported "target does not support trace"
-    return -1;
+    return -1
 }
 
 set BUFFER_SIZE 4
@@ -48,7 +48,7 @@ gdb_test_multiple "tstatus" $test {
 # If we did not get the default size then there is no point in running the
 # tests below.
 if { $default_size < 0 } {
-  return -1;
+  return -1
 }
 
 # Change buffer size to 'BUFFER_SIZE'.
diff --git a/gdb/testsuite/gdb.trace/tspeed.exp b/gdb/testsuite/gdb.trace/tspeed.exp
index 6abbeed3769..c5c20624242 100644
--- a/gdb/testsuite/gdb.trace/tspeed.exp
+++ b/gdb/testsuite/gdb.trace/tspeed.exp
@@ -129,7 +129,7 @@ runto_main
 
 if { ![gdb_target_supports_trace] } then {
     unsupported "Current target does not support trace"
-    return 1;
+    return 1
 }
 
 # Body of test encased in a proc so we can return prematurely.
diff --git a/gdb/testsuite/gdb.trace/tsv.exp b/gdb/testsuite/gdb.trace/tsv.exp
index de523fddacf..6e88adc8a53 100644
--- a/gdb/testsuite/gdb.trace/tsv.exp
+++ b/gdb/testsuite/gdb.trace/tsv.exp
@@ -107,7 +107,7 @@ gdb_reinitialize_dir $srcdir/$subdir
 # The rest of the testing needs actual tracing to work.
 if { ![gdb_target_supports_trace] } then {
     unsupported "Current target does not support trace"
-    return 1;
+    return 1
 }
 
 gdb_delete_tracepoints
diff --git a/gdb/testsuite/gdb.trace/unavailable.exp b/gdb/testsuite/gdb.trace/unavailable.exp
index b776dd33b15..005aa623f0a 100644
--- a/gdb/testsuite/gdb.trace/unavailable.exp
+++ b/gdb/testsuite/gdb.trace/unavailable.exp
@@ -589,7 +589,7 @@ runto_main
 
 if { ![gdb_target_supports_trace] } then {
     unsupported "Current target does not support trace"
-    return 1;
+    return 1
 }
 
 # Body of test encased in a proc so we can return prematurely.
diff --git a/gdb/testsuite/gdb.trace/while-dyn.exp b/gdb/testsuite/gdb.trace/while-dyn.exp
index 8629f067a42..d6404044040 100644
--- a/gdb/testsuite/gdb.trace/while-dyn.exp
+++ b/gdb/testsuite/gdb.trace/while-dyn.exp
@@ -36,7 +36,7 @@ gdb_reinitialize_dir $srcdir/$subdir
 
 if { ![gdb_target_supports_trace] } then {
     unsupported "Current target does not support trace"
-    return 1;
+    return 1
 }
 
 #
diff --git a/gdb/testsuite/lib/fortran.exp b/gdb/testsuite/lib/fortran.exp
index 92aeab3b4e7..41efa2cf4b6 100644
--- a/gdb/testsuite/lib/fortran.exp
+++ b/gdb/testsuite/lib/fortran.exp
@@ -26,5 +26,5 @@ proc set_lang_fortran {} {
 	   "set language to \"fortran\""] {
 	return 0
     }
-    return 1;
+    return 1
 }
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index f7f2ac9473d..ee9fdecd261 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -123,7 +123,7 @@ proc default_gdb_version {} {
 }
 
 proc gdb_version { } {
-    return [default_gdb_version];
+    return [default_gdb_version]
 }
 
 #
@@ -310,7 +310,7 @@ proc gdb_start_cmd {args} {
 	    -re "$gdb_prompt $" { }
 	    default {
 		perror "gdb_init_command for target failed";
-		return -1;
+		return -1
 	    }
 	}
     }
@@ -421,7 +421,7 @@ proc gdb_breakpoint { function args } {
     if { $print_pass } {
 	pass $test_name
     }
-    return 1;
+    return 1
 }    
 
 # Set breakpoint at function and run gdb until it breaks there.
@@ -466,7 +466,7 @@ proc runto { function args } {
     # elements, and we don't want Tcl to move the remaining elements after
     # the first to $args.  That is why $function is wrapped in {}.
     if ![eval gdb_breakpoint {$function} $args] {
-	return 0;
+	return 0
     }
 
     gdb_run_cmd
@@ -758,7 +758,7 @@ proc gdb_test_multiple { command message user_code } {
 			perror "Couldn't send $command to GDB.";
 		    }
 		    fail "$message";
-		    return $result;
+		    return $result
 		}
 		# since we're checking if each line of the multi-line
 		# command are 'accepted' by GDB here,
@@ -783,7 +783,7 @@ proc gdb_test_multiple { command message user_code } {
 		    perror "Couldn't send $command to GDB.";
 		}
 		fail "$message";
-		return $result;
+		return $result
 	    }
 	}
     }
@@ -1208,7 +1208,7 @@ proc gdb_reinitialize_dir { subdir } {
     global gdb_prompt
 
     if [is_remote host] {
-	return "";
+	return ""
     }
     send_gdb "dir\n"
     gdb_expect 60 {
@@ -1418,7 +1418,7 @@ proc default_gdb_start { } {
     verbose "Spawning $GDB $INTERNAL_GDBFLAGS $GDBFLAGS"
 
     if [info exists gdb_spawn_id] {
-	return 0;
+	return 0
     }
 
     if ![is_remote host] {
@@ -1430,7 +1430,7 @@ proc default_gdb_start { } {
     set res [remote_spawn host "$GDB $INTERNAL_GDBFLAGS $GDBFLAGS [host_info gdb_opts]"];
     if { $res < 0 || $res == "" } {
 	perror "Spawning $GDB failed."
-	return 1;
+	return 1
     }
     gdb_expect 360 {
 	-re "\[\r\n\]$gdb_prompt $" {
@@ -1468,7 +1468,7 @@ proc default_gdb_start { } {
 	    warning "Couldn't set the width to 0."
 	}
     }
-    return 0;
+    return 0
 }
 
 # Examine the output of compilation to determine whether compilation
@@ -2452,7 +2452,7 @@ proc get_compiler_info {{arg ""}} {
       uplevel \#0 { set false false }
     }
 
-    return 0;
+    return 0
 }
 
 proc test_compiler_info { {compiler ""} } {
@@ -2670,7 +2670,7 @@ proc gdb_compile {source dest type options} {
 	    clone_output "gdb compile failed, $result"
 	}
     }
-    return $result;
+    return $result
 }
 
 
@@ -2863,9 +2863,9 @@ proc gdb_compile_objc {source dest type options} {
 proc send_gdb { string } {
     global suppress_flag;
     if { $suppress_flag } {
-	return "suppressed";
+	return "suppressed"
     }
-    return [remote_send host "$string"];
+    return [remote_send host "$string"]
 }
 
 #
@@ -3263,7 +3263,7 @@ proc gdb_reload { } {
 proc gdb_continue { function } {
     global decimal
 
-    return [gdb_test "continue" ".*Breakpoint $decimal, $function .*" "continue to $function"];
+    return [gdb_test "continue" ".*Breakpoint $decimal, $function .*" "continue to $function"]
 }
 
 proc default_gdb_init { args } {
@@ -3470,7 +3470,7 @@ proc gdb_init { args } {
     set gdbserver_reconnect_p 1
     unset gdbserver_reconnect_p
 
-    return [eval default_gdb_init $args];
+    return [eval default_gdb_init $args]
 }
 
 proc gdb_finish { } {
@@ -3520,19 +3520,19 @@ proc get_debug_format { } {
 	-re "Compiled with (.*) debugging format.\r\n.*$gdb_prompt $" {
 	    set debug_format $expect_out(1,string)
 	    verbose "debug format is $debug_format"
-	    return 1;
+	    return 1
 	}
 	-re "No current source file.\r\n$gdb_prompt $" {
 	    perror "get_debug_format used when no current source file"
-	    return 0;
+	    return 0
 	}
 	-re "$gdb_prompt $" {
 	    warning "couldn't check debug format (no valid response)."
-	    return 1;
+	    return 1
 	}
 	timeout {
 	    warning "couldn't check debug format (timeout)."
-	    return 1;
+	    return 1
 	}
     }
 }
@@ -3561,7 +3561,7 @@ proc setup_xfail_format { format } {
     if {$ret} then {
 	setup_xfail "*-*-*"
     }
-    return $ret;
+    return $ret
 }
 
 # gdb_get_line_number TEXT [FILE]
@@ -3745,9 +3745,9 @@ proc rerun_to_main {} {
 proc gdb_skip_float_test { msg } {
     if [target_info exists gdb,skip_float_tests] {
 	verbose "Skipping test '$msg': no float tests.";
-	return 1;
+	return 1
     }
-    return 0;
+    return 0
 }
 
 # Print a message and return true if a test should be skipped
@@ -3756,13 +3756,13 @@ proc gdb_skip_float_test { msg } {
 proc gdb_skip_stdio_test { msg } {
     if [target_info exists gdb,noinferiorio] {
 	verbose "Skipping test '$msg': no inferior i/o.";
-	return 1;
+	return 1
     }
-    return 0;
+    return 0
 }
 
 proc gdb_skip_bogus_test { msg } {
-    return 0;
+    return 0
 }
 
 # Return true if a test should be skipped due to lack of XML support
@@ -3832,7 +3832,7 @@ proc build_id_debug_filename_get { exec } {
     # Convert it to hex.
     binary scan $data H* data
     regsub {^..} $data {\0/} data
-    return ".build-id/${data}.debug";
+    return ".build-id/${data}.debug"
 }
 
 # Create stripped files for DEST, replacing it.  If ARGS is passed, it is a
@@ -4136,7 +4136,7 @@ proc get_remotetimeout { } {
 
     gdb_test_multiple "show remotetimeout" "" {
 	-re "Timeout limit to wait for target to respond is ($decimal).*$gdb_prompt $" {
-	    return $expect_out(1,string);
+	    return $expect_out(1,string)
 	}
     }
 
diff --git a/gdb/testsuite/lib/java.exp b/gdb/testsuite/lib/java.exp
index 1434e10c92f..ced37a47c0a 100644
--- a/gdb/testsuite/lib/java.exp
+++ b/gdb/testsuite/lib/java.exp
@@ -115,7 +115,7 @@ proc set_lang_java {} {
 	   "set language to \"java\""] {
 	return 0
     }
-    return 1;
+    return 1
 }
 
 # Local Variables:
diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp
index afb255eb5cd..50b926fb366 100644
--- a/gdb/testsuite/lib/mi-support.exp
+++ b/gdb/testsuite/lib/mi-support.exp
@@ -126,7 +126,7 @@ proc default_mi_gdb_start { args } {
     verbose "Spawning $GDB $INTERNAL_GDBFLAGS $GDBFLAGS $MIFLAGS"
 
     if [info exists gdb_spawn_id] {
-	return 0;
+	return 0
     }
 
     if ![is_remote host] {
@@ -148,7 +148,7 @@ proc default_mi_gdb_start { args } {
     set res [remote_spawn host "$GDB $INTERNAL_GDBFLAGS $GDBFLAGS $MIFLAGS [host_info gdb_opts]"];
     if { $res < 0 || $res == "" } {
 	perror "Spawning $GDB failed."
-	return 1;
+	return 1
     }
     gdb_expect {
 	-re "~\"GNU.*\r\n~\".*$mi_gdb_prompt$" {
@@ -158,7 +158,7 @@ proc default_mi_gdb_start { args } {
 	    if { $MIFLAGS == "-i=mi1" } {
 	        perror "(mi startup) Got unexpected new mi prompt."
 	        remote_close host;
-	        return -1;
+	        return -1
 	    }
 	    verbose "GDB initialized."
 	}
@@ -169,19 +169,19 @@ proc default_mi_gdb_start { args } {
 	    if { $MIFLAGS != "-i=mi1" } {
 	        perror "(mi startup) Got unexpected old mi prompt."
 	        remote_close host;
-	        return -1;
+	        return -1
 	    }
 	    verbose "GDB initialized."
 	}
 	-re ".*unrecognized option.*for a complete list of options." {
 	    untested "Skip mi tests (not compiled with mi support)."
 	    remote_close host;
-	    return -1;
+	    return -1
 	}
 	-re ".*Interpreter `mi' unrecognized." {
 	    untested "Skip mi tests (not compiled with mi support)."
 	    remote_close host;
-	    return -1;
+	    return -1
 	}
 	timeout {
 	    perror "(timeout) GDB never initialized after 10 seconds."
@@ -228,7 +228,7 @@ proc default_mi_gdb_start { args } {
 
     mi_detect_async
 
-    return 0;
+    return 0
 }
 
 #
@@ -288,7 +288,7 @@ proc mi_gdb_reinitialize_dir { subdir } {
     }
 
     if [is_remote host] {
-	return "";
+	return ""
     }
 
     if { $MIFLAGS == "-i=mi1" } {
@@ -339,7 +339,7 @@ proc mi_gdb_target_cmd { targetname serialport } {
 	gdb_expect 60 {
 	    -re "47\\^connected.*$mi_gdb_prompt" {
 		verbose "Set target to $targetname";
-		return 0;
+		return 0
 	    }
 	    -re "unknown host.*$mi_gdb_prompt" {
 	        verbose "Couldn't look up $serialport"
@@ -349,19 +349,19 @@ proc mi_gdb_target_cmd { targetname serialport } {
 	    }
 	    -re "Remote MIPS debugging.*$mi_gdb_prompt$" {
 		verbose "Set target to $targetname";
-		return 0;
+		return 0
 	    }
 	    -re "Remote debugging using .*$serialport_re.*$mi_gdb_prompt$" {
 		verbose "Set target to $targetname";
-		return 0;
+		return 0
 	    }
 	    -re "Remote target $targetname connected to.*$mi_gdb_prompt$" {
 		verbose "Set target to $targetname";
-		return 0;
+		return 0
 	    }
 	    -re "Connected to.*$mi_gdb_prompt$" { 
 		verbose "Set target to $targetname";
-		return 0;
+		return 0
 	    }
 	    -re "Ending remote.*$mi_gdb_prompt$" { }
 	    -re "Connection refused.*$mi_gdb_prompt$" {
@@ -404,7 +404,7 @@ proc mi_gdb_file_cmd { arg } {
 	set arg [remote_download host $arg];
 	if { $arg == "" } {
 	    error "download failed"
-	    return -1;
+	    return -1
 	}
     }
 
@@ -620,7 +620,7 @@ proc mi_gdb_test { args } {
 			perror "Couldn't send $command to GDB.";
 		    }
 		    fail "$message";
-		    return $result;
+		    return $result
 		}
 		gdb_expect 2 {
 		    -re "\[\r\n\]" { }
@@ -639,7 +639,7 @@ proc mi_gdb_test { args } {
 		    perror "Couldn't send $command to GDB.";
 		}
 		fail "$message";
-		return $result;
+		return $result
 	    }
 	}
     }
@@ -666,7 +666,7 @@ proc mi_gdb_test { args } {
 		 fail "$message";
 	     }
 	     gdb_suppress_entire_file "GDB died";
-	     return -1;
+	     return -1
 	 }
 	 -re "Ending remote debugging.*$mi_gdb_prompt\[ \]*$" {
 	    if ![isnative] then {
@@ -814,7 +814,7 @@ proc mi_run_cmd_full {use_mi_command args} {
 	    -re "$mi_gdb_prompt$" { }
 	    default {
 		perror "gdb_init_command for target failed";
-		return -1;
+		return -1
 	    }
 	}
     }
@@ -830,7 +830,7 @@ proc mi_run_cmd_full {use_mi_command args} {
 		-re "${run_match}\\^running\[\r\n\]+\\*running,thread-id=\"\[^\"\]+\"\r\n$mi_gdb_prompt" {}
 		default {}
 	    }
-	    return 0;
+	    return 0
 	}
 
 	if [target_info exists gdb,start_symbol] {
@@ -1123,7 +1123,7 @@ proc mi_expect_interrupt { test } {
     gdb_expect {
 	-re "\\*stopped,${r}$any\r\n$prompt_re" {
 	    pass "$test"
-	    return 0;
+	    return 0
 	}
 	-re ".*\r\n$mi_gdb_prompt$" {
 	    verbose -log "got $expect_out(buffer)"
diff --git a/gdb/testsuite/lib/objc.exp b/gdb/testsuite/lib/objc.exp
index dd29c67f91b..25f99f2740e 100644
--- a/gdb/testsuite/lib/objc.exp
+++ b/gdb/testsuite/lib/objc.exp
@@ -26,5 +26,5 @@ proc set_lang_objc {} {
 	   "set language to \"objective-c\""] {
 	return 0
     }
-    return 1;
+    return 1
 }
diff --git a/gdb/testsuite/lib/pascal.exp b/gdb/testsuite/lib/pascal.exp
index 569fb029f4e..7e52233cb6e 100644
--- a/gdb/testsuite/lib/pascal.exp
+++ b/gdb/testsuite/lib/pascal.exp
@@ -161,5 +161,5 @@ proc set_lang_pascal {} {
 	   "set language to \"pascal\""] {
 	return 0
     }
-    return 1;
+    return 1
 }
diff --git a/gdb/testsuite/lib/prompt.exp b/gdb/testsuite/lib/prompt.exp
index e23fe52a8cf..87d889cc1f7 100644
--- a/gdb/testsuite/lib/prompt.exp
+++ b/gdb/testsuite/lib/prompt.exp
@@ -37,7 +37,7 @@ proc default_prompt_gdb_start { } {
     verbose "Spawning $GDB $INTERNAL_GDBFLAGS $GDBFLAGS"
 
     if [info exists gdb_spawn_id] {
-	return 0;
+	return 0
     }
 
     if ![is_remote host] {
@@ -49,7 +49,7 @@ proc default_prompt_gdb_start { } {
     set res [remote_spawn host "$GDB $INTERNAL_GDBFLAGS $GDBFLAGS [host_info gdb_opts]"];
     if { $res < 0 || $res == "" } {
 	perror "Spawning $GDB failed."
-	return 1;
+	return 1
     }
     gdb_expect 360 {
 	-re ".*$gdb_prompt_fail.*$gdb_prompt_fail.*" {
@@ -79,7 +79,7 @@ proc default_prompt_gdb_start { } {
 	}
     }
     set gdb_spawn_id -1;
-    return 0;
+    return 0
 }
 
 #
diff --git a/gdb/testsuite/lib/trace-support.exp b/gdb/testsuite/lib/trace-support.exp
index 2c0c999994a..10482b84611 100644
--- a/gdb/testsuite/lib/trace-support.exp
+++ b/gdb/testsuite/lib/trace-support.exp
@@ -107,7 +107,7 @@ proc gdb_trace_setactions { testname tracepoint args } {
     gdb_expect 5 {
 	-re "No tracepoint number .*$gdb_prompt $" {
 	    fail $testname
-	    return 1;
+	    return 1
 	}
 	-re "Enter actions for tracepoint $tracepoint.*>" {
 	    if { [llength $args] > 0 } {
@@ -159,9 +159,9 @@ proc gdb_trace_setactions { testname tracepoint args } {
 	$passfail $testname;
     }
     if { $passfail == "pass" } then { 
-	return 0;
+	return 0
     } else {
-	return 1;
+	return 1
     }
 }
 
@@ -202,9 +202,9 @@ proc gdb_tfind_test { testname tfind_arg exp_res args } {
     }
     $passfail "$testname";
     if { $passfail == "pass" } then { 
-	return 0;
+	return 0
     } else {
-	return 1;
+	return 1
     }
 }
 
@@ -229,7 +229,7 @@ proc gdb_readexpr { gdb_expr } {
 	-re "$gdb_prompt $" { }
 	default { }
     }
-    return $result;
+    return $result
 }
 
 #
@@ -246,7 +246,7 @@ proc gdb_gettpnum { tracepoint } {
     if { $tracepoint != "" } {
 	gdb_test "trace $tracepoint" "" ""
     }
-    return [gdb_readexpr "\$tpnum"];
+    return [gdb_readexpr "\$tpnum"]
 }
 
 
@@ -299,7 +299,7 @@ proc gdb_find_recursion_test_baseline { filename } {
 	-re "$gdb_prompt $" { }
 	default { }
     }
-    return $baseline;
+    return $baseline
 }
 
 # Return the location of the IPA library.