Commit a8b7e53b authored by Tycho Andersen's avatar Tycho Andersen Committed by Pavel Emelyanov

test: add mnt_ext_* tests to zdtm.sh

Note that we should only do the ns specific mounting when we are actually in a
ns test.
Signed-off-by: 's avatarTycho Andersen <tycho.andersen@canonical.com>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent 8adbdbb1
...@@ -204,6 +204,8 @@ generate_test_list() ...@@ -204,6 +204,8 @@ generate_test_list()
" "
TEST_MNTNS=" TEST_MNTNS="
ns/static/mnt_ext_auto
ns/static/mnt_ext_master
ns/static/mntns_open ns/static/mntns_open
ns/static/mntns_link_remap ns/static/mntns_link_remap
ns/static/mntns_link_ghost ns/static/mntns_link_ghost
...@@ -560,9 +562,11 @@ start_test() ...@@ -560,9 +562,11 @@ start_test()
return 1 return 1
fi fi
mount --make-private "$ZDTM_ROOT" if [ -n "$ZDTM_ROOT" ]; then
umount -l "$ZDTM_ROOT" mount --make-private "$ZDTM_ROOT"
mount --make-private --bind . $ZDTM_ROOT || return 1 umount -l "$ZDTM_ROOT"
mount --make-private --bind . $ZDTM_ROOT || return 1
fi
} }
stop_test() stop_test()
......
...@@ -60,6 +60,8 @@ ...@@ -60,6 +60,8 @@
/live/static/maps_file_prot /live/static/maps_file_prot
/live/static/mem-touch /live/static/mem-touch
/live/static/mmx00 /live/static/mmx00
/live/static/mnt_ext_auto
/live/static/mnt_ext_master
/live/static/mntns_link_ghost /live/static/mntns_link_ghost
/live/static/mntns_link_remap /live/static/mntns_link_remap
/live/static/mntns_open /live/static/mntns_open
......
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