mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-22 09:58:09 +00:00
Code Issues Releases Wiki Activity

test/others: drop '_exit' function

Browse Source 
The function name '_exit' is misleading as this function doesn't
actually exit when the status of the previous command is zero.
In addition, the behaviour of this function is not really needed.

This patch removes the '_exit' function and applies the correct
behaviour to stop the test on failure.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
This commit is contained in:
Radostin Stoyanov 2021-06-09 07:25:34 +01:00 committed by Andrei Vagin
parent 34410b9e75
commit 2b78d95e6b
2 changed files with 40 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
test/others/crit/test.sh
View File

@ -7,28 +7,20 @@ source ../env.sh
images_list="" images_list=""
function _exit {
# shellcheck disable=SC2181
if [ $? -ne 0 ]; then
echo "FAIL"
exit 1
fi
}
function gen_imgs { function gen_imgs {
setsid ./loop.sh < /dev/null &> /dev/null & setsid ./loop.sh < /dev/null &> /dev/null &
PID=$! PID=$!
$CRIU dump -v4 -o dump.log -D ./ -t $PID if ! $CRIU dump -v4 -o dump.log -D ./ -t "$PID"; then
# shellcheck disable=SC2181 echo "Failed to checkpoint process $PID"
if [ $? -ne 0 ]; then cat dump.log
kill -9 $PID kill -9 "$PID"
_exit 1 exit 1
fi fi
images_list=$(ls -1 ./*.img) images_list=$(ls -1 ./*.img)
if [ -z "$images_list" ]; then if [ -z "$images_list" ]; then
echo "Failed to generate images" echo "Failed to generate images"
_exit 1 exit 1
fi fi
} }
@ -42,11 +34,11 @@ function run_test1 {
fi fi
echo " -- to json" echo " -- to json"
$CRIT decode -o "$x"".json" --pretty < "$x" || _exit $? $CRIT decode -o "$x"".json" --pretty < "$x" || exit $?
echo " -- to img" echo " -- to img"
$CRIT encode -i "$x"".json" > "$x"".json.img" || _exit $? $CRIT encode -i "$x"".json" > "$x"".json.img" || exit $?
echo " -- cmp" echo " -- cmp"
cmp "$x" "$x"".json.img" || _exit $? cmp "$x" "$x"".json.img" || exit $?
echo "=== done" echo "=== done"
done done
@ -64,15 +56,15 @@ function run_test2 {
${CRIT} decode -i "${PROTO_IN}" -o "${JSON_IN}" ${CRIT} decode -i "${PROTO_IN}" -o "${JSON_IN}"
# proto in - json out decode # proto in - json out decode
cat "${PROTO_IN}" | ${CRIT} decode || _exit 1 cat "${PROTO_IN}" | ${CRIT} decode || exit 1
cat "${PROTO_IN}" | ${CRIT} decode -o "${OUT}" || _exit 1 cat "${PROTO_IN}" | ${CRIT} decode -o "${OUT}" || exit 1
cat "${PROTO_IN}" | ${CRIT} decode > "${OUT}" || _exit 1 cat "${PROTO_IN}" | ${CRIT} decode > "${OUT}" || exit 1
${CRIT} decode -i "${PROTO_IN}" || _exit 1 ${CRIT} decode -i "${PROTO_IN}" || exit 1
${CRIT} decode -i "${PROTO_IN}" -o "${OUT}" || _exit 1 ${CRIT} decode -i "${PROTO_IN}" -o "${OUT}" || exit 1
${CRIT} decode -i "${PROTO_IN}" > "${OUT}" || _exit 1 ${CRIT} decode -i "${PROTO_IN}" > "${OUT}" || exit 1
${CRIT} decode < "${PROTO_IN}" || _exit 1 ${CRIT} decode < "${PROTO_IN}" || exit 1
${CRIT} decode -o "${OUT}" < "${PROTO_IN}" || _exit 1 ${CRIT} decode -o "${OUT}" < "${PROTO_IN}" || exit 1
${CRIT} decode < "${PROTO_IN}" > "${OUT}" || _exit 1 ${CRIT} decode < "${PROTO_IN}" > "${OUT}" || exit 1
# proto in - json out encode -> should fail # proto in - json out encode -> should fail
cat "${PROTO_IN}" | ${CRIT} encode || true cat "${PROTO_IN}" | ${CRIT} encode || true
@ -83,15 +75,15 @@ function run_test2 {
${CRIT} encode -i "${PROTO_IN}" > "${OUT}" || true ${CRIT} encode -i "${PROTO_IN}" > "${OUT}" || true
# json in - proto out encode # json in - proto out encode
cat "${JSON_IN}" | ${CRIT} encode || _exit 1 cat "${JSON_IN}" | ${CRIT} encode || exit 1
cat "${JSON_IN}" | ${CRIT} encode -o "${OUT}" || _exit 1 cat "${JSON_IN}" | ${CRIT} encode -o "${OUT}" || exit 1
cat "${JSON_IN}" | ${CRIT} encode > "${OUT}" || _exit 1 cat "${JSON_IN}" | ${CRIT} encode > "${OUT}" || exit 1
${CRIT} encode -i "${JSON_IN}" || _exit 1 ${CRIT} encode -i "${JSON_IN}" || exit 1
${CRIT} encode -i "${JSON_IN}" -o "${OUT}" || _exit 1 ${CRIT} encode -i "${JSON_IN}" -o "${OUT}" || exit 1
${CRIT} encode -i "${JSON_IN}" > "${OUT}" || _exit 1 ${CRIT} encode -i "${JSON_IN}" > "${OUT}" || exit 1
${CRIT} encode < "${JSON_IN}" || _exit 1 ${CRIT} encode < "${JSON_IN}" || exit 1
${CRIT} encode -o "${OUT}" < "${JSON_IN}" || _exit 1 ${CRIT} encode -o "${OUT}" < "${JSON_IN}" || exit 1
${CRIT} encode < "${JSON_IN}" > "${OUT}" || _exit 1 ${CRIT} encode < "${JSON_IN}" > "${OUT}" || exit 1
# json in - proto out decode -> should fail # json in - proto out decode -> should fail
cat "${JSON_IN}" | ${CRIT} decode || true cat "${JSON_IN}" | ${CRIT} decode || true
@ -102,10 +94,10 @@ function run_test2 {
${CRIT} decode -i "${JSON_IN}" > "${OUT}" || true ${CRIT} decode -i "${JSON_IN}" > "${OUT}" || true
# explore image directory # explore image directory
${CRIT} x ./ ps || _exit 1 ${CRIT} x ./ ps || exit 1
${CRIT} x ./ fds || _exit 1 ${CRIT} x ./ fds || exit 1
${CRIT} x ./ mems || _exit 1 ${CRIT} x ./ mems || exit 1
${CRIT} x ./ rss || _exit 1 ${CRIT} x ./ rss || exit 1
} }
gen_imgs gen_imgs

24
test/others/criu-coredump/test.sh
View File

@ -1,25 +1,19 @@
source ../env.sh source ../env.sh
function _exit {
if [ $? -ne 0 ]; then
echo "FAIL"
exit 1
fi
}
function gen_imgs { function gen_imgs {
setsid ./loop.sh < /dev/null &> /dev/null & setsid ./loop.sh < /dev/null &> /dev/null &
PID=$! PID=$!
$CRIU dump -v4 -o dump.log -D ./ -t $PID if ! $CRIU dump -v4 -o dump.log -D ./ -t "$PID"; then
if [ $? -ne 0 ]; then echo "Failed to checkpoint process $PID"
kill -9 $PID cat dump.log
_exit 1 kill -9 "$PID"
exit 1
fi fi
images_list=$(ls -1 *.img) images_list=$(ls -1 *.img)
if [ -z "$images_list" ]; then if [ -z "$images_list" ]; then
echo "Failed to generate images" echo "Failed to generate images"
_exit 1 exit 1
fi fi
} }
@ -27,19 +21,19 @@ function run_test {
echo "= Test core dump" echo "= Test core dump"
echo "=== img to core dump" echo "=== img to core dump"
$CRIU_COREDUMP -i ./ -o ./ || _exit $? $CRIU_COREDUMP -i ./ -o ./ || exit $?
echo "=== done" echo "=== done"
cores=$(ls -1 core.*) cores=$(ls -1 core.*)
if [ -z "$cores" ]; then if [ -z "$cores" ]; then
echo "Failed to generate coredumps" echo "Failed to generate coredumps"
_exit 1 exit 1
fi fi
for x in $cores for x in $cores
do do
echo "=== try readelf $x" echo "=== try readelf $x"
readelf -a $x || _exit $? readelf -a $x || exit $?
echo "=== done" echo "=== done"
done done