From patchwork Wed Aug 2 17:23:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 73499 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7715C385828D for ; Wed, 2 Aug 2023 17:24:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7715C385828D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1690997070; bh=mUqwlHegsnt5oSgbUkDxbN9GbfH6CNs8QZDd//tmUWk=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=f7+IdmMEJmWVLJOfGG5X/aRLL5Ywhv3hjzNkOR+pm+7OUdaL2IKnFU84L7bGRZPc8 SyCJXmdidT89xwH3XpnQoESzBF1Z0vRkXL2MU5GI50h5Y5jzuCnSa4BdziauQFx5Fc S13awLfmQNRaAtYuK3pHfq52Tt8DNBW7ApNGGTiM= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by sourceware.org (Postfix) with ESMTPS id DD8E73858D1E for ; Wed, 2 Aug 2023 17:24:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DD8E73858D1E 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 E45B421A31; Wed, 2 Aug 2023 17:24:05 +0000 (UTC) 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 CC2B213919; Wed, 2 Aug 2023 17:24:05 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 0vPOMDWRymS9ZAAAMHmgww (envelope-from ); Wed, 02 Aug 2023 17:24:05 +0000 To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH] [gdb/dap] Disable DAP for python <= 3.5 Date: Wed, 2 Aug 2023 19:23:47 +0200 Message-Id: <20230802172347.12824-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, 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 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Tom de Vries via Gdb-patches From: Tom de Vries Reply-To: Tom de Vries Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" DAP requires python module typing, which is supported starting python 3.5. Make this formal by: - disabling the dap interpreter for python version < 3.5 - returning 0 in allow_dap_tests for python version < 3.5 PR dap/30708 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=30708 --- gdb/python/py-dap.c | 3 +++ gdb/testsuite/lib/gdb.exp | 25 +++++++++++++++++++++++++ 2 files changed, 28 insertions(+) base-commit: 86bb2d76c901a558e5b2dd29df95874ce6e78dae diff --git a/gdb/python/py-dap.c b/gdb/python/py-dap.c index 52188406982..3444eccb6fb 100644 --- a/gdb/python/py-dap.c +++ b/gdb/python/py-dap.c @@ -91,8 +91,11 @@ void _initialize_py_interp (); void _initialize_py_interp () { + /* The dap code uses module typing, available starting python 3.5. */ +#if PY_VERSION_HEX >= 0x03050000 interp_factory_register ("dap", [] (const char *name) -> interp * { return new dap_interp (name); }); +#endif } diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 87d6895d44e..36bf738c667 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -1533,6 +1533,26 @@ proc gdb_test { args } { return [gdb_test_multiple $command $message {*}$opts $user_code] } +# Return 1 if python version used is at least MAJOR.MINOR +proc python_version_at_least { major minor } { + set python_script {print (sys.version_info\[0\], sys.version_info\[1\])} + + set res [remote_exec host $::GDB \ + "$::INTERNAL_GDBFLAGS -batch -ex \"python $python_script\""] + if { [lindex $res 0] != 0 } { + error "Couldn't get python version" + } + + set python_version [lindex $res 1] + set python_version [string trim $python_version] + + regexp {^([0-9]+) ([0-9]+)$} $python_version \ + dummy python_version_major python_version_minor + + return [version_compare [list $major $minor] \ + <= [list $python_version_major $python_version_minor]] +} + # Return 1 if tcl version used is at least MAJOR.MINOR proc tcl_version_at_least { major minor } { global tcl_version @@ -2586,6 +2606,11 @@ gdb_caching_proc allow_dap_tests {} { return 0 } + # The dap code uses module typing, available starting python 3.5. + if { ![python_version_at_least 3 5] } { + return 0 + } + # ton.tcl uses "string is entier", supported starting tcl 8.6. if { ![tcl_version_at_least 8 6] } { return 0