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 2096c5b0c88e5a1034aa9d6d78595a544696ef49..54d6fd4355e571c1737e4090028cb1b74c0b9014 100755 (executable)
--- 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 3d56582607aa615f2a48111761f030f71f3bb92b..fcff5e806851659a2011d3f201d4642d534afeef 100755 (executable)
--- 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 4b69ec751a610614a84a9f22ce71819fb40003ab..c875defa0e3c2563771c1bed97eb740fd4efe50a 100755 (executable)
--- 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 e1bf77338cbad71a017f243195f3fa0c7b0088a1..ef769c916b6b46f3ca26fb94822c64b28789f039 100755 (executable)
--- 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 4dd03e1f99af390398df26b0389884fb55467a2f..1f705aecb451d9904102791481ecb5556d0f6f40 100755 (executable)
--- 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 876185318d679cb7de79f7a597f99c78c836850e..ae4f65c83b3f6407a9cff0affeb2cc6f5a57dd1c 100755 (executable)
--- 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 a95d3a86f4438a76fd232ee9fccadd3d1173a7ac..539f8d03324025fab0b510d334a535c7a2ae2cea 100755 (executable)
--- 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 2c33abcd94f86e1886f59332fa9735b52beb1bd8..0260ba1d9a37d6829ce36c17dbb41a04d8881356 100755 (executable)
--- 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 135a425c556787e17f96bd6414038e535ae08ff0..d758aad2410cab3a8a52eb8cc5231e3eda574483 100755 (executable)
--- 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 00ad6c00fc7bc44ab8ff283630ede9edc35968e3..5701aea479408a890d6b03791cf35c53b5bcc967 100755 (executable)
--- 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 8d0f02b02789aa604c357f34ea44988a638c75a1..a2c4c268b874b00187158f45342be59cf6b20c37 100755 (executable)
--- 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 8ac0fe4c5de6d9c2e1a7270baf9f7e5cb52c3f3a..85dd29cad6d426a3ba5498791c27f92eb336eac6 100755 (executable)
--- 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 e16d5bee1cc81e2e0d62dd0bfd09115205e655b2..4653f091238dfd073534dd6ab34422b559a835a4 100755 (executable)
--- 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 3b3e3c168dcead1af73ecf12c2564645e6db91a8..482564519fdee5a23ff98a882ef9968a34f92dc7 100755 (executable)
--- 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 259b520c3a55fb68d824fd7c893abba1fafe6675..e531a7b06bac51ea65a826bf87905a8d71f1b7ce 100755 (executable)
--- 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 b987c88b511a35d8f9bb430e88aebe5b02569a29..5f196daafd4eb8c7e64e97a63151991812b91422 100755 (executable)
--- 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 9261771d82723f4a80e399fd67dce8610c435b11..e6e1f1cef1f3e52121fae419054e97678a198597 100755 (executable)
--- 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 e3da894f6f39ad4ea3183f35845ee95835636144..cd8dc00a4a28527dce96ae3d943c73c1c566a399 100755 (executable)
--- 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 c211a65f86a3c4930492c824b9376f7afd97fb2e..1464054ca5df38674d519688851f9a8e18134671 100755 (executable)
--- 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 ea22ae5d1d2fdac88e561ec64934d0d0b5160b12..234208909c1c8cc0e092a300c79260baf003152c 100755 (executable)
--- 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 0bc69aeac6caa1bf3b769843f97b583e645a2b94..2d0dd67fb890f138c6cd1b919d7e02d62ee1a528 100755 (executable)
--- 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 0e0c986d5d33a5c63160a411a9cfb5820a8a7c7a..0ea4353e3e15b652b9767222d661f4e645419b2e 100755 (executable)
--- 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