From: Theodore Ts'o Date: Sat, 27 Apr 2024 17:35:09 +0000 (-0400) Subject: tests: fix tests that were always being skipped X-Git-Tag: v1.47.1-rc1~4 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=1ef9af435725cbf66f2edf5d7b2868b1c8b5d73d;p=tools%2Fe2fsprogs.git tests: fix tests that were always being skipped A broken OS check was causing a few tests that were supposed to be skipped on MacOS, Hurd, and FreeBSD systems to be always skipped. Signed-off-by: Theodore Ts'o --- diff --git a/tests/m_hugefile/script b/tests/m_hugefile/script index fc1d115..3af4503 100644 --- a/tests/m_hugefile/script +++ b/tests/m_hugefile/script @@ -4,7 +4,7 @@ EXP=$test_dir/expect CONF=$TMPFILE.conf os=$(uname -s) -if [ "$os" = "Darwin" -o "$os" = "GNU" -o "FreeBSD" ]; then +if [ "$os" = "Darwin" -o "$os" = "GNU" -o "$os" = "FreeBSD" ]; then # creates a 44GB filesystem echo "$test_name: $test_description: skipped for $os" return 0 diff --git a/tests/r_64bit_big_expand/script b/tests/r_64bit_big_expand/script index d1bf8cd..147cf9b 100644 --- a/tests/r_64bit_big_expand/script +++ b/tests/r_64bit_big_expand/script @@ -11,7 +11,7 @@ LOG=$test_name.log E2FSCK=../e2fsck/e2fsck os=$(uname -s) -if [ "$os" = "Darwin" -o "$os" = "GNU" -o "FreeBSD" ]; then +if [ "$os" = "Darwin" -o "$os" = "GNU" -o "$os" = "FreeBSD" ]; then # creates a 2TB filesystem echo "$test_name: $test_description: skipped for $os" return 0 diff --git a/tests/r_bigalloc_big_expand/script b/tests/r_bigalloc_big_expand/script index 101aafb..bd42178 100644 --- a/tests/r_bigalloc_big_expand/script +++ b/tests/r_bigalloc_big_expand/script @@ -12,7 +12,7 @@ E2FSCK=../e2fsck/e2fsck RESIZE2FS_OPTS=-f os=$(uname -s) -if [ "$os" = "Darwin" -o "$os" = "GNU" -o "FreeBSD" ]; then +if [ "$os" = "Darwin" -o "$os" = "GNU" -o "$os" = "FreeBSD" ]; then # creates a 2TB filesystem echo "$test_name: $test_description: skipped for $os" return 0 diff --git a/tests/r_ext4_big_expand/script b/tests/r_ext4_big_expand/script index a49e4c3..4b0016c 100644 --- a/tests/r_ext4_big_expand/script +++ b/tests/r_ext4_big_expand/script @@ -11,9 +11,9 @@ LOG=$test_name.log E2FSCK=../e2fsck/e2fsck os=$(uname -s) -if [ "$os" = "Darwin" -o "$os" = "GNU" -o "FreeBSD" ]; then +if [ "$os" = "Darwin" -o "$os" = "GNU" -o "$os" = "FreeBSD" ]; then # creates a 2TB filesystem - echo "$test_name: $test_description: skipped for FreeBSD" + echo "$test_name: $test_description: skipped for $os" return 0 fi diff --git a/tests/r_move_itable_nostride/script b/tests/r_move_itable_nostride/script index d24df22..1246e1a 100644 --- a/tests/r_move_itable_nostride/script +++ b/tests/r_move_itable_nostride/script @@ -1,5 +1,5 @@ os=$(uname -s) -if [ "$os" = "Darwin" -o "$os" = "GNU" -o "FreeBSD" ]; then +if [ "$os" = "Darwin" -o "$os" = "GNU" -o "$os" = "FreeBSD" ]; then # creates a 96GB filesystem echo "$test_name: $test_description: skipped for $os" return 0