Get rid of "No such file or directory" in the testsuite's btrace support detection.

When I tried running the btrace tests, I noticed something odd in the gdb.log file:

 (gdb) run
 Starting program: /home/pedro/gdb/mygit/build/gdb/testsuite/gdb.btrace/btrace22343.x
 Breakpoint 1, main () at /home/pedro/gdb/mygit/build/gdb/testsuite/gdb.btrace/btrace22343.c:1
 1       /home/pedro/gdb/mygit/build/gdb/testsuite/gdb.btrace/btrace22343.c: No such file or directory.
                                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^
 (gdb) record btrace
 Target does not support branch tracing.
 (gdb) testcase ../../../src/gdb/testsuite/gdb.btrace/enable.exp completed in 0 seconds

I knew that the btrace tests on my machine weren't supposed to work,
but still, that error made me wonder if the test had something broken,
and waste a few minutes looking up where that is coming from.

The issue is that the btrace detection deletes the source file right
after compiling it, and before GDB has a chance to open it.  It's
really harmless, but I'd rather spare others from going through the
same exercise.

We now get the regular:

 (gdb) run
 Starting program: /home/pedro/gdb/mygit/build/gdb/testsuite/gdb.btrace/btrace24210.x
 ...
 Breakpoint 1, main () at /home/pedro/gdb/mygit/build/gdb/testsuite/gdb.btrace/btrace24210.c:1
 1       int main(void) { return 0; }
 ...

gdb/testsuite/
2013-03-26  Pedro Alves  <palves@redhat.com>

	* lib/gdb.exp (skip_btrace_tests): Delay deleting the source file
	until after GDB has run.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 6b0692dd00c0610d4717fad94b2f2f529f504f0a..2d96caa0e73bf557e63f66e613d5607a3ba654f1 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-26  Pedro Alves  <palves@redhat.com>
+
+       * lib/gdb.exp (skip_btrace_tests): Delay deleting the source file
+       until after GDB has run.
+
 2013-03-26  Yao Qi  <yao@codesourcery.com>
 
        * gdb.trace/actions.c, gdb.trace/circ.c: Add license header.

diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index ee9fdecd26117fac2720df9238b30c518a5e6b61..d05257d0f3cbfc29d7104f8b7951d816dfec624e 100644 (file)
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -2129,10 +2129,10 @@ proc skip_btrace_tests {} {
     verbose "$me:  compiling testfile $src" 2
     set compile_flags {debug nowarnings quiet}
     set lines [gdb_compile $src $exe executable $compile_flags]
-    file delete $src
 
     if ![string match "" $lines] then {
         verbose "$me:  testfile compilation failed, returning 1" 2
+       file delete $src
         return [set skip_btrace_tests_saved 1]
     }
 
@@ -2140,8 +2140,10 @@ proc skip_btrace_tests {} {
 
     clean_restart btrace[pid].x
     if ![runto_main] {
+       file delete $src
         return [set skip_btrace_tests_saved 1]
     }
+    file delete $src
     # In case of an unexpected output, we return 2 as a fail value.
     set skip_btrace_tests_saved 2
     gdb_test_multiple "record btrace" "check btrace support" {