From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id 22EF33858D38 for ; Tue, 13 Jun 2023 10:21:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 22EF33858D38 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 C655D2252F for ; Tue, 13 Jun 2023 10:21:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686651711; 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=asYOnkpfZ230wKPzdFhfPuE+KUuC5d4gtkcgVbC1Z3c=; b=mUQZiyOTtNeAseiKI4QBt5TDfkAObmBmngEEpTA9ja8eGOYCCYH8VwUhdSJh/m9q07aqMF NNS0h/BcOwHPz/0cvCh2K+M6L0c2TyMmb7xiAQd3XdgG0+Y7ZF5NrkklgK0+aCXGE5NWH+ XHR2VtNKwwZGlAd239P0P7T2vfv6EoI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686651711; 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=asYOnkpfZ230wKPzdFhfPuE+KUuC5d4gtkcgVbC1Z3c=; b=a6RoMuFiRAti1HAzeptj2kOctKgV2WBL6axO1lxLIO1dPfw4EeXg/9OntHHNyP6dB50HYq b1vWYqiKEFthFiBQ== 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 B458413345 for ; Tue, 13 Jun 2023 10:21:51 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id ALDaKj9DiGQZcAAAMHmgww (envelope-from ) for ; Tue, 13 Jun 2023 10:21:51 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [pushed] [gdb/testsuite] Fix gdb.dap/type_check.exp with older python Date: Tue, 13 Jun 2023 12:22:11 +0200 Message-Id: <20230613102211.13281-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.3 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: On openSUSE Leap 15.4 with system python 3.6, I run into: ... (gdb) python check_everything()^M (gdb) FAIL: gdb.dap/type_check.exp: type checker ... In check_everything, the hasattr test fails silently: ... def check_everything(): # Older versions of Python can't really implement this. if hasattr(typing, "get_origin"): ... and that makes the gdb_test in the test-case fail. Fix this by emitting UNSUPPORTED instead in check_everything, and detecting this in the test-case. Tested on x86_64-linux. --- gdb/testsuite/gdb.dap/type_check.exp | 9 ++++++++- gdb/testsuite/gdb.dap/type_check.py | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/gdb.dap/type_check.exp b/gdb/testsuite/gdb.dap/type_check.exp index 346b4ba75b1..441588e5b1e 100644 --- a/gdb/testsuite/gdb.dap/type_check.exp +++ b/gdb/testsuite/gdb.dap/type_check.exp @@ -26,4 +26,11 @@ 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" -gdb_test "python check_everything()" OK "type checker" +gdb_test_multiple "python check_everything()" "type checker" { + -re -wrap "OK" { + pass $gdb_test_name + } + -re -wrap "UNSUPPORTED" { + unsupported $gdb_test_name + } +} diff --git a/gdb/testsuite/gdb.dap/type_check.py b/gdb/testsuite/gdb.dap/type_check.py index 1fdb595f3c6..ec4982c2932 100644 --- a/gdb/testsuite/gdb.dap/type_check.py +++ b/gdb/testsuite/gdb.dap/type_check.py @@ -94,3 +94,5 @@ def check_everything(): check_map() check_opt() print("OK") + else: + print("UNSUPPORTED") base-commit: bdde90c4cea27aacb0b98b4b1fa7289cb1a96168 -- 2.35.3