2012-02-10 Pedro Alves <palves@redhat.com>

	* gdb.base/break-interp.exp (test_attach_gdb): Assume $file is
	always non-empty.
	(test_attach): Always pass $exec to test_attach_gdb.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 556e7e0c4619be2f2c6e0b1de41be589bf37202e..f0eab1ca4e6707834b032b71ec2e7e4fac85093e 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-10  Pedro Alves  <palves@redhat.com>
+
+       * gdb.base/break-interp.exp (test_attach_gdb): Assume $file is
+       always non-empty.
+       (test_attach): Always pass $exec to test_attach_gdb.
+
 2012-02-08  Tom Tromey  <tromey@redhat.com>
 
        * gdb.python/py-symbol.exp: Use lookup_global_symbol for tests

diff --git a/gdb/testsuite/gdb.base/break-interp.exp b/gdb/testsuite/gdb.base/break-interp.exp
index 04b5eabcb9ac5bbcc4508d7e9201d39b433f7e42..575e8f0a151c8abd11338af75e703a6846b6d20d 100644 (file)
--- a/gdb/testsuite/gdb.base/break-interp.exp
+++ b/gdb/testsuite/gdb.base/break-interp.exp
@@ -262,9 +262,7 @@ proc test_attach_gdb {file pid displacement prefix} {
     # Print the "PIE (Position Independent Executable) displacement" message.
     gdb_test_no_output "set verbose on"
 
-    if {$file != ""} {
-       gdb_test "file $file" "Reading symbols from .*done\\." "file"
-    }
+    gdb_test "file $file" "Reading symbols from .*done\\." "file"
 
     set test "attach"
     gdb_test_multiple "attach $pid" $test {
@@ -308,6 +306,7 @@ proc test_attach_gdb {file pid displacement prefix} {
 
 proc test_attach {file displacement {relink_args ""}} {
     global board_info
+    global exec
 
     gdb_exit
 
@@ -336,10 +335,10 @@ proc test_attach {file displacement {relink_args ""}} {
     }
 
     if {$relink_args == ""} {
-       test_attach_gdb "" $pid $displacement "attach"
+       test_attach_gdb $exec $pid $displacement "attach"
     } else {
        # These could be rather passed as arguments.
-       global exec interp_saved interp
+       global interp_saved interp
 
        foreach relink {YES NO} {
            # Formerly this test was testing only prelinking of $EXEC.  As the