zdtm: drop redundant config_inotify_irmap test

The config_inotify_irmap test duplicates inotify_irmap with slight change to add the --force-irmap and --irmap-scan-path options in a configuration file. The --criu-config option of ZDTM provides more general solution for testing CRIU options provided in configuration files. Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
avagin · Apr 29, 2022 · 1c54c45 · 1c54c45
1 parent d2073cd
commit 1c54c45
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 101 deletions.
diff --git a/scripts/ci/Makefile b/scripts/ci/Makefile
@@ -18,7 +18,7 @@ export UNAME
 CONTAINER_RUNTIME := docker
 export CONTAINER_RUNTIME
 
-alpine: ZDTM_OPTIONS=-x zdtm/static/binfmt_misc -x zdtm/static/netns-nf -x zdtm/static/sched_policy00 -x zdtm/static/seccomp_strict -x zdtm/static/sigaltstack -x zdtm/static/signalfd00 -x zdtm/static/config_inotify_irmap
+alpine: ZDTM_OPTIONS=-x zdtm/static/binfmt_misc -x zdtm/static/netns-nf -x zdtm/static/sched_policy00 -x zdtm/static/seccomp_strict -x zdtm/static/sigaltstack -x zdtm/static/signalfd00
 
 define DOCKER_JSON
 {

diff --git a/test/Makefile b/test/Makefile
@@ -51,7 +51,7 @@ clean_root:
 .PHONY: clean_root
 
 clean: clean_root
-	$(RM) zdtm_ct zdtm-tst-list umount2 zdtm_test_config.conf
+	$(RM) zdtm_ct zdtm-tst-list umount2
 	$(Q) $(RM) *.log
 	$(Q) $(RM) -r ./dump/
 	$(Q) $(MAKE) -C zdtm cleandep clean cleanout

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
@@ -237,7 +237,6 @@ TST_NOFILE	:=				\
 		netns_sub_veth			\
 		netns_sub_sysctl	\
 		unlink_multiple_largefiles	\
-		config_inotify_irmap		\
 		thp_disable			\
 		pid_file			\
 		selinux00			\

diff --git a/test/zdtm/static/config_inotify_irmap.c b/test/zdtm/static/config_inotify_irmap.c
diff --git a/test/zdtm/static/config_inotify_irmap.desc b/test/zdtm/static/config_inotify_irmap.desc