summaryrefslogtreecommitdiffstats
path: root/test/test-functions
diff options
context:
space:
mode:
authorFrantisek Sumsal <frantisek@sumsal.cz>2024-02-19 11:23:31 +0100
committerFrantisek Sumsal <frantisek@sumsal.cz>2024-02-19 11:43:54 +0100
commit18c769b0ff6c704fd31ba1f81f35c188fbe02bc9 (patch)
tree33df6df4baf7626f8aef5070d947166c1e24b22c /test/test-functions
parentsd-radv: fix potential buffer overflow (diff)
downloadsystemd-18c769b0ff6c704fd31ba1f81f35c188fbe02bc9.tar.xz
systemd-18c769b0ff6c704fd31ba1f81f35c188fbe02bc9.zip
Revert "test: use btrfs by default on Arch as well"
There's something very wrong going on when using btrfs for the test images, namely: - there's a significant performance hit, i.e. the Arch Linux run is ~20% slower, in the coverage run the situation is even worse - intermittent boot failures - intermittent "No space left on device" errors (even though there's enough free space) Since debugging this might take a while, let's temporarily revert back to ext4 to make the CI stable again. This reverts commit 7eb7e3ec4f5dbc13ee729557e1544527f3101187.
Diffstat (limited to 'test/test-functions')
-rw-r--r--test/test-functions6
1 files changed, 1 insertions, 5 deletions
diff --git a/test/test-functions b/test/test-functions
index 6a9a1291de..a3bb4abc00 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -47,13 +47,9 @@ 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.