2b5bfeb2a8
The current detach test code does:
set -e
...
cleanup() {
set +e
kill ...
wait ...
}
...
cleanup
exit 0
The problem is that while `set -e` is disabled for the body of the
cleanup function, it isn't necessarily disabled in the caller scope.
So if the return value of the cleanup function (`wait` in this case)
is non-zero, the script ends up failing overall.
Add an explicit return 0 to the cleanup function so that we don't kill
the overall test pipeline.
* tests/detach-running.test (cleanup): Add return 0.
* tests/detach-sleeping.test (cleanup): Likewise.
* tests/detach-stopped.test (cleanup): Likewise.
59 lines
1.1 KiB
Bash
Executable File
59 lines
1.1 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
# Ensure that strace can detach from running processes.
|
|
|
|
. "${srcdir=.}/init.sh"
|
|
|
|
check_prog sleep
|
|
check_prog grep
|
|
|
|
set -e
|
|
|
|
./set_ptracer_any sh -c "echo > $LOG; while :; do :; done" > /dev/null &
|
|
|
|
while ! [ -s $LOG ]; do
|
|
kill -0 $! 2> /dev/null ||
|
|
fail_ 'set_ptracer_any sh failed'
|
|
$SLEEP_A_BIT
|
|
done
|
|
|
|
tracee_pid=$!
|
|
|
|
cleanup()
|
|
{
|
|
set +e
|
|
kill $tracee_pid
|
|
wait $tracee_pid 2> /dev/null
|
|
return 0
|
|
}
|
|
|
|
rm -f $LOG
|
|
$STRACE -p $tracee_pid 2> $LOG &
|
|
|
|
while ! grep -F "Process $tracee_pid attached" $LOG > /dev/null; do
|
|
kill -0 $! 2> /dev/null ||
|
|
{ cat $LOG; cleanup; fail_ 'strace -p does not work'; }
|
|
$SLEEP_A_BIT
|
|
done
|
|
|
|
kill -INT $!
|
|
wait $!
|
|
|
|
grep -F "Process $tracee_pid detached" $LOG > /dev/null ||
|
|
{ cat $LOG; cleanup; fail_ 'strace -p failed to detach'; }
|
|
|
|
if [ -f /proc/self/status ]; then
|
|
$SLEEP_A_BIT
|
|
test -d /proc/$tracee_pid ||
|
|
{ cat $LOG; cleanup; fail_ 'tracee died after detach'; }
|
|
grep '^State:.*R (running)' < /proc/$tracee_pid/status > /dev/null || {
|
|
cat $LOG
|
|
grep '^State:' < /proc/$tracee_pid/status
|
|
cleanup
|
|
fail_ 'tracee is not running after detach'
|
|
}
|
|
fi
|
|
|
|
cleanup
|
|
exit 0
|