From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by sourceware.org (Postfix) with ESMTPS id 7B01C385702B for ; Wed, 5 Apr 2023 18:34:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7B01C385702B Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 5BD9722388 for ; Wed, 5 Apr 2023 18:34:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1680719653; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=VjaRBAqr9Go+CMoc5qebStdkxX5odQ7AyenLxJo79ko=; b=PSZwkLDtbvDjRbFO2fGbYQ3vyuMwH3HI7SRUye0AaqjrO6QH+9wcC7xAt3CdVJId642+oh lwhM2ZFlCwovlTuM3bqlYe4bbA2aPTXHDr8jhoQwJfxcX3reQPPpPotyxq1rItWKn0mPUG JWo92k46kKOFlaMzpsv1YizARD6rOnk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1680719653; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=VjaRBAqr9Go+CMoc5qebStdkxX5odQ7AyenLxJo79ko=; b=KVIDwSDCzEL815dmd/RB2ZK1K5j1au5pBRyB/j01VLtfqnjC6jBXBLvtnUmx4pKvBc6gPw GzkWq1nFOV6uLxBw== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 47D5013A31 for ; Wed, 5 Apr 2023 18:34:13 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id DJxBECW/LWTEBwAAMHmgww (envelope-from ) for ; Wed, 05 Apr 2023 18:34:13 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH] [gdb/testsuite] Add -q to INTERNAL_GDBFLAGS Date: Wed, 5 Apr 2023 20:34:10 +0200 Message-Id: <20230405183410.13468-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Whenever we start gdb in the testsuite, we have the rather verbose: ... $ gdb GNU gdb (GDB) 14.0.50.20230405-git Copyright (C) 2023 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type "show copying" and "show warranty" for details. This GDB was configured as "x86_64-pc-linux-gnu". Type "show configuration" for configuration details. For bug reporting instructions, please see: . Find the GDB manual and other documentation resources online at: . For help, type "help". Type "apropos word" to search for commands related to "word". (gdb) ... This makes gdb.log longer than necessary and harder to read. We do need to test that the output is produced, but that should be limited to one or a few test-cases. Fix this by adding -q to INTERNAL_GDBFLAGS, such that we simply have: ... $ gdb -q (gdb) ... Tested on x86_64-linux. --- gdb/testsuite/gdb.base/early-init-file.exp | 9 +- gdb/testsuite/gdb.base/libsegfault.exp | 5 +- .../gdb.base/paginate-execution-startup.exp | 14 +- gdb/testsuite/gdb.base/style.exp | 7 +- gdb/testsuite/gdb.gdb/selftest.exp | 5 +- gdb/testsuite/gdb.python/py-prompt.exp | 176 +++++++++--------- gdb/testsuite/lib/gdb.exp | 9 + gdb/testsuite/lib/mi-support.exp | 4 + 8 files changed, 132 insertions(+), 97 deletions(-) diff --git a/gdb/testsuite/gdb.base/early-init-file.exp b/gdb/testsuite/gdb.base/early-init-file.exp index 07159d45f0c..fcd1ff041a1 100644 --- a/gdb/testsuite/gdb.base/early-init-file.exp +++ b/gdb/testsuite/gdb.base/early-init-file.exp @@ -101,7 +101,10 @@ save_vars { env(TERM) } { setenv TERM ansi # Start GDB and confirm that the version string is styled. - check_gdb_startup_version_string version + save_vars { INTERNAL_GDBFLAGS env(HOME) env(XDG_CONFIG_HOME) } { + set INTERNAL_GDBFLAGS [string map {"-q" ""} $INTERNAL_GDBFLAGS] + check_gdb_startup_version_string version + } # Create an empty directory we can use as HOME for some of the # tests below. When we set XDG_CONFIG_HOME we still need to point @@ -120,7 +123,7 @@ save_vars { env(TERM) } { # Now arrange to use the fake home directory early init file. save_vars { INTERNAL_GDBFLAGS env(HOME) env(XDG_CONFIG_HOME) } { - set INTERNAL_GDBFLAGS [string map {"-nx" ""} $INTERNAL_GDBFLAGS] + set INTERNAL_GDBFLAGS [string map {"-nx" "" "-q" ""} $INTERNAL_GDBFLAGS] # Now test GDB when using the HOME directory. set env(HOME) $home_dir @@ -144,7 +147,7 @@ save_vars { env(TERM) } { # Now arrange to use the fake home directory startup file. save_vars { INTERNAL_GDBFLAGS env(HOME) env(XDG_CONFIG_HOME) } { - set INTERNAL_GDBFLAGS [string map {"-nx" ""} $INTERNAL_GDBFLAGS] + set INTERNAL_GDBFLAGS [string map {"-nx" "" "-q" ""} $INTERNAL_GDBFLAGS] # Now test GDB when using the HOME directory. set env(HOME) $home_dir diff --git a/gdb/testsuite/gdb.base/libsegfault.exp b/gdb/testsuite/gdb.base/libsegfault.exp index 7862c9600fe..0af96154eff 100644 --- a/gdb/testsuite/gdb.base/libsegfault.exp +++ b/gdb/testsuite/gdb.base/libsegfault.exp @@ -84,4 +84,7 @@ proc test_libsegfault {} { } } -test_libsegfault +save_vars { ::INTERNAL_GDBFLAGS } { + set ::INTERNAL_GDBFLAGS [string map {"-q" ""} $::INTERNAL_GDBFLAGS] + test_libsegfault +} diff --git a/gdb/testsuite/gdb.base/paginate-execution-startup.exp b/gdb/testsuite/gdb.base/paginate-execution-startup.exp index 0b14db2f922..4c52d0f73c2 100644 --- a/gdb/testsuite/gdb.base/paginate-execution-startup.exp +++ b/gdb/testsuite/gdb.base/paginate-execution-startup.exp @@ -172,12 +172,16 @@ proc test_fg_execution_pagination_cancel { how } { } } -if {[probe_can_run_cmdline] > 0} { - test_fg_execution_pagination_return - if ![target_info exists gdb,nointerrupts] { - test_fg_execution_pagination_cancel "ctrl-c" +save_vars { INTERNAL_GDBFLAGS } { + set INTERNAL_GDBFLAGS [string map {"-q" ""} $INTERNAL_GDBFLAGS] + + if {[probe_can_run_cmdline] > 0} { + test_fg_execution_pagination_return + if ![target_info exists gdb,nointerrupts] { + test_fg_execution_pagination_cancel "ctrl-c" + } + test_fg_execution_pagination_cancel "quit" } - test_fg_execution_pagination_cancel "quit" } set GDBFLAGS $saved_gdbflags diff --git a/gdb/testsuite/gdb.base/style.exp b/gdb/testsuite/gdb.base/style.exp index 0a7228c6890..0370550d251 100644 --- a/gdb/testsuite/gdb.base/style.exp +++ b/gdb/testsuite/gdb.base/style.exp @@ -459,7 +459,12 @@ proc test_disassembler_error_handling { } { # startup process). proc test_startup_version_string { } { gdb_exit - gdb_spawn + + save_vars { ::INTERNAL_GDBFLAGS } { + set ::INTERNAL_GDBFLAGS [string map {"-q" ""} $::INTERNAL_GDBFLAGS] + + gdb_spawn + } # Deliberate use of base STYLE proc here as the style of the # startup version string can't (currently) be controlled. diff --git a/gdb/testsuite/gdb.gdb/selftest.exp b/gdb/testsuite/gdb.gdb/selftest.exp index ac3f3fc2f6a..23d180a6298 100644 --- a/gdb/testsuite/gdb.gdb/selftest.exp +++ b/gdb/testsuite/gdb.gdb/selftest.exp @@ -165,4 +165,7 @@ proc test_with_self { } { return 0 } -do_self_tests captured_main test_with_self +save_vars { INTERNAL_GDBFLAGS } { + set INTERNAL_GDBFLAGS [string map {"-q" ""} $INTERNAL_GDBFLAGS] + do_self_tests captured_main test_with_self +} diff --git a/gdb/testsuite/gdb.python/py-prompt.exp b/gdb/testsuite/gdb.python/py-prompt.exp index 35e8144d3f9..d45bf0f9c97 100644 --- a/gdb/testsuite/gdb.python/py-prompt.exp +++ b/gdb/testsuite/gdb.python/py-prompt.exp @@ -27,92 +27,96 @@ if {[build_executable $testfile.exp $testfile $srcfile debug] == -1} { return -1 } -global GDBFLAGS -set saved_gdbflags $GDBFLAGS -set GDBFLAGS [concat $GDBFLAGS " -ex \"set height 0\""] -set GDBFLAGS [concat $GDBFLAGS " -ex \"set width 0\""] -set GDBFLAGS [concat $GDBFLAGS " -ex \"python p = list()\""] -set prompt_func "python def foo(x): global p; p.append(x); return \'(Foo) \'" -set GDBFLAGS [concat $GDBFLAGS " -ex \"$prompt_func\""] -set GDBFLAGS [concat $GDBFLAGS " -ex \"python gdb.prompt_hook=foo\""] - -set tmp_gdbflags $GDBFLAGS -set gdb_prompt_fail $gdb_prompt - -global gdb_prompt -# Does not include the space at the end of the prompt. -# gdb_test expects it not to be there. -set gdb_prompt "\[(\]Foo\[)\]" - -with_test_prefix "set editing on" { - set GDBFLAGS [concat $tmp_gdbflags " -ex \"set editing on\""] - prompt_gdb_start - gdb_test "python x = len(p); print (gdb.execute(\"show prompt\", to_string = True))" \ - ".*prompt is \"$gdb_prompt \".*" \ - "show prompt gets the correct result" - gdb_test "python print ('%d %d' % (x, len(p)))" "1 2" \ - "retrieving the prompt causes no extra prompt_hook calls" - gdb_test "python print (\"'\" + str(p\[0\]) + \"'\")" "'$gdb_prompt_fail '" \ - "prompt_hook argument is default prompt." - gdb_exit -} - -with_test_prefix "set editing off" { - set GDBFLAGS [concat $tmp_gdbflags " -ex \"set editing off\""] - prompt_gdb_start - gdb_test "python x = len(p); print (gdb.execute(\"show prompt\", to_string = True))" \ - ".*prompt is \"$gdb_prompt \".*" \ - "show prompt gets the correct result 2" - gdb_test "python print ('%d %d' % (x, len(p)))" "1 2" \ - "retrieving the prompt causes no extra prompt_hook calls 2" - gdb_test "python print (\"'\" + str(p\[0\]) + \"'\")" "'$gdb_prompt_fail '" \ - "prompt_hook argument is default prompt. 2" - gdb_exit -} +save_vars { INTERNAL_GDBFLAGS } { + set INTERNAL_GDBFLAGS [string map {"-q" ""} $INTERNAL_GDBFLAGS] + + global GDBFLAGS + set saved_gdbflags $GDBFLAGS + set GDBFLAGS [concat $GDBFLAGS " -ex \"set height 0\""] + set GDBFLAGS [concat $GDBFLAGS " -ex \"set width 0\""] + set GDBFLAGS [concat $GDBFLAGS " -ex \"python p = list()\""] + set prompt_func "python def foo(x): global p; p.append(x); return \'(Foo) \'" + set GDBFLAGS [concat $GDBFLAGS " -ex \"$prompt_func\""] + set GDBFLAGS [concat $GDBFLAGS " -ex \"python gdb.prompt_hook=foo\""] + + set tmp_gdbflags $GDBFLAGS + set gdb_prompt_fail $gdb_prompt + + global gdb_prompt + # Does not include the space at the end of the prompt. + # gdb_test expects it not to be there. + set gdb_prompt "\[(\]Foo\[)\]" + + with_test_prefix "set editing on" { + set GDBFLAGS [concat $tmp_gdbflags " -ex \"set editing on\""] + prompt_gdb_start + gdb_test "python x = len(p); print (gdb.execute(\"show prompt\", to_string = True))" \ + ".*prompt is \"$gdb_prompt \".*" \ + "show prompt gets the correct result" + gdb_test "python print ('%d %d' % (x, len(p)))" "1 2" \ + "retrieving the prompt causes no extra prompt_hook calls" + gdb_test "python print (\"'\" + str(p\[0\]) + \"'\")" "'$gdb_prompt_fail '" \ + "prompt_hook argument is default prompt." + gdb_exit + } + + with_test_prefix "set editing off" { + set GDBFLAGS [concat $tmp_gdbflags " -ex \"set editing off\""] + prompt_gdb_start + gdb_test "python x = len(p); print (gdb.execute(\"show prompt\", to_string = True))" \ + ".*prompt is \"$gdb_prompt \".*" \ + "show prompt gets the correct result 2" + gdb_test "python print ('%d %d' % (x, len(p)))" "1 2" \ + "retrieving the prompt causes no extra prompt_hook calls 2" + gdb_test "python print (\"'\" + str(p\[0\]) + \"'\")" "'$gdb_prompt_fail '" \ + "prompt_hook argument is default prompt. 2" + gdb_exit + } + + if {![can_spawn_for_attach]} { + set GDBFLAGS $saved_gdbflags + return 0 + } + + set test_spawn_id [spawn_wait_for_attach $binfile] + set testpid [spawn_id_get_pid $test_spawn_id] + + set GDBFLAGS [concat $tmp_gdbflags " -ex \"set pagination off\""] + set GDBFLAGS [concat $GDBFLAGS " -ex \"set editing on\""] + set GDBFLAGS [concat $GDBFLAGS " -ex \"attach $testpid\""] + set GDBFLAGS [concat $GDBFLAGS " -ex \"continue&\""] + + # sync_execution = 1 is_running = 1 + with_test_prefix "sync_execution = 1, is_running = 1" { + prompt_gdb_start + gdb_test "python x = len(p); print (gdb.execute(\"show prompt\", to_string = True))" \ + ".*prompt is \"$gdb_prompt \".*" \ + "show prompt gets the correct result 3" + gdb_test "python print ('%d %d' % (x, len(p)))" "1 2" \ + "retrieving the prompt causes no extra prompt_hook calls 3" + gdb_test "python print (\"'\" + str(p\[0\]) + \"'\")" "'$gdb_prompt_fail '" \ + "prompt_hook argument is default prompt. 3" + gdb_exit + } + + set GDBFLAGS [concat $tmp_gdbflags " -ex \"set pagination off\""] + set GDBFLAGS [concat $GDBFLAGS " -ex \"set editing on\""] + set GDBFLAGS [concat $GDBFLAGS " -ex \"attach $testpid\""] + set GDBFLAGS [concat $GDBFLAGS " -ex \"interrupt\""] + + # sync_execution = 1 is_running = 0 + with_test_prefix "sync_execution = 1, is_running = 0" { + prompt_gdb_start + gdb_test "python x = len(p); print (gdb.execute(\"show prompt\", to_string = True))" \ + ".*prompt is \"$gdb_prompt \".*" \ + "show prompt gets the correct result 4" + gdb_test "python print ('%d %d' % (x, len(p)))" "1 2" \ + "retrieving the prompt causes no extra prompt_hook calls 4" + gdb_test "python print (\"'\" + str(p\[0\]) + \"'\")" "'$gdb_prompt_fail '" \ + "prompt_hook argument is default prompt. 4" + gdb_exit + } -if {![can_spawn_for_attach]} { set GDBFLAGS $saved_gdbflags - return 0 -} - -set test_spawn_id [spawn_wait_for_attach $binfile] -set testpid [spawn_id_get_pid $test_spawn_id] - -set GDBFLAGS [concat $tmp_gdbflags " -ex \"set pagination off\""] -set GDBFLAGS [concat $GDBFLAGS " -ex \"set editing on\""] -set GDBFLAGS [concat $GDBFLAGS " -ex \"attach $testpid\""] -set GDBFLAGS [concat $GDBFLAGS " -ex \"continue&\""] - -# sync_execution = 1 is_running = 1 -with_test_prefix "sync_execution = 1, is_running = 1" { - prompt_gdb_start - gdb_test "python x = len(p); print (gdb.execute(\"show prompt\", to_string = True))" \ - ".*prompt is \"$gdb_prompt \".*" \ - "show prompt gets the correct result 3" - gdb_test "python print ('%d %d' % (x, len(p)))" "1 2" \ - "retrieving the prompt causes no extra prompt_hook calls 3" - gdb_test "python print (\"'\" + str(p\[0\]) + \"'\")" "'$gdb_prompt_fail '" \ - "prompt_hook argument is default prompt. 3" - gdb_exit -} - -set GDBFLAGS [concat $tmp_gdbflags " -ex \"set pagination off\""] -set GDBFLAGS [concat $GDBFLAGS " -ex \"set editing on\""] -set GDBFLAGS [concat $GDBFLAGS " -ex \"attach $testpid\""] -set GDBFLAGS [concat $GDBFLAGS " -ex \"interrupt\""] - -# sync_execution = 1 is_running = 0 -with_test_prefix "sync_execution = 1, is_running = 0" { - prompt_gdb_start - gdb_test "python x = len(p); print (gdb.execute(\"show prompt\", to_string = True))" \ - ".*prompt is \"$gdb_prompt \".*" \ - "show prompt gets the correct result 4" - gdb_test "python print ('%d %d' % (x, len(p)))" "1 2" \ - "retrieving the prompt causes no extra prompt_hook calls 4" - gdb_test "python print (\"'\" + str(p\[0\]) + \"'\")" "'$gdb_prompt_fail '" \ - "prompt_hook argument is default prompt. 4" - gdb_exit + kill_wait_spawned_process $test_spawn_id } - -set GDBFLAGS $saved_gdbflags -kill_wait_spawned_process $test_spawn_id diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index bb4bd656471..7538071d1cf 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -216,6 +216,7 @@ if ![info exists INTERNAL_GDBFLAGS] { [join [list \ "-nw" \ "-nx" \ + "-q" \ {-iex "set height 0"} \ {-iex "set width 0"}]] @@ -2302,6 +2303,14 @@ proc default_gdb_start { } { # that case, this case is hit. verbose "GDB initialized." } + -re "^$gdb_prompt $" { + # Output with -q. + verbose "GDB initialized." + } + -re "^\033\\\[.2004h$gdb_prompt $" { + # Output with -q, and bracketed paste mode enabled, see above. + verbose "GDB initialized." + } -re "$gdb_prompt $" { perror "GDB never initialized." unset gdb_spawn_id diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp index c914ed49150..1841816ffeb 100644 --- a/gdb/testsuite/lib/mi-support.exp +++ b/gdb/testsuite/lib/mi-support.exp @@ -265,6 +265,10 @@ proc default_mi_gdb_start { { flags {} } } { # We have a new format mi startup prompt. verbose "GDB initialized." } + -re "^(=\[^\r\n\]*\r\n)*$mi_gdb_prompt$" { + # Output with -q. + verbose "GDB initialized." + } -re ".*unrecognized option.*for a complete list of options." { untested "skip mi tests (not compiled with mi support)." remote_close host base-commit: 3401f947d8612ffad751fc71e7deda8613b6630e -- 2.35.3