From: Luca Boccassi <luca.boccassi@gmail.com>
Date: Tue, 24 Jun 2025 12:07:11 +0000 (+0100)
Subject: test: escape '+' from uname -r before using in regex via '=~'
X-Git-Tag: v258-rc1~255
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a0dfb0245662e31ded34730010e0e92be9bd9f1a;p=thirdparty%2Fsystemd.git

test: escape '+' from uname -r before using in regex via '=~'

It will otherwise interpret characters such as '+' as if they
were regex, and break matching.

For example TEST-71-HOSTNAME started failing when
uname -r started including a '+':

FAIL: 'Kernel: Linux 6.12.33+deb13-amd64' not found in:
 Static hostname: host
       Icon name: computer-vm
         Chassis: vm 🖴
      Machine ID: e6471c1f95ab49098827498ed816cdf7
         Boot ID: 231da987f64d4af59f2076fbb638c611
  Virtualization: kvm
Operating System: Debian GNU/Linux 13 (trixie)
          Kernel: Linux 6.12.33+deb13-amd64
    Architecture: x86-64
---

diff --git a/test/units/TEST-17-UDEV.link-property.sh b/test/units/TEST-17-UDEV.link-property.sh
index 517cc3f7d21..faf05b83ebb 100755
--- a/test/units/TEST-17-UDEV.link-property.sh
+++ b/test/units/TEST-17-UDEV.link-property.sh
@@ -163,11 +163,11 @@ EOF
 udevadm control --reload
 
 output=$(udevadm test --action add /sys/class/net/test1)
-assert_in "LINK_VERSION=$(uname -r)" "$output"
+assert_in "LINK_VERSION=$(uname -r | sed 's/\+/\\+/g')" "$output"
 
 udevadm trigger --settle --action add /sys/class/net/test1
 output=$(udevadm info --query property /sys/class/net/test1)
-assert_in "LINK_VERSION=$(uname -r)" "$output"
+assert_in "LINK_VERSION=$(uname -r | sed 's/\+/\\+/g')" "$output"
 
 # test for constant properties
 cat >/run/systemd/network/10-test.link.d/13-override.conf <<EOF
diff --git a/test/units/TEST-71-HOSTNAME.sh b/test/units/TEST-71-HOSTNAME.sh
index d1eaa8106e3..1ed13fe414e 100755
--- a/test/units/TEST-71-HOSTNAME.sh
+++ b/test/units/TEST-71-HOSTNAME.sh
@@ -31,7 +31,7 @@ testcase_hostname() {
     if [[ -n "$orig" ]]; then
         assert_in "Static hostname: $orig" "$(hostnamectl)"
     fi
-    assert_in "Kernel: $(uname -s) $(uname -r)" "$(hostnamectl)"
+    assert_in "Kernel: $(uname -s) $(uname -r | sed 's/\+/\\+/g')" "$(hostnamectl)"
 
     # change hostname
     assert_rc 0 hostnamectl set-hostname testhost