From: Masatake YAMATO <yamato@redhat.com>
Date: Mon, 11 Oct 2021 22:24:42 +0000 (+0900)
Subject: lsfd: (test) add a case for displaying a directory
X-Git-Tag: v2.38-rc1~144^2~46
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=77c70070ff2c2dc7f3313c3821a00606ee408ec7;p=thirdparty%2Futil-linux.git

lsfd: (test) add a case for displaying a directory

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

diff --git a/tests/expected/lsfd/mkfds-directory b/tests/expected/lsfd/mkfds-directory
new file mode 100644
index 0000000000..d3207be6cf
--- /dev/null
+++ b/tests/expected/lsfd/mkfds-directory
@@ -0,0 +1,12 @@
+    3  r--  DIR directory,_tmpfile /
+ASSOC,MODE,TYPE,NAME: 0
+PID[RUN]: 0
+PID[STR]: 0
+INODE[RUN]: 0
+INODE[STR]: 0
+UID[RUN]: 0
+UID[STR]: 0
+USER[RUN]: 0
+USER[STR]: 0
+NLINK[RUN]: 0
+NLINK[STR]: 0
diff --git a/tests/helpers/test_mkfds.c b/tests/helpers/test_mkfds.c
index 336ddc7d7e..27bbf984e9 100644
--- a/tests/helpers/test_mkfds.c
+++ b/tests/helpers/test_mkfds.c
@@ -112,6 +112,26 @@ static void make_pipe(struct factory *factory _U_, struct fdesc fdescs[], pid_t
 	}
 }
 
+static void open_directory(struct factory *factory _U_, struct fdesc fdescs[], pid_t * child _U_)
+{
+	const char *dir = "/";
+
+	int fd = open(dir, O_RDONLY|O_DIRECTORY);
+	if (fd < 0)
+		err(EXIT_FAILURE, "failed to open: %s", dir);
+
+	if (dup2(fd, fdescs[0].fd) < 0) {
+		close(fd);
+		err(EXIT_FAILURE, "failed to dup %d -> %d", fd, fdescs[0].fd);
+	}
+
+	fdescs[0] = (struct fdesc){
+		.fd    = fdescs[0].fd,
+		.close = close_fdesc,
+		.data  = NULL
+	};
+}
+
 static struct factory factories[] = {
 	{
 		.name = "ro-regular-file",
@@ -129,6 +149,14 @@ static struct factory factories[] = {
 		.fork = false,
 		.make = make_pipe,
 	},
+	{
+		.name = "directory",
+		.desc = "directory (/)",
+		.priv = false,
+		.N    = 1,
+		.fork = false,
+		.make = open_directory
+	},
 };
 
 static void print_factory(struct factory *factory)
diff --git a/tests/ts/lsfd/mkfds-directory b/tests/ts/lsfd/mkfds-directory
new file mode 100755
index 0000000000..5d2083ae01
--- /dev/null
+++ b/tests/ts/lsfd/mkfds-directory
@@ -0,0 +1,72 @@
+#!/bin/bash
+#
+# Copyright (C) 2021 Masatake YAMATO <yamato@redhat.com>
+#
+# This file is part of util-linux.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+TS_TOPDIR="${0%/*}/../.."
+TS_DESC="directory"
+
+. $TS_TOPDIR/functions.sh
+ts_init "$*"
+
+ts_check_test_command "$TS_CMD_LSFD"
+ts_check_test_command "$TS_HELPER_MKFDS"
+
+ts_check_prog "stat"
+ts_check_prog "id"
+
+ts_cd "$TS_OUTDIR"
+
+PID=
+FD=3
+EXPR=
+
+{
+    coproc MKFDS { "$TS_HELPER_MKFDS" directory $FD; }
+    if read -u ${MKFDS[0]} PID; then
+	EXPR='(PID == '"${PID}"') and (FD == '"$FD"')'
+	${TS_CMD_LSFD} -n -o ASSOC,MODE,TYPE,FLAGS,NAME -Q "${EXPR}"
+	echo 'ASSOC,MODE,TYPE,NAME': $?
+
+	LSFD_PID=$(${TS_CMD_LSFD} --raw -n -o PID -Q "${EXPR}")
+	echo 'PID[RUN]:' $?
+	[ "${LSFD_PID}" == "${PID}" ]
+	echo 'PID[STR]:' $?
+
+	LSFD_INODE=$(${TS_CMD_LSFD} --raw -n -o INODE -Q "${EXPR}")
+	echo 'INODE[RUN]:' $?
+	[ "${LSFD_INODE}"  == "$(stat -c %i /)" ]
+	echo 'INODE[STR]:' $?
+
+	LSFD_UID=$(${TS_CMD_LSFD} --raw -n -o UID -Q "${EXPR}")
+	echo 'UID[RUN]:' $?
+	[ "${LSFD_UID}" == $(id -u) ]
+	echo 'UID[STR]:' $?
+
+	LSFD_USER=$(${TS_CMD_LSFD} --raw -n -o USER -Q "${EXPR}")
+	echo 'USER[RUN]:' $?
+	[ "${LSFD_USER}" == $(id -u -n) ]
+	echo 'USER[STR]:' $?
+
+	LSFD_NLINK=$(${TS_CMD_LSFD} --raw -n -o NLINK -Q "${EXPR}")
+	echo 'NLINK[RUN]:' $?
+	[ "${LSFD_NLINK}" == $(stat -c %h /) ]
+	echo 'NLINK[STR]:' $?
+
+	kill -CONT ${PID}
+	wait ${MKFDS_PID}
+    fi
+} > $TS_OUTPUT 2>&1
+
+ts_finalize