Various improvements to userspace tests framework (#1410)

* Replace libwrap with macros. * Testname not needed anymore. * Split vfs_symlink test in twos. * Add missing atexit implementation. * Each VFS test runs in separate directory.
cahirwpz · Jul 31, 2023 · 6b7cfaf · 6b7cfaf
1 parent 87571b8
commit 6b7cfaf
Show file tree

Hide file tree

Showing 42 changed files with 278 additions and 551 deletions.
diff --git a/bin/utest/Makefile b/bin/utest/Makefile
@@ -33,45 +33,8 @@ SOURCES = \
 	vm_map.c \
 	vm_map_prot.c \
 
-LIBWRAP = \
-	xaccess.c \
-	xchdir.c \
-	xchmod.c \
-	xclose.c \
-	xfork.c \
-	xfstat.c \
-	xgetgroups.c \
-	xgetresgid.c \
-	xgetresuid.c \
-	xgettimeofday.c \
-	xkill.c \
-	xkillpg.c \
-	xlchmod.c \
-	xlink.c \
-	xlstat.c \
-	xmkdir.c \
-	xmmap.c \
-	xmprotect.c \
-	xmunmap.c \
-	xopen.c \
-	xpipe.c \
-	xread.c \
-	xrmdir.c \
-	xsetgroups.c \
-	xsetresgid.c \
-	xsetresuid.c \
-	xsignal.c \
-	xsigaction.c \
-	xsigprocmask.c \
-	xstat.c \
-	xsymlink.c \
-	xunlink.c \
-	xwaitpid.c \
-	xwrite.c
-
 PROGRAM = utest
 
-SOURCES += $(addprefix libwrap/,$(LIBWRAP))
 CPPFLAGS += -I.
 EXTRAFILES = $(shell find extra -type f)
 INSTALL-FILES = $(EXTRAFILES:extra/%=$(SYSROOT)/%)

diff --git a/bin/utest/getcwd.c b/bin/utest/getcwd.c
@@ -6,6 +6,8 @@
 #include <unistd.h>
 
 TEST_ADD(getcwd, 0) {
+  xchdir("/");
+
   {
     /* Working directory is set to root if not changed */
     char buffer[256];

diff --git a/bin/utest/libwrap/xaccess.c b/bin/utest/libwrap/xaccess.c
diff --git a/bin/utest/libwrap/xchdir.c b/bin/utest/libwrap/xchdir.c
diff --git a/bin/utest/libwrap/xchmod.c b/bin/utest/libwrap/xchmod.c
diff --git a/bin/utest/libwrap/xclose.c b/bin/utest/libwrap/xclose.c
diff --git a/bin/utest/libwrap/xfork.c b/bin/utest/libwrap/xfork.c
diff --git a/bin/utest/libwrap/xfstat.c b/bin/utest/libwrap/xfstat.c
diff --git a/bin/utest/libwrap/xgetgroups.c b/bin/utest/libwrap/xgetgroups.c
diff --git a/bin/utest/libwrap/xgetresgid.c b/bin/utest/libwrap/xgetresgid.c
diff --git a/bin/utest/libwrap/xgetresuid.c b/bin/utest/libwrap/xgetresuid.c
diff --git a/bin/utest/libwrap/xgettimeofday.c b/bin/utest/libwrap/xgettimeofday.c
diff --git a/bin/utest/libwrap/xkill.c b/bin/utest/libwrap/xkill.c
diff --git a/bin/utest/libwrap/xkillpg.c b/bin/utest/libwrap/xkillpg.c
diff --git a/bin/utest/libwrap/xlchmod.c b/bin/utest/libwrap/xlchmod.c
diff --git a/bin/utest/libwrap/xlink.c b/bin/utest/libwrap/xlink.c
diff --git a/bin/utest/libwrap/xlstat.c b/bin/utest/libwrap/xlstat.c
diff --git a/bin/utest/libwrap/xmkdir.c b/bin/utest/libwrap/xmkdir.c
diff --git a/bin/utest/libwrap/xmmap.c b/bin/utest/libwrap/xmmap.c
diff --git a/bin/utest/libwrap/xmprotect.c b/bin/utest/libwrap/xmprotect.c
diff --git a/bin/utest/libwrap/xmunmap.c b/bin/utest/libwrap/xmunmap.c
diff --git a/bin/utest/libwrap/xopen.c b/bin/utest/libwrap/xopen.c
diff --git a/bin/utest/libwrap/xpipe.c b/bin/utest/libwrap/xpipe.c
diff --git a/bin/utest/libwrap/xread.c b/bin/utest/libwrap/xread.c
diff --git a/bin/utest/libwrap/xrmdir.c b/bin/utest/libwrap/xrmdir.c
diff --git a/bin/utest/libwrap/xsetgroups.c b/bin/utest/libwrap/xsetgroups.c
diff --git a/bin/utest/libwrap/xsetresgid.c b/bin/utest/libwrap/xsetresgid.c
diff --git a/bin/utest/libwrap/xsetresuid.c b/bin/utest/libwrap/xsetresuid.c
diff --git a/bin/utest/libwrap/xsigaction.c b/bin/utest/libwrap/xsigaction.c
diff --git a/bin/utest/libwrap/xsignal.c b/bin/utest/libwrap/xsignal.c
diff --git a/bin/utest/libwrap/xsigprocmask.c b/bin/utest/libwrap/xsigprocmask.c
diff --git a/bin/utest/libwrap/xstat.c b/bin/utest/libwrap/xstat.c
diff --git a/bin/utest/libwrap/xsymlink.c b/bin/utest/libwrap/xsymlink.c