diff options
author | Daniel Jacobowitz <drow@false.org> | 2006-08-23 17:24:07 +0000 |
---|---|---|
committer | Daniel Jacobowitz <drow@false.org> | 2006-08-23 17:24:07 +0000 |
commit | 3128dd130893d1bb84e89c2f29f6ba93627e0aaf (patch) | |
tree | 2a6045bcd405dbd177180c2aa0bee6ead2db4ec5 | |
parent | 2c3fa127dab44d8aced91f316837037fcef7776a (diff) | |
download | binutils-gdb-3128dd130893d1bb84e89c2f29f6ba93627e0aaf.tar.gz |
* config/symbian.exp (symbian_compile): Fail after unknown options.gdb-csl-symbian-6_4_50_20060226-11
Copy ELF files from the build tree.
* gdb.asm/asm-source.exp: Use untested.
-rw-r--r-- | ChangeLog.csl | 7 | ||||
-rw-r--r-- | gdb/testsuite/config/symbian.exp | 15 | ||||
-rw-r--r-- | gdb/testsuite/gdb.asm/asm-source.exp | 6 |
3 files changed, 25 insertions, 3 deletions
diff --git a/ChangeLog.csl b/ChangeLog.csl index 47391faaf98..2eabc49f56a 100644 --- a/ChangeLog.csl +++ b/ChangeLog.csl @@ -1,3 +1,10 @@ +2006-08-23 Daniel Jacobowitz <dan@codesourcery.com> + + gdb/testsuite/ + * config/symbian.exp (symbian_compile): Fail after unknown options. + Copy ELF files from the build tree. + * gdb.asm/asm-source.exp: Use untested. + 2006-08-17 Daniel Jacobowitz <dan@codesourcery.com> gdb/testsuite/ diff --git a/gdb/testsuite/config/symbian.exp b/gdb/testsuite/config/symbian.exp index 95e4cc8b810..cb129c02bcc 100644 --- a/gdb/testsuite/config/symbian.exp +++ b/gdb/testsuite/config/symbian.exp @@ -70,6 +70,7 @@ proc symbian_compile { sources destfile type options } { append allflags " $flags" } else { warning "Compilation option $option not supported" + return -1 } } @@ -134,7 +135,19 @@ proc symbian_compile { sources destfile type options } { } file copy -force -- "$epocroot/epoc32/release/gcce/${reldir}/${proj}.exe" ${destfile}.exe - file copy -force -- "$epocroot/epoc32/release/gcce/${reldir}/${proj}.sym" ${destfile} + + # Don't look for a .sym file in that same directory; UDEB has one but + # UREL doesn't. Grab the .exe from the temporary build directory instead. + # file copy -force -- "$epocroot/epoc32/release/gcce/${reldir}/${proj}.sym" ${destfile} + + set result [file native [file normalize [pwd]]] + if { [string first "C:" $result] != -1 } { + set result [string map {C: ""} $result] + } else { + # This appears to be a Unix-thinking sort of TCL. + set result "/cygwin/$result" + } + file copy -force -- "$epocroot/epoc32/BUILD$result/${proj}/gcce/${reldir}/${proj}.exe" ${destfile} # file delete "bld.inf" # file delete "${proj}.mmp" diff --git a/gdb/testsuite/gdb.asm/asm-source.exp b/gdb/testsuite/gdb.asm/asm-source.exp index cbd38a45b36..5797c440a4e 100644 --- a/gdb/testsuite/gdb.asm/asm-source.exp +++ b/gdb/testsuite/gdb.asm/asm-source.exp @@ -230,10 +230,12 @@ regsub "--" "-gstabs\[+\]" "${debug-flags}" "-gstabs" debug-flags regsub "--" "-g\[0-9\]" "${debug-flags}" "" debug-flags if {[target_assemble ${srcdir}/${subdir}/${srcfile1} asmsrc1.o "${asm-flags} ${debug-flags}"] != ""} then { - gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." + untested asm-source.exp + return -1 } if {[target_assemble ${srcdir}/${subdir}/${srcfile2} asmsrc2.o "${asm-flags} ${debug-flags}"] != ""} then { - gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." + untested asm-source.exp + return -1 } # We deliberately don't use gdb_compile here to link together the |