diff options
| author | Simon Marchi <simon.marchi@ericsson.com> | 2016-07-06 10:02:48 -0400 |
|---|---|---|
| committer | Simon Marchi <simon.marchi@ericsson.com> | 2016-07-06 10:03:15 -0400 |
| commit | f0464b231f046b836e2ed721d764fa309f18eb39 (patch) | |
| tree | 23519a3df3ac21ab3a4f5040bb2b7e5182287a0d /gdb/testsuite/gdb.ada | |
| parent | fb36c6bf0a019e7b989e61710f17b5ce4ec27686 (diff) | |
Remove extra output directory level for Ada tests
The output of Ada tests create a layout where the test name
("formatted_ref" in this example) appears twice:
outputs
└── gdb.ada
└── formatted_ref
└── formatted_ref
├── b~formatted_ref.adb
├── b~formatted_ref.ads
├── b~formatted_ref.ali
├── b~formatted_ref.o
├── defs.ali
├── defs.o
├── formatted_ref
├── formatted_ref.ali
└── formatted_ref.o
This causes a problem when testing with the native-gdbserver board, when
the binary has the same name as the test. When gdb_remote_download is
called to upload the compiled binary, the implementation for
native-gdbserver copies it in the standard output directory (in
outputs/gdb.ada/formatted_ref). However, there is already a directory
named formatted_ref in there, so the copy fails and gdbserver isn't able
to load the binary.
This patch bypasses the problem by removing the extra directory level.
The compiled binary will already be in its final location in the
standard output directory, so the copy will effectively be a no-op.
gdb/testsuite/ChangeLog:
* lib/ada.exp: Remove extra directory level in build directory.
* gdb.ada/cond_lang.exp: Likewise.
* gdb.ada/exec_changed.exp: Likewise.
* gdb.ada/lang_switch.exp: Likewise.
Diffstat (limited to 'gdb/testsuite/gdb.ada')
| -rw-r--r-- | gdb/testsuite/gdb.ada/cond_lang.exp | 4 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.ada/exec_changed.exp | 7 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.ada/lang_switch.exp | 4 |
3 files changed, 7 insertions, 8 deletions
diff --git a/gdb/testsuite/gdb.ada/cond_lang.exp b/gdb/testsuite/gdb.ada/cond_lang.exp index e08fadac30..997b37a8ec 100644 --- a/gdb/testsuite/gdb.ada/cond_lang.exp +++ b/gdb/testsuite/gdb.ada/cond_lang.exp @@ -17,8 +17,8 @@ load_lib "ada.exp" standard_ada_testfile a -set cfile "${testdir}/foo" -set csrcfile ${srcdir}/${subdir}/${cfile}.c +set cfile "foo" +set csrcfile ${srcdir}/${subdir}/${testdir}/${cfile}.c set cobject [standard_output_file ${cfile}.o] gdb_compile "${csrcfile}" "${cobject}" object [list debug] diff --git a/gdb/testsuite/gdb.ada/exec_changed.exp b/gdb/testsuite/gdb.ada/exec_changed.exp index 6cc6408e54..a574cd5fb7 100644 --- a/gdb/testsuite/gdb.ada/exec_changed.exp +++ b/gdb/testsuite/gdb.ada/exec_changed.exp @@ -32,9 +32,8 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}$EXEEXT" executable {debug}] != ""} } # Build the second test program -set testfile2 "${testdir}/second" -set srcfile2 ${srcdir}/${subdir}/${testfile2}.adb -set binfile2 [standard_output_file ${testfile2}$EXEEXT] +set srcfile2 ${srcdir}/${subdir}/${testdir}/second.adb +set binfile2 [standard_output_file second$EXEEXT] if {[gdb_compile_ada "${srcfile2}" "${binfile2}" executable {debug}] != ""} { return -1 @@ -42,7 +41,7 @@ if {[gdb_compile_ada "${srcfile2}" "${binfile2}" executable {debug}] != ""} { # Start with a fresh gdb. -set common_binfile [standard_output_file ${testdir}/common$EXEEXT] +set common_binfile [standard_output_file common$EXEEXT] gdb_start gdb_reinitialize_dir $srcdir/$subdir diff --git a/gdb/testsuite/gdb.ada/lang_switch.exp b/gdb/testsuite/gdb.ada/lang_switch.exp index 804535814b..661829bee7 100644 --- a/gdb/testsuite/gdb.ada/lang_switch.exp +++ b/gdb/testsuite/gdb.ada/lang_switch.exp @@ -16,8 +16,8 @@ load_lib "ada.exp" standard_ada_testfile lang_switch -set cfile "${testdir}/foo" -set csrcfile ${srcdir}/${subdir}/${cfile}.c +set cfile "foo" +set csrcfile ${srcdir}/${subdir}/${testdir}/${cfile}.c set cobject [standard_output_file ${cfile}.o] gdb_compile "${csrcfile}" "${cobject}" object [list debug] |