diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-14 19:22:57 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-14 19:22:57 +0000 |
commit | ce95875445c67808caa5d4fb0e6f80dbdaef0cb7 (patch) | |
tree | 6da8cbc66ef15086c9d295e4abe733b24818551e /tests/ts/lslocks | |
parent | Adding upstream version 2.40. (diff) | |
download | util-linux-ce95875445c67808caa5d4fb0e6f80dbdaef0cb7.tar.xz util-linux-ce95875445c67808caa5d4fb0e6f80dbdaef0cb7.zip |
Adding upstream version 2.40.1.upstream/2.40.1upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'tests/ts/lslocks')
-rwxr-xr-x | tests/ts/lslocks/lslocks | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/tests/ts/lslocks/lslocks b/tests/ts/lslocks/lslocks index 912fac8..a9ef69a 100755 --- a/tests/ts/lslocks/lslocks +++ b/tests/ts/lslocks/lslocks @@ -53,14 +53,6 @@ OFD_METHODS=( lease-w ) -SLEEP() -{ - # It appears that there is a time lag between locking and its - # visibility in /proc/locks. See the unstbale results of errors I - # observed in https://github.com/util-linux/util-linux/pull/2629. - sleep 1 -} - DFD=18 COLS_WITH_HOLDERS=COMMAND,TYPE,SIZE,MODE,START,END,HOLDERS run_lslocks() @@ -71,8 +63,6 @@ run_lslocks() rm -f "${FILE}" coproc MKFDS { "$TS_HELPER_MKFDS" make-regular-file $FD file="$FILE" lock=$m; } if read -r -u "${MKFDS[0]}" PID; then - SLEEP - "$TS_CMD_LSLOCKS" ${OPTS} --pid "${PID}" -o "${COLS}" echo "# $m + ${COLS} + ${OPTS}": $? "$TS_CMD_LSLOCKS" ${OPTS} --pid "${PID}" -o PATH | sed -e 's#.*\('"$FILE0"'\)--[0-9]\+ *$#\1#' @@ -91,7 +81,6 @@ run_lslocks_with_co_holders() { rm -f "${FILE}" coproc MKFDS { "$TS_HELPER_MKFDS" make-regular-file $FD file="$FILE" lock=$m dupfd=$DFD; } - SLEEP if read -r -u "${MKFDS[0]}" PID; then "$TS_CMD_LSLOCKS" ${OPTS} --pid "${PID}" -o "${COLS_WITH_HOLDERS}" | sed -e "s/${PID},/1,/g" echo "# $m + ${COLS_WITH_HOLDERS} + ${OPTS}": ${PIPESTATUS[0]} |