tests: add most kyua kernel tests

Change-Id: I2da22559ee3b0208945e21312e7721a32e629d27
Tookmund · Jan 16, 2016 · 226d301 · 226d301
1 parent b3bac6e
commit 226d301
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 16 deletions.
diff --git a/distrib/sets/lists/tests/mi b/distrib/sets/lists/tests/mi
@@ -2047,10 +2047,10 @@
 ./usr/tests/ipf/t_nat_parse			tests-ipf-tests		compattestfile,atf,ipfilter
 ./usr/tests/ipf/t_pools				tests-ipf-tests		compattestfile,atf,ipfilter
 ./usr/tests/kernel				tests-kernel-tests	compattestfile,atf
-./usr/tests/kernel/Atffile			tests-kernel-tests	compattestfile,atf,minix-false
-./usr/tests/kernel/Kyuafile			tests-kernel-tests	compattestfile,atf,kyua,minix-false
-./usr/tests/kernel/h_ps_strings1		tests-kernel-tests	compattestfile,atf,minix-false
-./usr/tests/kernel/h_ps_strings2		tests-kernel-tests	compattestfile,atf,minix-false
+./usr/tests/kernel/Atffile			tests-kernel-tests	compattestfile,atf
+./usr/tests/kernel/Kyuafile			tests-kernel-tests	compattestfile,atf,kyua
+./usr/tests/kernel/h_ps_strings1		tests-kernel-tests	compattestfile,atf
+./usr/tests/kernel/h_ps_strings2		tests-kernel-tests	compattestfile,atf
 ./usr/tests/kernel/kqueue			tests-kernel-tests	compattestfile,atf
 ./usr/tests/kernel/kqueue/Atffile		tests-kernel-tests	compattestfile,atf,minix-false
 ./usr/tests/kernel/kqueue/Kyuafile		tests-kernel-tests	compattestfile,atf,kyua,minix-false
@@ -2084,12 +2084,12 @@
 ./usr/tests/kernel/posix_spawn/t_fileactions	tests-kernel-tests	obsolete
 ./usr/tests/kernel/posix_spawn/t_spawn		tests-kernel-tests	obsolete
 ./usr/tests/kernel/posix_spawn/t_spawnattr	tests-kernel-tests	obsolete
-./usr/tests/kernel/t_extattrctl			tests-kernel-tests	atf,rump,minix-false
+./usr/tests/kernel/t_extattrctl			tests-kernel-tests	atf,rump
 ./usr/tests/kernel/t_extent			tests-kernel-tests	compattestfile,atf,minix-false
-./usr/tests/kernel/t_filedesc			tests-kernel-tests	atf,rump,minix-false
-./usr/tests/kernel/t_kauth_pr_47598		tests-kernel-tests	compattestfile,atf,minix-false
-./usr/tests/kernel/t_lock			tests-kernel-tests	compattestfile,atf,minix-false
-./usr/tests/kernel/t_lockf			tests-kernel-tests	compattestfile,atf,minix-false
+./usr/tests/kernel/t_filedesc			tests-kernel-tests	atf,rump
+./usr/tests/kernel/t_kauth_pr_47598		tests-kernel-tests	compattestfile,atf
+./usr/tests/kernel/t_lock			tests-kernel-tests	compattestfile,atf
+./usr/tests/kernel/t_lockf			tests-kernel-tests	compattestfile,atf
 ./usr/tests/kernel/t_lwpctl			tests-obsolete		obsolete
 ./usr/tests/kernel/t_mkdir			tests-obsolete		obsolete
 ./usr/tests/kernel/t_mqueue			tests-kernel-tests	compattestfile,atf,minix-false
@@ -2098,17 +2098,17 @@
 ./usr/tests/kernel/t_pollts			tests-obsolete		obsolete
 ./usr/tests/kernel/t_posix_fadvise		tests-obsolete		obsolete
 ./usr/tests/kernel/t_posix_fallocate		tests-obsolete		obsolete
-./usr/tests/kernel/t_ps_strings			tests-kernel-tests	compattestfile,atf,minix-false
-./usr/tests/kernel/t_pty			tests-kernel-tests	compattestfile,atf,minix-false
+./usr/tests/kernel/t_ps_strings			tests-kernel-tests	compattestfile,atf
+./usr/tests/kernel/t_pty			tests-kernel-tests	compattestfile,atf
 ./usr/tests/kernel/t_rnd			tests-kernel-tests	atf,rump
 ./usr/tests/kernel/t_sigaction			tests-obsolete		obsolete
 ./usr/tests/kernel/t_subr_prf			tests-kernel-tests	compattestfile,atf,minix-false
-./usr/tests/kernel/t_sysctl			tests-kernel-tests	compattestfile,atf,minix-false
+./usr/tests/kernel/t_sysctl			tests-kernel-tests	compattestfile,atf
 ./usr/tests/kernel/t_sysv			tests-kernel-tests	compattestfile,atf,minix-false
 ./usr/tests/kernel/t_time			tests-obsolete		obsolete
 ./usr/tests/kernel/t_ucontext			tests-obsolete		obsolete
-./usr/tests/kernel/t_umount			tests-kernel-tests	compattestfile,atf,minix-false
-./usr/tests/kernel/t_umountstress		tests-kernel-tests	compattestfile,atf,minix-false
+./usr/tests/kernel/t_umount			tests-kernel-tests	compattestfile,atf
+./usr/tests/kernel/t_umountstress		tests-kernel-tests	compattestfile,atf
 ./usr/tests/kernel/t_writev			tests-obsolete		obsolete
 ./usr/tests/kernel/tty				tests-kernel-tests	compattestfile,atf
 ./usr/tests/kernel/tty/Atffile			tests-kernel-tests	atf,rump

diff --git a/tests/Makefile b/tests/Makefile
@@ -7,8 +7,8 @@
 TESTSDIR=	${TESTSBASE}
 
 # LSC: Unsupported on MINIX:
-# kernel net
-TESTS_SUBDIRS=		bin dev games include lib libexec
+# net
+TESTS_SUBDIRS=		bin dev games include kernel lib libexec
 TESTS_SUBDIRS+=		sbin sys usr.bin usr.sbin
 
 . if (${MKRUMP} != "no") && !defined(BSD_MK_COMPAT_FILE)

diff --git a/tests/kernel/Makefile b/tests/kernel/Makefile
@@ -6,13 +6,17 @@ NOMAN=		# defined
 
 TESTSDIR=	${TESTSBASE}/kernel
 
+.if !defined(__MINIX)
 TESTS_SUBDIRS=	kqueue
+.endif # !defined(__MINIX)
 TESTS_C=	t_lock
 TESTS_C+=	t_lockf
 TESTS_C+=	t_pty
+.if !defined(__MINIX)
 TESTS_C+=	t_mqueue
 TESTS_C+=	t_sysv
 TESTS_C+=	t_subr_prf
+.endif # !defined(__MINIX)
 TESTS_C+=	t_kauth_pr_47598
 TESTS_C+=	t_sysctl
 
@@ -42,6 +46,7 @@ LDADD.t_rnd+=  -lrump -lpthread
 .endif
 
 
+.if !defined(__MINIX)
 .PATH:			${NETBSDSRCDIR}/sys/kern
 TESTS_C+=		t_extent
 SRCS.t_extent=		t_extent.c subr_extent.c
@@ -53,5 +58,6 @@ t_subr_prf.c: gen_t_subr_prf ${NETBSDSRCDIR}/sys/kern/subr_prf.c
 CPPFLAGS.t_subr_prf.c=	-Wno-pointer-sign	# XXX platform vs kernel SHA2
 
 CLEANFILES+=	t_subr_prf.c
+.endif # !defined(__MINIX)
 
 .include <bsd.test.mk>