gdb/testsuite: avoid temporary file in gdb/testsuite (unittest.exp)

I spotted that the gdb.gdb/unittest.exp script causes a temporary file
inserters_extractors-2.txt to be created in build/gdb/testsuite/
instead of in build/gdb/testsuite/output/gdb.gdb/unittest/.

This is because some of the 'maint selftest' tests create temporary
files in GDB's current directory, specifically, the two source files:

  gdb/unittests/basic_string_view/inserters/wchar_t/2.cc
  gdb/unittests/basic_string_view/inserters/char/2.cc

both create a temporary file called inserters_extractors-2.txt, though
we only run the second of these as part of GDB's selftests.

I initially proposed just using GDB's 'cd' command in unittest.exp to
switch to the test output directory before running the selftests,
however, Pedro pointed out that there was a risk here that, if GDB
crashed during shutdown, the generated core file would be left in the
test output directory rather than in the testsuite directory.  As a
result, our clever core file spotting logic would fail to spot the
core file and alert the user.

Instead, I propose this slightly more involved solution.  I've added a
new with_gdb_cwd directory proc, used like this:

  with_gdb_cwd $directory {
    # Tests here...
  }

The new proc temporarily switches to $directory and then runs the
tests within the block.  After running the tests the previous current
working directory is restored.

Additionally, after switching back to the previous cwd, we check that
GDB is still responsive.  This means that if GDB crashed immediately
prior to restoring the previous directory, and left the core file in
the wrong place, then the responsiveness check will fail, and a FAIL
will be emitted, this should be enough to alert the user that
something has gone wrong.

With this commit in place the unittest.exp script now leaves its
temporary file in the test output directory.

diff --git a/gdb/testsuite/gdb.gdb/unittest.exp b/gdb/testsuite/gdb.gdb/unittest.exp
index 2967b994cc3dcccac0f8680b247bc7651a3a68bb..fdae7a2463256cf6c4f581a3ffb3512fed42a720 100644 (file)
--- a/gdb/testsuite/gdb.gdb/unittest.exp
+++ b/gdb/testsuite/gdb.gdb/unittest.exp
@@ -40,26 +40,34 @@ proc run_selftests { binfile } {
        clean_restart ${binfile}
     }
 
+    # Some of the selftests create temporary files in GDB's current
+    # directory.  So, while running the selftests, switch to the
+    # test's output directory to avoid leaving clutter in the
+    # gdb/testsuite root directory.
+    set dir [standard_output_file ""]
     set enabled 1
-    set test "maintenance selftest"
-    gdb_test_multiple $test $test {
-       -re ".*Running selftest \[^\n\r\]+\." {
-           # The selftests can take some time to complete.  To prevent
-           # timeout spot the 'Running ...' lines going past, so long as
-           # these are produced quickly enough then the overall test will
-           # not timeout.
-           exp_continue
-       }
-       -re "Ran ($decimal) unit tests, ($decimal) failed\r\n$gdb_prompt $" {
-           set num_ran $expect_out(1,string)
-           set num_failed $expect_out(2,string)
-           gdb_assert "$num_ran > 0" "$test, ran some tests"
-           gdb_assert "$num_failed == 0" "$test, failed none"
-       }
-       -re "Selftests have been disabled for this build.\r\n$gdb_prompt $" {
-           unsupported $test
-           set num_ran 0
-           set enabled 0
+    set num_ran 0
+    with_gdb_cwd $dir {
+       set test "maintenance selftest"
+       gdb_test_multiple $test $test {
+           -re ".*Running selftest \[^\n\r\]+\." {
+               # The selftests can take some time to complete.  To prevent
+               # timeout spot the 'Running ...' lines going past, so long as
+               # these are produced quickly enough then the overall test will
+               # not timeout.
+               exp_continue
+           }
+           -re "Ran ($decimal) unit tests, ($decimal) failed\r\n$gdb_prompt $" {
+               set num_ran $expect_out(1,string)
+               set num_failed $expect_out(2,string)
+               gdb_assert "$num_ran > 0" "$test, ran some tests"
+               gdb_assert "$num_failed == 0" "$test, failed none"
+           }
+           -re "Selftests have been disabled for this build.\r\n$gdb_prompt $" {
+               unsupported $test
+               set num_ran 0
+               set enabled 0
+           }
        }
     }
 

diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index c510ab253654ae9a5dadcacad994f2222c86a8e9..e2cda30b95a06a5e5b5cfb3534f47f77e4e65822 100644 (file)
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -2904,6 +2904,116 @@ proc with_cwd { dir body } {
     }
 }
 
+# Use GDB's 'cd' command to switch to DIR.  Return true if the switch
+# was successful, otherwise, call perror and return false.
+
+proc gdb_cd { dir } {
+    set new_dir ""
+    gdb_test_multiple "cd $dir" "" {
+       -re "^cd \[^\r\n\]+\r\n" {
+           exp_continue
+       }
+
+       -re "^Working directory (\[^\r\n\]+)\\.\r\n" {
+           set new_dir $expect_out(1,string)
+           exp_continue
+       }
+
+       -re "^$::gdb_prompt $" {
+           if { $new_dir == "" || $new_dir != $dir } {
+               perror "failed to switch to $dir"
+               return false
+           }
+       }
+    }
+
+    return true
+}
+
+# Use GDB's 'pwd' command to figure out the current working directory.
+# Return the directory as a string.  If we can't figure out the
+# current working directory, then call perror, and return the empty
+# string.
+
+proc gdb_pwd { } {
+    set dir ""
+    gdb_test_multiple "pwd" "" {
+       -re "^pwd\r\n" {
+           exp_continue
+       }
+
+       -re "^Working directory (\[^\r\n\]+)\\.\r\n" {
+           set dir $expect_out(1,string)
+           exp_continue
+       }
+
+       -re "^$::gdb_prompt $" {
+       }
+    }
+
+    if { $dir == "" } {
+       perror "failed to read GDB's current working directory"
+    }
+
+    return $dir
+}
+
+# Similar to the with_cwd proc, this proc runs BODY with the current
+# working directory changed to CWD.
+#
+# Unlike with_cwd, the directory change here is done within GDB
+# itself, so GDB must be running before this proc is called.
+
+proc with_gdb_cwd { dir body } {
+    set saved_dir [gdb_pwd]
+    if { $saved_dir == "" } {
+       return
+    }
+
+    verbose -log "Switching to directory $dir (saved CWD: $saved_dir)."
+    if ![gdb_cd $dir] {
+       return
+    }
+
+    set code [catch {uplevel 1 $body} result]
+
+    verbose -log "Switching back to $saved_dir."
+    if ![gdb_cd $saved_dir] {
+       return
+    }
+
+    # Check that GDB is still alive.  If GDB crashed in the above code
+    # then any corefile will have been left in DIR, not the root
+    # testsuite directory.  As a result the corefile will not be
+    # brought to the users attention.  Instead, if GDB crashed, then
+    # this check should cause a FAIL, which should be enough to alert
+    # the user.
+    set saw_result false
+    gdb_test_multiple "p 123" "" {
+       -re "p 123\r\n" {
+           exp_continue
+       }
+
+       -re "^\\\$$::decimal = 123\r\n" {
+           set saw_result true
+           exp_continue
+       }
+
+       -re "^$::gdb_prompt $" {
+           if { !$saw_result } {
+               fail "check gdb is alive in with_gdb_cwd"
+           }
+       }
+    }
+
+    if {$code == 1} {
+       global errorInfo errorCode
+       return -code $code -errorinfo $errorInfo -errorcode $errorCode $result
+    } else {
+       return -code $code $result
+    }
+}
+
 # Run tests in BODY with GDB prompt and variable $gdb_prompt set to
 # PROMPT.  When BODY is finished, restore GDB prompt and variable
 # $gdb_prompt.