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

zdtm: don't execute mntns_* tests, if the kernel doesn't show mnt_id

Browse Source 
Signed-off-by: Andrey Vagin <avagin@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Andrey Vagin
2014-08-07 21:07:00 +04:00
committed by Pavel Emelyanov
parent 5a1b5197c3
commit 29a688bb80
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
test/zdtm.sh
View File

@@ -174,9 +174,6 @@ static/netns
static/cgroup00 static/cgroup00
static/cgroup01 static/cgroup01
ns/static/clean_mntns ns/static/clean_mntns
ns/static/mntns_open
ns/static/mntns_link_remap
ns/static/mntns_link_ghost
" "
TEST_CR_KERNEL=" TEST_CR_KERNEL="
@@ -184,6 +181,18 @@ ns/static/tun
static/timerfd static/timerfd
" "
cat /proc/self/fdinfo/1 | grep -q mnt_id
if [ $? -eq 0 ]; then
TEST_LIST="$TEST_LIST
ns/static/mntns_open
ns/static/mntns_link_remap
ns/static/mntns_link_ghost
"
else
export ZDTM_NOSUBNS=1
fi
TEST_SUID_LIST=" TEST_SUID_LIST="
pid00 pid00
caps00 caps00
@@ -237,8 +246,6 @@ START_ONLY=0
BATCH_TEST=0 BATCH_TEST=0
SPECIFIED_NAME_USED=0 SPECIFIED_NAME_USED=0
cat /proc/self/fdinfo/1 | grep -q mnt_id || export ZDTM_NOSUBNS=1
zdtm_sep() zdtm_sep()
{ ( { (
set +x set +x