From 2c44deac314a68855b3c330e675bcd984a2dcf66 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 22 Jun 2012 17:15:22 +0000 Subject: [PATCH] * gdb.objc/basicclass.exp: Use standard_testfile. (do_objc_tests): Don't declare objdir. * gdb.objc/nondebug.exp: Use standard_testfile. (do_objc_tests): Don't declare objdir. * gdb.objc/objcdecode.exp: Use standard_testfile. (do_objc_tests): Don't declare objdir. --- gdb/testsuite/ChangeLog | 9 +++++++++ gdb/testsuite/gdb.objc/basicclass.exp | 5 +---- gdb/testsuite/gdb.objc/nondebug.exp | 5 +---- gdb/testsuite/gdb.objc/objcdecode.exp | 5 +---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 2bfe39b3765..e205c26a779 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,12 @@ +2012-06-22 Tom Tromey + + * gdb.objc/basicclass.exp: Use standard_testfile. + (do_objc_tests): Don't declare objdir. + * gdb.objc/nondebug.exp: Use standard_testfile. + (do_objc_tests): Don't declare objdir. + * gdb.objc/objcdecode.exp: Use standard_testfile. + (do_objc_tests): Don't declare objdir. + 2012-06-22 Tom Tromey * gdb.java/jmain.exp: Use standard_testfile. diff --git a/gdb/testsuite/gdb.objc/basicclass.exp b/gdb/testsuite/gdb.objc/basicclass.exp index 6ebffb0a2cc..befe620df34 100644 --- a/gdb/testsuite/gdb.objc/basicclass.exp +++ b/gdb/testsuite/gdb.objc/basicclass.exp @@ -15,9 +15,7 @@ # This file was written by Adam Fedor (fedor@gnu.org) -set testfile "basicclass" -set srcfile ${testfile}.m -set binfile ${objdir}/${subdir}/${testfile} +standard_testfile .m # # Objective-C program compilation isn't standard. We need to figure out @@ -73,7 +71,6 @@ proc deduce_language_of_main {} { proc do_objc_tests {} { global subdir - global objdir global srcdir global binfile global gdb_prompt diff --git a/gdb/testsuite/gdb.objc/nondebug.exp b/gdb/testsuite/gdb.objc/nondebug.exp index ea775fc79a8..bca897f7a3b 100644 --- a/gdb/testsuite/gdb.objc/nondebug.exp +++ b/gdb/testsuite/gdb.objc/nondebug.exp @@ -17,9 +17,7 @@ # This file was written by Adam Fedor (fedor@gnu.org) -set testfile "nondebug" -set srcfile ${testfile}.m -set binfile ${objdir}/${subdir}/${testfile} +standard_testfile .m # # Objective-C program compilation isn't standard. We need to figure out @@ -31,7 +29,6 @@ if {[gdb_compile_objc "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [ proc do_objc_tests {} { global subdir - global objdir global srcdir global binfile global gdb_prompt diff --git a/gdb/testsuite/gdb.objc/objcdecode.exp b/gdb/testsuite/gdb.objc/objcdecode.exp index ba2085a7e87..9a39de2810e 100644 --- a/gdb/testsuite/gdb.objc/objcdecode.exp +++ b/gdb/testsuite/gdb.objc/objcdecode.exp @@ -17,9 +17,7 @@ # This file was written by Adam Fedor (fedor@gnu.org) -set testfile "objcdecode" -set srcfile ${testfile}.m -set binfile ${objdir}/${subdir}/${testfile} +standard_testfile .m # # Objective-C program compilation isn't standard. We need to figure out @@ -31,7 +29,6 @@ if {[gdb_compile_objc "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [ proc do_objc_tests {} { global subdir - global objdir global srcdir global binfile global gdb_prompt -- 2.30.2