diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2016-08-26 12:35:58 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2016-08-26 12:35:58 +0100 |
| commit | e8223484b3a8b8bbe20dfd70706e3da626f2b962 (patch) | |
| tree | b11c78e688a768d8f5f220ab1d9fd08152727987 | |
| parent | 21184026d5e37878304c421cba6649fbc44f1b7c (diff) | |
| download | gcc-e8223484b3a8b8bbe20dfd70706e3da626f2b962.zip gcc-e8223484b3a8b8bbe20dfd70706e3da626f2b962.tar.gz gcc-e8223484b3a8b8bbe20dfd70706e3da626f2b962.tar.bz2 | |
Restore dg-interpreter-batch-mode for libstdc++ tests
2016-08-26 Jonathan Wakely <jwakely@redhat.com>
Pedro Alves <palves@redhat.com>
* testsuite/lib/gdb-test.exp (gdb-dg-runtest): Define wrapper to save
and restore dg-interpreter-batch-mode.
* testsuite/libstdc++-prettyprinters/prettyprinters.exp: Use
gdb-dg-runtest instead of dg-runtest.
* testsuite/libstdc++-xmethods/xmethods.exp: Likewise.
Co-Authored-By: Pedro Alves <palves@redhat.com>
From-SVN: r239776
| -rw-r--r-- | libstdc++-v3/ChangeLog | 9 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/lib/gdb-test.exp | 12 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/libstdc++-prettyprinters/prettyprinters.exp | 7 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/libstdc++-xmethods/xmethods.exp | 7 |
4 files changed, 23 insertions, 12 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 8b552b0..8a7f59d 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,4 +1,13 @@ 2016-08-26 Jonathan Wakely <jwakely@redhat.com> + Pedro Alves <palves@redhat.com> + + * testsuite/lib/gdb-test.exp (gdb-dg-runtest): Define wrapper to save + and restore dg-interpreter-batch-mode. + * testsuite/libstdc++-prettyprinters/prettyprinters.exp: Use + gdb-dg-runtest instead of dg-runtest. + * testsuite/libstdc++-xmethods/xmethods.exp: Likewise. + +2016-08-26 Jonathan Wakely <jwakely@redhat.com> * config/abi/pre/gnu.ver (GLIBCXX_3.4, GLIBCXX_3.4.21): Use more precise patterns for basic_string constructors. diff --git a/libstdc++-v3/testsuite/lib/gdb-test.exp b/libstdc++-v3/testsuite/lib/gdb-test.exp index 5570009..a029883 100644 --- a/libstdc++-v3/testsuite/lib/gdb-test.exp +++ b/libstdc++-v3/testsuite/lib/gdb-test.exp @@ -277,3 +277,15 @@ proc gdb_version_check_xmethods {} { "python import gdb.xmethod; print(gdb.xmethod.XMethod)" \ "<class 'gdb\\.xmethod\\.XMethod'>"] } + +# Like dg-runtest but keep the .exe around. dg-test has an option for +# this but there is no way to pass it through dg-runtest. +proc gdb-dg-runtest {args} { + global dg-interpreter-batch-mode + set saved-dg-interpreter-batch-mode ${dg-interpreter-batch-mode} + set dg-interpreter-batch-mode 1 + + eval dg-runtest $args + + set dg-interpreter-batch-mode ${saved-dg-interpreter-batch-mode} +} diff --git a/libstdc++-v3/testsuite/libstdc++-prettyprinters/prettyprinters.exp b/libstdc++-v3/testsuite/libstdc++-prettyprinters/prettyprinters.exp index 0c62b5e..cc003cd 100644 --- a/libstdc++-v3/testsuite/libstdc++-prettyprinters/prettyprinters.exp +++ b/libstdc++-v3/testsuite/libstdc++-prettyprinters/prettyprinters.exp @@ -41,14 +41,9 @@ if {! [gdb_version_check]} { return } -# This can be used to keep the .exe around. dg-test has an option for -# this but there is no way to pass it through dg-runtest. -global dg-interpreter-batch-mode -set dg-interpreter-batch-mode 1 - global DEFAULT_CXXFLAGS global PCH_CXXFLAGS -dg-runtest [lsort [glob $srcdir/$subdir/*.cc]] \ +gdb-dg-runtest [lsort [glob $srcdir/$subdir/*.cc]] \ "" "$DEFAULT_CXXFLAGS $PCH_CXXFLAGS" if [info exists guality_gdb_name] { diff --git a/libstdc++-v3/testsuite/libstdc++-xmethods/xmethods.exp b/libstdc++-v3/testsuite/libstdc++-xmethods/xmethods.exp index ee9b31a..e580d73 100644 --- a/libstdc++-v3/testsuite/libstdc++-xmethods/xmethods.exp +++ b/libstdc++-v3/testsuite/libstdc++-xmethods/xmethods.exp @@ -42,14 +42,9 @@ if {! [gdb_version_check_xmethods]} { return } -# This can be used to keep the .exe around. dg-test has an option for -# this but there is no way to pass it through dg-runtest. -global dg-interpreter-batch-mode -set dg-interpreter-batch-mode 1 - global DEFAULT_CXXFLAGS global PCH_CXXFLAGS -dg-runtest [lsort [glob $srcdir/$subdir/*.cc]] \ +gdb-dg-runtest [lsort [glob $srcdir/$subdir/*.cc]] \ "" "$DEFAULT_CXXFLAGS $PCH_CXXFLAGS" if [info exists guality_gdb_name] { |