Merge GDB 7.5.1

gdb/testsuite/gdb.cp/nsnoimports.exp

Index: gdb/testsuite/gdb.cp/nsnoimports.exp
diff --git a/gdb/testsuite/gdb.cp/nsnoimports.exp b/gdb/testsuite/gdb.cp/nsnoimports.exp
index d1ed3b3fa8a6b4728afeeb03bbcdd61d5b266d42..38e45773f20eec3cd7c8638257b2f63e06cc4b17 100644
--- a/gdb/testsuite/gdb.cp/nsnoimports.exp
+++ b/gdb/testsuite/gdb.cp/nsnoimports.exp
@@ -13,8 +13,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-set testfile nsnoimports
-set srcfile ${testfile}.cc
+standard_testfile .cc
+
 if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug c++}] } {
      return -1
 }