Commit dd63975b authored by Andrew Vagin's avatar Andrew Vagin Committed by Pavel Emelyanov

test: don't clean up submounts (v2)

I'm scared, when I see smth like that:
rm: cannot remove ‘/var/lib/jenkins/jobs/CRIU/workspace/test/dump/static/cgroup00/31195/1/.criu.cgyard.6qctPl/systemd/tasks’: Operation not permitted

v2: do that only in the "test" directory

Reported-by: Mr Jenkins
Signed-off-by: 's avatarAndrew Vagin <avagin@openvz.org>
Signed-off-by: 's avatarAndrey Vagin <avagin@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent 5d9b3612
TST = $(shell ./zdtm.sh -l) TST = $(shell ./zdtm.sh -l)
RM := rm -f --one-file-system
ZDTM_ARGS ?= -C ZDTM_ARGS ?= -C
......
...@@ -686,7 +686,7 @@ EOF ...@@ -686,7 +686,7 @@ EOF
cat $test.out cat $test.out
cat $test.out | grep -q PASS || return 2 cat $test.out | grep -q PASS || return 2
[ "$CLEANUP" -ne 0 ] && rm -rf `dirname $ddump` [ "$CLEANUP" -ne 0 ] && rm -rf --one-file-system `dirname $ddump`
echo "Test: $test, Result: PASS" echo "Test: $test, Result: PASS"
return 0 return 0
} }
...@@ -951,5 +951,5 @@ else ...@@ -951,5 +951,5 @@ else
fi fi
fi fi
[ -n "$TMP_TREE" ] && rm -rf $TMP_TREE [ -n "$TMP_TREE" ] && rm -rf --one-file-system $TMP_TREE
[ -n "$ZDTM_FAILED" ] && exit 1 || exit 0 [ -n "$ZDTM_FAILED" ] && exit 1 || exit 0
...@@ -29,4 +29,6 @@ else ...@@ -29,4 +29,6 @@ else
Q = Q =
endif endif
export E Q RM := rm -f --one-file-system
export E Q RM
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment