test: Get rid of live directory

Move static and transition into zdtm top. We can't move all the micro
tests themselves, as we need to distinguish static from non static (zdtm.py
makes additional checks on static ones).

Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>

427 files changed, 15 insertions, 19 deletions

diff --git a/test/zdtm.desc b/test/zdtm.desc
index bce3e9e9c..0671d4988 100644
--- a/test/zdtm.desc
+++ b/test/zdtm.desc
@@ -1 +1 @@
-{ 'dir': 'zdtm/live/', 'exclude': [ 'static/route_rules', 'static/criu-rtc.so' ] }
+{ 'dir': 'zdtm/', 'exclude': [ 'static/route_rules', 'static/criu-rtc.so', 'lib/parseargs.sh', 'lib/stop_and_chk.sh' ] }
diff --git a/test/zdtm.py b/test/zdtm.py
index 01b20e7b3..a0caa328d 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -418,7 +418,7 @@ class zdtm_test:
 			print " <<< " + "=" * 32
 
 	def static(self):
-		return self.__name.split('/')[2] == 'static'
+		return self.__name.split('/')[1] == 'static'
 
 	def ns(self):
 		return self.__flavor.ns
diff --git a/test/zdtm/Makefile b/test/zdtm/Makefile
index 4d6639557..8abf2144d 100644
--- a/test/zdtm/Makefile
+++ b/test/zdtm/Makefile
@@ -1,15 +1,18 @@
-SUBDIRS	=	lib live
+SUBDIRS	=	lib static transition
 
 default:	all
-.PHONY: default lib live
+.PHONY: default lib static transition
 
 lib:
 	$(MAKE) -C lib all
 
-live: lib
-	$(MAKE) -C live all
+static: lib
+	$(MAKE) -C static all
 
-all: lib live
+transition: lib
+	$(MAKE) -C transition all
+
+all: lib static transition
 	@true
 %:
 	set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
diff --git a/test/zdtm/live/Makefile b/test/zdtm/live/Makefile
deleted file mode 100644
index 87c0e7ef4..000000000
--- a/test/zdtm/live/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-SUBDIRS	= transition static
-
-default:	all
-.PHONY: default
-
-%:
-	set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
diff --git a/test/zdtm/live/static/Makefile b/test/zdtm/static/Makefile
index 06e59853f..74712b5b4 100644
--- a/test/zdtm/live/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -1,6 +1,6 @@
-include ../../Makefile.inc
+include ../Makefile.inc
 
-LIBDIR	= ../../lib
+LIBDIR	= ../lib
 LIB	= $(LIBDIR)/libzdtmtst.a
 override CPPFLAGS += -I$(LIBDIR)
 CFLAGS	= -g -O2 -Wall -Werror -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
@@ -400,7 +400,7 @@ criu-rtc.pb-c.c: criu-rtc.proto
 	protoc-c --proto_path=. --c_out=. criu-rtc.proto
 
 criu-rtc.so: criu-rtc.c criu-rtc.pb-c.c
-	$(CC) -g -Wall -shared -nostartfiles criu-rtc.c criu-rtc.pb-c.c -o criu-rtc.so -iquote ../../../../criu/include -fPIC $(USERCFLAGS)
+	$(CC) -g -Wall -shared -nostartfiles criu-rtc.c criu-rtc.pb-c.c -o criu-rtc.so -iquote ../../../criu/include -fPIC $(USERCFLAGS)
 
 .PHONY:	force clean cleandep cleanout realclean start check_start stop wait_stop
 
diff --git a/test/zdtm/live/static/aio00.c b/test/zdtm/static/aio00.c
index 93ca7aabb..93ca7aabb 100644
--- a/test/zdtm/live/static/aio00.c
+++ b/test/zdtm/static/aio00.c
diff --git a/test/zdtm/live/static/aio00.desc b/test/zdtm/static/aio00.desc
index fcaf84a14..fcaf84a14 100644
--- a/test/zdtm/live/static/aio00.desc
+++ b/test/zdtm/static/aio00.desc
diff --git a/test/zdtm/live/static/apparmor.c b/test/zdtm/static/apparmor.c
index 7af0be8db..7af0be8db 100644
--- a/test/zdtm/live/static/apparmor.c
+++ b/test/zdtm/static/apparmor.c
diff --git a/test/zdtm/live/static/apparmor.checkskip b/test/zdtm/static/apparmor.checkskip
index 99fa72721..99fa72721 100755
--- a/test/zdtm/live/static/apparmor.checkskip
+++ b/test/zdtm/static/apparmor.checkskip
diff --git a/test/zdtm/live/static/apparmor.desc b/test/zdtm/static/apparmor.desc
index d969725f6..d969725f6 100644
--- a/test/zdtm/live/static/apparmor.desc
+++ b/test/zdtm/static/apparmor.desc
diff --git a/test/zdtm/live/static/apparmor.profile b/test/zdtm/static/apparmor.profile
index 69b1b259b..69b1b259b 100644
--- a/test/zdtm/live/static/apparmor.profile
+++ b/test/zdtm/static/apparmor.profile
diff --git a/test/zdtm/live/static/arm-neon00.c b/test/zdtm/static/arm-neon00.c
index 96da16c6b..96da16c6b 100644
--- a/test/zdtm/live/static/arm-neon00.c
+++ b/test/zdtm/static/arm-neon00.c
diff --git a/test/zdtm/live/static/arm-neon00.desc b/test/zdtm/static/arm-neon00.desc
index 95c58b401..95c58b401 100644
--- a/test/zdtm/live/static/arm-neon00.desc
+++ b/test/zdtm/static/arm-neon00.desc
diff --git a/test/zdtm/live/static/bind-mount.c b/test/zdtm/static/bind-mount.c
index 06c5cf173..06c5cf173 100644
--- a/test/zdtm/live/static/bind-mount.c
+++ b/test/zdtm/static/bind-mount.c
diff --git a/test/zdtm/live/static/bind-mount.desc b/test/zdtm/static/bind-mount.desc
index 7657ba45c..7657ba45c 100644
--- a/test/zdtm/live/static/bind-mount.desc
+++ b/test/zdtm/static/bind-mount.desc
diff --git a/test/zdtm/live/static/binfmt_misc.c b/test/zdtm/static/binfmt_misc.c
index 9d7394c75..9d7394c75 100644
--- a/test/zdtm/live/static/binfmt_misc.c
+++ b/test/zdtm/static/binfmt_misc.c
diff --git a/test/zdtm/live/static/binfmt_misc.desc b/test/zdtm/static/binfmt_misc.desc
index 5f0328f0b..5f0328f0b 100644
--- a/test/zdtm/live/static/binfmt_misc.desc
+++ b/test/zdtm/static/binfmt_misc.desc
diff --git a/test/zdtm/live/static/bridge.c b/test/zdtm/static/bridge.c
index 983c262af..983c262af 100644
--- a/test/zdtm/live/static/bridge.c
+++ b/test/zdtm/static/bridge.c
diff --git a/test/zdtm/live/static/bridge.desc b/test/zdtm/static/bridge.desc
index 8af1df737..8af1df737 100644
--- a/test/zdtm/live/static/bridge.desc
+++ b/test/zdtm/static/bridge.desc
diff --git a/test/zdtm/live/static/busyloop00.c b/test/zdtm/static/busyloop00.c
index e9a065cf7..e9a065cf7 100644
--- a/test/zdtm/live/static/busyloop00.c
+++ b/test/zdtm/static/busyloop00.c
diff --git a/test/zdtm/live/static/caps00.c b/test/zdtm/static/caps00.c
index 5911fa19b..5911fa19b 100644
--- a/test/zdtm/live/static/caps00.c
+++ b/test/zdtm/static/caps00.c
diff --git a/test/zdtm/live/static/caps00.desc b/test/zdtm/static/caps00.desc
index 2eac7e654..2eac7e654 100644
--- a/test/zdtm/live/static/caps00.desc
+++ b/test/zdtm/static/caps00.desc
diff --git a/test/zdtm/live/static/cgroup00.c b/test/zdtm/static/cgroup00.c
index ee14d1fd3..ee14d1fd3 100644
--- a/test/zdtm/live/static/cgroup00.c
+++ b/test/zdtm/static/cgroup00.c
diff --git a/test/zdtm/live/static/cgroup00.desc b/test/zdtm/static/cgroup00.desc
index 3c6c4a7e2..3c6c4a7e2 100644
--- a/test/zdtm/live/static/cgroup00.desc
+++ b/test/zdtm/static/cgroup00.desc
diff --git a/test/zdtm/live/static/cgroup00.hook b/test/zdtm/static/cgroup00.hook
index a8af99268..a8af99268 100755
--- a/test/zdtm/live/static/cgroup00.hook
+++ b/test/zdtm/static/cgroup00.hook
diff --git a/test/zdtm/live/static/cgroup00.opts b/test/zdtm/static/cgroup00.opts
index 998cb32c7..998cb32c7 100644
--- a/test/zdtm/live/static/cgroup00.opts
+++ b/test/zdtm/static/cgroup00.opts
diff --git a/test/zdtm/live/static/cgroup01.c b/test/zdtm/static/cgroup01.c
index 384f86053..384f86053 100644
--- a/test/zdtm/live/static/cgroup01.c
+++ b/test/zdtm/static/cgroup01.c
diff --git a/test/zdtm/live/static/cgroup01.desc b/test/zdtm/static/cgroup01.desc
index 3c6c4a7e2..3c6c4a7e2 100644
--- a/test/zdtm/live/static/cgroup01.desc
+++ b/test/zdtm/static/cgroup01.desc
diff --git a/test/zdtm/live/static/cgroup01.hook b/test/zdtm/static/cgroup01.hook
index d2eacbbdf..d2eacbbdf 100755
--- a/test/zdtm/live/static/cgroup01.hook
+++ b/test/zdtm/static/cgroup01.hook
diff --git a/test/zdtm/live/static/cgroup01.opts b/test/zdtm/static/cgroup01.opts
index 998cb32c7..998cb32c7 100644
--- a/test/zdtm/live/static/cgroup01.opts
+++ b/test/zdtm/static/cgroup01.opts
diff --git a/test/zdtm/live/static/cgroup02.c b/test/zdtm/static/cgroup02.c
index d892b2f86..d892b2f86 100644
--- a/test/zdtm/live/static/cgroup02.c
+++ b/test/zdtm/static/cgroup02.c
diff --git a/test/zdtm/live/static/cgroup02.desc b/test/zdtm/static/cgroup02.desc
index 4999d91b6..4999d91b6 100644
--- a/test/zdtm/live/static/cgroup02.desc
+++ b/test/zdtm/static/cgroup02.desc
diff --git a/test/zdtm/live/static/cgroup02.hook b/test/zdtm/static/cgroup02.hook
index 3214552a8..3214552a8 100755
--- a/test/zdtm/live/static/cgroup02.hook
+++ b/test/zdtm/static/cgroup02.hook
diff --git a/test/zdtm/live/static/cgroup02.opts b/test/zdtm/static/cgroup02.opts
index 159938e0a..159938e0a 100644
--- a/test/zdtm/live/static/cgroup02.opts
+++ b/test/zdtm/static/cgroup02.opts
diff --git a/test/zdtm/live/static/cgroup03.c b/test/zdtm/static/cgroup03.c
index c6c4938ba..c6c4938ba 100644
--- a/test/zdtm/live/static/cgroup03.c
+++ b/test/zdtm/static/cgroup03.c
diff --git a/test/zdtm/live/static/cgroup03.desc b/test/zdtm/static/cgroup03.desc
index 3c6c4a7e2..3c6c4a7e2 100644
--- a/test/zdtm/live/static/cgroup03.desc
+++ b/test/zdtm/static/cgroup03.desc
diff --git a/test/zdtm/live/static/cgroup03.hook b/test/zdtm/static/cgroup03.hook
index 6f1102255..6f1102255 100755
--- a/test/zdtm/live/static/cgroup03.hook
+++ b/test/zdtm/static/cgroup03.hook
diff --git a/test/zdtm/live/static/child_opened_proc.c b/test/zdtm/static/child_opened_proc.c
index 2a1fa8c79..2a1fa8c79 100644
--- a/test/zdtm/live/static/child_opened_proc.c
+++ b/test/zdtm/static/child_opened_proc.c
diff --git a/test/zdtm/live/static/chroot-file.c b/test/zdtm/static/chroot-file.c
index 94f584213..94f584213 100644
--- a/test/zdtm/live/static/chroot-file.c
+++ b/test/zdtm/static/chroot-file.c
diff --git a/test/zdtm/live/static/chroot-file.desc b/test/zdtm/static/chroot-file.desc
index 2eac7e654..2eac7e654 100644
--- a/test/zdtm/live/static/chroot-file.desc
+++ b/test/zdtm/static/chroot-file.desc
diff --git a/test/zdtm/live/static/chroot.c b/test/zdtm/static/chroot.c
index 39b1ace0c..39b1ace0c 100644
--- a/test/zdtm/live/static/chroot.c
+++ b/test/zdtm/static/chroot.c
diff --git a/test/zdtm/live/static/chroot.desc b/test/zdtm/static/chroot.desc
index 2eac7e654..2eac7e654 100644
--- a/test/zdtm/live/static/chroot.desc
+++ b/test/zdtm/static/chroot.desc
diff --git a/test/zdtm/live/static/clean_mntns.c b/test/zdtm/static/clean_mntns.c
index 762894611..762894611 100644
--- a/test/zdtm/live/static/clean_mntns.c
+++ b/test/zdtm/static/clean_mntns.c
diff --git a/test/zdtm/live/static/clean_mntns.desc b/test/zdtm/static/clean_mntns.desc
index dfe829b84..dfe829b84 100644
--- a/test/zdtm/live/static/clean_mntns.desc
+++ b/test/zdtm/static/clean_mntns.desc
diff --git a/test/zdtm/live/static/cmdlinenv00.c b/test/zdtm/static/cmdlinenv00.c
index 9d3fe6c16..9d3fe6c16 100644
--- a/test/zdtm/live/static/cmdlinenv00.c
+++ b/test/zdtm/static/cmdlinenv00.c
diff --git a/test/zdtm/live/static/cmdlinenv00.desc b/test/zdtm/static/cmdlinenv00.desc
index 2eac7e654..2eac7e654 100644
--- a/test/zdtm/live/static/cmdlinenv00.desc
+++ b/test/zdtm/static/cmdlinenv00.desc
diff --git a/test/zdtm/live/static/conntracks b/test/zdtm/static/conntracks
index bb2950ca9..bb2950ca9 100755
--- a/test/zdtm/live/static/conntracks
+++ b/test/zdtm/static/conntracks
diff --git a/test/zdtm/live/static/conntracks.desc b/test/zdtm/static/conntracks.desc
index 95c58b401..95c58b401 100644
--- a/test/zdtm/live/static/conntracks.desc
+++ b/test/zdtm/static/conntracks.desc
diff --git a/test/zdtm/live/static/console.c b/test/zdtm/static/console.c
index a86b14639..a86b14639 100644
--- a/test/zdtm/live/static/console.c
+++ b/test/zdtm/static/console.c
diff --git a/test/zdtm/live/static/console.desc b/test/zdtm/static/console.desc
index d969725f6..d969725f6 100644
--- a/test/zdtm/live/static/console.desc
+++ b/test/zdtm/static/console.desc
diff --git a/test/zdtm/live/static/cow00.c b/test/zdtm/static/cow00.c
index 92446a16c..92446a16c 100644
--- a/test/zdtm/live/static/cow00.c
+++ b/test/zdtm/static/cow00.c
diff --git a/test/zdtm/live/static/cow00.desc b/test/zdtm/static/cow00.desc
index 95c58b401..95c58b401 100644
--- a/test/zdtm/live/static/cow00.desc
+++ b/test/zdtm/static/cow00.desc
diff --git a/test/zdtm/live/static/cow01.c b/test/zdtm/static/cow01.c
index 895dd9005..895dd9005 100644
--- a/test/zdtm/live/static/cow01.c
+++ b/test/zdtm/static/cow01.c
diff --git a/test/zdtm/live/static/cow01.desc b/test/zdtm/static/cow01.desc
index d969725f6..d969725f6 100644
--- a/test/zdtm/live/static/cow01.desc
+++ b/test/zdtm/static/cow01.desc
diff --git a/test/zdtm/live/static/criu-rtc.c b/test/zdtm/static/criu-rtc.c
index 0d6ffeac0..0d6ffeac0 100644
--- a/test/zdtm/live/static/criu-rtc.c
+++ b/test/zdtm/static/criu-rtc.c
diff --git a/test/zdtm/live/static/criu-rtc.proto b/test/zdtm/static/criu-rtc.proto
index 5d5cee956..5d5cee956 100644
--- a/test/zdtm/live/static/criu-rtc.proto
+++ b/test/zdtm/static/criu-rtc.proto
diff --git a/test/zdtm/live/static/cwd00.c b/test/zdtm/static/cwd00.c
index b0736f5e2..b0736f5e2 100644
--- a/test/zdtm/live/static/cwd00.c
+++ b/test/zdtm/static/cwd00.c
diff --git a/test/zdtm/live/static/cwd01.c b/test/zdtm/static/cwd01.c
index 4e10a6b8b..4e10a6b8b 100644
--- a/test/zdtm/live/static/cwd01.c
+++ b/test/zdtm/static/cwd01.c
diff --git a/test/zdtm/live/static/cwd02.c b/test/zdtm/static/cwd02.c
index 123744567..123744567 100644
--- a/test/zdtm/live/static/cwd02.c
+++ b/test/zdtm/static/cwd02.c
diff --git a/test/zdtm/live/static/deleted_dev.c b/test/zdtm/static/deleted_dev.c
index e855aed69..e855aed69 100644
--- a/test/zdtm/live/static/deleted_dev.c
+++ b/test/zdtm/static/deleted_dev.c
diff --git a/test/zdtm/live/static/deleted_dev.desc b/test/zdtm/static/deleted_dev.desc
index d969725f6..d969725f6 100644
--- a/test/zdtm/live/static/deleted_dev.desc
+++ b/test/zdtm/static/deleted_dev.desc
diff --git a/test/zdtm/live/static/deleted_unix_sock.c b/test/zdtm/static/deleted_unix_sock.c
index 3562e2635..3562e2635 100644
--- a/test/zdtm/live/static/deleted_unix_sock.c
+++ b/test/zdtm/static/deleted_unix_sock.c
diff --git a/test/zdtm/live/static/different_creds.c b/test/zdtm/static/different_creds.c
index af7aa3c6f..af7aa3c6f 100644
--- a/test/zdtm/live/static/different_creds.c
+++ b/test/zdtm/static/different_creds.c
diff --git a/test/zdtm/live/static/different_creds.desc b/test/zdtm/static/different_creds.desc
index fa2c82d08..fa2c82d08 100644
--- a/test/zdtm/live/static/different_creds.desc
+++ b/test/zdtm/static/different_creds.desc
diff --git a/test/zdtm/live/static/dumpable01.c b/test/zdtm/static/dumpable01.c
index e5dfc9ab7..e5dfc9ab7 100644
--- a/test/zdtm/live/static/dumpable01.c
+++ b/test/zdtm/static/dumpable01.c
diff --git a/test/zdtm/live/static/dumpable02.c b/test/zdtm/static/dumpable02.c
index 3463deda7..3463deda7 100644
--- a/test/zdtm/live/static/dumpable02.c
+++ b/test/zdtm/static/dumpable02.c
diff --git a/test/zdtm/live/static/dumpable02.desc b/test/zdtm/static/dumpable02.desc
index f8c897914..f8c897914 100644
--- a/test/zdtm/live/static/dumpable02.desc
+++ b/test/zdtm/static/dumpable02.desc
diff --git a/test/zdtm/live/static/env00.c b/test/zdtm/static/env00.c
index 1feabfa9f..1feabfa9f 100644
--- a/test/zdtm/live/static/env00.c
+++ b/test/zdtm/static/env00.c
diff --git a/test/zdtm/live/static/eventfs00.c b/test/zdtm/static/eventfs00.c
index 69fc88186..69fc88186 100644
--- a/test/zdtm/live/static/eventfs00.c
+++ b/test/zdtm/static/eventfs00.c
diff --git a/test/zdtm/live/static/fanotify00.c b/test/zdtm/static/fanotify00.c
index 37c9cb425..37c9cb425 100644
--- a/test/zdtm/live/static/fanotify00.c
+++ b/test/zdtm/static/fanotify00.c
diff --git a/test/zdtm/live/static/fanotify00.desc b/test/zdtm/static/fanotify00.desc
index d969725f6..d969725f6 100644
--- a/test/zdtm/live/static/fanotify00.desc
+++ b/test/zdtm/static/fanotify00.desc
diff --git a/test/zdtm/live/static/fd.c b/test/zdtm/static/fd.c
index a2e89d93f..a2e89d93f 100644
--- a/test/zdtm/live/static/fd.c
+++ b/test/zdtm/static/fd.c
diff --git a/test/zdtm/live/static/fd.desc b/test/zdtm/static/fd.desc
index 95c58b401..95c58b401 100644
--- a/test/zdtm/live/static/fd.desc
+++ b/test/zdtm/static/fd.desc
diff --git a/test/zdtm/live/static/fdt_shared.c b/test/zdtm/static/fdt_shared.c
index 908f6bcd0..908f6bcd0 100644
--- a/test/zdtm/live/static/fdt_shared.c
+++ b/test/zdtm/static/fdt_shared.c
diff --git a/test/zdtm/live/static/fifo-ghost.c b/test/zdtm/static/fifo-ghost.c
index 94a8c57f5..94a8c57f5 100644
--- a/test/zdtm/live/static/fifo-ghost.c
+++ b/test/zdtm/static/fifo-ghost.c
diff --git a/test/zdtm/live/static/fifo-rowo-pair.c b/test/zdtm/static/fifo-rowo-pair.c
index b96714772..b96714772 100644
--- a/test/zdtm/live/static/fifo-rowo-pair.c
+++ b/test/zdtm/static/fifo-rowo-pair.c
diff --git a/test/zdtm/live/static/fifo.c b/test/zdtm/static/fifo.c
index c8437d932..c8437d932 100644
--- a/test/zdtm/live/static/fifo.c
+++ b/test/zdtm/static/fifo.c
diff --git a/test/zdtm/live/static/fifo_ro.c b/test/zdtm/static/fifo_ro.c
index 63c4d29cf..63c4d29cf 100644
--- a/test/zdtm/live/static/fifo_ro.c
+++ b/test/zdtm/static/fifo_ro.c
diff --git a/test/zdtm/live/static/fifo_wronly.c b/test/zdtm/static/fifo_wronly.c
index 2fbd69e6b..2fbd69e6b 100644
--- a/test/zdtm/live/static/fifo_wronly.c
+++ b/test/zdtm/static/fifo_wronly.c
diff --git a/test/zdtm/live/static/file_append.c b/test/zdtm/static/file_append.c
index 14f18776c..14f18776c 100644
--- a/test/zdtm/live/static/file_append.c
+++ b/test/zdtm/static/file_append.c
diff --git a/test/zdtm/live/static/file_attr.c b/test/zdtm/static/file_attr.c
index 80ad78914..80ad78914 100644
--- a/test/zdtm/live/static/file_attr.c
+++ b/test/zdtm/static/file_attr.c
diff --git a/test/zdtm/live/static/file_fown.c b/test/zdtm/static/file_fown.c
index c0732e72a..c0732e72a 100644
--- a/test/zdtm/live/static/file_fown.c
+++ b/test/zdtm/static/file_fown.c
diff --git a/test/zdtm/live/static/file_fown.desc b/test/zdtm/static/file_fown.desc
index 63df42aa6..63df42aa6 100644
--- a/test/zdtm/live/static/file_fown.desc
+++ b/test/zdtm/static/file_fown.desc
diff --git a/test/zdtm/live/static/file_locks00.c b/test/zdtm/static/file_locks00.c
index f701e00c0..f701e00c0 100644
--- a/test/zdtm/live/static/file_locks00.c
+++ b/test/zdtm/static/file_locks00.c
diff --git a/test/zdtm/live/static/file_locks00.desc b/test/zdtm/static/file_locks00.desc
index 80cd04e28..80cd04e28 100644
--- a/test/zdtm/live/static/file_locks00.desc
+++ b/test/zdtm/static/file_locks00.desc
diff --git a/test/zdtm/live/static/file_locks00.opts b/test/zdtm/static/file_locks00.opts
index 738083ade..738083ade 100644
--- a/test/zdtm/live/static/file_locks00.opts
+++ b/test/zdtm/static/file_locks00.opts
diff --git a/test/zdtm/live/static/file_locks01.c b/test/zdtm/static/file_locks01.c
index 24f54acc7..24f54acc7 100644
--- a/test/zdtm/live/static/file_locks01.c
+++ b/test/zdtm/static/file_locks01.c
diff --git a/test/zdtm/live/static/file_locks01.desc b/test/zdtm/static/file_locks01.desc
index 80cd04e28..80cd04e28 100644
--- a/test/zdtm/live/static/file_locks01.desc
+++ b/test/zdtm/static/file_locks01.desc
diff --git a/test/zdtm/live/static/file_locks01.opts b/test/zdtm/static/file_locks01.opts
index 738083ade..738083ade 100644
--- a/test/zdtm/live/static/file_locks01.opts
+++ b/test/zdtm/static/file_locks01.opts
diff --git a/test/zdtm/live/static/file_locks02.c b/test/zdtm/static/file_locks02.c
index 2db3bd0a0..2db3bd0a0 100644
--- a/test/zdtm/live/static/file_locks02.c
+++ b/test/zdtm/static/file_locks02.c
diff --git a/test/zdtm/live/static/file_locks02.desc b/test/zdtm/static/file_locks02.desc
index 80cd04e28..80cd04e28 100644
--- a/test/zdtm/live/static/file_locks02.desc
+++ b/test/zdtm/static/file_locks02.desc
diff --git a/test/zdtm/live/static/file_locks02.opts b/test/zdtm/static/file_locks02.opts
index 738083ade..738083ade 100644
--- a/test/zdtm/live/static/file_locks02.opts
+++ b/test/zdtm/static/file_locks02.opts
diff --git a/test/zdtm/live/static/file_locks03.c b/test/zdtm/static/file_locks03.c
index 167fd2e19..167fd2e19 100644
--- a/test/zdtm/live/static/file_locks03.c
+++ b/test/zdtm/static/file_locks03.c
diff --git a/test/zdtm/live/static/file_locks03.desc b/test/zdtm/static/file_locks03.desc
index 80cd04e28..80cd04e28 100644
--- a/test/zdtm/live/static/file_locks03.desc
+++ b/test/zdtm/static/file_locks03.desc
diff --git a/test/zdtm/live/static/file_locks03.opts b/test/zdtm/static/file_locks03.opts
index 738083ade..738083ade 100644
--- a/test/zdtm/live/static/file_locks03.opts
+++ b/test/zdtm/static/file_locks03.opts
diff --git a/test/zdtm/live/static/file_locks04.c b/test/zdtm/static/file_locks04.c
index 995dd099c..995dd099c 100644
--- a/test/zdtm/live/static/file_locks04.c
+++ b/test/zdtm/static/file_locks04.c
diff --git a/test/zdtm/live/static/file_locks04.desc b/test/zdtm/static/file_locks04.desc
index 80cd04e28..80cd04e28 100644
--- a/test/zdtm/live/static/file_locks04.desc
+++ b/test/zdtm/static/file_locks04.desc
diff --git a/test/zdtm/live/static/file_locks04.opts b/test/zdtm/static/file_locks04.opts
index 738083ade..738083ade 100644
--- a/test/zdtm/live/static/file_locks04.opts
+++ b/test/zdtm/static/file_locks04.opts
diff --git a/test/zdtm/live/static/file_locks05.c b/test/zdtm/static/file_locks05.c
index f7d34b19e..f7d34b19e 100644
--- a/test/zdtm/live/static/file_locks05.c
+++ b/test/zdtm/static/file_locks05.c
diff --git a/test/zdtm/live/static/file_locks05.desc b/test/zdtm/static/file_locks05.desc
index 80cd04e28..80cd04e28 100644
--- a/test/zdtm/live/static/file_locks05.desc
+++ b/test/zdtm/static/file_locks05.desc
diff --git a/test/zdtm/live/static/file_locks05.opts b/test/zdtm/static/file_locks05.opts
index 738083ade..738083ade 100644
--- a/test/zdtm/live/static/file_locks05.opts
+++ b/test/zdtm/static/file_locks05.opts
diff --git a/test/zdtm/live/static/file_shared.c b/test/zdtm/static/file_shared.c
index 8f1acb160..8f1acb160 100644
--- a/test/zdtm/live/static/file_shared.c
+++ b/test/zdtm/static/file_shared.c
diff --git a/test/zdtm/live/static/fpu00.c b/test/zdtm/static/fpu00.c
index f04fac4f2..f04fac4f2 100644
--- a/test/zdtm/live/static/fpu00.c
+++ b/test/zdtm/static/fpu00.c
diff --git a/test/zdtm/live/static/fpu00.desc b/test/zdtm/static/fpu00.desc
index d2f501de2..d2f501de2 100644
--- a/test/zdtm/live/static/fpu00.desc
+++ b/test/zdtm/static/fpu00.desc
diff --git a/test/zdtm/live/static/fpu01.c b/test/zdtm/static/fpu01.c
index c8e6ca19e..c8e6ca19e 100644
--- a/test/zdtm/live/static/fpu01.c
+++ b/test/zdtm/static/fpu01.c
diff --git a/test/zdtm/live/static/fpu01.desc b/test/zdtm/static/fpu01.desc
index d2f501de2..d2f501de2 100644
--- a/test/zdtm/live/static/fpu01.desc
+++ b/test/zdtm/static/fpu01.desc
diff --git a/test/zdtm/live/static/futex-rl.c b/test/zdtm/static/futex-rl.c
index 9a3181a2c..9a3181a2c 100644
--- a/test/zdtm/live/static/futex-rl.c
+++ b/test/zdtm/static/futex-rl.c
diff --git a/test/zdtm/live/static/futex.c b/test/zdtm/static/futex.c
index 2ad82d28b..2ad82d28b 100644
--- a/test/zdtm/live/static/futex.c
+++ b/test/zdtm/static/futex.c
diff --git a/test/zdtm/live/static/get_smaps_bits.c b/test/zdtm/static/get_smaps_bits.c
index 9253f4db6..9253f4db6 100644
--- a/test/zdtm/live/static/get_smaps_bits.c
+++ b/test/zdtm/static/get_smaps_bits.c
diff --git a/test/zdtm/live/static/groups.c b/test/zdtm/static/groups.c
index 1aed8f50b..1aed8f50b 100644
--- a/test/zdtm/live/static/groups.c
+++ b/test/zdtm/static/groups.c
diff --git a/test/zdtm/live/static/groups.desc b/test/zdtm/static/groups.desc
index 2eac7e654..2eac7e654 100644
--- a/test/zdtm/live/static/groups.desc
+++ b/test/zdtm/static/groups.desc
diff --git a/test/zdtm/live/static/grow_map.c b/test/zdtm/static/grow_map.c
index c26cfc84a..c26cfc84a 100644
--- a/test/zdtm/live/static/grow_map.c
+++ b/test/zdtm/static/grow_map.c
diff --git a/test/zdtm/live/static/grow_map02.c b/test/zdtm/static/grow_map02.c
index 0b93714f4..0b93714f4 100644
--- a/test/zdtm/live/static/grow_map02.c
+++ b/test/zdtm/static/grow_map02.c
diff --git a/test/zdtm/live/static/grow_map03.c b/test/zdtm/static/grow_map03.c
index 6310386a4..6310386a4 100644
--- a/test/zdtm/live/static/grow_map03.c
+++ b/test/zdtm/static/grow_map03.c
diff --git a/test/zdtm/live/static/inotify00.c b/test/zdtm/static/inotify00.c
index 00190dc58..00190dc58 100644
--- a/test/zdtm/live/static/inotify00.c
+++ b/test/zdtm/static/inotify00.c
diff --git a/test/zdtm/live/static/inotify00.desc b/test/zdtm/static/inotify00.desc
index 083b58305..083b58305 100644
--- a/test/zdtm/live/static/inotify00.desc
+++ b/test/zdtm/static/inotify00.desc
diff --git a/test/zdtm/live/static/inotify00.opts b/test/zdtm/static/inotify00.opts
index 472294671..472294671 100644
--- a/test/zdtm/live/static/inotify00.opts
+++ b/test/zdtm/static/inotify00.opts
diff --git a/test/zdtm/live/static/inotify01.c b/test/zdtm/static/inotify01.c
index a7937cf57..a7937cf57 120000
--- a/test/zdtm/live/static/inotify01.c
+++ b/test/zdtm/static/inotify01.c
diff --git a/test/zdtm/live/static/inotify01.desc b/test/zdtm/static/inotify01.desc
index a8849e097..a8849e097 100644
--- a/test/zdtm/live/static/inotify01.desc
+++ b/test/zdtm/static/inotify01.desc
diff --git a/test/zdtm/live/static/inotify02.c b/test/zdtm/static/inotify02.c
index eca36dde8..eca36dde8 100644
--- a/test/zdtm/live/static/inotify02.c
+++ b/test/zdtm/static/inotify02.c
diff --git a/test/zdtm/live/static/inotify02.desc b/test/zdtm/static/inotify02.desc
index 95c58b401..95c58b401 100644
--- a/test/zdtm/live/static/inotify02.desc
+++ b/test/zdtm/static/inotify02.desc
diff --git a/test/zdtm/live/static/inotify_irmap.c b/test/zdtm/static/inotify_irmap.c
index e16a4181b..e16a4181b 100644
--- a/test/zdtm/live/static/inotify_irmap.c
+++ b/test/zdtm/static/inotify_irmap.c
diff --git a/test/zdtm/live/static/inotify_irmap.desc b/test/zdtm/static/inotify_irmap.desc
index 9c5994e92..9c5994e92 100644
--- a/test/zdtm/live/static/inotify_irmap.desc
+++ b/test/zdtm/static/inotify_irmap.desc
diff --git a/test/zdtm/live/static/inotify_system.c b/test/zdtm/static/inotify_system.c
index 6a95f5b2c..6a95f5b2c 100644
--- a/test/zdtm/live/static/inotify_system.c
+++ b/test/zdtm/static/inotify_system.c
diff --git a/test/zdtm/live/static/inotify_system.desc b/test/zdtm/static/inotify_system.desc
index 95c58b401..95c58b401 100644
--- a/test/zdtm/live/static/inotify_system.desc
+++ b/test/zdtm/static/inotify_system.desc
diff --git a/test/zdtm/live/static/inotify_system_nodel.c b/test/zdtm/static/inotify_system_nodel.c
index 6a95f5b2c..6a95f5b2c 100644
--- a/test/zdtm/live/static/inotify_system_nodel.c
+++ b/test/zdtm/static/inotify_system_nodel.c
diff --git a/test/zdtm/live/static/inotify_system_nodel.desc b/test/zdtm/static/inotify_system_nodel.desc
index 95c58b401..95c58b401 100644
--- a/test/zdtm/live/static/inotify_system_nodel.desc
+++ b/test/zdtm/static/inotify_system_nodel.desc
diff --git a/test/zdtm/live/static/ipc_namespace.c b/test/zdtm/static/ipc_namespace.c
index 99c25a706..99c25a706 100644
--- a/test/zdtm/live/static/ipc_namespace.c
+++ b/test/zdtm/static/ipc_namespace.c
diff --git a/test/zdtm/live/static/ipc_namespace.desc b/test/zdtm/static/ipc_namespace.desc
index 7b165283c..7b165283c 100644
--- a/test/zdtm/live/static/ipc_namespace.desc
+++ b/test/zdtm/static/ipc_namespace.desc
diff --git a/test/zdtm/live/static/jobctl00.c b/test/zdtm/static/jobctl00.c
index 397747b24..397747b24 100644
--- a/test/zdtm/live/static/jobctl00.c
+++ b/test/zdtm/static/jobctl00.c
diff --git a/test/zdtm/live/static/lib/criu-rtc.so b/test/zdtm/static/lib/criu-rtc.so
index 17f3ef78e..17f3ef78e 120000
--- a/test/zdtm/live/static/lib/criu-rtc.so
+++ b/test/zdtm/static/lib/criu-rtc.so
diff --git a/test/zdtm/live/static/link10.c b/test/zdtm/static/link10.c
index 9f4c7f099..9f4c7f099 100644
--- a/test/zdtm/live/static/link10.c
+++ b/test/zdtm/static/link10.c
diff --git a/test/zdtm/live/static/loginuid.c b/test/zdtm/static/loginuid.c
index 628fe64b9..628fe64b9 100644
--- a/test/zdtm/live/static/loginuid.c
+++ b/test/zdtm/static/loginuid.c
diff --git a/test/zdtm/live/static/loginuid.desc b/test/zdtm/static/loginuid.desc
index e27f6ccf9..e27f6ccf9 100644
--- a/test/zdtm/live/static/loginuid.desc
+++ b/test/zdtm/static/loginuid.desc
diff --git a/test/zdtm/live/static/maps00.c b/test/zdtm/static/maps00.c
index aa3c29e6a..aa3c29e6a 100644
--- a/test/zdtm/live/static/maps00.c
+++ b/test/zdtm/static/maps00.c
diff --git a/test/zdtm/live/static/maps01.c b/test/zdtm/static/maps01.c
index 024dff1fc..024dff1fc 100644
--- a/test/zdtm/live/static/maps01.c
+++ b/test/zdtm/static/maps01.c
diff --git a/test/zdtm/live/static/maps01.desc b/test/zdtm/static/maps01.desc
index d969725f6..d969725f6 100644
--- a/test/zdtm/live/static/maps01.desc
+++ b/test/zdtm/static/maps01.desc
diff --git a/test/zdtm/live/static/maps02.c b/test/zdtm/static/maps02.c
index 4c12bec99..4c12bec99 100644
--- a/test/zdtm/live/static/maps02.c
+++ b/test/zdtm/static/maps02.c
diff --git a/test/zdtm/live/static/maps03.c b/test/zdtm/static/maps03.c
index c4aba196a..c4aba196a 100644
--- a/test/zdtm/live/static/maps03.c
+++ b/test/zdtm/static/maps03.c
diff --git a/test/zdtm/live/static/maps03.desc b/test/zdtm/static/maps03.desc
index 95c58b401..95c58b401 100644
--- a/test/zdtm/live/static/maps03.desc
+++ b/test/zdtm/static/maps03.desc
diff --git a/test/zdtm/live/static/maps04.c b/test/zdtm/static/maps04.c
index 780c5667d..780c5667d 100644
--- a/test/zdtm/live/static/maps04.c
+++ b/test/zdtm/static/maps04.c
diff --git a/test/zdtm/live/static/maps05.c b/test/zdtm/static/maps05.c
index faa09ee9a..faa09ee9a 100644
--- a/test/zdtm/live/static/maps05.c
+++ b/test/zdtm/static/maps05.c
diff --git a/test/zdtm/live/static/maps_file_prot.c b/test/zdtm/static/maps_file_prot.c
index 3b28c1ff1..3b28c1ff1 100644
--- a/test/zdtm/live/static/maps_file_prot.c
+++ b/test/zdtm/static/maps_file_prot.c
diff --git a/test/zdtm/live/static/mem-touch.c b/test/zdtm/static/mem-touch.c
index c14b48050..c14b48050 100644
--- a/test/zdtm/live/static/mem-touch.c
+++ b/test/zdtm/static/mem-touch.c
diff --git a/test/zdtm/live/static/mem-touch.desc b/test/zdtm/static/mem-touch.desc
index 95c58b401..95c58b401 100644
--- a/test/zdtm/live/static/mem-touch.desc
+++ b/test/zdtm/static/mem-touch.desc
diff --git a/test/zdtm/live/static/mlock_setuid.c b/test/zdtm/static/mlock_setuid.c
index 92b313ed5..92b313ed5 100644
--- a/test/zdtm/live/static/mlock_setuid.c
+++ b/test/zdtm/static/mlock_setuid.c
diff --git a/test/zdtm/live/static/mlock_setuid.desc b/test/zdtm/static/mlock_setuid.desc
index d969725f6..d969725f6 100644
--- a/test/zdtm/live/static/mlock_setuid.desc
+++ b/test/zdtm/static/mlock_setuid.desc
diff --git a/test/zdtm/live/static/mmx00.c b/test/zdtm/static/mmx00.c
index f0f7c3c9e..f0f7c3c9e 100644
--- a/test/zdtm/live/static/mmx00.c
+++ b/test/zdtm/static/mmx00.c
diff --git a/test/zdtm/live/static/mmx00.desc b/test/zdtm/static/mmx00.desc
index d2f501de2..d2f501de2 100644
--- a/test/zdtm/live/static/mmx00.desc
+++ b/test/zdtm/static/mmx00.desc
diff --git a/test/zdtm/live/static/mnt_ext_auto.c b/test/zdtm/static/mnt_ext_auto.c
index 4a931b9a3..4a931b9a3 100644
--- a/test/zdtm/live/static/mnt_ext_auto.c
+++ b/test/zdtm/static/mnt_ext_auto.c
diff --git a/test/zdtm/live/static/mnt_ext_auto.desc b/test/zdtm/static/mnt_ext_auto.desc
index 12d1427dd..12d1427dd 100644
--- a/test/zdtm/live/static/mnt_ext_auto.desc
+++ b/test/zdtm/static/mnt_ext_auto.desc
diff --git a/test/zdtm/live/static/mnt_ext_auto.opts b/test/zdtm/static/mnt_ext_auto.opts
index aab0bcd0a..aab0bcd0a 100644
--- a/test/zdtm/live/static/mnt_ext_auto.opts
+++ b/test/zdtm/static/mnt_ext_auto.opts
diff --git a/test/zdtm/live/static/mnt_ext_master.c b/test/zdtm/static/mnt_ext_master.c
index 290868ef5..290868ef5 100644
--- a/test/zdtm/live/static/mnt_ext_master.c
+++ b/test/zdtm/static/mnt_ext_master.c
diff --git a/test/zdtm/live/static/mnt_ext_master.desc b/test/zdtm/static/mnt_ext_master.desc
index 57d3787c6..57d3787c6 100644
--- a/test/zdtm/live/static/mnt_ext_master.desc
+++ b/test/zdtm/static/mnt_ext_master.desc
diff --git a/test/zdtm/live/static/mnt_ext_master.opts b/test/zdtm/static/mnt_ext_master.opts
index bbcdf9f33..bbcdf9f33 100644
--- a/test/zdtm/live/static/mnt_ext_master.opts
+++ b/test/zdtm/static/mnt_ext_master.opts
diff --git a/test/zdtm/live/static/mnt_ro_bind.c b/test/zdtm/static/mnt_ro_bind.c
index 1d9881408..1d9881408 100644
--- a/test/zdtm/live/static/mnt_ro_bind.c
+++ b/test/zdtm/static/mnt_ro_bind.c
diff --git a/test/zdtm/live/static/mnt_ro_bind.desc b/test/zdtm/static/mnt_ro_bind.desc
index 7657ba45c..7657ba45c 100644
--- a/test/zdtm/live/static/mnt_ro_bind.desc
+++ b/test/zdtm/static/mnt_ro_bind.desc
diff --git a/test/zdtm/live/static/mntns_deleted.c b/test/zdtm/static/mntns_deleted.c
index b38d8340b..b38d8340b 100644
--- a/test/zdtm/live/static/mntns_deleted.c
+++ b/test/zdtm/static/mntns_deleted.c
diff --git a/test/zdtm/live/static/mntns_deleted.desc b/test/zdtm/static/mntns_deleted.desc
index a8849e097..a8849e097 100644
--- a/test/zdtm/live/static/mntns_deleted.desc
+++ b/test/zdtm/static/mntns_deleted.desc
diff --git a/test/zdtm/live/static/mntns_link_ghost.c b/test/zdtm/static/mntns_link_ghost.c
index 0314c6281..0314c6281 120000
--- a/test/zdtm/live/static/mntns_link_ghost.c
+++ b/test/zdtm/static/mntns_link_ghost.c
diff --git a/test/zdtm/live/static/mntns_link_ghost.desc b/test/zdtm/static/mntns_link_ghost.desc
index 3fd8e03f7..3fd8e03f7 100644
--- a/test/zdtm/live/static/mntns_link_ghost.desc
+++ b/test/zdtm/static/mntns_link_ghost.desc
diff --git a/test/zdtm/live/static/mntns_link_remap.c b/test/zdtm/static/mntns_link_remap.c
index 210188bae..210188bae 100644
--- a/test/zdtm/live/static/mntns_link_remap.c
+++ b/test/zdtm/static/mntns_link_remap.c
diff --git a/test/zdtm/live/static/mntns_link_remap.desc b/test/zdtm/static/mntns_link_remap.desc
index a84aba32c..a84aba32c 100644
--- a/test/zdtm/live/static/mntns_link_remap.desc
+++ b/test/zdtm/static/mntns_link_remap.desc
diff --git a/test/zdtm/live/static/mntns_link_remap.opts b/test/zdtm/static/mntns_link_remap.opts
index 472294671..472294671 100644
--- a/test/zdtm/live/static/mntns_link_remap.opts
+++ b/test/zdtm/static/mntns_link_remap.opts
diff --git a/test/zdtm/live/static/mntns_open.c b/test/zdtm/static/mntns_open.c
index 629d76275..629d76275 100644
--- a/test/zdtm/live/static/mntns_open.c
+++ b/test/zdtm/static/mntns_open.c
diff --git a/test/zdtm/live/static/mntns_open.desc b/test/zdtm/static/mntns_open.desc
index a8849e097..a8849e097 100644
--- a/test/zdtm/live/static/mntns_open.desc
+++ b/test/zdtm/static/mntns_open.desc
diff --git a/test/zdtm/live/static/mntns_root_bind.c b/test/zdtm/static/mntns_root_bind.c
index 3bd0bece0..3bd0bece0 100644
--- a/test/zdtm/live/static/mntns_root_bind.c
+++ b/test/zdtm/static/mntns_root_bind.c
diff --git a/test/zdtm/live/static/mntns_root_bind.desc b/test/zdtm/static/mntns_root_bind.desc
index a8849e097..a8849e097 100644
--- a/test/zdtm/live/static/mntns_root_bind.desc
+++ b/test/zdtm/static/mntns_root_bind.desc
diff --git a/test/zdtm/live/static/mntns_root_bind02.c b/test/zdtm/static/mntns_root_bind02.c
index 4957c1fa1..4957c1fa1 120000
--- a/test/zdtm/live/static/mntns_root_bind02.c
+++ b/test/zdtm/static/mntns_root_bind02.c
diff --git a/test/zdtm/live/static/mntns_root_bind02.desc b/test/zdtm/static/mntns_root_bind02.desc
index cd4ed51a4..cd4ed51a4 120000
--- a/test/zdtm/live/static/mntns_root_bind02.desc
+++ b/test/zdtm/static/mntns_root_bind02.desc
diff --git a/test/zdtm/live/static/mntns_rw_ro_rw.c b/test/zdtm/static/mntns_rw_ro_rw.c
index 7aed254b6..7aed254b6 100644
--- a/test/zdtm/live/static/mntns_rw_ro_rw.c
+++ b/test/zdtm/static/mntns_rw_ro_rw.c
diff --git a/test/zdtm/live/static/mntns_rw_ro_rw.desc b/test/zdtm/static/mntns_rw_ro_rw.desc
index 7657ba45c..7657ba45c 100644
--- a/test/zdtm/live/static/mntns_rw_ro_rw.desc
+++ b/test/zdtm/static/mntns_rw_ro_rw.desc
diff --git a/test/zdtm/live/static/mntns_shared_bind.c b/test/zdtm/static/mntns_shared_bind.c
index f11b2df98..f11b2df98 100644
--- a/test/zdtm/live/static/mntns_shared_bind.c
+++ b/test/zdtm/static/mntns_shared_bind.c
diff --git a/test/zdtm/live/static/mntns_shared_bind.desc b/test/zdtm/static/mntns_shared_bind.desc
index a8849e097..a8849e097 100644
--- a/test/zdtm/live/static/mntns_shared_bind.desc
+++ b/test/zdtm/static/mntns_shared_bind.desc
diff --git a/test/zdtm/live/static/mntns_shared_bind02.c b/test/zdtm/static/mntns_shared_bind02.c
index 5efca6707..5efca6707 120000
--- a/test/zdtm/live/static/mntns_shared_bind02.c
+++ b/test/zdtm/static/mntns_shared_bind02.c
diff --git a/test/zdtm/live/static/mntns_shared_bind02.desc b/test/zdtm/static/mntns_shared_bind02.desc
index a8849e097..a8849e097 100644
--- a/test/zdtm/live/static/mntns_shared_bind02.desc
+++ b/test/zdtm/static/mntns_shared_bind02.desc
diff --git a/test/zdtm/live/static/mount_paths.c b/test/zdtm/static/mount_paths.c
index a42b0eb3d..a42b0eb3d 100644
--- a/test/zdtm/live/static/mount_paths.c
+++ b/test/zdtm/static/mount_paths.c
diff --git a/test/zdtm/live/static/mount_paths.desc b/test/zdtm/static/mount_paths.desc
index 7657ba45c..7657ba45c 100644
--- a/test/zdtm/live/static/mount_paths.desc
+++ b/test/zdtm/static/mount_paths.desc
diff --git a/test/zdtm/live/static/mountpoints.c b/test/zdtm/static/mountpoints.c
index 0b46480e0..0b46480e0 100644
--- a/test/zdtm/live/static/mountpoints.c
+++ b/test/zdtm/static/mountpoints.c
diff --git a/test/zdtm/live/static/mountpoints.desc b/test/zdtm/static/mountpoints.desc
index aba60c9e5..aba60c9e5 100644
--- a/test/zdtm/live/static/mountpoints.desc
+++ b/test/zdtm/static/mountpoints.desc
diff --git a/test/zdtm/live/static/mprotect00.c b/test/zdtm/static/mprotect00.c
index be70135d6..be70135d6 100644
--- a/test/zdtm/live/static/mprotect00.c
+++ b/test/zdtm/static/mprotect00.c
diff --git a/test/zdtm/live/static/msgque.c b/test/zdtm/static/msgque.c
index a855bec36..a855bec36 100644
--- a/test/zdtm/live/static/msgque.c
+++ b/test/zdtm/static/msgque.c
diff --git a/test/zdtm/live/static/msgque.desc b/test/zdtm/static/msgque.desc
index 6c4afe5f0..6c4afe5f0 100644
--- a/test/zdtm/live/static/msgque.desc
+++ b/test/zdtm/static/msgque.desc
diff --git a/test/zdtm/live/static/mtime_mmap.c b/test/zdtm/static/mtime_mmap.c
index 6c97487ea..6c97487ea 100644
--- a/test/zdtm/live/static/mtime_mmap.c
+++ b/test/zdtm/static/mtime_mmap.c
diff --git a/test/zdtm/live/static/netns-dev.c b/test/zdtm/static/netns-dev.c
index fa623aaee..fa623aaee 100644
--- a/test/zdtm/live/static/netns-dev.c
+++ b/test/zdtm/static/netns-dev.c
diff --git a/test/zdtm/live/static/netns-dev.desc b/test/zdtm/static/netns-dev.desc
index 7657ba45c..7657ba45c 100644
--- a/test/zdtm/live/static/netns-dev.desc
+++ b/test/zdtm/static/netns-dev.desc
diff --git a/test/zdtm/live/static/netns-nf.c b/test/zdtm/static/netns-nf.c
index 393f0e732..393f0e732 100644
--- a/test/zdtm/live/static/netns-nf.c
+++ b/test/zdtm/static/netns-nf.c
diff --git a/test/zdtm/live/static/netns-nf.desc b/test/zdtm/static/netns-nf.desc
index c43840580..c43840580 100644
--- a/test/zdtm/live/static/netns-nf.desc
+++ b/test/zdtm/static/netns-nf.desc
diff --git a/test/zdtm/live/static/netns.c b/test/zdtm/static/netns.c
index b7a75b6d9..b7a75b6d9 100644
--- a/test/zdtm/live/static/netns.c
+++ b/test/zdtm/static/netns.c
diff --git a/test/zdtm/live/static/netns.desc b/test/zdtm/static/netns.desc
index d0b2c2c1a..d0b2c2c1a 100644
--- a/test/zdtm/live/static/netns.desc
+++ b/test/zdtm/static/netns.desc
diff --git a/test/zdtm/live/static/oom_score_adj.c b/test/zdtm/static/oom_score_adj.c
index b4275301e..b4275301e 100644
--- a/test/zdtm/live/static/oom_score_adj.c
+++ b/test/zdtm/static/oom_score_adj.c
diff --git a/test/zdtm/live/static/overmount_dev.c b/test/zdtm/static/overmount_dev.c
index b3dd4e08b..b3dd4e08b 100644
--- a/test/zdtm/live/static/overmount_dev.c
+++ b/test/zdtm/static/overmount_dev.c
diff --git a/test/zdtm/live/static/overmount_dev.desc b/test/zdtm/static/overmount_dev.desc
index 95c58b401..95c58b401 100644
--- a/test/zdtm/live/static/overmount_dev.desc
+++ b/test/zdtm/static/overmount_dev.desc
diff --git a/test/zdtm/live/static/overmount_fifo.c b/test/zdtm/static/overmount_fifo.c
index 2de2a8a7e..2de2a8a7e 100644
--- a/test/zdtm/live/static/overmount_fifo.c
+++ b/test/zdtm/static/overmount_fifo.c
diff --git a/test/zdtm/live/static/overmount_fifo.desc b/test/zdtm/static/overmount_fifo.desc
index 95c58b401..95c58b401 100644
--- a/test/zdtm/live/static/overmount_fifo.desc
+++ b/test/zdtm/static/overmount_fifo.desc
diff --git a/test/zdtm/live/static/overmount_file.c b/test/zdtm/static/overmount_file.c
index 5c370e05a..5c370e05a 100644
--- a/test/zdtm/live/static/overmount_file.c
+++ b/test/zdtm/static/overmount_file.c
diff --git a/test/zdtm/live/static/overmount_file.desc b/test/zdtm/static/overmount_file.desc
index 95c58b401..95c58b401 100644
--- a/test/zdtm/live/static/overmount_file.desc
+++ b/test/zdtm/static/overmount_file.desc
diff --git a/test/zdtm/live/static/overmount_sock.c b/test/zdtm/static/overmount_sock.c
index 94e4c7e6f..94e4c7e6f 100644
--- a/test/zdtm/live/static/overmount_sock.c
+++ b/test/zdtm/static/overmount_sock.c
diff --git a/test/zdtm/live/static/overmount_sock.desc b/test/zdtm/static/overmount_sock.desc
index 95c58b401..95c58b401 100644
--- a/test/zdtm/live/static/overmount_sock.desc
+++ b/test/zdtm/static/overmount_sock.desc
diff --git a/test/zdtm/live/static/packet_sock.c b/test/zdtm/static/packet_sock.c
index 66175d46b..66175d46b 100644
--- a/test/zdtm/live/static/packet_sock.c
+++ b/test/zdtm/static/packet_sock.c
diff --git a/test/zdtm/live/static/packet_sock.desc b/test/zdtm/static/packet_sock.desc
index 2eac7e654..2eac7e654 100644
--- a/test/zdtm/live/static/packet_sock.desc
+++ b/test/zdtm/static/packet_sock.desc
diff --git a/test/zdtm/live/static/packet_sock_mmap.c b/test/zdtm/static/packet_sock_mmap.c
index 99b6e2fc3..99b6e2fc3 100644
--- a/test/zdtm/live/static/packet_sock_mmap.c
+++ b/test/zdtm/static/packet_sock_mmap.c
diff --git a/test/zdtm/live/static/packet_sock_mmap.desc b/test/zdtm/static/packet_sock_mmap.desc
index 2eac7e654..2eac7e654 100644
--- a/test/zdtm/live/static/packet_sock_mmap.desc
+++ b/test/zdtm/static/packet_sock_mmap.desc
diff --git a/test/zdtm/live/static/pdeath_sig.c b/test/zdtm/static/pdeath_sig.c
index 0f7436f63..0f7436f63 100644
--- a/test/zdtm/live/static/pdeath_sig.c
+++ b/test/zdtm/static/pdeath_sig.c
diff --git a/test/zdtm/live/static/pid00.c b/test/zdtm/static/pid00.c
index 0b03ef596..0b03ef596 100644
--- a/test/zdtm/live/static/pid00.c
+++ b/test/zdtm/static/pid00.c
diff --git a/test/zdtm/live/static/pid00.desc b/test/zdtm/static/pid00.desc
index 2eac7e654..2eac7e654 100644
--- a/test/zdtm/live/static/pid00.desc
+++ b/test/zdtm/static/pid00.desc
diff --git a/test/zdtm/live/static/pipe00.c b/test/zdtm/static/pipe00.c
index dd487d091..dd487d091 100644
--- a/test/zdtm/live/static/pipe00.c
+++ b/test/zdtm/static/pipe00.c
diff --git a/test/zdtm/live/static/pipe01.c b/test/zdtm/static/pipe01.c
index 85478b6ea..85478b6ea 100644
--- a/test/zdtm/live/static/pipe01.c
+++ b/test/zdtm/static/pipe01.c
diff --git a/test/zdtm/live/static/pipe02.c b/test/zdtm/static/pipe02.c
index 2a8cca7da..2a8cca7da 100644
--- a/test/zdtm/live/static/pipe02.c
+++ b/test/zdtm/static/pipe02.c
diff --git a/test/zdtm/live/static/poll.c b/test/zdtm/static/poll.c
index c0f757452..c0f757452 100644
--- a/test/zdtm/live/static/poll.c
+++ b/test/zdtm/static/poll.c
diff --git a/test/zdtm/live/static/poll.desc b/test/zdtm/static/poll.desc
index 63df42aa6..63df42aa6 100644
--- a/test/zdtm/live/static/poll.desc
+++ b/test/zdtm/static/poll.desc
diff --git a/test/zdtm/live/static/posix_timers.c b/test/zdtm/static/posix_timers.c
index 97fd3c0a9..97fd3c0a9 100644
--- a/test/zdtm/live/static/posix_timers.c
+++ b/test/zdtm/static/posix_timers.c
diff --git a/test/zdtm/live/static/proc-self.c b/test/zdtm/static/proc-self.c
index 54cc5f1f3..54cc5f1f3 100644
--- a/test/zdtm/live/static/proc-self.c
+++ b/test/zdtm/static/proc-self.c
diff --git a/test/zdtm/live/static/pstree.c b/test/zdtm/static/pstree.c
index ba94a275d..ba94a275d 100644
--- a/test/zdtm/live/static/pstree.c
+++ b/test/zdtm/static/pstree.c
diff --git a/test/zdtm/live/static/pthread00.c b/test/zdtm/static/pthread00.c
index 2b248b234..2b248b234 100644
--- a/test/zdtm/live/static/pthread00.c
+++ b/test/zdtm/static/pthread00.c
diff --git a/test/zdtm/live/static/pthread01.c b/test/zdtm/static/pthread01.c
index 52f849c06..52f849c06 100644
--- a/test/zdtm/live/static/pthread01.c
+++ b/test/zdtm/static/pthread01.c
diff --git a/test/zdtm/live/static/pthread02.c b/test/zdtm/static/pthread02.c
index 186271b74..186271b74 100644
--- a/test/zdtm/live/static/pthread02.c
+++ b/test/zdtm/static/pthread02.c
diff --git a/test/zdtm/live/static/pthread02.desc b/test/zdtm/static/pthread02.desc
index 95c58b401..95c58b401 100644
--- a/test/zdtm/live/static/pthread02.desc
+++ b/test/zdtm/static/pthread02.desc
diff --git a/test/zdtm/live/static/ptrace_sig.c b/test/zdtm/static/ptrace_sig.c
index a8e1dc501..a8e1dc501 100644
--- a/test/zdtm/live/static/ptrace_sig.c
+++ b/test/zdtm/static/ptrace_sig.c
diff --git a/test/zdtm/live/static/ptrace_sig.desc b/test/zdtm/static/ptrace_sig.desc
index 95c58b401..95c58b401 100644
--- a/test/zdtm/live/static/ptrace_sig.desc
+++ b/test/zdtm/static/ptrace_sig.desc
diff --git a/test/zdtm/live/static/pty00.c b/test/zdtm/static/pty00.c
index 7aa9c8a07..7aa9c8a07 100644
--- a/test/zdtm/live/static/pty00.c
+++ b/test/zdtm/static/pty00.c
diff --git a/test/zdtm/live/static/pty01.c b/test/zdtm/static/pty01.c
index 46710e280..46710e280 100644
--- a/test/zdtm/live/static/pty01.c
+++ b/test/zdtm/static/pty01.c
diff --git a/test/zdtm/live/static/pty02.c b/test/zdtm/static/pty02.c
index 0074bbd8d..0074bbd8d 100644
--- a/test/zdtm/live/static/pty02.c
+++ b/test/zdtm/static/pty02.c
diff --git a/test/zdtm/live/static/pty02.desc b/test/zdtm/static/pty02.desc
index 95c58b401..95c58b401 100644
--- a/test/zdtm/live/static/pty02.desc
+++ b/test/zdtm/static/pty02.desc
diff --git a/test/zdtm/live/static/pty03.c b/test/zdtm/static/pty03.c
index f60d30d4b..f60d30d4b 100644
--- a/test/zdtm/live/static/pty03.c
+++ b/test/zdtm/static/pty03.c
diff --git a/test/zdtm/live/static/pty03.desc b/test/zdtm/static/pty03.desc
index 63df42aa6..63df42aa6 100644
--- a/test/zdtm/live/static/pty03.desc
+++ b/test/zdtm/static/pty03.desc
diff --git a/test/zdtm/live/static/pty04.c b/test/zdtm/static/pty04.c
index 199d2c758..199d2c758 100644
--- a/test/zdtm/live/static/pty04.c
+++ b/test/zdtm/static/pty04.c
diff --git a/test/zdtm/live/static/remap_dead_pid.c b/test/zdtm/static/remap_dead_pid.c
index 00fe3fd16..00fe3fd16 100644
--- a/test/zdtm/live/static/remap_dead_pid.c
+++ b/test/zdtm/static/remap_dead_pid.c
diff --git a/test/zdtm/live/static/remap_dead_pid.desc b/test/zdtm/static/remap_dead_pid.desc
index 63df42aa6..63df42aa6 100644
--- a/test/zdtm/live/static/remap_dead_pid.desc
+++ b/test/zdtm/static/remap_dead_pid.desc
diff --git a/test/zdtm/live/static/remap_dead_pid_root.c b/test/zdtm/static/remap_dead_pid_root.c
index 2a3141216..2a3141216 100644
--- a/test/zdtm/live/static/remap_dead_pid_root.c
+++ b/test/zdtm/static/remap_dead_pid_root.c
diff --git a/test/zdtm/live/static/remap_dead_pid_root.desc b/test/zdtm/static/remap_dead_pid_root.desc
index 63df42aa6..63df42aa6 100644
--- a/test/zdtm/live/static/remap_dead_pid_root.desc
+++ b/test/zdtm/static/remap_dead_pid_root.desc
diff --git a/test/zdtm/live/static/rlimits00.c b/test/zdtm/static/rlimits00.c
index 17ea8daea..17ea8daea 100644
--- a/test/zdtm/live/static/rlimits00.c
+++ b/test/zdtm/static/rlimits00.c
diff --git a/test/zdtm/live/static/rmdir_open.c b/test/zdtm/static/rmdir_open.c
index a4fb5b0f2..a4fb5b0f2 100644
--- a/test/zdtm/live/static/rmdir_open.c
+++ b/test/zdtm/static/rmdir_open.c
diff --git a/test/zdtm/live/static/route_rules b/test/zdtm/static/route_rules
index ea44537c7..ea44537c7 100755
--- a/test/zdtm/live/static/route_rules
+++ b/test/zdtm/static/route_rules
diff --git a/test/zdtm/live/static/rtc.c b/test/zdtm/static/rtc.c
index e082edc31..e082edc31 100644
--- a/test/zdtm/live/static/rtc.c
+++ b/test/zdtm/static/rtc.c
diff --git a/test/zdtm/live/static/rtc.desc b/test/zdtm/static/rtc.desc
index 80094be09..80094be09 100644
--- a/test/zdtm/live/static/rtc.desc
+++ b/test/zdtm/static/rtc.desc
diff --git a/test/zdtm/live/static/sched_policy00.c b/test/zdtm/static/sched_policy00.c
index 9fe89a1a1..9fe89a1a1 100644
--- a/test/zdtm/live/static/sched_policy00.c
+++ b/test/zdtm/static/sched_policy00.c
diff --git a/test/zdtm/live/static/sched_policy00.desc b/test/zdtm/static/sched_policy00.desc
index d969725f6..d969725f6 100644
--- a/test/zdtm/live/static/sched_policy00.desc
+++ b/test/zdtm/static/sched_policy00.desc
diff --git a/test/zdtm/live/static/sched_prio00.c b/test/zdtm/static/sched_prio00.c
index ea4a2ee13..ea4a2ee13 100644
--- a/test/zdtm/live/static/sched_prio00.c
+++ b/test/zdtm/static/sched_prio00.c
diff --git a/test/zdtm/live/static/sched_prio00.desc b/test/zdtm/static/sched_prio00.desc
index d969725f6..d969725f6 100644
--- a/test/zdtm/live/static/sched_prio00.desc
+++ b/test/zdtm/static/sched_prio00.desc
diff --git a/test/zdtm/live/static/seccomp_filter.c b/test/zdtm/static/seccomp_filter.c
index 1a1f34302..1a1f34302 100644
--- a/test/zdtm/live/static/seccomp_filter.c
+++ b/test/zdtm/static/seccomp_filter.c
diff --git a/test/zdtm/live/static/seccomp_filter.desc b/test/zdtm/static/seccomp_filter.desc
index 14dd96184..14dd96184 100644
--- a/test/zdtm/live/static/seccomp_filter.desc
+++ b/test/zdtm/static/seccomp_filter.desc
diff --git a/test/zdtm/live/static/seccomp_filter_inheritance.c b/test/zdtm/static/seccomp_filter_inheritance.c
index ff0c46a7d..ff0c46a7d 100644
--- a/test/zdtm/live/static/seccomp_filter_inheritance.c
+++ b/test/zdtm/static/seccomp_filter_inheritance.c
diff --git a/test/zdtm/live/static/seccomp_filter_inheritance.desc b/test/zdtm/static/seccomp_filter_inheritance.desc
index 14dd96184..14dd96184 100644
--- a/test/zdtm/live/static/seccomp_filter_inheritance.desc
+++ b/test/zdtm/static/seccomp_filter_inheritance.desc
diff --git a/test/zdtm/live/static/seccomp_filter_tsync.c b/test/zdtm/static/seccomp_filter_tsync.c
index a5835498f..a5835498f 100644
--- a/test/zdtm/live/static/seccomp_filter_tsync.c
+++ b/test/zdtm/static/seccomp_filter_tsync.c
diff --git a/test/zdtm/live/static/seccomp_filter_tsync.desc b/test/zdtm/static/seccomp_filter_tsync.desc
index 14dd96184..14dd96184 100644
--- a/test/zdtm/live/static/seccomp_filter_tsync.desc
+++ b/test/zdtm/static/seccomp_filter_tsync.desc
diff --git a/test/zdtm/live/static/seccomp_strict.c b/test/zdtm/static/seccomp_strict.c
index 8b1a37ac5..8b1a37ac5 100644
--- a/test/zdtm/live/static/seccomp_strict.c
+++ b/test/zdtm/static/seccomp_strict.c
diff --git a/test/zdtm/live/static/seccomp_strict.desc b/test/zdtm/static/seccomp_strict.desc
index d73e109d8..d73e109d8 100644
--- a/test/zdtm/live/static/seccomp_strict.desc
+++ b/test/zdtm/static/seccomp_strict.desc
diff --git a/test/zdtm/live/static/selfexe00.c b/test/zdtm/static/selfexe00.c
index bc6117248..bc6117248 100644
--- a/test/zdtm/live/static/selfexe00.c
+++ b/test/zdtm/static/selfexe00.c
diff --git a/test/zdtm/live/static/sem.c b/test/zdtm/static/sem.c
index a06649de2..a06649de2 100644
--- a/test/zdtm/live/static/sem.c
+++ b/test/zdtm/static/sem.c
diff --git a/test/zdtm/live/static/sem.desc b/test/zdtm/static/sem.desc
index 6c4afe5f0..6c4afe5f0 100644
--- a/test/zdtm/live/static/sem.desc
+++ b/test/zdtm/static/sem.desc
diff --git a/test/zdtm/live/static/session00.c b/test/zdtm/static/session00.c
index bc8f00940..bc8f00940 100644
--- a/test/zdtm/live/static/session00.c
+++ b/test/zdtm/static/session00.c
diff --git a/test/zdtm/live/static/session00.desc b/test/zdtm/static/session00.desc
index 6c4afe5f0..6c4afe5f0 100644
--- a/test/zdtm/live/static/session00.desc
+++ b/test/zdtm/static/session00.desc
diff --git a/test/zdtm/live/static/session01.c b/test/zdtm/static/session01.c
index 9bea83d92..9bea83d92 100644
--- a/test/zdtm/live/static/session01.c
+++ b/test/zdtm/static/session01.c
diff --git a/test/zdtm/live/static/session01.desc b/test/zdtm/static/session01.desc
index 6c4afe5f0..6c4afe5f0 100644
--- a/test/zdtm/live/static/session01.desc
+++ b/test/zdtm/static/session01.desc
diff --git a/test/zdtm/live/static/session02.c b/test/zdtm/static/session02.c
index 6c5e77121..6c5e77121 100644
--- a/test/zdtm/live/static/session02.c
+++ b/test/zdtm/static/session02.c
diff --git a/test/zdtm/live/static/session02.desc b/test/zdtm/static/session02.desc
index 95c58b401..95c58b401 100644
--- a/test/zdtm/live/static/session02.desc
+++ b/test/zdtm/static/session02.desc
diff --git a/test/zdtm/live/static/session03.c b/test/zdtm/static/session03.c
index ef268e552..ef268e552 100644
--- a/test/zdtm/live/static/session03.c
+++ b/test/zdtm/static/session03.c
diff --git a/test/zdtm/live/static/session03.desc b/test/zdtm/static/session03.desc
index 95c58b401..95c58b401 100644
--- a/test/zdtm/live/static/session03.desc
+++ b/test/zdtm/static/session03.desc
diff --git a/test/zdtm/live/static/shm.c b/test/zdtm/static/shm.c
index fc90a9955..fc90a9955 100644
--- a/test/zdtm/live/static/shm.c
+++ b/test/zdtm/static/shm.c
diff --git a/test/zdtm/live/static/shm.desc b/test/zdtm/static/shm.desc
index 6c4afe5f0..6c4afe5f0 100644
--- a/test/zdtm/live/static/shm.desc
+++ b/test/zdtm/static/shm.desc
diff --git a/test/zdtm/live/static/sigaltstack.c b/test/zdtm/static/sigaltstack.c
index be5ddf792..be5ddf792 100644
--- a/test/zdtm/live/static/sigaltstack.c
+++ b/test/zdtm/static/sigaltstack.c
diff --git a/test/zdtm/live/static/signalfd00.c b/test/zdtm/static/signalfd00.c
index 5a1527382..5a1527382 100644
--- a/test/zdtm/live/static/signalfd00.c
+++ b/test/zdtm/static/signalfd00.c
diff --git a/test/zdtm/live/static/sigpending.c b/test/zdtm/static/sigpending.c
index 2a4abfba0..2a4abfba0 100644
--- a/test/zdtm/live/static/sigpending.c
+++ b/test/zdtm/static/sigpending.c
diff --git a/test/zdtm/live/static/sk-freebind-false.c b/test/zdtm/static/sk-freebind-false.c
index de243ce6e..de243ce6e 120000
--- a/test/zdtm/live/static/sk-freebind-false.c
+++ b/test/zdtm/static/sk-freebind-false.c
diff --git a/test/zdtm/live/static/sk-freebind.c b/test/zdtm/static/sk-freebind.c
index de30329c9..de30329c9 100644
--- a/test/zdtm/live/static/sk-freebind.c
+++ b/test/zdtm/static/sk-freebind.c
diff --git a/test/zdtm/live/static/sk-netlink.c b/test/zdtm/static/sk-netlink.c
index f334246e2..f334246e2 100644
--- a/test/zdtm/live/static/sk-netlink.c
+++ b/test/zdtm/static/sk-netlink.c
diff --git a/test/zdtm/live/static/sk-netlink.desc b/test/zdtm/static/sk-netlink.desc
index 2eac7e654..2eac7e654 100644
--- a/test/zdtm/live/static/sk-netlink.desc
+++ b/test/zdtm/static/sk-netlink.desc
diff --git a/test/zdtm/live/static/sk-unix-rel.c b/test/zdtm/static/sk-unix-rel.c
index d341ce9af..d341ce9af 100644
--- a/test/zdtm/live/static/sk-unix-rel.c
+++ b/test/zdtm/static/sk-unix-rel.c
diff --git a/test/zdtm/live/static/sk-unix-unconn.c b/test/zdtm/static/sk-unix-unconn.c
index 8e600130d..8e600130d 100644
--- a/test/zdtm/live/static/sk-unix-unconn.c
+++ b/test/zdtm/static/sk-unix-unconn.c
diff --git a/test/zdtm/live/static/sleeping00.c b/test/zdtm/static/sleeping00.c
index f59ffaf1f..f59ffaf1f 100644
--- a/test/zdtm/live/static/sleeping00.c
+++ b/test/zdtm/static/sleeping00.c
diff --git a/test/zdtm/live/static/sock_filter.c b/test/zdtm/static/sock_filter.c
index e2475cd89..e2475cd89 100644
--- a/test/zdtm/live/static/sock_filter.c
+++ b/test/zdtm/static/sock_filter.c
diff --git a/test/zdtm/live/static/sock_opts00.c b/test/zdtm/static/sock_opts00.c
index 08fc1d357..08fc1d357 100644
--- a/test/zdtm/live/static/sock_opts00.c
+++ b/test/zdtm/static/sock_opts00.c
diff --git a/test/zdtm/live/static/sock_opts00.desc b/test/zdtm/static/sock_opts00.desc
index 2eac7e654..2eac7e654 100644
--- a/test/zdtm/live/static/sock_opts00.desc
+++ b/test/zdtm/static/sock_opts00.desc
diff --git a/test/zdtm/live/static/sock_opts01.c b/test/zdtm/static/sock_opts01.c
index 7dfce2257..7dfce2257 100644
--- a/test/zdtm/live/static/sock_opts01.c
+++ b/test/zdtm/static/sock_opts01.c
diff --git a/test/zdtm/live/static/sock_opts01.desc b/test/zdtm/static/sock_opts01.desc
index 2eac7e654..2eac7e654 100644
--- a/test/zdtm/live/static/sock_opts01.desc
+++ b/test/zdtm/static/sock_opts01.desc
diff --git a/test/zdtm/live/static/socket-closed-tcp.c b/test/zdtm/static/socket-closed-tcp.c
index 58fc7d7b0..58fc7d7b0 100644
--- a/test/zdtm/live/static/socket-closed-tcp.c
+++ b/test/zdtm/static/socket-closed-tcp.c
diff --git a/test/zdtm/live/static/socket-closed-tcp.desc b/test/zdtm/static/socket-closed-tcp.desc
index 95c58b401..95c58b401 100644
--- a/test/zdtm/live/static/socket-closed-tcp.desc
+++ b/test/zdtm/static/socket-closed-tcp.desc
diff --git a/test/zdtm/live/static/socket-ext.c b/test/zdtm/static/socket-ext.c
index bfc2925e2..bfc2925e2 100644
--- a/test/zdtm/live/static/socket-ext.c
+++ b/test/zdtm/static/socket-ext.c
diff --git a/test/zdtm/live/static/socket-ext.desc b/test/zdtm/static/socket-ext.desc
index 5ecad7b47..5ecad7b47 100644
--- a/test/zdtm/live/static/socket-ext.desc
+++ b/test/zdtm/static/socket-ext.desc
diff --git a/test/zdtm/live/static/socket-ext.opts b/test/zdtm/static/socket-ext.opts
index de3680778..de3680778 100644
--- a/test/zdtm/live/static/socket-ext.opts
+++ b/test/zdtm/static/socket-ext.opts
diff --git a/test/zdtm/live/static/socket-tcp-local.c b/test/zdtm/static/socket-tcp-local.c
index 8cb60dd03..8cb60dd03 120000
--- a/test/zdtm/live/static/socket-tcp-local.c
+++ b/test/zdtm/static/socket-tcp-local.c
diff --git a/test/zdtm/live/static/socket-tcp-local.desc b/test/zdtm/static/socket-tcp-local.desc
index e02979edf..e02979edf 100644
--- a/test/zdtm/live/static/socket-tcp-local.desc
+++ b/test/zdtm/static/socket-tcp-local.desc
diff --git a/test/zdtm/live/static/socket-tcp-local.opts b/test/zdtm/static/socket-tcp-local.opts
index 5f40ff841..5f40ff841 120000
--- a/test/zdtm/live/static/socket-tcp-local.opts
+++ b/test/zdtm/static/socket-tcp-local.opts
diff --git a/test/zdtm/live/static/socket-tcp-nfconntrack.c b/test/zdtm/static/socket-tcp-nfconntrack.c
index 8cb60dd03..8cb60dd03 120000
--- a/test/zdtm/live/static/socket-tcp-nfconntrack.c
+++ b/test/zdtm/static/socket-tcp-nfconntrack.c
diff --git a/test/zdtm/live/static/socket-tcp-nfconntrack.desc b/test/zdtm/static/socket-tcp-nfconntrack.desc
index add2513f8..add2513f8 100644
--- a/test/zdtm/live/static/socket-tcp-nfconntrack.desc
+++ b/test/zdtm/static/socket-tcp-nfconntrack.desc
diff --git a/test/zdtm/live/static/socket-tcp.c b/test/zdtm/static/socket-tcp.c
index 3eca8de26..3eca8de26 100644
--- a/test/zdtm/live/static/socket-tcp.c
+++ b/test/zdtm/static/socket-tcp.c
diff --git a/test/zdtm/live/static/socket-tcp.desc b/test/zdtm/static/socket-tcp.desc
index 7c1ae7a78..7c1ae7a78 100644
--- a/test/zdtm/live/static/socket-tcp.desc
+++ b/test/zdtm/static/socket-tcp.desc
diff --git a/test/zdtm/live/static/socket-tcp.opts b/test/zdtm/static/socket-tcp.opts
index f016a5435..f016a5435 100644
--- a/test/zdtm/live/static/socket-tcp.opts
+++ b/test/zdtm/static/socket-tcp.opts
diff --git a/test/zdtm/live/static/socket-tcp6-local.c b/test/zdtm/static/socket-tcp6-local.c
index 8cb60dd03..8cb60dd03 120000
--- a/test/zdtm/live/static/socket-tcp6-local.c
+++ b/test/zdtm/static/socket-tcp6-local.c
diff --git a/test/zdtm/live/static/socket-tcp6-local.desc b/test/zdtm/static/socket-tcp6-local.desc
index c915663eb..c915663eb 120000
--- a/test/zdtm/live/static/socket-tcp6-local.desc
+++ b/test/zdtm/static/socket-tcp6-local.desc
diff --git a/test/zdtm/live/static/socket-tcp6-local.opts b/test/zdtm/static/socket-tcp6-local.opts
index 5f40ff841..5f40ff841 120000
--- a/test/zdtm/live/static/socket-tcp6-local.opts
+++ b/test/zdtm/static/socket-tcp6-local.opts
diff --git a/test/zdtm/live/static/socket-tcp6.c b/test/zdtm/static/socket-tcp6.c
index 8cb60dd03..8cb60dd03 120000
--- a/test/zdtm/live/static/socket-tcp6.c
+++ b/test/zdtm/static/socket-tcp6.c
diff --git a/test/zdtm/live/static/socket-tcp6.desc b/test/zdtm/static/socket-tcp6.desc
index 7c1ae7a78..7c1ae7a78 100644
--- a/test/zdtm/live/static/socket-tcp6.desc
+++ b/test/zdtm/static/socket-tcp6.desc
diff --git a/test/zdtm/live/static/socket-tcp6.opts b/test/zdtm/static/socket-tcp6.opts
index f016a5435..f016a5435 100644
--- a/test/zdtm/live/static/socket-tcp6.opts
+++ b/test/zdtm/static/socket-tcp6.opts
diff --git a/test/zdtm/live/static/socket-tcpbuf-local.c b/test/zdtm/static/socket-tcpbuf-local.c
index 58c46c74a..58c46c74a 120000
--- a/test/zdtm/live/static/socket-tcpbuf-local.c
+++ b/test/zdtm/static/socket-tcpbuf-local.c
diff --git a/test/zdtm/live/static/socket-tcpbuf-local.desc b/test/zdtm/static/socket-tcpbuf-local.desc
index e02979edf..e02979edf 100644
--- a/test/zdtm/live/static/socket-tcpbuf-local.desc
+++ b/test/zdtm/static/socket-tcpbuf-local.desc
diff --git a/test/zdtm/live/static/socket-tcpbuf-local.opts b/test/zdtm/static/socket-tcpbuf-local.opts
index f016a5435..f016a5435 100644
--- a/test/zdtm/live/static/socket-tcpbuf-local.opts
+++ b/test/zdtm/static/socket-tcpbuf-local.opts
diff --git a/test/zdtm/live/static/socket-tcpbuf.c b/test/zdtm/static/socket-tcpbuf.c
index f61f6a507..f61f6a507 100644
--- a/test/zdtm/live/static/socket-tcpbuf.c
+++ b/test/zdtm/static/socket-tcpbuf.c
diff --git a/test/zdtm/live/static/socket-tcpbuf.desc b/test/zdtm/static/socket-tcpbuf.desc
index 7c1ae7a78..7c1ae7a78 100644
--- a/test/zdtm/live/static/socket-tcpbuf.desc
+++ b/test/zdtm/static/socket-tcpbuf.desc
diff --git a/test/zdtm/live/static/socket-tcpbuf.opts b/test/zdtm/static/socket-tcpbuf.opts
index f016a5435..f016a5435 100644
--- a/test/zdtm/live/static/socket-tcpbuf.opts
+++ b/test/zdtm/static/socket-tcpbuf.opts
diff --git a/test/zdtm/live/static/socket-tcpbuf6-local.c b/test/zdtm/static/socket-tcpbuf6-local.c
index 58c46c74a..58c46c74a 120000
--- a/test/zdtm/live/static/socket-tcpbuf6-local.c
+++ b/test/zdtm/static/socket-tcpbuf6-local.c
diff --git a/test/zdtm/live/static/socket-tcpbuf6-local.desc b/test/zdtm/static/socket-tcpbuf6-local.desc
index 3c9afd2b8..3c9afd2b8 120000
--- a/test/zdtm/live/static/socket-tcpbuf6-local.desc
+++ b/test/zdtm/static/socket-tcpbuf6-local.desc
diff --git a/test/zdtm/live/static/socket-tcpbuf6-local.opts b/test/zdtm/static/socket-tcpbuf6-local.opts
index ed660979e..ed660979e 120000
--- a/test/zdtm/live/static/socket-tcpbuf6-local.opts
+++ b/test/zdtm/static/socket-tcpbuf6-local.opts
diff --git a/test/zdtm/live/static/socket-tcpbuf6.c b/test/zdtm/static/socket-tcpbuf6.c
index 58c46c74a..58c46c74a 120000
--- a/test/zdtm/live/static/socket-tcpbuf6.c
+++ b/test/zdtm/static/socket-tcpbuf6.c
diff --git a/test/zdtm/live/static/socket-tcpbuf6.desc b/test/zdtm/static/socket-tcpbuf6.desc
index 7c1ae7a78..7c1ae7a78 100644
--- a/test/zdtm/live/static/socket-tcpbuf6.desc
+++ b/test/zdtm/static/socket-tcpbuf6.desc
diff --git a/test/zdtm/live/static/socket-tcpbuf6.opts b/test/zdtm/static/socket-tcpbuf6.opts
index f016a5435..f016a5435 100644
--- a/test/zdtm/live/static/socket-tcpbuf6.opts
+++ b/test/zdtm/static/socket-tcpbuf6.opts
diff --git a/test/zdtm/live/static/socket6_udp.c b/test/zdtm/static/socket6_udp.c
index 30ddc9a40..30ddc9a40 100644
--- a/test/zdtm/live/static/socket6_udp.c
+++ b/test/zdtm/static/socket6_udp.c
diff --git a/test/zdtm/live/static/socket_aio.c b/test/zdtm/static/socket_aio.c
index 6ca5079b0..6ca5079b0 100644
--- a/test/zdtm/live/static/socket_aio.c
+++ b/test/zdtm/static/socket_aio.c
diff --git a/test/zdtm/live/static/socket_aio.desc b/test/zdtm/static/socket_aio.desc
index 95c58b401..95c58b401 100644
--- a/test/zdtm/live/static/socket_aio.desc
+++ b/test/zdtm/static/socket_aio.desc
diff --git a/test/zdtm/live/static/socket_close_data.c b/test/zdtm/static/socket_close_data.c
index de552ada9..de552ada9 100644
--- a/test/zdtm/live/static/socket_close_data.c
+++ b/test/zdtm/static/socket_close_data.c
diff --git a/test/zdtm/live/static/socket_close_data01.c b/test/zdtm/static/socket_close_data01.c
index 53b5f7a6d..53b5f7a6d 100644
--- a/test/zdtm/live/static/socket_close_data01.c
+++ b/test/zdtm/static/socket_close_data01.c
diff --git a/test/zdtm/live/static/socket_dgram_data.c b/test/zdtm/static/socket_dgram_data.c
index ec79a381c..ec79a381c 100644
--- a/test/zdtm/live/static/socket_dgram_data.c
+++ b/test/zdtm/static/socket_dgram_data.c
diff --git a/test/zdtm/live/static/socket_listen.c b/test/zdtm/static/socket_listen.c
index f11d37959..f11d37959 100644
--- a/test/zdtm/live/static/socket_listen.c
+++ b/test/zdtm/static/socket_listen.c
diff --git a/test/zdtm/live/static/socket_listen6.c b/test/zdtm/static/socket_listen6.c
index d026b3bf8..d026b3bf8 120000
--- a/test/zdtm/live/static/socket_listen6.c
+++ b/test/zdtm/static/socket_listen6.c
diff --git a/test/zdtm/live/static/socket_queues.c b/test/zdtm/static/socket_queues.c
index 486d12a58..486d12a58 100644
--- a/test/zdtm/live/static/socket_queues.c
+++ b/test/zdtm/static/socket_queues.c
diff --git a/test/zdtm/live/static/socket_snd_addr.c b/test/zdtm/static/socket_snd_addr.c
index 1d72d4e4a..1d72d4e4a 100644
--- a/test/zdtm/live/static/socket_snd_addr.c
+++ b/test/zdtm/static/socket_snd_addr.c
diff --git a/test/zdtm/live/static/socket_snd_addr.desc b/test/zdtm/static/socket_snd_addr.desc
index 95c58b401..95c58b401 100644
--- a/test/zdtm/live/static/socket_snd_addr.desc
+++ b/test/zdtm/static/socket_snd_addr.desc
diff --git a/test/zdtm/live/static/socket_udp.c b/test/zdtm/static/socket_udp.c
index e84e8bf29..e84e8bf29 100644
--- a/test/zdtm/live/static/socket_udp.c
+++ b/test/zdtm/static/socket_udp.c
diff --git a/test/zdtm/live/static/socket_udplite.c b/test/zdtm/static/socket_udplite.c
index aaa40e1dc..aaa40e1dc 100644
--- a/test/zdtm/live/static/socket_udplite.c
+++ b/test/zdtm/static/socket_udplite.c
diff --git a/test/zdtm/live/static/sockets00.c b/test/zdtm/static/sockets00.c
index 9d0095740..9d0095740 100644
--- a/test/zdtm/live/static/sockets00.c
+++ b/test/zdtm/static/sockets00.c
diff --git a/test/zdtm/live/static/sockets00.desc b/test/zdtm/static/sockets00.desc
index 2eac7e654..2eac7e654 100644
--- a/test/zdtm/live/static/sockets00.desc
+++ b/test/zdtm/static/sockets00.desc
diff --git a/test/zdtm/live/static/sockets01.c b/test/zdtm/static/sockets01.c
index a111e9d40..a111e9d40 100644
--- a/test/zdtm/live/static/sockets01.c
+++ b/test/zdtm/static/sockets01.c
diff --git a/test/zdtm/live/static/sockets02.c b/test/zdtm/static/sockets02.c
index a7bec03f7..a7bec03f7 100644
--- a/test/zdtm/live/static/sockets02.c
+++ b/test/zdtm/static/sockets02.c
diff --git a/test/zdtm/live/static/sockets_dgram.c b/test/zdtm/static/sockets_dgram.c
index a34bb144c..a34bb144c 100644
--- a/test/zdtm/live/static/sockets_dgram.c
+++ b/test/zdtm/static/sockets_dgram.c
diff --git a/test/zdtm/live/static/sockets_spair.c b/test/zdtm/static/sockets_spair.c
index f2c916f34..f2c916f34 100644
--- a/test/zdtm/live/static/sockets_spair.c
+++ b/test/zdtm/static/sockets_spair.c
diff --git a/test/zdtm/live/static/sse00.c b/test/zdtm/static/sse00.c
index 0c04aba1b..0c04aba1b 100644
--- a/test/zdtm/live/static/sse00.c
+++ b/test/zdtm/static/sse00.c
diff --git a/test/zdtm/live/static/sse00.desc b/test/zdtm/static/sse00.desc
index d2f501de2..d2f501de2 100644
--- a/test/zdtm/live/static/sse00.desc
+++ b/test/zdtm/static/sse00.desc
diff --git a/test/zdtm/live/static/sse20.c b/test/zdtm/static/sse20.c
index 912528b42..912528b42 100644
--- a/test/zdtm/live/static/sse20.c
+++ b/test/zdtm/static/sse20.c
diff --git a/test/zdtm/live/static/sse20.desc b/test/zdtm/static/sse20.desc
index d2f501de2..d2f501de2 100644
--- a/test/zdtm/live/static/sse20.desc
+++ b/test/zdtm/static/sse20.desc
diff --git a/test/zdtm/live/static/stopped.c b/test/zdtm/static/stopped.c
index af5780793..af5780793 100644
--- a/test/zdtm/live/static/stopped.c
+++ b/test/zdtm/static/stopped.c
diff --git a/test/zdtm/live/static/stopped01.c b/test/zdtm/static/stopped01.c
index 87790302e..87790302e 120000
--- a/test/zdtm/live/static/stopped01.c
+++ b/test/zdtm/static/stopped01.c
diff --git a/test/zdtm/live/static/stopped02.c b/test/zdtm/static/stopped02.c
index 87790302e..87790302e 120000
--- a/test/zdtm/live/static/stopped02.c
+++ b/test/zdtm/static/stopped02.c
diff --git a/test/zdtm/live/static/stopped12.c b/test/zdtm/static/stopped12.c
index 87790302e..87790302e 120000
--- a/test/zdtm/live/static/stopped12.c
+++ b/test/zdtm/static/stopped12.c
diff --git a/test/zdtm/live/static/tempfs.c b/test/zdtm/static/tempfs.c
index 66c51a5eb..66c51a5eb 100644
--- a/test/zdtm/live/static/tempfs.c
+++ b/test/zdtm/static/tempfs.c
diff --git a/test/zdtm/live/static/tempfs.desc b/test/zdtm/static/tempfs.desc
index 7657ba45c..7657ba45c 100644
--- a/test/zdtm/live/static/tempfs.desc
+++ b/test/zdtm/static/tempfs.desc
diff --git a/test/zdtm/live/static/tempfs_ro.c b/test/zdtm/static/tempfs_ro.c
index f30ae8dc5..f30ae8dc5 100644
--- a/test/zdtm/live/static/tempfs_ro.c
+++ b/test/zdtm/static/tempfs_ro.c
diff --git a/test/zdtm/live/static/tempfs_ro.desc b/test/zdtm/static/tempfs_ro.desc
index dfe829b84..dfe829b84 100644
--- a/test/zdtm/live/static/tempfs_ro.desc
+++ b/test/zdtm/static/tempfs_ro.desc
diff --git a/test/zdtm/live/static/tempfs_subns.c b/test/zdtm/static/tempfs_subns.c
index 413d0a1e2..413d0a1e2 100644
--- a/test/zdtm/live/static/tempfs_subns.c
+++ b/test/zdtm/static/tempfs_subns.c
diff --git a/test/zdtm/live/static/tempfs_subns.desc b/test/zdtm/static/tempfs_subns.desc
index a8849e097..a8849e097 100644
--- a/test/zdtm/live/static/tempfs_subns.desc
+++ b/test/zdtm/static/tempfs_subns.desc
diff --git a/test/zdtm/live/static/timerfd.c b/test/zdtm/static/timerfd.c
index 132c3acd8..132c3acd8 100644
--- a/test/zdtm/live/static/timerfd.c
+++ b/test/zdtm/static/timerfd.c
diff --git a/test/zdtm/live/static/timerfd.desc b/test/zdtm/static/timerfd.desc
index 6f5419321..6f5419321 100644
--- a/test/zdtm/live/static/timerfd.desc
+++ b/test/zdtm/static/timerfd.desc
diff --git a/test/zdtm/live/static/timers.c b/test/zdtm/static/timers.c
index 256a5c1be..256a5c1be 100644
--- a/test/zdtm/live/static/timers.c
+++ b/test/zdtm/static/timers.c
diff --git a/test/zdtm/live/static/tty00.c b/test/zdtm/static/tty00.c
index 749b9bc64..749b9bc64 100644
--- a/test/zdtm/live/static/tty00.c
+++ b/test/zdtm/static/tty00.c
diff --git a/test/zdtm/live/static/tty00.desc b/test/zdtm/static/tty00.desc
index 95c58b401..95c58b401 100644
--- a/test/zdtm/live/static/tty00.desc
+++ b/test/zdtm/static/tty00.desc
diff --git a/test/zdtm/live/static/tty02.c b/test/zdtm/static/tty02.c
index b179e2fe3..b179e2fe3 100644
--- a/test/zdtm/live/static/tty02.c
+++ b/test/zdtm/static/tty02.c
diff --git a/test/zdtm/live/static/tty03.c b/test/zdtm/static/tty03.c
index c9d4a25dc..c9d4a25dc 100644
--- a/test/zdtm/live/static/tty03.c
+++ b/test/zdtm/static/tty03.c
diff --git a/test/zdtm/live/static/tun.c b/test/zdtm/static/tun.c
index c53b8fa88..c53b8fa88 100644
--- a/test/zdtm/live/static/tun.c
+++ b/test/zdtm/static/tun.c
diff --git a/test/zdtm/live/static/tun.desc b/test/zdtm/static/tun.desc
index 8c7cfe860..8c7cfe860 100644
--- a/test/zdtm/live/static/tun.desc
+++ b/test/zdtm/static/tun.desc
diff --git a/test/zdtm/live/static/umask00.c b/test/zdtm/static/umask00.c
index 1157f0d08..1157f0d08 100644
--- a/test/zdtm/live/static/umask00.c
+++ b/test/zdtm/static/umask00.c
diff --git a/test/zdtm/live/static/unbound_sock.c b/test/zdtm/static/unbound_sock.c
index be8318c5f..be8318c5f 100644
--- a/test/zdtm/live/static/unbound_sock.c
+++ b/test/zdtm/static/unbound_sock.c
diff --git a/test/zdtm/live/static/unhashed_proc.c b/test/zdtm/static/unhashed_proc.c
index 1fdc38f67..1fdc38f67 100644
--- a/test/zdtm/live/static/unhashed_proc.c
+++ b/test/zdtm/static/unhashed_proc.c
diff --git a/test/zdtm/live/static/unhashed_proc.desc b/test/zdtm/static/unhashed_proc.desc
index 95c58b401..95c58b401 100644
--- a/test/zdtm/live/static/unhashed_proc.desc
+++ b/test/zdtm/static/unhashed_proc.desc
diff --git a/test/zdtm/live/static/unlink_fifo.c b/test/zdtm/static/unlink_fifo.c
index 765f5eb07..765f5eb07 100644
--- a/test/zdtm/live/static/unlink_fifo.c
+++ b/test/zdtm/static/unlink_fifo.c
diff --git a/test/zdtm/live/static/unlink_fifo_wronly.c b/test/zdtm/static/unlink_fifo_wronly.c
index 5fb4c3450..5fb4c3450 100644
--- a/test/zdtm/live/static/unlink_fifo_wronly.c
+++ b/test/zdtm/static/unlink_fifo_wronly.c
diff --git a/test/zdtm/live/static/unlink_fstat00.c b/test/zdtm/static/unlink_fstat00.c
index 4965dbc05..4965dbc05 100644
--- a/test/zdtm/live/static/unlink_fstat00.c
+++ b/test/zdtm/static/unlink_fstat00.c
diff --git a/test/zdtm/live/static/unlink_fstat00.hook b/test/zdtm/static/unlink_fstat00.hook
index dfae0f60c..dfae0f60c 100755
--- a/test/zdtm/live/static/unlink_fstat00.hook
+++ b/test/zdtm/static/unlink_fstat00.hook
diff --git a/test/zdtm/live/static/unlink_fstat01+.c b/test/zdtm/static/unlink_fstat01+.c
index 232e6983c..232e6983c 120000
--- a/test/zdtm/live/static/unlink_fstat01+.c
+++ b/test/zdtm/static/unlink_fstat01+.c
diff --git a/test/zdtm/live/static/unlink_fstat01.c b/test/zdtm/static/unlink_fstat01.c
index 104abec4f..104abec4f 100644
--- a/test/zdtm/live/static/unlink_fstat01.c
+++ b/test/zdtm/static/unlink_fstat01.c
diff --git a/test/zdtm/live/static/unlink_fstat02.c b/test/zdtm/static/unlink_fstat02.c
index dd18b8fb0..dd18b8fb0 100644
--- a/test/zdtm/live/static/unlink_fstat02.c
+++ b/test/zdtm/static/unlink_fstat02.c
diff --git a/test/zdtm/live/static/unlink_fstat03.c b/test/zdtm/static/unlink_fstat03.c
index 06268e3e6..06268e3e6 100644
--- a/test/zdtm/live/static/unlink_fstat03.c
+++ b/test/zdtm/static/unlink_fstat03.c
diff --git a/test/zdtm/live/static/unlink_fstat03.desc b/test/zdtm/static/unlink_fstat03.desc
index 083b58305..083b58305 100644
--- a/test/zdtm/live/static/unlink_fstat03.desc
+++ b/test/zdtm/static/unlink_fstat03.desc
diff --git a/test/zdtm/live/static/unlink_fstat03.opts b/test/zdtm/static/unlink_fstat03.opts
index 472294671..472294671 100644
--- a/test/zdtm/live/static/unlink_fstat03.opts
+++ b/test/zdtm/static/unlink_fstat03.opts
diff --git a/test/zdtm/live/static/unlink_largefile.c b/test/zdtm/static/unlink_largefile.c
index b1f8079bc..b1f8079bc 100644
--- a/test/zdtm/live/static/unlink_largefile.c
+++ b/test/zdtm/static/unlink_largefile.c
diff --git a/test/zdtm/live/static/unlink_largefile.desc b/test/zdtm/static/unlink_largefile.desc
index 95c58b401..95c58b401 100644
--- a/test/zdtm/live/static/unlink_largefile.desc
+++ b/test/zdtm/static/unlink_largefile.desc
diff --git a/test/zdtm/live/static/unlink_mmap00.c b/test/zdtm/static/unlink_mmap00.c
index 03509aabc..03509aabc 100644
--- a/test/zdtm/live/static/unlink_mmap00.c
+++ b/test/zdtm/static/unlink_mmap00.c
diff --git a/test/zdtm/live/static/unlink_mmap00.desc b/test/zdtm/static/unlink_mmap00.desc
index 1fda48301..1fda48301 100644
--- a/test/zdtm/live/static/unlink_mmap00.desc
+++ b/test/zdtm/static/unlink_mmap00.desc
diff --git a/test/zdtm/live/static/unlink_mmap01.c b/test/zdtm/static/unlink_mmap01.c
index 66c1bc353..66c1bc353 100644
--- a/test/zdtm/live/static/unlink_mmap01.c
+++ b/test/zdtm/static/unlink_mmap01.c
diff --git a/test/zdtm/live/static/unlink_mmap01.desc b/test/zdtm/static/unlink_mmap01.desc
index 1fda48301..1fda48301 100644
--- a/test/zdtm/live/static/unlink_mmap01.desc
+++ b/test/zdtm/static/unlink_mmap01.desc
diff --git a/test/zdtm/live/static/unlink_mmap02.c b/test/zdtm/static/unlink_mmap02.c
index 85d6b3887..85d6b3887 100644
--- a/test/zdtm/live/static/unlink_mmap02.c
+++ b/test/zdtm/static/unlink_mmap02.c
diff --git a/test/zdtm/live/static/unlink_mmap02.desc b/test/zdtm/static/unlink_mmap02.desc
index 1fda48301..1fda48301 100644
--- a/test/zdtm/live/static/unlink_mmap02.desc
+++ b/test/zdtm/static/unlink_mmap02.desc
diff --git a/test/zdtm/live/static/unlink_regular00.c b/test/zdtm/static/unlink_regular00.c
index 6e97df2d1..6e97df2d1 100644
--- a/test/zdtm/live/static/unlink_regular00.c
+++ b/test/zdtm/static/unlink_regular00.c
diff --git a/test/zdtm/live/static/unlink_regular00.desc b/test/zdtm/static/unlink_regular00.desc
index 53aea561b..53aea561b 100644
--- a/test/zdtm/live/static/unlink_regular00.desc
+++ b/test/zdtm/static/unlink_regular00.desc
diff --git a/test/zdtm/live/static/uptime_grow.c b/test/zdtm/static/uptime_grow.c
index 6d99509ca..6d99509ca 100644
--- a/test/zdtm/live/static/uptime_grow.c
+++ b/test/zdtm/static/uptime_grow.c
diff --git a/test/zdtm/live/static/uptime_grow.desc b/test/zdtm/static/uptime_grow.desc
index 95c58b401..95c58b401 100644
--- a/test/zdtm/live/static/uptime_grow.desc
+++ b/test/zdtm/static/uptime_grow.desc
diff --git a/test/zdtm/live/static/utsname.c b/test/zdtm/static/utsname.c
index 5e1e0cb88..5e1e0cb88 100644
--- a/test/zdtm/live/static/utsname.c
+++ b/test/zdtm/static/utsname.c
diff --git a/test/zdtm/live/static/utsname.desc b/test/zdtm/static/utsname.desc
index 7657ba45c..7657ba45c 100644
--- a/test/zdtm/live/static/utsname.desc
+++ b/test/zdtm/static/utsname.desc
diff --git a/test/zdtm/live/static/vdso00.c b/test/zdtm/static/vdso00.c
index 8ac4ccad9..8ac4ccad9 100644
--- a/test/zdtm/live/static/vdso00.c
+++ b/test/zdtm/static/vdso00.c
diff --git a/test/zdtm/live/static/vdso01.c b/test/zdtm/static/vdso01.c
index 8db396ed8..8db396ed8 100644
--- a/test/zdtm/live/static/vdso01.c
+++ b/test/zdtm/static/vdso01.c
diff --git a/test/zdtm/live/static/vdso01.desc b/test/zdtm/static/vdso01.desc
index d2f501de2..d2f501de2 100644
--- a/test/zdtm/live/static/vdso01.desc
+++ b/test/zdtm/static/vdso01.desc
diff --git a/test/zdtm/live/static/vfork00.c b/test/zdtm/static/vfork00.c
index d61bb35f1..d61bb35f1 100644
--- a/test/zdtm/live/static/vfork00.c
+++ b/test/zdtm/static/vfork00.c
diff --git a/test/zdtm/live/static/vfork00.desc b/test/zdtm/static/vfork00.desc
index 95c58b401..95c58b401 100644
--- a/test/zdtm/live/static/vfork00.desc
+++ b/test/zdtm/static/vfork00.desc
diff --git a/test/zdtm/live/static/vsx.c b/test/zdtm/static/vsx.c
index 33151cab7..33151cab7 100644
--- a/test/zdtm/live/static/vsx.c
+++ b/test/zdtm/static/vsx.c
diff --git a/test/zdtm/live/static/vsx.desc b/test/zdtm/static/vsx.desc
index 2ba6eda79..2ba6eda79 100644
--- a/test/zdtm/live/static/vsx.desc
+++ b/test/zdtm/static/vsx.desc
diff --git a/test/zdtm/live/static/vt.c b/test/zdtm/static/vt.c
index 1726a6f32..1726a6f32 100644
--- a/test/zdtm/live/static/vt.c
+++ b/test/zdtm/static/vt.c
diff --git a/test/zdtm/live/static/vt.desc b/test/zdtm/static/vt.desc
index d969725f6..d969725f6 100644
--- a/test/zdtm/live/static/vt.desc
+++ b/test/zdtm/static/vt.desc
diff --git a/test/zdtm/live/static/wait00.c b/test/zdtm/static/wait00.c
index f16505c0f..f16505c0f 100644
--- a/test/zdtm/live/static/wait00.c
+++ b/test/zdtm/static/wait00.c
diff --git a/test/zdtm/live/static/write_read00.c b/test/zdtm/static/write_read00.c
index 1648e3546..1648e3546 100644
--- a/test/zdtm/live/static/write_read00.c
+++ b/test/zdtm/static/write_read00.c
diff --git a/test/zdtm/live/static/write_read01.c b/test/zdtm/static/write_read01.c
index 0d4176742..0d4176742 100644
--- a/test/zdtm/live/static/write_read01.c
+++ b/test/zdtm/static/write_read01.c
diff --git a/test/zdtm/live/static/write_read02.c b/test/zdtm/static/write_read02.c
index 0a8055805..0a8055805 100644
--- a/test/zdtm/live/static/write_read02.c
+++ b/test/zdtm/static/write_read02.c
diff --git a/test/zdtm/live/static/write_read10.c b/test/zdtm/static/write_read10.c
index 8af581dad..8af581dad 100644
--- a/test/zdtm/live/static/write_read10.c
+++ b/test/zdtm/static/write_read10.c
diff --git a/test/zdtm/live/static/xids00.c b/test/zdtm/static/xids00.c
index c3ddfb483..c3ddfb483 100644
--- a/test/zdtm/live/static/xids00.c
+++ b/test/zdtm/static/xids00.c
diff --git a/test/zdtm/live/static/zombie00.c b/test/zdtm/static/zombie00.c
index 8ee9c0765..8ee9c0765 100644
--- a/test/zdtm/live/static/zombie00.c
+++ b/test/zdtm/static/zombie00.c
diff --git a/test/zdtm/live/transition/Makefile b/test/zdtm/transition/Makefile
index 256d1161d..f0cad38c8 100644
--- a/test/zdtm/live/transition/Makefile
+++ b/test/zdtm/transition/Makefile
@@ -1,6 +1,6 @@
-include ../../Makefile.inc
+include ../Makefile.inc
 
-LIBDIR	= ../../lib
+LIBDIR	= ../lib
 LIB	= $(LIBDIR)/libzdtmtst.a
 override CPPFLAGS += -I$(LIBDIR)
 CFLAGS	= -g -O2 -Wall -Werror -fno-strict-aliasing
diff --git a/test/zdtm/live/transition/epoll.c b/test/zdtm/transition/epoll.c
index f89d96d41..f89d96d41 100644
--- a/test/zdtm/live/transition/epoll.c
+++ b/test/zdtm/transition/epoll.c
diff --git a/test/zdtm/live/transition/epoll.desc b/test/zdtm/transition/epoll.desc
index 95c58b401..95c58b401 100644
--- a/test/zdtm/live/transition/epoll.desc
+++ b/test/zdtm/transition/epoll.desc
diff --git a/test/zdtm/live/transition/fifo_dyn.c b/test/zdtm/transition/fifo_dyn.c
index 62ebce4f3..62ebce4f3 100644
--- a/test/zdtm/live/transition/fifo_dyn.c
+++ b/test/zdtm/transition/fifo_dyn.c
diff --git a/test/zdtm/live/transition/fifo_dyn.desc b/test/zdtm/transition/fifo_dyn.desc
index 95c58b401..95c58b401 100644
--- a/test/zdtm/live/transition/fifo_dyn.desc
+++ b/test/zdtm/transition/fifo_dyn.desc
diff --git a/test/zdtm/live/transition/fifo_loop.c b/test/zdtm/transition/fifo_loop.c
index 2e28320ba..2e28320ba 100644
--- a/test/zdtm/live/transition/fifo_loop.c
+++ b/test/zdtm/transition/fifo_loop.c
diff --git a/test/zdtm/live/transition/fifo_loop.desc b/test/zdtm/transition/fifo_loop.desc
index 95c58b401..95c58b401 100644
--- a/test/zdtm/live/transition/fifo_loop.desc
+++ b/test/zdtm/transition/fifo_loop.desc
diff --git a/test/zdtm/live/transition/file_aio.c b/test/zdtm/transition/file_aio.c
index a16010158..a16010158 100644
--- a/test/zdtm/live/transition/file_aio.c
+++ b/test/zdtm/transition/file_aio.c
diff --git a/test/zdtm/live/transition/file_aio.desc b/test/zdtm/transition/file_aio.desc
index 95c58b401..95c58b401 100644
--- a/test/zdtm/live/transition/file_aio.desc
+++ b/test/zdtm/transition/file_aio.desc
diff --git a/test/zdtm/live/transition/file_read.c b/test/zdtm/transition/file_read.c
index 63926c069..63926c069 100644
--- a/test/zdtm/live/transition/file_read.c
+++ b/test/zdtm/transition/file_read.c
diff --git a/test/zdtm/live/transition/fork.c b/test/zdtm/transition/fork.c
index 4940bc538..4940bc538 100644
--- a/test/zdtm/live/transition/fork.c
+++ b/test/zdtm/transition/fork.c
diff --git a/test/zdtm/live/transition/fork2.c b/test/zdtm/transition/fork2.c
index c2e58c00f..c2e58c00f 120000
--- a/test/zdtm/live/transition/fork2.c
+++ b/test/zdtm/transition/fork2.c
diff --git a/test/zdtm/live/transition/ipc.c b/test/zdtm/transition/ipc.c
index 4affe04b2..4affe04b2 100644
--- a/test/zdtm/live/transition/ipc.c
+++ b/test/zdtm/transition/ipc.c
diff --git a/test/zdtm/live/transition/ipc.desc b/test/zdtm/transition/ipc.desc
index 593970609..593970609 100644
--- a/test/zdtm/live/transition/ipc.desc
+++ b/test/zdtm/transition/ipc.desc
diff --git a/test/zdtm/live/transition/maps007.c b/test/zdtm/transition/maps007.c
index 96e401e95..96e401e95 100644
--- a/test/zdtm/live/transition/maps007.c
+++ b/test/zdtm/transition/maps007.c
diff --git a/test/zdtm/live/transition/maps007.desc b/test/zdtm/transition/maps007.desc
index 2eac7e654..2eac7e654 100644
--- a/test/zdtm/live/transition/maps007.desc
+++ b/test/zdtm/transition/maps007.desc
diff --git a/test/zdtm/live/transition/netlink00.c b/test/zdtm/transition/netlink00.c
index 9a2ed1680..9a2ed1680 100644
--- a/test/zdtm/live/transition/netlink00.c
+++ b/test/zdtm/transition/netlink00.c
diff --git a/test/zdtm/live/transition/netlink00.desc b/test/zdtm/transition/netlink00.desc
index 95c58b401..95c58b401 100644
--- a/test/zdtm/live/transition/netlink00.desc
+++ b/test/zdtm/transition/netlink00.desc
diff --git a/test/zdtm/live/transition/pipe_loop00.c b/test/zdtm/transition/pipe_loop00.c
index cce60270e..cce60270e 100644
--- a/test/zdtm/live/transition/pipe_loop00.c
+++ b/test/zdtm/transition/pipe_loop00.c
diff --git a/test/zdtm/live/transition/pipe_shared00.c b/test/zdtm/transition/pipe_shared00.c
index 64708d9f8..64708d9f8 100644
--- a/test/zdtm/live/transition/pipe_shared00.c
+++ b/test/zdtm/transition/pipe_shared00.c
diff --git a/test/zdtm/live/transition/ptrace.c b/test/zdtm/transition/ptrace.c
index dc6eca243..dc6eca243 100644
--- a/test/zdtm/live/transition/ptrace.c
+++ b/test/zdtm/transition/ptrace.c
diff --git a/test/zdtm/live/transition/ptrace.desc b/test/zdtm/transition/ptrace.desc
index 95c58b401..95c58b401 100644
--- a/test/zdtm/live/transition/ptrace.desc
+++ b/test/zdtm/transition/ptrace.desc
diff --git a/test/zdtm/live/transition/socket-tcp.c b/test/zdtm/transition/socket-tcp.c
index 772a5dd6e..772a5dd6e 120000
--- a/test/zdtm/live/transition/socket-tcp.c
+++ b/test/zdtm/transition/socket-tcp.c
diff --git a/test/zdtm/live/transition/socket-tcp.desc b/test/zdtm/transition/socket-tcp.desc
index 7c1ae7a78..7c1ae7a78 100644
--- a/test/zdtm/live/transition/socket-tcp.desc
+++ b/test/zdtm/transition/socket-tcp.desc
diff --git a/test/zdtm/live/transition/socket-tcp.opts b/test/zdtm/transition/socket-tcp.opts
index f016a5435..f016a5435 100644
--- a/test/zdtm/live/transition/socket-tcp.opts
+++ b/test/zdtm/transition/socket-tcp.opts
diff --git a/test/zdtm/live/transition/socket-tcp6.c b/test/zdtm/transition/socket-tcp6.c
index 772a5dd6e..772a5dd6e 120000
--- a/test/zdtm/live/transition/socket-tcp6.c
+++ b/test/zdtm/transition/socket-tcp6.c
diff --git a/test/zdtm/live/transition/socket-tcp6.desc b/test/zdtm/transition/socket-tcp6.desc
index 7c1ae7a78..7c1ae7a78 100644
--- a/test/zdtm/live/transition/socket-tcp6.desc
+++ b/test/zdtm/transition/socket-tcp6.desc
diff --git a/test/zdtm/live/transition/socket-tcp6.opts b/test/zdtm/transition/socket-tcp6.opts
index f016a5435..f016a5435 100644
--- a/test/zdtm/live/transition/socket-tcp6.opts
+++ b/test/zdtm/transition/socket-tcp6.opts
diff --git a/test/zdtm/live/transition/socket_loop00.c b/test/zdtm/transition/socket_loop00.c
index 9bc3d6e28..9bc3d6e28 100644
--- a/test/zdtm/live/transition/socket_loop00.c
+++ b/test/zdtm/transition/socket_loop00.c
diff --git a/test/zdtm/live/transition/socket_loop00.desc b/test/zdtm/transition/socket_loop00.desc
index 95c58b401..95c58b401 100644
--- a/test/zdtm/live/transition/socket_loop00.desc
+++ b/test/zdtm/transition/socket_loop00.desc
diff --git a/test/zdtm/live/transition/thread-bomb.c b/test/zdtm/transition/thread-bomb.c
index 0b794ef2e..0b794ef2e 100644
--- a/test/zdtm/live/transition/thread-bomb.c
+++ b/test/zdtm/transition/thread-bomb.c
diff --git a/test/zdtm/live/transition/thread-bomb.desc b/test/zdtm/transition/thread-bomb.desc
index 95c58b401..95c58b401 100644
--- a/test/zdtm/live/transition/thread-bomb.desc
+++ b/test/zdtm/transition/thread-bomb.desc
diff --git a/test/zdtm/live/transition/unix_sock.c b/test/zdtm/transition/unix_sock.c
index 64a4919dc..64a4919dc 100644
--- a/test/zdtm/live/transition/unix_sock.c
+++ b/test/zdtm/transition/unix_sock.c
diff --git a/test/zdtm/live/transition/unix_sock.desc b/test/zdtm/transition/unix_sock.desc
index 95c58b401..95c58b401 100644
--- a/test/zdtm/live/transition/unix_sock.desc
+++ b/test/zdtm/transition/unix_sock.desc