From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id 8CD613858D1E for ; Tue, 14 Feb 2023 10:54:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8CD613858D1E 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-out2.suse.de (Postfix) with ESMTPS id B89731F8B6 for ; Tue, 14 Feb 2023 10:54:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1676372056; 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=7gJIeS51OiHy/EqzoUcBHsB7NZP8c08Ak5fNHYJ+pR0=; b=NdJvj7AixipZTy/gCD7go4OCVAEr4vRzc7qaiQV9Qn2SqjzZHWPSiupQhSWnnNxKb/qXKI gXyCet2TmSHAUKO04dvc1E6K+L1+zRcRSLWpqRvwf0CxmP/lg630EAkjN1thZlfBDh4mQo nk87Jc3bYl/uSrR1QuuZIZavhrYKwF8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1676372056; 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=7gJIeS51OiHy/EqzoUcBHsB7NZP8c08Ak5fNHYJ+pR0=; b=WQBf80oMAXuqWeVZCtJF92wAoTBxQwb7kGXqZnW+aBq1GFkq/ufVTCApGoI87B+DIY/SGe aI3GHgBoAb7VOpAw== 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 A3F15138E3 for ; Tue, 14 Feb 2023 10:54:16 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id SgqgJlho62PMbAAAMHmgww (envelope-from ) for ; Tue, 14 Feb 2023 10:54:16 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [pushed] [gdb/testsuite] Factor out proc linux_kernel_version Date: Tue, 14 Feb 2023 11:54:16 +0100 Message-Id: <20230214105416.6677-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.5 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 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: Factor out new proc linux_kernel_version from test-case gdb.arch/i386-pkru.exp. Tested on x86_64-linux. --- gdb/testsuite/gdb.arch/i386-pkru.exp | 20 ++++++-------------- gdb/testsuite/lib/gdb.exp | 23 +++++++++++++++++++++++ 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/gdb/testsuite/gdb.arch/i386-pkru.exp b/gdb/testsuite/gdb.arch/i386-pkru.exp index 90d8c1d9d4c..1f047df68ef 100644 --- a/gdb/testsuite/gdb.arch/i386-pkru.exp +++ b/gdb/testsuite/gdb.arch/i386-pkru.exp @@ -59,20 +59,12 @@ if { !$supports_pkru } { # the PKRU using ptrace, see commit 4a804c4f8356 ("x86/fpu: Allow PKRU to be # (once again) written by ptrace."). set have_xfail 0 -if { [istarget *-*-linux*] } { - set res [remote_exec target "uname -r"] - set status [lindex $res 0] - set output [lindex $res 1] - - set re ^($decimal)\\.($decimal)\\.($decimal) - if { $status == 0 - && [regexp $re $output dummy v1 v2 v3] == 1 } { - set v [list $v1 $v2 $v3] - set have_xfail \ - [expr \ - [version_compare [list 5 14 0] <= $v] \ - && [version_compare $v < [list 6 2 0]]] - } +set v [linux_kernel_version] +if { $v != {} } { + set have_xfail \ + [expr \ + [version_compare [list 5 14 0] <= $v] \ + && [version_compare $v < [list 6 2 0]]] } # Test pkru register at startup diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 7f98f080328..e48228ed4f6 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -9374,5 +9374,28 @@ proc has_dependency { file dep } { return [regexp $dep $output] } +# Detect linux kernel version and return as list of 3 numbers: major, minor, +# and patchlevel. On failure, return an empty list. + +gdb_caching_proc linux_kernel_version { + if { ![istarget *-*-linux*] } { + return {} + } + + set res [remote_exec target "uname -r"] + set status [lindex $res 0] + set output [lindex $res 1] + if { $status != 0 } { + return {} + } + + set re ^($::decimal)\\.($::decimal)\\.($::decimal) + if { [regexp $re $output dummy v1 v2 v3] != 1 } { + return {} + } + + return [list $v1 $v2 $v3] +} + # Always load compatibility stuff. load_lib future.exp base-commit: 0d79a2a8e2d91fc258ac795c19c13e3ab505a6c2 -- 2.35.3