From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Wed, 14 Feb 2024 09:36:55 +0000 (+0100)
Subject: test: use btrfs by default on Arch as well
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a5ceb22e209913ff6e340f9cede4e05eaab7d9d;p=thirdparty%2Fsystemd.git

test: use btrfs by default on Arch as well
---

diff --git a/test/test-functions b/test/test-functions
index 80fdcd26b94..d504971706e 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -47,9 +47,13 @@ KERNEL_VER="${KERNEL_VER-$(uname -r)}"
 QEMU_TIMEOUT="${QEMU_TIMEOUT:-1800}"
 NSPAWN_TIMEOUT="${NSPAWN_TIMEOUT:-1800}"
 TIMED_OUT=  # will be 1 after run_* if *_TIMEOUT is set and test timed out
-get_bool "$LOOKS_LIKE_SUSE" && FSTYPE="${FSTYPE:-btrfs}" || FSTYPE="${FSTYPE:-ext4}"
 UNIFIED_CGROUP_HIERARCHY="${UNIFIED_CGROUP_HIERARCHY:-default}"
 EFI_MOUNT="${EFI_MOUNT:-$(bootctl -x 2>/dev/null || echo /boot)}"
+if get_bool "$LOOKS_LIKE_SUSE" || get_bool "$LOOKS_LIKE_ARCH"; then
+    FSTYPE="${FSTYPE:-btrfs}"
+else
+    FSTYPE="${FSTYPE:-ext4}"
+fi
 # Note that defining a different IMAGE_NAME in a test setup script will only result
 # in default.img being copied and renamed. It can then be extended by defining
 # a test_append_files() function. The $1 parameter will be the root directory.