Skip to content

Commit 4e9019a

Browse files
authored
Merge pull request #1361 from mildas/fix_process58_command_line_test
Change creating of zombie process and waiting for processes at process58 test
2 parents 8f36cf6 + 34c5dfc commit 4e9019a

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

tests/probes/process58/command_line.sh

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,14 @@ function get_process_cmdline() {
2424
# We can scan processes before process's exec() and get wrong command_line
2525
function wait_for_process() {
2626
local PID="$1"
27+
local PROC_NAME="$2"
28+
if [[ -z "$PROC_NAME" ]]; then
29+
PROC_NAME="$PROC"
30+
fi
2731
for i in $(seq 1 100); # wait max 100 * 300ms
2832
do
2933
PROCESS_CMDLINE=$(get_process_cmdline "$PID")
30-
[[ "${PROCESS_CMDLINE}" == *${PROC}* ]] && break
34+
[[ "${PROCESS_CMDLINE}" == *${PROC_NAME}* ]] && break
3135
sleep 0.3s
3236
done
3337
}
@@ -86,7 +90,7 @@ echo "stderr file: $stderr"
8690
CMDLINE_REGEX='/(\w+/)+bash.*stopped_process\.sh param1 param2 param3$'
8791

8892
# Run zombie process (without full cmdline)
89-
( : & exec "${PROC}" ) &
93+
( SHELL_PID=$BASHPID && ( kill -STOP $SHELL_PID && sleep 1 ) ) &
9094
ZOMBIE_PPID=$!
9195
ZOMBIE_PID=$(get_zombie_pid_from_ppid ${ZOMBIE_PPID})
9296
[ -n "${ZOMBIE_PPID}" ]
@@ -104,7 +108,7 @@ echo "stderr file: $stderr"
104108
### Wait for start of all processes (all processes have done exec())
105109
########################################################################
106110
wait_for_process $PID
107-
wait_for_process ${ZOMBIE_PID}
111+
wait_for_process ${ZOMBIE_PID} "command_line.sh"
108112
wait_for_process ${ESCAPED_PID}
109113

110114
########################################################################

0 commit comments

Comments
 (0)