zdtm: Stop using test_init_ns by static/mountpoints

Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
Acked-by: Andrew Vagin <avagin@virtuozzo.com>

test/zdtm.sh

@@ -188,7 +188,7 @@ generate_test_list()
 		static/socket-tcpbuf
 		static/socket-tcpbuf6
 		static/pty03
-		static/mountpoints
+		ns/static/mountpoints
 		ns/static/session00
 		ns/static/session01
 		ns/static/tempfs

test/zdtm/live/static/mountpoints.c

@@ -70,7 +70,7 @@ int ns_child(void *_arg)
 	return 0;
 }
 
-static int test_fn(int argc, char **argv)
+int main(int argc, char **argv)
 {
 	FILE *f;
 	int fd, tmpfs_fd, have_bfmtm = 0;
@@ -79,13 +79,8 @@ static int test_fn(int argc, char **argv)
 	mode_t old_mask;
 	pid_t pid = -1;
 
-	if (!getenv("ZDTM_REEXEC")) {
-		setenv("ZDTM_REEXEC", "1", 0);
-		return execv(argv[0], argv);
-	} else
-		test_init(argc, argv);
+	test_init(argc, argv);
 
-	close(0); /* /dev/null */
 again:
 	fs_cnt = 0;
 	f = fopen("/proc/self/mountinfo", "r");
@@ -364,13 +359,3 @@ done:
 	pass();
 	return 0;
 }
-
-#define CLONE_NEWNS     0x00020000
-
-int main(int argc, char **argv)
-{
-	if (getenv("ZDTM_REEXEC"))
-		return test_fn(argc, argv);
-	test_init_ns(argc, argv, CLONE_NEWNS, test_fn);
-	return 0;
-}

test/zdtm/live/static/mountpoints.desc

-{'flavor': 'h', 'flags': 'suid'}
+{'flavor': 'ns', 'flags': 'suid'}