mirror of
https://github.com/checkpoint-restore/criu
synced 2025-08-31 14:25:49 +00:00
test/zdtm.sh cleanup: remove 30 mentions of $ZP
Replace them by just two. Signed-off-by: Kir Kolyshkin <kir@openvz.org> Signed-off-by: Andrey Vagin <avagin@gmail.com>
This commit is contained in:
committed by
Andrey Vagin
parent
5059cc7b0a
commit
dae80231b0
78
test/zdtm.sh
78
test/zdtm.sh
@@ -2,45 +2,49 @@
|
|||||||
|
|
||||||
ZP="zdtm/live"
|
ZP="zdtm/live"
|
||||||
|
|
||||||
TEST_LIST="\
|
TEST_LIST="
|
||||||
$ZP/static/pipe00
|
static/pipe00
|
||||||
$ZP/static/busyloop00
|
static/busyloop00
|
||||||
$ZP/static/cwd00
|
static/cwd00
|
||||||
$ZP/static/env00
|
static/env00
|
||||||
$ZP/static/shm
|
static/shm
|
||||||
$ZP/static/maps00
|
static/maps00
|
||||||
$ZP/static/mprotect00
|
static/mprotect00
|
||||||
$ZP/static/mtime_mmap
|
static/mtime_mmap
|
||||||
$ZP/static/sleeping00
|
static/sleeping00
|
||||||
$ZP/static/write_read00
|
static/write_read00
|
||||||
$ZP/static/write_read01
|
static/write_read01
|
||||||
$ZP/static/write_read02
|
static/write_read02
|
||||||
$ZP/static/wait00
|
static/wait00
|
||||||
$ZP/static/vdso00
|
static/vdso00
|
||||||
$ZP/static/file_shared
|
static/file_shared
|
||||||
$ZP/static/timers
|
static/timers
|
||||||
$ZP/streaming/pipe_loop00
|
streaming/pipe_loop00
|
||||||
$ZP/streaming/pipe_shared00
|
streaming/pipe_shared00
|
||||||
$ZP/transition/file_read
|
transition/file_read
|
||||||
$ZP/transition/fork
|
transition/fork
|
||||||
$ZP/static/zombie00
|
static/zombie00
|
||||||
$ZP/static/sockets00
|
static/sockets00
|
||||||
$ZP/static/pid00
|
static/pid00
|
||||||
$ZP/static/pstree
|
static/pstree
|
||||||
$ZP/static/caps00
|
static/caps00
|
||||||
$ZP/static/cmdlinenv00
|
static/cmdlinenv00
|
||||||
$ZP/static/socket_listen"
|
static/socket_listen
|
||||||
|
"
|
||||||
|
|
||||||
UTS_TEST_LIST="\
|
UTS_TEST_LIST="
|
||||||
$ZP/static/utsname"
|
static/utsname
|
||||||
IPC_TEST_LIST="\
|
"
|
||||||
$ZP/static/ipc_namespace"
|
|
||||||
|
IPC_TEST_LIST="
|
||||||
|
static/ipc_namespace
|
||||||
|
"
|
||||||
|
|
||||||
CRTOOLS=`pwd`/`dirname $0`/../crtools
|
CRTOOLS=`pwd`/`dirname $0`/../crtools
|
||||||
|
|
||||||
run_test()
|
run_test()
|
||||||
{
|
{
|
||||||
test=$1
|
test=$ZP/$1
|
||||||
tname=`basename $test`
|
tname=`basename $test`
|
||||||
tdir=`dirname $test`
|
tdir=`dirname $test`
|
||||||
|
|
||||||
@@ -76,7 +80,7 @@ run_test()
|
|||||||
|
|
||||||
case_error()
|
case_error()
|
||||||
{
|
{
|
||||||
test=$1
|
test=$ZP/$1
|
||||||
test_log="`pwd`/$test.out"
|
test_log="`pwd`/$test.out"
|
||||||
|
|
||||||
echo "Test: $test"
|
echo "Test: $test"
|
||||||
@@ -106,10 +110,10 @@ elif [ "$1" == "-l" ]; then
|
|||||||
echo $IPC_TEST_LIST | sed -e "s#$ZP/##g" -e 's/ /\n/g'
|
echo $IPC_TEST_LIST | sed -e "s#$ZP/##g" -e 's/ /\n/g'
|
||||||
else
|
else
|
||||||
if echo "$UTS_TEST_LIST" | fgrep -q "$1" ; then
|
if echo "$UTS_TEST_LIST" | fgrep -q "$1" ; then
|
||||||
run_test "$ZP/$1" "-n uts" || case_error "$ZP/$1"
|
run_test "$1" "-n uts" || case_error "$1"
|
||||||
elif echo "$IPC_TEST_LIST" | fgrep -q "$1" ; then
|
elif echo "$IPC_TEST_LIST" | fgrep -q "$1" ; then
|
||||||
run_test "$ZP/$1" "-n ipc" || case_error "$ZP/$1"
|
run_test "$1" "-n ipc" || case_error "$1"
|
||||||
else
|
else
|
||||||
run_test "$ZP/$1" || case_error "$ZP/$1"
|
run_test "$1" || case_error "$1"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
Reference in New Issue
Block a user