zdtm: Move netns-nf test into ns/uns flavor

After this patch it stops working in zdtm.sh launcher duo to incomplete
root constructed. Do we want to fix it?
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Acked-by: Andrew Vagin <avagin@odin.com>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

test/zdtm.sh

@@ -199,7 +199,6 @@ generate_test_list()
 		ns/static/msgque
 		ns/static/sem
 		transition/ipc
-		static/netns-nf
 		static/netns
 		ns/static/netns-dev
 		static/cgroup00

test/zdtm/live/static/netns-nf.c

@@ -11,10 +11,12 @@ const char *test_author	= "Pavel Emelianov <xemul@parallels.com>";
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
 
-static int test_fn(int argc, char **argv)
+int main(int argc, char **argv)
 {
 	char cmd[128];
 
+	test_init(argc, argv);
+
 	if (system("iptables -A INPUT -t filter --protocol icmp -j DROP")) {
 		pr_perror("Can't set input rule");
 		return -1;
@@ -44,12 +46,3 @@ static int test_fn(int argc, char **argv)
 	pass();
 	return 0;
 }
-
-#define CLONE_NEWNET     0x40000000
-
-int main(int argc, char **argv)
-{
-	test_init_ns(argc, argv, CLONE_NEWNET, test_fn);
-	return 0;
-}
-

test/zdtm/live/static/netns-nf.desc

-{'flavor': 'h'}
+{'flavor': 'ns uns', 'deps': [ '/bin/sh', '/sbin/iptables', '/usr/lib64/xtables/libxt_standard.so', '/bin/diff' ], 'flags': 'suid'}