From: Masatake YAMATO <yamato@redhat.com>
Date: Sat, 24 Feb 2024 17:46:37 +0000 (+0900)
Subject: tests: (lsfd::mkfds-inotify-btrfs) test INOTIFY.INODES cooked output
X-Git-Tag: v2.42-start~502^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=80a4f2f4dd946c45b76917ef0d54db67f66c02ab;p=thirdparty%2Futil-linux.git

tests: (lsfd::mkfds-inotify-btrfs) test INOTIFY.INODES cooked output

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

diff --git a/tests/expected/lsfd/mkfds-inotify-btrfs b/tests/expected/lsfd/mkfds-inotify-btrfs
index cb55f9669..a47fc4830 100644
--- a/tests/expected/lsfd/mkfds-inotify-btrfs
+++ b/tests/expected/lsfd/mkfds-inotify-btrfs
@@ -2,3 +2,5 @@ INOTIFY.INODES.RAW: 0
 INOTIFY.INODES.RAW == FSTAB\x0aROOT
 INOTIFY.INODES.RAW (JSON): 0
 INOTIFY.INODES.RAW == EXPECTED_JSON
+INOTIFY.INODES: 0
+INOTIFY.INODES == FSTABI@btrfs\x0aROOTI@btrfs
diff --git a/tests/ts/lsfd/mkfds-inotify-btrfs b/tests/ts/lsfd/mkfds-inotify-btrfs
index 5dc8e97e3..fe0ac237a 100755
--- a/tests/ts/lsfd/mkfds-inotify-btrfs
+++ b/tests/ts/lsfd/mkfds-inotify-btrfs
@@ -48,8 +48,12 @@ fi
 
 PID=
 FD=3
-ROOT="$(stat -c %i $MNTPNT)"@"$($TS_CMD_FINDMNT --raw --noheadings -oMAJ:MIN --target $MNTPNT)"
-FSTAB="$(stat -c %i $MNTPNT/fstab)"@"$($TS_CMD_FINDMNT --raw --noheadings -oMAJ:MIN --target $MNTPNT/fstab)"
+ROOTI="$(stat -c %i $MNTPNT)"
+ROOTD="$($TS_CMD_FINDMNT --raw --noheadings -oMAJ:MIN --target $MNTPNT)"
+ROOT="${ROOTI}"@"${ROOTD}"
+FSTABI="$(stat -c %i $MNTPNT/fstab)"
+FSTABD="$($TS_CMD_FINDMNT --raw --noheadings -oMAJ:MIN --target $MNTPNT/fstab)"
+FSTAB="${FSTABI}"@"${FSTABD}"
 {
     coproc MKFDS { "$TS_HELPER_MKFDS" inotify $FD dir=$MNTPNT file=$MNTPNT/fstab; }
     if read -u ${MKFDS[0]} PID; then
@@ -83,6 +87,16 @@ EOF
 	    echo "INOTIFY.INODES.RAW": "$INODES_RAW_JSON"
 	fi
 
+	INODES_COOKED=$(${TS_CMD_LSFD} --raw -n -o INOTIFY.INODES -Q "${EXPR}")
+	echo "INOTIFY.INODES": $?
+	if [[ "$INODES_COOKED" ==  "${FSTABI}@btrfs"'\x0a'"${ROOTI}@btrfs" ]]; then
+	    echo "INOTIFY.INODES" == FSTABI@btrfs'\x0a'ROOTI@btrfs
+	else
+	    echo "INOTIFY.INODES": "$INODES_COOKED"
+	    echo "FSTABI": "$FSTABI"
+	    echo "ROOTI": "$ROOTI"
+	fi
+
 	echo DONE >&"${MKFDS[1]}"
     fi
     wait "${MKFDS_PID}"