]> granicus.if.org Git - strace/commitdiff
tests: fix parallel-tests support in detach-* tests
authorDmitry V. Levin <ldv@altlinux.org>
Tue, 18 Jun 2013 22:31:58 +0000 (22:31 +0000)
committerDmitry V. Levin <ldv@altlinux.org>
Tue, 18 Jun 2013 22:37:08 +0000 (22:37 +0000)
* tests/detach-sleeping: Use $LOG file for set_ptracer_any output.
* tests/detach-stopped: Likewise.

tests/detach-sleeping
tests/detach-stopped

index 2a7e9ab9ae65aa169f1ce716971afa17c4b03298..33a2675b2f693059f597a0146986d2d845bc5273 100755 (executable)
@@ -9,14 +9,14 @@ check_prog grep
 
 set -e
 
-./set_ptracer_any sleep $((2*$TIMEOUT_DURATION)) > set_ptracer_any.out &
+rm -f $LOG
+./set_ptracer_any sleep $((2*$TIMEOUT_DURATION)) > $LOG &
 
-while ! [ -s set_ptracer_any.out ]; do
+while ! [ -s $LOG ]; do
        kill -0 $! 2> /dev/null ||
                fail_ 'set_ptracer_any sleep failed'
        $SLEEP_A_BIT
 done
-rm -f set_ptracer_any.out
 
 tracee_pid=$!
 
@@ -28,6 +28,7 @@ cleanup()
        wait $tracee_pid 2> /dev/null
 }
 
+rm -f $LOG
 $STRACE -p $tracee_pid 2> $LOG &
 
 while ! grep -F "Process $tracee_pid attached" $LOG > /dev/null; do
index 3844fc25d36ba31b8e1afbe48591d4cda5fb99cb..d2b8a31d11fb77fb1f6ebbdbc8d0d1bfe9c93715 100755 (executable)
@@ -9,14 +9,14 @@ check_prog grep
 
 set -e
 
-./set_ptracer_any sleep $((2*$TIMEOUT_DURATION)) > set_ptracer_any.out &
+rm -f $LOG
+./set_ptracer_any sleep $((2*$TIMEOUT_DURATION)) > $LOG &
 
-while ! [ -s set_ptracer_any.out ]; do
+while ! [ -s $LOG ]; do
        kill -0 $! 2> /dev/null ||
                fail_ 'set_ptracer_any sleep failed'
        $SLEEP_A_BIT
 done
-rm -f set_ptracer_any.out
 
 tracee_pid=$!
 kill -STOP $tracee_pid
@@ -29,6 +29,7 @@ cleanup()
        wait $tracee_pid 2> /dev/null
 }
 
+rm -f $LOG
 $STRACE -p $tracee_pid 2> $LOG &
 
 while ! grep -F "Process $tracee_pid attached" $LOG > /dev/null; do