Re-arrange the ufetchstore tests to look like the other ones.

tests/modules/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/04/06 03:06:29 thorpej Exp $
+# $NetBSD: Makefile,v 1.17 2019/04/15 23:41:23 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -13,8 +13,12 @@ CPPFLAGS+=	-D_KERNTYPES
 TESTS_C=	t_modctl
 TESTS_C+=	t_builtin
 TESTS_C+=	t_kcov
-LDADD=		-lprop
-LDADD+=		-lrumpfs_kernfs -lrumpvfs -lrump -lrumpuser -lrump -lpthread
+TESTS_C+=	t_ufetchstore
+CPPFLAGS.t_ufetchstore.c+=-I${.CURDIR}/ufetchstore
+.for i in t_modctl t_builtin t_kcov
+LDADD.${i}=	-lprop
+LDADD.${i}+=	-lrumpfs_kernfs -lrumpvfs -lrump -lrumpuser -lrump -lpthread
+.endfor
 
 TESTS_SH=	t_abi_uvm
 TESTS_SH+=	t_modload
@@ -28,6 +32,4 @@ SUBDIR+=	k_uvm
 SUBDIR+=	threadpool_tester
 SUBDIR+=	ufetchstore
 
-ATFFILE_EXTRA_SUBDIRS= t_ufetchstore
-
 .include <bsd.test.mk>

tests/modules/ufetchstore/Makefile

@@ -1,17 +1,14 @@
-# $NetBSD: Makefile,v 1.2 2019/04/15 20:21:35 christos Exp $
+#	$NetBSD: Makefile,v 1.3 2019/04/15 23:41:23 christos Exp $
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/modules/ufetchstore
-CPPFLAGS+=	-D_KERNTYPES -I${.CURDIR}/module
+KMOD=		ufetchstore_tester
+KMODULEDIR=	${DESTDIR}/${TESTSBASE}/modules/${KMOD}
 
-# Ideally this test could be in the parent Makefile, which could not descend
-# into this directory at all.  Unfortunately, the etc/mtree/NetBSD.dist file
-# creates the 'modules' subdirectory unconditionally, which if left empty
-# will confuse atf-run.  Therefore we must install, at the very least, the
-# Atffile into it.
-TESTS_C=	t_ufetchstore
+SRCS=		ufetchstore_tester.c
 
-SUBDIR+=	module
+ATFFILE=	no
+NOMAN=		# defined
 
 .include <bsd.test.mk>
+.include <bsd.kmodule.mk>

tests/modules/ufetchstore/Makefile.inc

@@ -1,2 +0,0 @@
-.include "../Makefile.inc"
-CPPFLAGS+=	-D_KERNTYPES

tests/modules/ufetchstore/common.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: common.h,v 1.1 2019/04/06 03:06:29 thorpej Exp $	*/
+/*	$NetBSD: common.h,v 1.1 2019/04/15 23:41:23 christos Exp $	*/
 
 /*-
  * Copyright (c) 2019 The NetBSD Foundation, Inc.

tests/modules/ufetchstore/module/Makefile

@@ -1,14 +0,0 @@
-#	$NetBSD: Makefile,v 1.1 2019/04/06 03:06:29 thorpej Exp $
-
-.include <bsd.own.mk>
-
-KMOD=		ufetchstore_tester
-KMODULEDIR=	${DESTDIR}/${TESTSBASE}/modules/${KMOD}
-
-SRCS=		ufetchstore_tester.c
-
-ATFFILE=	no
-NOMAN=		# defined
-
-.include <bsd.test.mk>
-.include <bsd.kmodule.mk>

tests/modules/ufetchstore/ufetchstore_tester.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: ufetchstore_tester.c,v 1.1 2019/04/06 03:06:29 thorpej Exp $	*/
+/*	$NetBSD: ufetchstore_tester.c,v 1.1 2019/04/15 23:41:23 christos Exp $	*/
 
 /*-
  * Copyright (c) 2019 The NetBSD Foundation, Inc.