> On 16 May 2019, at 20:19, Tom Tromey <tom@tromey.com> wrote:
>
>>>>>> "Alan" == Alan Hayward <Alan.Hayward@arm.com> writes:
>
> Alan> Fix up all failures encountered when running the testsuite with
> Alan> GDB_DEBUG="infrun".
>
> Alan> Some tests rely on enabling debugging for various components. With
> Alan> debugging on, this will be lost to the debug file.
>
> Alan> Disable separate tty for mi tests when debugging. This currently
> Alan> does not work.
>
> Alan> disasm.c should send errors to the stderr instead of the logfile.
>
> I wonder if it should error(), but this isn't something you need to
> worry about for this patch.
Sounds reasonable.
>
> Alan> +# Test relies on checking gdb debug ouput. Do not run if gdb debug is
>
> All these patches have the "ouput" typo, should be "output”.
Doh! Fixed.
>
> Alan> +if [gdb_debug_enabled] {
> Alan> + continue
>
> I think these early returns should call "untested", see:
>
> https://sourceware.org/gdb/wiki/GDBTestcaseCookbook#A.22untested.22_calls
>
Makes sense. Fixed these all up to be:
if [gdb_debug_enabled] {
untested "debug is enabled"
return 0
}
Pushed with the above changes:
@@ -943,7 +943,7 @@ set_disassembler_options (char *prospective_options)
valid_options_and_args = gdbarch_valid_disassembler_options (gdbarch);
if (valid_options_and_args == NULL)
{
- fprintf_filtered (gdb_stdlog, _("\
+ fprintf_filtered (gdb_stderr, _("\
'set disassembler-options ...' is not supported on this architecture.\n"));
return;
}
@@ -979,7 +979,7 @@ set_disassembler_options (char *prospective_options)
break;
if (valid_options->name[i] == NULL)
{
- fprintf_filtered (gdb_stdlog,
+ fprintf_filtered (gdb_stderr,
_("Invalid disassembler option value: '%s'.\n"),
opt);
return;
@@ -15,6 +15,13 @@
# This file is part of the gdb testsuite
+# Test relies on checking gdb debug output. Do not run if gdb debug is
+# enabled as any debug will be redirected to the log.
+if [gdb_debug_enabled] {
+ untested "debug is enabled"
+ return 0
+}
+
standard_testfile
if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } {
@@ -15,6 +15,13 @@
# Test "set debug expr 1" on c expressions.
+# Test relies on checking gdb debug output. Do not run if gdb debug is
+# enabled as any debug will be redirected to the log.
+if [gdb_debug_enabled] {
+ untested "debug is enabled"
+ return 0
+}
+
standard_testfile .c
if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug}]} {
@@ -20,6 +20,13 @@ if { ![istarget "*-*-linux*"] && ![istarget "*-*-openbsd*"] } then {
continue
}
+# Test relies on checking follow-fork output. Do not run if gdb debug is
+# enabled as it will be redirected to the log.
+if [gdb_debug_enabled] {
+ untested "debug is enabled"
+ return 0
+}
+
standard_testfile
if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
@@ -25,6 +25,13 @@ if {![istarget "*-linux*"]} then {
continue
}
+# Test relies on checking follow-fork output. Do not run if gdb debug is
+# enabled as it will be redirected to the log.
+if [gdb_debug_enabled] {
+ untested "debug is enabled"
+ return 0
+}
+
standard_testfile
set compile_options debug
@@ -25,6 +25,13 @@ if { [use_gdb_stub] } {
return
}
+# Test relies on checking follow-fork output. Do not run if gdb debug is
+# enabled as it will be redirected to the log.
+if [gdb_debug_enabled] {
+ untested "debug is enabled"
+ return 0
+}
+
standard_testfile
if { [prepare_for_testing "failed to prepare" $testfile $srcfile debug] } {
@@ -15,6 +15,13 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# Test relies on checking gdb debug output. Do not run if gdb debug is
+# enabled as any debug will be redirected to the log.
+if [gdb_debug_enabled] {
+ untested "debug is enabled"
+ return 0
+}
+
standard_testfile
# The test program exits after a while, in case GDB crashes. Make it
@@ -21,6 +21,12 @@
# We cannot expect remote hosts to see environment variables set on the
# local machine.
+# Do not run if gdb debug is enabled - it interferes with the command history.
+if [gdb_debug_enabled] {
+ untested "debug is enabled"
+ return 0
+}
+
if { [is_remote host] } {
unsupported "can't set environment variables on remote host"
return -1
@@ -15,6 +15,13 @@
# This file is part of the gdb testsuite.
+# Test relies on checking gdb debug output. Do not run if gdb debug is
+# enabled as any debug will be redirected to the log.
+if [gdb_debug_enabled] {
+ untested "debug is enabled"
+ return 0
+}
+
# Test that choosing "set osabi none" really requests a gdbarch with no osabi.
proc test_set_osabi_none { } {
@@ -31,6 +31,13 @@
# 4 - The single-step finishes, and GDB removes the single-step
# breakpoint.
+# Test relies on checking gdb debug output. Do not run if gdb debug is
+# enabled as any debug will be redirected to the log.
+if [gdb_debug_enabled] {
+ untested "debug is enabled"
+ return 0
+}
+
standard_testfile
if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
@@ -13,6 +13,12 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# Do not run if gdb debug is enabled as it will interfere with log redirect.
+if [gdb_debug_enabled] {
+ untested "debug is enabled"
+ return 0
+}
+
if { [prepare_for_testing "failed to prepare" ui-redirect start.c] } {
return -1
}
@@ -13,6 +13,13 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# Do not run if gdb debug is enabled as maintenance output will be
+# redirected to the log files.
+if [gdb_debug_enabled] {
+ untested "debug is enabled"
+ return 0
+}
+
set do_xml_test [expr ![gdb_skip_xml_test]]
gdb_start
@@ -429,6 +429,13 @@ proc test_break {mi_mode} {
test_explicit_breakpoints
}
-foreach_with_prefix mi-mode {"main" "separate"} {
+if [gdb_debug_enabled] {
+ # gdb debug doesn't work for separate-mi-tty.
+ set modes {"main"}
+} else {
+ set modes {"main" "separate"}
+}
+
+foreach_with_prefix mi-mode $modes {
test_break ${mi-mode}
}
@@ -174,9 +174,16 @@ proc test_watchpoint_all {mi_mode type} {
test_watchpoint_triggering
}
+if [gdb_debug_enabled] {
+ # gdb debug doesn't work for separate-mi-tty.
+ set modes {"main"}
+} else {
+ set modes {"main" "separate"}
+}
+
# Run the tests twice, once using software watchpoints, and another
# with hardware watchpoints.
-foreach_with_prefix mi-mode {"main" "separate"} {
+foreach_with_prefix mi-mode $modes {
foreach_with_prefix wp-type {"sw" "hw"} {
test_watchpoint_all ${mi-mode} ${wp-type}
}
@@ -20,6 +20,12 @@
# commands, MI should not process further commands until the inferior
# stops again. See PR gdb/20418.
+# Do not run if gdb debug is enabled as it doesn't work for separate-mi-tty.
+if [gdb_debug_enabled] {
+ untested "debug is enabled"
+ return 0
+}
+
load_lib mi-support.exp
standard_testfile
@@ -29,6 +29,12 @@
# - Thread 3 of each inferior is either stopped at /* thread loop line */, if we
# are using all-stop, or running, if we are using non-stop.
+# Do not run if gdb debug is enabled as it doesn't work for separate-mi-tty.
+if [gdb_debug_enabled] {
+ untested "debug is enabled"
+ return 0
+}
+
load_lib mi-support.exp
standard_testfile
@@ -293,7 +293,10 @@ gdb_test "python print (sys.stdout)" ".*gdb.GdbOutputFile (instance|object) at.*
gdb_test "python gdb.write(\"Foo\\n\")" "Foo" "test default write"
gdb_test "python gdb.write(\"Error stream\\n\", stream=gdb.STDERR)" "Error stream" "test stderr write"
gdb_test "python gdb.write(\"Normal stream\\n\", stream=gdb.STDOUT)" "Normal stream" "test stdout write"
-gdb_test "python gdb.write(\"Log stream\\n\", stream=gdb.STDLOG)" "Log stream" "test stdlog write"
+
+if ![gdb_debug_enabled] {
+ gdb_test "python gdb.write(\"Log stream\\n\", stream=gdb.STDLOG)" "Log stream" "test stdlog write"
+}
# Turn on full stack printing for subsequent tests.
gdb_py_test_silent_cmd "set python print-stack full" \
@@ -18,6 +18,13 @@ if {[target_info gdb_protocol] != "" || ![istarget *-linux*]} {
continue
}
+# Test relies on checking gdb debug output. Do not run if gdb debug is
+# enabled as any debug will be redirected to the log.
+if [gdb_debug_enabled] {
+ untested "debug is enabled"
+ return 0
+}
+
standard_testfile
if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
@@ -18,6 +18,12 @@
# stop, when the thread that hit that breakpoint is not the stepped
# thread.
+# Test relies on checking gdb debug output. Do not run if gdb debug is
+# enabled as any debug will be redirected to the log.
+if [gdb_debug_enabled] {
+ continue
+}
+
standard_testfile
set executable ${testfile}
@@ -13,6 +13,13 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# Test relies on checking gdb debug output. Do not run if gdb debug is
+# enabled as any debug will be redirected to the log.
+if [gdb_debug_enabled] {
+ untested "debug is enabled"
+ return 0
+}
+
standard_testfile
set executable ${testfile}