* gdb.dwarf2/fission-base.S: Include gdb.dwarf2/ in dwo_name.

	* gdb.dwarf2/fission-reread.S: Ditto.
	* gdb.dwarf2/fission-base.exp: Remove setting of debug-file-directory.
	* gdb.dwarf2/fission-reread.exp: Ditto.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index e67eea6b81a537813bc7f23fce75911e8dc54b85..047017e0c0b59990f3e367328e7fe37a654ce740 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2012-09-11  Doug Evans  <dje@google.com>
+
+       * gdb.dwarf2/fission-base.S: Include gdb.dwarf2/ in dwo_name.
+       * gdb.dwarf2/fission-reread.S: Ditto.
+       * gdb.dwarf2/fission-base.exp: Remove setting of debug-file-directory.
+       * gdb.dwarf2/fission-reread.exp: Ditto.
+
 2012-09-11  Andrew Burgess  <aburgess@broadcom.com>
 
        * gdb.base/ptype.exp: Test ptype on a pointer to a typedef.

diff --git a/gdb/testsuite/gdb.dwarf2/fission-base.S b/gdb/testsuite/gdb.dwarf2/fission-base.S
index 94ba06834cb746f0c9f3581fee4704eb46bf3f2f..36b7cf57a9f32fc5752a58432e48f50de138b316 100644 (file)
--- a/gdb/testsuite/gdb.dwarf2/fission-base.S
+++ b/gdb/testsuite/gdb.dwarf2/fission-base.S
@@ -85,8 +85,8 @@ main:
        .uleb128 0x1    # (DIE (0xb) DW_TAG_compile_unit)
        .ascii "GNU C 4.6.x-fission\0"  # DW_AT_producer
        .byte   0x1     # DW_AT_language
-       .ascii "fission-base.c\0"       # DW_AT_name
-       .ascii "/tmp/src/gdb/testsuite/gdb.dwarf2\0"    # DW_AT_comp_dir
+       .ascii "gdb.dwarf2/fission-base.c\0"    # DW_AT_name
+       .ascii "/tmp/src/gdb/testsuite\0"       # DW_AT_comp_dir
        .byte   0       # DW_AT_GNU_dwo_id
        .byte   0
        .byte   0
@@ -142,10 +142,13 @@ main:
        .8byte  .Ltext0 # DW_AT_low_pc
        .8byte  .Letext0-.Ltext0        # DW_AT_high_pc
        .4byte  .Ldebug_line0   # DW_AT_stmt_list
-       .ascii "/tmp/src/gdb/testsuite/gdb.dwarf2\0"    # DW_AT_comp_dir
+       .ascii "/tmp/src/gdb/testsuite\0"       # DW_AT_comp_dir
        # Normally dwo_name would be "fission-base.dwo".
        # Simplification: Leave the DWO contents in the executable.
-       .ascii "fission-base\0" # DW_AT_GNU_dwo_name
+       # "gdb.dwarf2/" is included so that gdb can load the file without
+       # having to set "debug-file-directory".  This is useful when
+       # testing with cc-with-tweaks.sh -i.
+       .ascii "gdb.dwarf2/fission-base\0"      # DW_AT_GNU_dwo_name
        .4byte  .Ldebug_pubnames0       # DW_AT_GNU_pubnames
        .4byte  .Ldebug_pubtypes0       # DW_AT_GNU_pubtypes
        .4byte  .Ldebug_addr0_begin     # DW_AT_GNU_addr_base

diff --git a/gdb/testsuite/gdb.dwarf2/fission-base.exp b/gdb/testsuite/gdb.dwarf2/fission-base.exp
index 2bd274828e1ef155547b3861de61d664a1593792..f6ca7cafe79d3f377dfee1c6cd0498a9eac1e133 100644 (file)
--- a/gdb/testsuite/gdb.dwarf2/fission-base.exp
+++ b/gdb/testsuite/gdb.dwarf2/fission-base.exp
@@ -29,20 +29,10 @@ 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 { [prepare_for_testing "$testfile.exp" "$testfile" "$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]
-
 if ![runto_main] {
     return -1
 }

diff --git a/gdb/testsuite/gdb.dwarf2/fission-reread.S b/gdb/testsuite/gdb.dwarf2/fission-reread.S
index 3ad6518d53319e18cfdbade090dc446ab1e93e83..0cf61a3a31771cad257d57b9b39821a49fa34b69 100644 (file)
--- a/gdb/testsuite/gdb.dwarf2/fission-reread.S
+++ b/gdb/testsuite/gdb.dwarf2/fission-reread.S
@@ -133,10 +133,13 @@ main:
        .byte   0x90
        .4byte  0       /* Offset to Type DIE */
        .uleb128 0x2    /* (DIE (0) DW_TAG_type_unit) */
-       .ascii "/tmp/src/gdb/testsuite/gdb.dwarf2\0"    /* DW_AT_comp_dir */
-       /* Normally dwo_name would be "fission-reread.dwo". */
-       /* Simplification: Leave the DWO contents in the executable. */
-       .ascii "fission-reread\0"       /* DW_AT_GNU_dwo_name */
+       .ascii "/tmp/src/gdb/testsuite\0"       /* DW_AT_comp_dir */
+       /* Normally dwo_name would be "fission-reread.dwo".
+          Simplification: Leave the DWO contents in the executable.
+          "gdb.dwarf2/" is included so that gdb can load the file without
+          having to set "debug-file-directory".  This is useful when
+          testing with cc-with-tweaks.sh -i.  */
+       .ascii "gdb.dwarf2/fission-reread\0"    /* DW_AT_GNU_dwo_name */
        .4byte  .Ldebug_pubnames0       /* DW_AT_GNU_pubnames */
        .4byte  .Ldebug_pubtypes0       /* DW_AT_GNU_pubtypes */
        .4byte  .Ldebug_addr0   /* DW_AT_GNU_addr_base */
@@ -151,8 +154,8 @@ main:
        .uleb128 0x5    /* (DIE (0xb) DW_TAG_compile_unit) */
        .ascii "GNU C++ 4.6.x-fission\0"        /* DW_AT_producer */
        .byte   0x4     /* DW_AT_language */
-       .ascii "fission-reread.cc\0"    /* DW_AT_name */
-       .ascii "/tmp/src/gdb/testsuite/gdb.dwarf2\0"    /* DW_AT_comp_dir */
+       .ascii "gdb.dwarf2/fission-reread.cc\0" /* DW_AT_name */
+       .ascii "/tmp/src/gdb/testsuite\0"       /* DW_AT_comp_dir */
        .byte   0       /* DW_AT_GNU_dwo_id */
        .byte   0
        .byte   0
@@ -206,10 +209,13 @@ main:
        .4byte  .Ltext0 /* DW_AT_low_pc */
        .4byte  .Letext0-.Ltext0        /* DW_AT_high_pc */
        .4byte  .Ldebug_line0   /* DW_AT_stmt_list */
-       .ascii "/tmp/src/gdb/testsuite/gdb.dwarf2\0"    /* DW_AT_comp_dir */
-       /* Normally dwo_name would be "fission-reread.dwo". */
-       /* Simplification: Leave the DWO contents in the executable. */
-       .ascii "fission-reread\0"       /* DW_AT_GNU_dwo_name */
+       .ascii "/tmp/src/gdb/testsuite\0"       /* DW_AT_comp_dir */
+       /* Normally dwo_name would be "fission-reread.dwo".
+          Simplification: Leave the DWO contents in the executable.
+          "gdb.dwarf2/" is included so that gdb can load the file without
+          having to set "debug-file-directory".  This is useful when
+          testing with cc-with-tweaks.sh -i.  */
+       .ascii "gdb.dwarf2/fission-reread\0"    /* DW_AT_GNU_dwo_name */
        .4byte  .Ldebug_pubnames0       /* DW_AT_GNU_pubnames */
        .4byte  .Ldebug_pubtypes0       /* DW_AT_GNU_pubtypes */
        .4byte  .Ldebug_addr0   /* DW_AT_GNU_addr_base */

diff --git a/gdb/testsuite/gdb.dwarf2/fission-reread.exp b/gdb/testsuite/gdb.dwarf2/fission-reread.exp
index 9efc530816c38d588d09bc0d218b075f494a4103..585969a830b3bcd645e515db7f69d345407deb1e 100644 (file)
--- a/gdb/testsuite/gdb.dwarf2/fission-reread.exp
+++ b/gdb/testsuite/gdb.dwarf2/fission-reread.exp
@@ -24,20 +24,10 @@ set basename "fission-reread"
 
 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 { [prepare_for_testing "$testfile.exp" "$testfile" "$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]
-
 gdb_test "break main" "Breakpoint.*at.*"
 
 # If we get this far gdb didn't crash, nor did an error occur.