Merge pull request #12612 from keszybz/bootctl-column

Rename TEST-31-OOMPOLICY to avoid conflict and look in $BOOT for kernels

4 files changed, 1 insertions, 5 deletions

diff --git a/test/TEST-31-OOMPOLICY/Makefile b/test/TEST-32-OOMPOLICY/Makefile
index e9f93b1104..e9f93b1104 120000
--- a/test/TEST-31-OOMPOLICY/Makefile
+++ b/test/TEST-32-OOMPOLICY/Makefile
diff --git a/test/TEST-31-OOMPOLICY/test.sh b/test/TEST-32-OOMPOLICY/test.sh
index 55752e6a70..7e9431dd11 100755
--- a/test/TEST-31-OOMPOLICY/test.sh
+++ b/test/TEST-32-OOMPOLICY/test.sh
@@ -1,6 +1,4 @@
 #!/bin/bash
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
 set -e
 TEST_DESCRIPTION="test OOM killer logic"
 TEST_NO_NSPAWN=1
diff --git a/test/TEST-31-OOMPOLICY/testsuite.sh b/test/TEST-32-OOMPOLICY/testsuite.sh
index f0b1470d42..8aab487c6e 100755
--- a/test/TEST-31-OOMPOLICY/testsuite.sh
+++ b/test/TEST-32-OOMPOLICY/testsuite.sh
@@ -1,6 +1,4 @@
 #!/bin/bash
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
 set -ex
 set -o pipefail
 
diff --git a/test/test-functions b/test/test-functions
index 30b559097b..0394076f0a 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -14,7 +14,7 @@ NSPAWN_TIMEOUT="${NSPAWN_TIMEOUT:-infinity}"
 TIMED_OUT=  # will be 1 after run_* if *_TIMEOUT is set and test timed out
 [[ "$LOOKS_LIKE_SUSE" ]] && FSTYPE="${FSTYPE:-btrfs}" || FSTYPE="${FSTYPE:-ext4}"
 UNIFIED_CGROUP_HIERARCHY="${UNIFIED_CGROUP_HIERARCHY:-default}"
-EFI_MOUNT="$(bootctl -p 2>/dev/null || echo /boot)"
+EFI_MOUNT="$(bootctl -x 2>/dev/null || echo /boot)"
 QEMU_MEM="${QEMU_MEM:-512M}"
 
 if ! ROOTLIBDIR=$(pkg-config --variable=systemdutildir systemd); then