zdtm: Test for manual ext-mount-map option

The same as for --ext-mount-map auto, but with manual key:val
setting in .desc file.

travis-ci: success for mnt: Deprecate --ext-mount-map for --external
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>

test/zdtm/static/Makefile

@@ -245,6 +245,7 @@ TST_DIR		=				\
 		mntns_root_bind02		\
 		mntns_overmount			\
 		mntns_shared_vs_private		\
+		mnt_ext_manual			\
 		mnt_ext_auto			\
 		mnt_ext_master			\
 		mnt_ext_dev			\
@@ -394,6 +395,7 @@ socket-tcp6-local: override CFLAGS += -D ZDTM_TCP_LOCAL -D ZDTM_IPV6
 socket-tcp-local: override CFLAGS += -D ZDTM_TCP_LOCAL
 socket-tcp-nfconntrack: override CFLAGS += -D ZDTM_TCP_LOCAL -DZDTM_CONNTRACK
 socket_listen6: override CFLAGS += -D ZDTM_IPV6
+mnt_ext_manual: override CFLAGS += -D ZDTM_EXTMAP_MANUAL
 sigpending:		override LDLIBS += -lrt
 vdso01:			override LDLIBS += -lrt
 mntns_link_remap:	override CFLAGS += -DZDTM_LINK_REMAP

test/zdtm/static/mnt_ext_auto.c

@@ -11,10 +11,16 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check --mnt-ext-map auto";
+const char *test_doc	= "Check --mnt-ext-map";
 const char *test_author	= "Andrew Vagin <avagin@gmail.com>";
 
+#ifdef ZDTM_EXTMAP_MANUAL
+char *dirname = "mnt_ext_manual.test";
+#define DDIR	"mtest"
+#else
 char *dirname = "mnt_ext_auto.test";
+#define DDIR	"atest"
+#endif
 TEST_OPTION(dirname, string, "directory name", 1);
 
 int main(int argc, char ** argv)
@@ -35,7 +41,7 @@ int main(int argc, char ** argv)
 		goto test;
 
 	mkdir(dname, 755);
-	sprintf(src, "%s/test", dname);
+	sprintf(src, "%s/%s", dname, DDIR);
 	if (mount("zdtm_auto_ext_mnt", dname, "tmpfs", 0, NULL)) {
 		pr_perror("mount");
 		return 1;

test/zdtm/static/mnt_ext_manual.c

+mnt_ext_auto.c
\ No newline at end of file

test/zdtm/static/mnt_ext_manual.desc

+{   'dopts': '--external mnt[/zdtm/static/mnt_ext_manual.test]:ZDTM',
+    'feature': 'mnt_id',
+    'flavor': 'ns uns',
+    'ropts': '--external mnt[ZDTM]:/tmp/zdtm_ext_auto.XXXXXX/mtest'}