From: Masatake YAMATO <yamato@redhat.com>
Date: Sat, 13 Sep 2025 00:09:09 +0000 (+0900)
Subject: tests: (lsfd/column-source-btrfs) extract a minor number in a more reliable way
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b855ee731107dc46fc8c0656bbbde6203beba0d9;p=thirdparty%2Futil-linux.git

tests: (lsfd/column-source-btrfs) extract a minor number in a more reliable way

This change fixes a potential bug in the test case.

The original code used the %d of stat command to extract the device minor
number for a file based on a wrong assumption. Use %Ld instead.

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
---

diff --git a/tests/ts/lsfd/column-source-btrfs b/tests/ts/lsfd/column-source-btrfs
index 52999281c..fcc63165a 100755
--- a/tests/ts/lsfd/column-source-btrfs
+++ b/tests/ts/lsfd/column-source-btrfs
@@ -50,9 +50,24 @@ if ! touch $FILE; then
     ts_skip "failed to touch a file on a btrfs filesystem: $FILE"
 fi
 
-# The major number may be 0. So we can assume the device number is the
-# same as that of minor number.
-EXPECTED="btrfs:$(stat -c %d $FILE)"
+#
+# We cannot use %d of the stat command here.
+#
+# The major number may be 0. But we cannot assume the device number is
+# the same as that of the minor number. A device number is composed of a
+# major number and a minor number in a more complicated way on Linux.
+# See /usr/include/bits/sysmacros.h.
+#
+# Fortunately, stat command provides %Ld format specifier for
+# printing the minor number of a given file.
+#
+MIN=$(stat -c %Ld $FILE)
+# %Ld is available since version 9.0 of coreutils.
+# We cannot expect it to be available in any environment.
+if ! [[ "$MIN" =~ [0-9]+ ]]; then
+    ts_skip "stat commands doesn't support %Ld format specifier"
+fi
+EXPECTED="btrfs:$MIN"
 
 {
     coproc MKFDS { "$TS_HELPER_MKFDS" ro-regular-file $FD file=$FILE; }