Move .../sys/geom/eli/pbkdf2... to .../sys/geom/class/eli/...

This change moves the tests added in r313962 to an existing directory
structure used by the geli TAP tests. It also, renames the test from
pbkdf2 to pbkdf2_test .

The changes to ObsoleteFiles.inc are being committed separately as they
aren't needed for the MFC to ^/stable/11, etc, if the MFC for the tests
is done all in one commit.

MFC after:	2 weeks
X-MFC with:	r313962, r313972-r313973
Reviewed by:	allanjude
Sponsored by:	Dell EMC Isilon
Differential Revision:	D9985

etc/mtree/BSD.tests.dist

@@ -425,10 +425,6 @@
                     ..
                 ..
             ..
-            eli
-                pbkdf2
-                ..
-            ..
         ..
         kern
             acct

tests/sys/geom/Makefile

@@ -3,6 +3,5 @@
 TESTSDIR=	${TESTSBASE}/sys/geom
 
 TESTS_SUBDIRS+=	class
-TESTS_SUBDIRS+=	eli
 
 .include <bsd.test.mk>

tests/sys/geom/class/eli/Makefile

@@ -1,9 +1,13 @@
 # $FreeBSD$
 
+.PATH: ${SRCTOP}/sys/geom/eli ${SRCTOP}/sys/crypto/sha2
+
 PACKAGE=	tests
 
 TESTSDIR=	${TESTSBASE}/sys/geom/class/${.CURDIR:T}
 
+ATF_TESTS_C=	pbkdf2_test
+
 TAP_TESTS_SH+= attach_d_test
 TAP_TESTS_SH+= configure_b_B_test
 TAP_TESTS_SH+= delkey_test
@@ -40,4 +44,19 @@ ${PACKAGE}FILES+=		conf.sh
 TEST_METADATA.$t+=	required_user="root"
 .endfor
 
+CFLAGS.pbkdf2_test=	-I${SYSDIR}/sys
+
+SRCS.pbkdf2_test=	\
+		hmac_test.c \
+		g_eli_crypto.c \
+		g_eli_hmac.c \
+		pkcs5v2.c \
+		sha512c.c \
+		sha256c.c
+
+LIBADD.pbkdf2_test= crypto
+
+testvect.h:
+	python gentestvect.py > ${.TARGET}
+
 .include <bsd.test.mk>

tests/sys/geom/eli/Makefile

@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-TESTSDIR=	${TESTSBASE}/sys/geom/eli
-
-ATF_TESTS_SUBDIRS+= pbkdf2
-
-.include <bsd.test.mk>

tests/sys/geom/eli/pbkdf2/Makefile

@@ -1,28 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-SYSDIR = ${SRCTOP}/sys
-.PATH: ${SYSDIR}/geom/eli
-.PATH: ${SYSDIR}/crypto/sha2
-
-TESTSDIR=	${TESTBASE}/sys/geom/eli/pbkdf2
-
-ATF_TESTS_C=	pbkdf2
-
-CFLAGS.pbkdf2=	-I${SYSDIR}
-
-SRCS.pbkdf2=	\
-		hmactest.c \
-		g_eli_crypto.c \
-		g_eli_hmac.c \
-		pkcs5v2.c \
-		sha512c.c \
-		sha256c.c
-
-LIBADD.pbkdf2= crypto
-
-testvect.h:
-	python gentestvect.py > ${.TARGET}
-
-.include <bsd.test.mk>