Index: gdb/testsuite/gdb.dwarf2/fission-base.exp |
diff --git a/gdb/testsuite/gdb.dwarf2/fission-base.exp b/gdb/testsuite/gdb.dwarf2/fission-base.exp |
index 2bd274828e1ef155547b3861de61d664a1593792..81ca5854e267a8e683e3afed970c125c2e4ad171 100644 |
--- a/gdb/testsuite/gdb.dwarf2/fission-base.exp |
+++ b/gdb/testsuite/gdb.dwarf2/fission-base.exp |
@@ -1,4 +1,4 @@ |
-# Copyright 2012 Free Software Foundation, Inc. |
+# Copyright 2012-2013 Free Software Foundation, Inc. |
# This program is free software; you can redistribute it and/or modify |
# it under the terms of the GNU General Public License as published by |
@@ -15,6 +15,11 @@ |
load_lib dwarf.exp |
+# We run objcopy locally to split out the .dwo file. |
+if [is_remote host] { |
+ return 0 |
+} |
+ |
# This test can only be run on targets which support DWARF-2 and use gas. |
if ![dwarf2_support] { |
return 0 |
@@ -25,23 +30,21 @@ if {![istarget x86_64-*] || ![is_lp64_target]} { |
return 0 |
} |
-set basename "fission-base" |
- |
standard_testfile .S |
-# IWBN to use prepare_for_testing here, but we need to set debug-file-directory |
-# before we load the binary. |
- |
-if { [build_executable "$testfile.exp" "$testfile" "$srcfile" {nodebug}] } { |
+if [build_executable_from_fission_assembler \ |
+ "$testfile.exp" "$binfile" "$srcfile" {nodebug}] { |
return -1 |
} |
gdb_exit |
gdb_start |
gdb_reinitialize_dir $srcdir/$subdir |
-# Set debug-file-directory so we find the dwo file. |
-gdb_test_no_output "set debug-file-directory $subdir" |
-gdb_load [standard_output_file $testfile] |
+# Make sure we can find the .dwo file, regardless of whether we're |
+# running in parallel mode. |
+gdb_test_no_output "set debug-file-directory [file dirname $binfile]" \ |
+ "set debug-file-directory" |
+gdb_load $binfile |
if ![runto_main] { |
return -1 |