8 files changed, 16 insertions, 16 deletions
diff --git a/gdb/testsuite/gdb.perf/backtrace.exp b/gdb/testsuite/gdb.perf/backtrace.exp
index 9ec099f..aea1e01 100644
--- a/gdb/testsuite/gdb.perf/backtrace.exp
+++ b/gdb/testsuite/gdb.perf/backtrace.exp
@@ -28,7 +28,7 @@ set executable $testfile
 set expfile $testfile.exp
 
 # make check-perf RUNTESTFLAGS='backtrace.exp BACKTRACE_DEPTH=1024'
-if ![info exists BACKTRACE_DEPTH] {
+if {![info exists BACKTRACE_DEPTH]} {
     set BACKTRACE_DEPTH 64
 }
 
@@ -47,7 +47,7 @@ PerfTest::assemble {
 } {
     global binfile
 
-    clean_restart $binfile
+    clean_restart $::testfile
 
     if ![runto_main] {
 	return -1
diff --git a/gdb/testsuite/gdb.perf/gmonster1.exp b/gdb/testsuite/gdb.perf/gmonster1.exp
index f752062..8bb748d 100644
--- a/gdb/testsuite/gdb.perf/gmonster1.exp
+++ b/gdb/testsuite/gdb.perf/gmonster1.exp
@@ -38,7 +38,7 @@ load_lib gen-perf-test.exp
 
 require allow_perf_tests
 
-if ![info exists MONSTER] {
+if {![info exists MONSTER]} {
     set MONSTER "n"
 }
 
diff --git a/gdb/testsuite/gdb.perf/gmonster2.exp b/gdb/testsuite/gdb.perf/gmonster2.exp
index ba4e46b..7049bce 100644
--- a/gdb/testsuite/gdb.perf/gmonster2.exp
+++ b/gdb/testsuite/gdb.perf/gmonster2.exp
@@ -38,7 +38,7 @@ load_lib gen-perf-test.exp
 
 require allow_perf_tests
 
-if ![info exists MONSTER] {
+if {![info exists MONSTER]} {
     set MONSTER "n"
 }
 
diff --git a/gdb/testsuite/gdb.perf/single-step.exp b/gdb/testsuite/gdb.perf/single-step.exp
index 920cf9d..8ec32d1 100644
--- a/gdb/testsuite/gdb.perf/single-step.exp
+++ b/gdb/testsuite/gdb.perf/single-step.exp
@@ -26,7 +26,7 @@ set executable $testfile
 set expfile $testfile.exp
 
 # make check-perf RUNTESTFLAGS='single-step.exp SINGLE_STEP_COUNT=300'
-if ![info exists SINGLE_STEP_COUNT] {
+if {![info exists SINGLE_STEP_COUNT]} {
     set SINGLE_STEP_COUNT 1000
 }
 
@@ -39,7 +39,7 @@ PerfTest::assemble {
     return 0
 } {
     global binfile
-    clean_restart $binfile
+    clean_restart $::testfile
 
     if ![runto_main] {
 	return -1
diff --git a/gdb/testsuite/gdb.perf/skip-command.exp b/gdb/testsuite/gdb.perf/skip-command.exp
index b82d318..e59cb07 100644
--- a/gdb/testsuite/gdb.perf/skip-command.exp
+++ b/gdb/testsuite/gdb.perf/skip-command.exp
@@ -33,10 +33,10 @@ set skip_func_file [standard_output_file $srcfile2]
 set expfile $testfile.exp
 
 # make check-perf RUNTESTFLAGS='skip-command.exp SKIP_STEP_COUNT=1000 ...'
-if ![info exists SKIP_STEP_COUNT] {
+if {![info exists SKIP_STEP_COUNT]} {
     set SKIP_STEP_COUNT 1000
 }
-if ![info exists SKIP_DIRECTIVE_COUNT] {
+if {![info exists SKIP_DIRECTIVE_COUNT]} {
     set SKIP_DIRECTIVE_COUNT 1000
 }
 
@@ -91,7 +91,7 @@ proc write_skip_func_source { file_name func_name_prefix nr_funcs } {
 proc run_skip_bench { kind text } {
     global SKIP_STEP_COUNT SKIP_DIRECTIVE_COUNT
 
-    if ![runto_main] {
+    if {![runto_main]} {
 	return -1
     }
 
@@ -120,7 +120,7 @@ PerfTest::assemble {
     return 0
 } {
     global binfile
-    clean_restart $binfile
+    clean_restart $::testfile
     return 0
 } {
     global SKIP_STEP_COUNT SKIP_DIRECTIVE_COUNT
diff --git a/gdb/testsuite/gdb.perf/skip-prologue.exp b/gdb/testsuite/gdb.perf/skip-prologue.exp
index 50df93a..880a0f4 100644
--- a/gdb/testsuite/gdb.perf/skip-prologue.exp
+++ b/gdb/testsuite/gdb.perf/skip-prologue.exp
@@ -28,7 +28,7 @@ set executable $testfile
 set expfile $testfile.exp
 
 # make check-perf RUNTESTFLAGS='skip-prologue.exp SKIP_PROLOGUE_COUNT=500'
-if ![info exists SKIP_PROLOGUE_COUNT] {
+if {![info exists SKIP_PROLOGUE_COUNT]} {
     set SKIP_PROLOGUE_COUNT 500
 }
 
@@ -51,7 +51,7 @@ PerfTest::assemble {
     global binfile
     global gdb_prompt
 
-    clean_restart $binfile
+    clean_restart $::testfile
 
     if ![runto_main] {
 	return -1
diff --git a/gdb/testsuite/gdb.perf/solib.exp b/gdb/testsuite/gdb.perf/solib.exp
index 45f9330..e7870f6 100644
--- a/gdb/testsuite/gdb.perf/solib.exp
+++ b/gdb/testsuite/gdb.perf/solib.exp
@@ -31,7 +31,7 @@ set executable $testfile
 set expfile $testfile.exp
 
 # make check-perf RUNTESTFLAGS='solib.exp SOLIB_COUNT=1024'
-if ![info exists SOLIB_COUNT] {
+if {![info exists SOLIB_COUNT]} {
     set SOLIB_COUNT 128
 }
 
@@ -72,7 +72,7 @@ PerfTest::assemble {
 } {
     global binfile
 
-    clean_restart $binfile
+    clean_restart $::testfile
 
     if ![runto_main] {
 	return -1
diff --git a/gdb/testsuite/gdb.perf/template-breakpoints.exp b/gdb/testsuite/gdb.perf/template-breakpoints.exp
index 7d66e0f..e5d21b2 100644
--- a/gdb/testsuite/gdb.perf/template-breakpoints.exp
+++ b/gdb/testsuite/gdb.perf/template-breakpoints.exp
@@ -28,7 +28,7 @@ set executable $testfile
 set expfile $testfile.exp
 
 # make check-perf RUNTESTFLAGS='template-breakpoints.exp EXPANSION_DEPTH=40'
-if ![info exists EXPANSION_DEPTH] {
+if {![info exists EXPANSION_DEPTH]} {
 	set EXPANSION_DEPTH 40
 }
 
@@ -47,7 +47,7 @@ PerfTest::assemble {
 } {
 	global binfile
 
-	clean_restart $binfile
+	clean_restart $::testfile
 
 	if ![runto_main] {
 		return -1