Commit 1fef8420 authored by Andrey Vagin's avatar Andrey Vagin Committed by Pavel Emelyanov

zdtm.sh: dump mount namespace for test_init

* s/pidns/ns/
* Add option --namespace mnt to "crtools dump"
Signed-off-by: 's avatarAndrey Vagin <avagin@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent 9c1fa58c
...@@ -48,10 +48,10 @@ static/fifo-ghost ...@@ -48,10 +48,10 @@ static/fifo-ghost
static/fifo static/fifo
static/fifo_wronly static/fifo_wronly
" "
# Duplicate list with pidns/ prefix # Duplicate list with ns/ prefix
TEST_LIST=$TEST_LIST$(echo $TEST_LIST | tr ' ' '\n' | sed 's#^#pidns/#') TEST_LIST=$TEST_LIST$(echo $TEST_LIST | tr ' ' '\n' | sed 's#^#ns/#')
# These ones are not in pidns # These ones are not in ns
TEST_LIST="$TEST_LIST TEST_LIST="$TEST_LIST
static/zombie00 static/zombie00
transition/fork transition/fork
...@@ -62,9 +62,9 @@ MNT_TEST_LIST=" ...@@ -62,9 +62,9 @@ MNT_TEST_LIST="
static/mountpoints static/mountpoints
" "
# These ones are in pidns # These ones are in ns
TEST_LIST="$TEST_LIST TEST_LIST="$TEST_LIST
pidns/static/session00 ns/static/session00
" "
UTS_TEST_LIST=" UTS_TEST_LIST="
...@@ -144,8 +144,8 @@ run_test() ...@@ -144,8 +144,8 @@ run_test()
{ {
local test=$1 local test=$1
expr "$test" : 'pidns/' > /dev/null && PIDNS=1 || PIDNS="" expr "$test" : 'ns/' > /dev/null && PIDNS=1 || PIDNS=""
test=${ZP}/${test#pidns/} test=${ZP}/${test#ns/}
shift shift
local args=$* local args=$*
...@@ -167,7 +167,7 @@ run_test() ...@@ -167,7 +167,7 @@ run_test()
DUMP_PATH=`pwd`/$ddump DUMP_PATH=`pwd`/$ddump
if [ -n "$PIDNS" ]; then if [ -n "$PIDNS" ]; then
args="--namespace pid $args" args="--namespace pid --namespace mnt $args"
fi fi
echo Dump $PID echo Dump $PID
...@@ -210,7 +210,7 @@ run_test() ...@@ -210,7 +210,7 @@ run_test()
case_error() case_error()
{ {
test=${ZP}/${1#pidns/} test=${ZP}/${1#ns/}
local test_log=`pwd`/$test.out local test_log=`pwd`/$test.out
echo "Test: $test" echo "Test: $test"
......
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