From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by sourceware.org (Postfix) with ESMTPS id 316B538618BD for ; Mon, 19 Feb 2024 08:23:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 316B538618BD Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 316B538618BD Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708331037; cv=none; b=bA46qYPDViPsmBFCKGOtUGyZgi1n1dt8hskeTuXM1wOGnxYQOqwtpxJVRrmkz/EGu7jUotowQg5jMMXwzg/35bjF03liBX/TEKEwzXuEt4xB1vqWe0bjI89kscLHILKjkkfdzT++rrB5Z8Vk6VRUdJp+gHs+X56FybDN7v1yotM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708331037; c=relaxed/simple; bh=PLSdJDdi+m3eDQRX6gSSodhmOfjHAFhALBvSq6+XeBQ=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=xK4TMFTTNPXON1hpXssqtaB6ymXSeBNWB7yufltivi8XZ2RbAXthQzZgW57nGjA7BxYbcn4B2Wvg8xbDBuQ8BZYgzjhIYHpQC1ytbZlnxPFmthm+1VGNZnKiW4UkFX66EMRj4dS7lmliooD4K/JGgvIZTFT9WiyOKjx2p00p9Cg= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 2298E1F7E3 for ; Mon, 19 Feb 2024 08:23:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1708331032; 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=7kJdwu9qKF/in2+Qddz9UuBDAzpA2c3N2rFUc6YMmx8=; b=sENUMETJSxnMNAa+2bgya8hlzP3dA2FMmXPPjSNPBe4eLvxZBz/eAdK34IGAB9uTG+yEN0 nBwSZLRSskjzw84EUEEllU1lvo21KOtIE0YZIyi8XnhfB8Z5n3XO0KtsTcoCgxJhwRobRV 540XfuWG9p2y6iPFNysbYTaPcBtWCqA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1708331032; 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=7kJdwu9qKF/in2+Qddz9UuBDAzpA2c3N2rFUc6YMmx8=; b=Zl0+DTVSoitdpP+KUIY6TPAu+CrSmcqEA6k29b57u78srd3oZLNift6h2JMCAw2cF8o7y7 f7kZ9JW8U0+ch/Bg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1708331032; 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=7kJdwu9qKF/in2+Qddz9UuBDAzpA2c3N2rFUc6YMmx8=; b=sENUMETJSxnMNAa+2bgya8hlzP3dA2FMmXPPjSNPBe4eLvxZBz/eAdK34IGAB9uTG+yEN0 nBwSZLRSskjzw84EUEEllU1lvo21KOtIE0YZIyi8XnhfB8Z5n3XO0KtsTcoCgxJhwRobRV 540XfuWG9p2y6iPFNysbYTaPcBtWCqA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1708331032; 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=7kJdwu9qKF/in2+Qddz9UuBDAzpA2c3N2rFUc6YMmx8=; b=Zl0+DTVSoitdpP+KUIY6TPAu+CrSmcqEA6k29b57u78srd3oZLNift6h2JMCAw2cF8o7y7 f7kZ9JW8U0+ch/Bg== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 0D37C139D0 for ; Mon, 19 Feb 2024 08:23:52 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id lxoHAhgQ02WaBAAAD6G6ig (envelope-from ) for ; Mon, 19 Feb 2024 08:23:52 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 1/8] [gdb/testsuite] Set up dap log file in gdb.dap/type_checker.exp Date: Mon, 19 Feb 2024 09:23:34 +0100 Message-Id: <20240219082341.21313-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Level: X-Spamd-Bar: / Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=sENUMETJ; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=Zl0+DTVS X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [0.49 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; FROM_HAS_DN(0.00)[]; R_MISSING_CHARSET(2.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; BROKEN_CONTENT_TYPE(1.50)[]; RCPT_COUNT_ONE(0.00)[1]; NEURAL_HAM_LONG(-1.00)[-1.000]; RCVD_COUNT_THREE(0.00)[3]; TO_DN_NONE(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DKIM_TRACE(0.00)[suse.de:+]; MX_GOOD(-0.01)[]; MID_CONTAINS_FROM(1.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; NEURAL_HAM_SHORT(-0.20)[-1.000]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-3.00)[100.00%] X-Spam-Score: 0.49 X-Rspamd-Queue-Id: 2298E1F7E3 X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE 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: While debugging a slow-down in test-case gdb.dap/type_checker.exp due to a WIP patch, I noticed that test-case gdb.dap/type_checker.exp doesn't have a dap log file. This is normally set up by dap_gdb_start, but the test-case doesn't use it. Fix this by doing "set debug dap-log-file $logfile" in the test-case. To make it easy to do so, I've factored out a new proc new_dap_log_file, and while at likewise a new proc current_dap_log_file. Note that the log file is currently empty. Tested on x86_64-linux. --- gdb/testsuite/gdb.dap/type_check.exp | 3 +++ gdb/testsuite/lib/dap-support.exp | 22 +++++++++++++++------- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/gdb/testsuite/gdb.dap/type_check.exp b/gdb/testsuite/gdb.dap/type_check.exp index cda01299925..e6c9d73d871 100644 --- a/gdb/testsuite/gdb.dap/type_check.exp +++ b/gdb/testsuite/gdb.dap/type_check.exp @@ -26,6 +26,9 @@ set remote_python_file \ [gdb_remote_download host ${srcdir}/${subdir}/${gdb_test_file_name}.py] gdb_test_no_output "source ${remote_python_file}" "load python file" +set logfile [new_dap_log_file] +gdb_test_no_output "set debug dap-log-file $logfile" "set dap log file" + gdb_test_multiple "python check_everything()" "type checker" { -re -wrap "OK" { pass $gdb_test_name diff --git a/gdb/testsuite/lib/dap-support.exp b/gdb/testsuite/lib/dap-support.exp index 979dfa2cd73..31f036eddf2 100644 --- a/gdb/testsuite/lib/dap-support.exp +++ b/gdb/testsuite/lib/dap-support.exp @@ -26,6 +26,19 @@ set dap_gdb_instance 0 # is restarted. set dap_seq 1 +# Return the current DAP log file. +proc current_dap_log_file {} { + global dap_gdb_instance + return [standard_output_file "dap.log.$dap_gdb_instance"] +} + +# Return a new DAP log file. +proc new_dap_log_file {} { + global dap_gdb_instance + incr dap_gdb_instance + return [current_dap_log_file] +} + # Start gdb using the DAP interpreter. proc dap_gdb_start {} { # Keep track of the number of times GDB has been launched. @@ -34,13 +47,10 @@ proc dap_gdb_start {} { gdb_stdin_log_init - global dap_gdb_instance - incr dap_gdb_instance - global GDBFLAGS stty_init save_vars { GDBFLAGS stty_init } { set stty_init "-echo raw" - set logfile [standard_output_file "dap.log.$dap_gdb_instance"] + set logfile [new_dap_log_file] append GDBFLAGS " -iex \"set debug dap-log-file $logfile\" -q -i=dap" set res [gdb_spawn] if {$res != 0} { @@ -337,9 +347,7 @@ proc dap_target_remote {target} { # Read the most recent DAP log file and check it for exceptions. proc dap_check_log_file {} { - global dap_gdb_instance - - set fd [open [standard_output_file "dap.log.$dap_gdb_instance"]] + set fd [open [current_dap_log_file]] set contents [read $fd] close $fd base-commit: d1648ffe809ad288d989cd4f6794c01f524471f2 -- 2.35.3