From fa24be05492bc4f775c78ed9b0f058428c3778d0 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Mon, 4 Apr 2022 15:59:36 +0200 Subject: [PATCH] tests: make libmount tests more portable git tree on macbook: ... warning: the following paths have collided (e.g. case-sensitive paths on a case-insensitive filesystem) and only one from the same colliding group is in the working tree: 'tests/expected/libmount/optstr-apply-user-X' 'tests/expected/libmount/optstr-apply-user-x' Let's rename the files. Addresses: https://github.com/util-linux/util-linux/issues/1583 Signed-off-by: Karel Zak --- .../{optstr-apply-user-X => optstr-apply-user-large-X} | 0 .../{optstr-apply-user-x => optstr-apply-user-small-x} | 0 tests/ts/libmount/optstr | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) rename tests/expected/libmount/{optstr-apply-user-X => optstr-apply-user-large-X} (100%) rename tests/expected/libmount/{optstr-apply-user-x => optstr-apply-user-small-x} (100%) diff --git a/tests/expected/libmount/optstr-apply-user-X b/tests/expected/libmount/optstr-apply-user-large-X similarity index 100% rename from tests/expected/libmount/optstr-apply-user-X rename to tests/expected/libmount/optstr-apply-user-large-X diff --git a/tests/expected/libmount/optstr-apply-user-x b/tests/expected/libmount/optstr-apply-user-small-x similarity index 100% rename from tests/expected/libmount/optstr-apply-user-x rename to tests/expected/libmount/optstr-apply-user-small-x diff --git a/tests/ts/libmount/optstr b/tests/ts/libmount/optstr index d15e6bd079..03a1635eb8 100755 --- a/tests/ts/libmount/optstr +++ b/tests/ts/libmount/optstr @@ -112,14 +112,14 @@ ts_init_subtest "apply-user" ts_run $TESTPROG --apply --user "noexec,nosuid,loop=/dev/looop0" 0x408 &> $TS_OUTPUT ts_finalize_subtest -ts_init_subtest "apply-user-x" +ts_init_subtest "apply-user-small-x" # Use userspace options map (--user), remove X-* and loop=, keep unknown 'something' and # keep by flags specified x-* ts_run $TESTPROG --apply --user \ "something,loop=/dev/looop0,x-gvfs-hide,x-gdu.hide,x-canary,X-foo" 0x00002000 &> $TS_OUTPUT ts_finalize_subtest -ts_init_subtest "apply-user-X" +ts_init_subtest "apply-user-large-X" # Use userspace options map (--user), remove x-* and loop=, keep unknown 'something' and # keep by flags specified X-* ts_run $TESTPROG --apply --user \ -- 2.47.2