4 files changed, 13 insertions, 12 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 240cd50..2d75a1a 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,11 @@
 2012-06-25  Tom Tromey  <tromey@redhat.com>
 
+	* gdb.linespec/ls-errs.exp: Use standard_testfile.
+	* gdb.linespec/ls-dollar.exp: Use standard_testfile.
+	* gdb.linespec/linespec.exp: Use standard_testfile.
+
+2012-06-25  Tom Tromey  <tromey@redhat.com>
+
 	* gdb.modula2/unbounded-array.exp: Use standard_testfile,
 	prepare_for_testing.
 
diff --git a/gdb/testsuite/gdb.linespec/linespec.exp b/gdb/testsuite/gdb.linespec/linespec.exp
index 92be31c..3698ea2 100644
--- a/gdb/testsuite/gdb.linespec/linespec.exp
+++ b/gdb/testsuite/gdb.linespec/linespec.exp
@@ -15,10 +15,9 @@
 
 # Tests of ambiguous linespecs.
 
-set testfile linespec
+standard_testfile lspec.cc
 
-set exefile lspec
-set binfile ${objdir}/${subdir}/${exefile}
+set exefile $testfile
 
 set baseone base/one/thefile.cc
 set basetwo base/two/thefile.cc
@@ -29,7 +28,7 @@ if {[skip_cplus_tests]} {
 }
 
 if {[prepare_for_testing ${testfile}.exp $exefile \
-	 [list lspec.cc $baseone $basetwo] \
+	 [list $srcfile $baseone $basetwo] \
 	 {debug nowarnings c++}]} {
     return -1
 }
diff --git a/gdb/testsuite/gdb.linespec/ls-dollar.exp b/gdb/testsuite/gdb.linespec/ls-dollar.exp
index 7b1f0d63..1fbb6bb 100644
--- a/gdb/testsuite/gdb.linespec/ls-dollar.exp
+++ b/gdb/testsuite/gdb.linespec/ls-dollar.exp
@@ -15,10 +15,8 @@
 
 # Tests for dollar signs in linespecs
 
-set base "ls-dollar"
-set srcfile "$base.cc"
-set testfile "$base.exp"
-set exefile $base
+standard_testfile .cc
+set exefile $testfile
 
 if {[skip_cplus_tests]} {
     unsupported "skipping C++ tests"
diff --git a/gdb/testsuite/gdb.linespec/ls-errs.exp b/gdb/testsuite/gdb.linespec/ls-errs.exp
index 8ced8c6..7db8ae4 100644
--- a/gdb/testsuite/gdb.linespec/ls-errs.exp
+++ b/gdb/testsuite/gdb.linespec/ls-errs.exp
@@ -15,10 +15,8 @@
 
 # Tests for linespec error conditions
 
-set base ls-errs
-set srcfile "$base.c"
-set testfile "$base.exp"
-set exefile $base
+standard_testfile
+set exefile $testfile
 
 if {[prepare_for_testing $testfile $exefile $srcfile \
 	 {debug nowarnings}]} {