From: Masatake YAMATO <yamato@redhat.com>
Date: Wed, 26 Oct 2022 15:23:58 +0000 (+0900)
Subject: tests: (lsfd) send a signal only if the target PID is know
X-Git-Tag: v2.39-rc1~52^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ffc7662ee3a9032227fe07f0035e3ed9ec246077;p=thirdparty%2Futil-linux.git

tests: (lsfd) send a signal only if the target PID is know

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

diff --git a/tests/ts/lsfd/column-ainodeclass b/tests/ts/lsfd/column-ainodeclass
index 2096c5b0c8..54d6fd4355 100755
--- a/tests/ts/lsfd/column-ainodeclass
+++ b/tests/ts/lsfd/column-ainodeclass
@@ -38,8 +38,8 @@ EXPR="(FD == 3)"
 	    echo "$C"':ASSOC,STTYPE,AINODECLASS': $?
 
 	    kill -CONT "${PID}"
-	    wait "${MKFDS_PID}"
 	fi
+	wait "${MKFDS_PID}"
     done
 } > "$TS_OUTPUT" 2>&1
 
diff --git a/tests/ts/lsfd/column-name b/tests/ts/lsfd/column-name
index 3d56582607..fcff5e8068 100755
--- a/tests/ts/lsfd/column-name
+++ b/tests/ts/lsfd/column-name
@@ -51,8 +51,8 @@ EXPR="(FD == 3)"
 	    echo "$C"':ASSOC,KNAME,NAME': $?
 
 	    kill -CONT "${PID}"
-	    wait "${MKFDS_PID}"
 	fi
+	wait "${MKFDS_PID}"
     done
 } > "$TS_OUTPUT" 2>&1
 
diff --git a/tests/ts/lsfd/column-type b/tests/ts/lsfd/column-type
index 4b69ec751a..c875defa0e 100755
--- a/tests/ts/lsfd/column-type
+++ b/tests/ts/lsfd/column-type
@@ -46,8 +46,8 @@ EXPR="(FD == 3)"
 	    echo "$C"':ASSOC,STTYPE,TYPE': $?
 
 	    kill -CONT "${PID}"
-	    wait "${MKFDS_PID}"
 	fi
+	wait "${MKFDS_PID}"
     done
 } > "$TS_OUTPUT" 2>&1
 
diff --git a/tests/ts/lsfd/mkfds-directory b/tests/ts/lsfd/mkfds-directory
index e1bf77338c..ef769c916b 100755
--- a/tests/ts/lsfd/mkfds-directory
+++ b/tests/ts/lsfd/mkfds-directory
@@ -102,8 +102,8 @@ esac
 	fi
 
 	kill -CONT ${PID}
-	wait ${MKFDS_PID}
     fi
+    wait ${MKFDS_PID}
 } > $TS_OUTPUT 2>&1
 
 ts_finalize
diff --git a/tests/ts/lsfd/mkfds-mapped-packet-socket b/tests/ts/lsfd/mkfds-mapped-packet-socket
index 4dd03e1f99..1f705aecb4 100755
--- a/tests/ts/lsfd/mkfds-mapped-packet-socket
+++ b/tests/ts/lsfd/mkfds-mapped-packet-socket
@@ -41,9 +41,9 @@ INTERFACE=lo
 	EXPR='(ASSOC == "shm") and (STTYPE == "SOCK") and (MODE == "-w-")'
 	${TS_CMD_LSFD} -p "$PID" -n -o SOCK.PROTONAME -Q "${EXPR}"
 	echo 'SOCK.PROTONAME': $?
+	kill -CONT ${PID}
     fi
 
-    kill -CONT ${PID}
     wait ${MKFDS_PID}
 } > $TS_OUTPUT 2>&1
 
diff --git a/tests/ts/lsfd/mkfds-pidfd b/tests/ts/lsfd/mkfds-pidfd
index 876185318d..ae4f65c83b 100755
--- a/tests/ts/lsfd/mkfds-pidfd
+++ b/tests/ts/lsfd/mkfds-pidfd
@@ -40,8 +40,8 @@ EXPR="(PID != ${TARGET}) and (FD == 3) and (PIDFD.PID == ${TARGET})"
 	echo 'ASSOC,STTYPE,SOURCE,NAME,PIDFD.COMM,PIDFD.PID': $?
 
 	kill -CONT ${PID}
-	wait ${MKFDS_PID}
     fi
+    wait ${MKFDS_PID}
 } > $TS_OUTPUT 2>&1
 
 ts_finalize
diff --git a/tests/ts/lsfd/mkfds-pipe-no-fork b/tests/ts/lsfd/mkfds-pipe-no-fork
index a95d3a86f4..539f8d0332 100755
--- a/tests/ts/lsfd/mkfds-pipe-no-fork
+++ b/tests/ts/lsfd/mkfds-pipe-no-fork
@@ -93,8 +93,8 @@ EXPR=
 	    echo "${expected}"
 	fi
 	kill -CONT ${PID}
-	wait ${MKFDS_PID}
     fi
+    wait ${MKFDS_PID}
 } > $TS_OUTPUT 2>&1
 
 ts_finalize
diff --git a/tests/ts/lsfd/mkfds-raw b/tests/ts/lsfd/mkfds-raw
index 2c33abcd94..0260ba1d9a 100755
--- a/tests/ts/lsfd/mkfds-raw
+++ b/tests/ts/lsfd/mkfds-raw
@@ -40,9 +40,9 @@ PROTOCOL=5
 		       -o ASSOC,TYPE,NAME,SOCK.STATE,SOCK.TYPE,INET.LADDR,INET.RADDR,RAW.PROTOCOL \
 		       -p "${PID}" -Q "${EXPR}"
 	echo 'ASSOC,TYPE,NAME,SOCK.STATE,SOCK.TYPE,INET.LADDR,INET.RADDR,RAW.PROTOCOL': $?
+	kill -CONT "${PID}"
     fi
 
-    kill -CONT "${PID}"
     wait "${MKFDS_PID}"
 } > "$TS_OUTPUT" 2>&1
 
diff --git a/tests/ts/lsfd/mkfds-raw6 b/tests/ts/lsfd/mkfds-raw6
index 135a425c55..d758aad241 100755
--- a/tests/ts/lsfd/mkfds-raw6
+++ b/tests/ts/lsfd/mkfds-raw6
@@ -40,9 +40,9 @@ PROTOCOL=5
 		       -o ASSOC,TYPE,NAME,SOCK.STATE,SOCK.TYPE,INET6.LADDR,INET6.RADDR,RAW.PROTOCOL \
 		       -p "${PID}" -Q "${EXPR}"
 	echo 'ASSOC,TYPE,NAME,SOCK.STATE,SOCK.TYPE,INET6.LADDR,INET6.RADDR,RAW.PROTOCOL': $?
+	kill -CONT "${PID}"
     fi
 
-    kill -CONT "${PID}"
     wait "${MKFDS_PID}"
 } > "$TS_OUTPUT" 2>&1
 
diff --git a/tests/ts/lsfd/mkfds-ro-block-device b/tests/ts/lsfd/mkfds-ro-block-device
index 00ad6c00fc..5701aea479 100755
--- a/tests/ts/lsfd/mkfds-ro-block-device
+++ b/tests/ts/lsfd/mkfds-ro-block-device
@@ -71,8 +71,8 @@ EXPR=
 	lsfd_compare_dev "${TS_CMD_LSFD}" "${LSFD_LOOP_BDEV}" "${EXPR}"
 
 	kill -CONT ${PID}
-	wait ${MKFDS_PID}
     fi
+    wait ${MKFDS_PID}
 } > $TS_OUTPUT 2>&1
 
 ts_finalize
diff --git a/tests/ts/lsfd/mkfds-ro-regular-file b/tests/ts/lsfd/mkfds-ro-regular-file
index 8d0f02b027..a2c4c268b8 100755
--- a/tests/ts/lsfd/mkfds-ro-regular-file
+++ b/tests/ts/lsfd/mkfds-ro-regular-file
@@ -71,8 +71,8 @@ EXPR=
 	lsfd_compare_dev "${TS_CMD_LSFD}" $target "${EXPR}"
 
 	kill -CONT ${PID}
-	wait ${MKFDS_PID}
     fi
+    wait ${MKFDS_PID}
 } > $TS_OUTPUT 2>&1
 
 ts_finalize
diff --git a/tests/ts/lsfd/mkfds-rw-character-device b/tests/ts/lsfd/mkfds-rw-character-device
index 8ac0fe4c5d..85dd29cad6 100755
--- a/tests/ts/lsfd/mkfds-rw-character-device
+++ b/tests/ts/lsfd/mkfds-rw-character-device
@@ -43,8 +43,8 @@ EXPR=
 	lsfd_compare_dev "${TS_CMD_LSFD}" $target "${EXPR}"
 
 	kill -CONT ${PID}
-	wait ${MKFDS_PID}
     fi
+    wait ${MKFDS_PID}
 } > $TS_OUTPUT 2>&1
 
 ts_finalize
diff --git a/tests/ts/lsfd/mkfds-socketpair b/tests/ts/lsfd/mkfds-socketpair
index e16d5bee1c..4653f09123 100755
--- a/tests/ts/lsfd/mkfds-socketpair
+++ b/tests/ts/lsfd/mkfds-socketpair
@@ -41,8 +41,8 @@ EXPR=
 	echo 'ASSOC,MODE,STTYPE,SOURCE,SOCK.PROTONAME': $?
 
 	kill -CONT ${PID}
-	wait ${MKFDS_PID}
     fi
+    wait ${MKFDS_PID}
 } > $TS_OUTPUT 2>&1
 
 ts_finalize
diff --git a/tests/ts/lsfd/mkfds-symlink b/tests/ts/lsfd/mkfds-symlink
index 3b3e3c168d..482564519f 100755
--- a/tests/ts/lsfd/mkfds-symlink
+++ b/tests/ts/lsfd/mkfds-symlink
@@ -38,8 +38,8 @@ EXPR=
 	echo 'ASSOC,MODE,TYPE,NAME,FLAGS': $?
 
 	kill -CONT ${PID}
-	wait ${MKFDS_PID}
     fi
+    wait ${MKFDS_PID}
 } > $TS_OUTPUT 2>&1
 
 ts_finalize
diff --git a/tests/ts/lsfd/mkfds-tcp b/tests/ts/lsfd/mkfds-tcp
index 259b520c3a..e531a7b06b 100755
--- a/tests/ts/lsfd/mkfds-tcp
+++ b/tests/ts/lsfd/mkfds-tcp
@@ -43,8 +43,8 @@ EXPR='(TYPE == "TCP") and (FD >= 3) and (FD <= 5)'
 	echo 'ASSOC,TYPE,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET.LADDR,INET.RADDR,TCP.LADDR,TCP.LPORT,TCP.RADDR,TCP.RPORT': $?
 
 	kill -CONT "${PID}"
-	wait "${MKFDS_PID}"
     fi
+    wait "${MKFDS_PID}"
 } > "$TS_OUTPUT" 2>&1
 
 ts_finalize
diff --git a/tests/ts/lsfd/mkfds-tcp6 b/tests/ts/lsfd/mkfds-tcp6
index b987c88b51..5f196daafd 100755
--- a/tests/ts/lsfd/mkfds-tcp6
+++ b/tests/ts/lsfd/mkfds-tcp6
@@ -43,8 +43,8 @@ EXPR='(TYPE == "TCPv6") and (FD >= 3) and (FD <= 5)'
 	echo 'ASSOC,TYPE,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET6.LADDR,INET6.RADDR,TCP.LADDR,TCP.LPORT,TCP.RADDR,TCP.RPORT': $?
 
 	kill -CONT "${PID}"
-	wait "${MKFDS_PID}"
     fi
+    wait "${MKFDS_PID}"
 } > "$TS_OUTPUT" 2>&1
 
 ts_finalize
diff --git a/tests/ts/lsfd/mkfds-udp b/tests/ts/lsfd/mkfds-udp
index 9261771d82..e6e1f1cef1 100755
--- a/tests/ts/lsfd/mkfds-udp
+++ b/tests/ts/lsfd/mkfds-udp
@@ -61,8 +61,8 @@ for lite in 0 1; do
 	echo "ASSOC,TYPE,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET.LADDR,INET.RADDR,${COLNS[$lite]}.LADDR,${COLNS[$lite]}.LPORT,${COLNS[$lite]}.RADDR,${COLNS[$lite]}.RPORT": $?
 
 	kill -CONT "${PID}"
-	wait "${MKFDS_PID}"
     fi
+    wait "${MKFDS_PID}"
 
     coproc MKFDS { "$TS_HELPER_MKFDS" udp $FDS $FDC \
 				      server-port=34567 \
@@ -86,8 +86,8 @@ for lite in 0 1; do
 	fi
 
 	kill -CONT "${PID}"
-	wait "${MKFDS_PID}"
     fi
+    wait "${MKFDS_PID}"
 
     coproc MKFDS { "$TS_HELPER_MKFDS" udp $FDS $FDC \
 				      server-port=34567 \
@@ -116,8 +116,8 @@ for lite in 0 1; do
 	fi
 
 	kill -CONT "${PID}"
-	wait "${MKFDS_PID}"
     fi
+    wait "${MKFDS_PID}"
 
     coproc MKFDS { "$TS_HELPER_MKFDS" udp $FDS $FDC \
 				      server-port=34567 \
@@ -131,8 +131,8 @@ for lite in 0 1; do
 	echo 'ASSOC,TYPE,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET.LADDR,INET.RADDR,UDP.LADDR,UDP.LPORT,UDP.RADDR,UDP.RPORT': $?
 
 	kill -CONT "${PID}"
-	wait "${MKFDS_PID}"
     fi
+    wait "${MKFDS_PID}"
 done > "$TS_OUTPUT" 2>&1
 
 ts_finalize
diff --git a/tests/ts/lsfd/mkfds-udp6 b/tests/ts/lsfd/mkfds-udp6
index e3da894f6f..cd8dc00a4a 100755
--- a/tests/ts/lsfd/mkfds-udp6
+++ b/tests/ts/lsfd/mkfds-udp6
@@ -61,8 +61,8 @@ for lite in 0 1; do
 	echo "ASSOC,TYPE,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET6.LADDR,INET6.RADDR,${COLNS[$lite]}.LADDR,${COLNS[$lite]}.LPORT,${COLNS[$lite]}.RADDR,${COLNS[$lite]}.RPORT": $?
 
 	kill -CONT "${PID}"
-	wait "${MKFDS_PID}"
     fi
+    wait "${MKFDS_PID}"
 
     coproc MKFDS { "$TS_HELPER_MKFDS" udp6 $FDS $FDC \
 				      server-port=34567 \
@@ -86,8 +86,8 @@ for lite in 0 1; do
 	fi
 
 	kill -CONT "${PID}"
-	wait "${MKFDS_PID}"
     fi
+    wait "${MKFDS_PID}"
 
     coproc MKFDS { "$TS_HELPER_MKFDS" udp6 $FDS $FDC \
 				      server-port=34567 \
@@ -114,10 +114,10 @@ for lite in 0 1; do
 	else
 	    echo "LADDR/LPORT pattern match: FAILED (LADDR=$LADDR, LPORT=$LPORT)"
 	fi
-	
+
 	kill -CONT "${PID}"
-	wait "${MKFDS_PID}"
     fi
+    wait "${MKFDS_PID}"
 
     coproc MKFDS { "$TS_HELPER_MKFDS" udp6 $FDS $FDC \
 				      server-port=34567 \
@@ -131,8 +131,8 @@ for lite in 0 1; do
 	echo "ASSOC,TYPE,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET6.LADDR,INET6.RADDR,${COLNS[$lite]}.LADDR,${COLNS[$lite]}.LPORT,${COLNS[$lite]}.RADDR,${COLNS[$lite]}.RPORT": $?
 
 	kill -CONT "${PID}"
-	wait "${MKFDS_PID}"
     fi
+    wait "${MKFDS_PID}"
 done > "$TS_OUTPUT" 2>&1
 
 ts_finalize
diff --git a/tests/ts/lsfd/mkfds-unix-dgram b/tests/ts/lsfd/mkfds-unix-dgram
index c211a65f86..1464054ca5 100755
--- a/tests/ts/lsfd/mkfds-unix-dgram
+++ b/tests/ts/lsfd/mkfds-unix-dgram
@@ -40,8 +40,8 @@ EXPR='(TYPE == "UNIX") and ((FD == 3) or (FD == 4))'
 	echo 'ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH': $?
 
 	kill -CONT "${PID}"
-	wait "${MKFDS_PID}"
     fi
+    wait "${MKFDS_PID}"
 
     coproc MKFDS { "$TS_HELPER_MKFDS" unix-dgram $FDS $FDC \
 				      path=test_mkfds-unix-dgram \
@@ -53,8 +53,8 @@ EXPR='(TYPE == "UNIX") and ((FD == 3) or (FD == 4))'
 	echo 'ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH': $?
 
 	kill -CONT "${PID}"
-	wait "${MKFDS_PID}"
     fi
+    wait "${MKFDS_PID}"
 } > "$TS_OUTPUT" 2>&1
 
 ts_finalize
diff --git a/tests/ts/lsfd/mkfds-unix-in-netns b/tests/ts/lsfd/mkfds-unix-in-netns
index ea22ae5d1d..234208909c 100755
--- a/tests/ts/lsfd/mkfds-unix-in-netns
+++ b/tests/ts/lsfd/mkfds-unix-in-netns
@@ -68,8 +68,8 @@ compare_net_namespaces()
 	    compare_net_namespaces "$t" "${PID}"
 
 	    kill -CONT "${PID}"
-	    wait "${MKFDS_PID}"
 	fi
+	wait "${MKFDS_PID}"
 
 	coproc MKFDS { "$TS_HELPER_MKFDS" unix-in-netns $FDSELFNS $FDALTNS $FDSOCK \
 					  path=test_mkfds-unix-$t-ns \
@@ -84,8 +84,8 @@ compare_net_namespaces()
 	    compare_net_namespaces "abstract $t" "${PID}"
 
 	    kill -CONT "${PID}"
-	    wait "${MKFDS_PID}"
 	fi
+	wait "${MKFDS_PID}"
     done
 } > "$TS_OUTPUT" 2>&1
 
diff --git a/tests/ts/lsfd/mkfds-unix-stream b/tests/ts/lsfd/mkfds-unix-stream
index 0bc69aeac6..2d0dd67fb8 100755
--- a/tests/ts/lsfd/mkfds-unix-stream
+++ b/tests/ts/lsfd/mkfds-unix-stream
@@ -45,8 +45,8 @@ EXPR='(((TYPE == "UNIX-STREAM") or (TYPE == "UNIX")) and (FD >= 3) and (FD <= 5)
 	    echo 'ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH': $?
 
 	    kill -CONT "${PID}"
-	    wait "${MKFDS_PID}"
 	fi
+	wait "${MKFDS_PID}"
 
 	coproc MKFDS { "$TS_HELPER_MKFDS" unix-stream $FDS $FDC $FDA \
 					  path=test_mkfds-unix-${t}-abs \
@@ -58,8 +58,8 @@ EXPR='(((TYPE == "UNIX-STREAM") or (TYPE == "UNIX")) and (FD >= 3) and (FD <= 5)
 	    echo '(abs) ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH': $?
 
 	    kill -CONT "${PID}"
-	    wait "${MKFDS_PID}"
 	fi
+	wait "${MKFDS_PID}"
 
 	coproc MKFDS { "$TS_HELPER_MKFDS" unix-stream $FDS $FDC $FDA \
 					  path=test_mkfds-unix-${t}-shutdown \
@@ -74,8 +74,8 @@ EXPR='(((TYPE == "UNIX-STREAM") or (TYPE == "UNIX")) and (FD >= 3) and (FD <= 5)
 	    # Surprisingly, the socket status doesn't change at all.
 
 	    kill -CONT "${PID}"
-	    wait "${MKFDS_PID}"
 	fi
+	wait "${MKFDS_PID}"
 
 	coproc MKFDS { "$TS_HELPER_MKFDS" unix-stream $FDS $FDC $FDA \
 					  path="test_mkfds-unix with spaces ${t}" \
@@ -87,8 +87,8 @@ EXPR='(((TYPE == "UNIX-STREAM") or (TYPE == "UNIX")) and (FD >= 3) and (FD <= 5)
 	    echo 'ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH': $?
 
 	    kill -CONT "${PID}"
-	    wait "${MKFDS_PID}"
 	fi
+	wait "${MKFDS_PID}"
 
     done
 } > "$TS_OUTPUT" 2>&1
diff --git a/tests/ts/lsfd/option-pid b/tests/ts/lsfd/option-pid
index 0e0c986d5d..0ea4353e3e 100755
--- a/tests/ts/lsfd/option-pid
+++ b/tests/ts/lsfd/option-pid
@@ -73,8 +73,8 @@ POUT=
 	echo "EQ[-p PID --pid=1]:" $?
 
 	kill -CONT ${PID}
-	wait ${MKFDS_PID}
     fi
+    wait ${MKFDS_PID}
 } > $TS_OUTPUT 2>&1
 
 ts_finalize