mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-01 14:55:39 +00:00
Code Issues Releases Wiki Activity

zdtm: move file_locks test-cases to the common list

Browse Source 
In this case they will be executed in other name-spaces.

Signed-off-by: Andrey Vagin <avagin@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Andrey Vagin
2013-01-18 23:51:11 +04:00
committed by Pavel Emelyanov
parent d6ae662374
commit ab2d10c247
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
test/zdtm.sh
View File

@@ -80,6 +80,8 @@ static/mmx00
static/sse00 static/sse00
static/sse20 static/sse20
static/fdt_shared static/fdt_shared
static/file_locks00
static/file_locks01
" "
# Duplicate list with ns/ prefix # Duplicate list with ns/ prefix
TEST_LIST=$TEST_LIST$(echo $TEST_LIST | tr ' ' '\n' | sed 's#^#ns/#') TEST_LIST=$TEST_LIST$(echo $TEST_LIST | tr ' ' '\n' | sed 's#^#ns/#')
@@ -119,11 +121,6 @@ static/sem
transition/ipc transition/ipc
" "
FILE_LOCK_TEST_LIST="
static/file_locks00
static/file_locks01
"
TEST_CR_KERNEL=" TEST_CR_KERNEL="
static/sock_opts01 static/sock_opts01
static/sockets01 static/sockets01
@@ -315,7 +312,7 @@ EOF
mkdir -p $ddump mkdir -p $ddump
save_fds $PID $ddump/dump.fd save_fds $PID $ddump/dump.fd
setsid $CRTOOLS_CPT dump --tcp-established --link-remap -x --evasive-devices -D $ddump -o dump.log -v 4 -t $PID $args $ARGS || { setsid $CRTOOLS_CPT dump --file-locks --tcp-established --link-remap -x --evasive-devices -D $ddump -o dump.log -v 4 -t $PID $args $ARGS || {
echo WARNING: process $tname is left running for your debugging needs echo WARNING: process $tname is left running for your debugging needs
return 1 return 1
} }
@@ -340,7 +337,7 @@ EOF
done done
echo Restore $PID echo Restore $PID
setsid $CRTOOLS restore --tcp-established -x -D $ddump -o restore.log -v 4 -d -t $PID $args || return 2 setsid $CRTOOLS restore --file-locks --tcp-established -x -D $ddump -o restore.log -v 4 -d -t $PID $args || return 2
for i in `seq 5`; do for i in `seq 5`; do
save_fds $PID $ddump/restore.fd save_fds $PID $ddump/restore.fd
@@ -447,11 +444,8 @@ if [ $# -eq 0 ]; then
for t in $IPC_TEST_LIST; do for t in $IPC_TEST_LIST; do
run_test $t -n ipc || case_error $t run_test $t -n ipc || case_error $t
done done
for t in $FILE_LOCK_TEST_LIST; do
run_test $t -l || case_error $t
done
elif [ "$1" = "-l" ]; then elif [ "$1" = "-l" ]; then
echo $TEST_LIST $UTS_TEST_LIST $MNT_TEST_LIST $IPC_TEST_LIST $FILE_LOCK_TEST_LIST | tr ' ' '\n' echo $TEST_LIST $UTS_TEST_LIST $MNT_TEST_LIST $IPC_TEST_LIST | tr ' ' '\n'
elif [ "$1" = "-h" ]; then elif [ "$1" = "-h" ]; then
cat >&2 <<EOF cat >&2 <<EOF
This script is used for executing unit tests. This script is used for executing unit tests.