diff options
| -rw-r--r-- | gdb/testsuite/ChangeLog | 7 | ||||
| -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 | ||||
| -rw-r--r-- | gdb/testsuite/lib/ada.exp | 7 |
5 files changed, 17 insertions, 12 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 6445a10..013af4d 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2016-07-06 Simon Marchi <simon.marchi@ericsson.com> + + * 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. + 2016-07-06 Manish Goregaokar <manish@mozilla.com> * simple.rs: Add test for raw pointer subscripting diff --git a/gdb/testsuite/gdb.ada/cond_lang.exp b/gdb/testsuite/gdb.ada/cond_lang.exp index e08fada..997b37a 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 6cc6408..a574cd5 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 8045358..661829b 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] diff --git a/gdb/testsuite/lib/ada.exp b/gdb/testsuite/lib/ada.exp index 01f3008..a9d1758 100644 --- a/gdb/testsuite/lib/ada.exp +++ b/gdb/testsuite/lib/ada.exp @@ -73,9 +73,8 @@ proc standard_ada_testfile {base_file {dir ""}} { } else { set testdir $dir } - set testfile $testdir/$base_file - set srcfile $srcdir/$subdir/$testfile.adb - set binfile [standard_output_file $testfile] - file mkdir [standard_output_file $testdir] + set testfile $base_file + set srcfile $srcdir/$subdir/$testdir/$testfile.adb + set binfile [standard_output_file $testfile] } |