82 lines
2.4 KiB
Diff
82 lines
2.4 KiB
Diff
From 8797e6c1eb8c863617cd484d469dff23d059a15f Mon Sep 17 00:00:00 2001
|
|
From: Tom de Vries <tdevries@suse.de>
|
|
Date: Fri, 21 Apr 2023 17:58:49 +0200
|
|
Subject: [PATCH 4/5] [gdb/testsuite] Factor out proc linux_kernel_version
|
|
|
|
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 5d2b1a24a15..b2e5385c52b 100644
|
|
--- a/gdb/testsuite/gdb.arch/i386-pkru.exp
|
|
+++ b/gdb/testsuite/gdb.arch/i386-pkru.exp
|
|
@@ -62,20 +62,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 85c0bfb897f..2be69479d70 100644
|
|
--- a/gdb/testsuite/lib/gdb.exp
|
|
+++ b/gdb/testsuite/lib/gdb.exp
|
|
@@ -9334,5 +9334,28 @@ proc decompress_bz2 { bz2 } {
|
|
return $copy
|
|
}
|
|
|
|
+# 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
|
|
--
|
|
2.35.3
|
|
|