From b236bcf1680ee4835fcbbdc6a9ffa625eb9269f6 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Tue, 5 Aug 2014 18:41:27 +0000 Subject: [PATCH] Integrate lib/libnv into the build/kyua Rename all of the TAP test applications from to _test to match the convention described in the TestSuite wiki page Phabric: D538 Approved by: jmmv (mentor) Sponsored by: EMC / Isilon Storage Division --- etc/mtree/BSD.tests.dist | 2 ++ lib/libnv/Makefile | 6 ++++ lib/libnv/tests/Makefile | 17 +++++++++ .../libnv/tests/nvlist_add_test.c | 0 .../libnv/tests/nvlist_exists_test.c | 0 .../libnv/tests/nvlist_free_test.c | 0 .../libnv/tests/nvlist_get_test.c | 0 .../libnv/tests/nvlist_move_test.c | 0 .../libnv/tests/nvlist_send_recv_test.c | 0 tools/regression/lib/libnv/Makefile | 35 ------------------- 10 files changed, 25 insertions(+), 35 deletions(-) create mode 100644 lib/libnv/tests/Makefile rename tools/regression/lib/libnv/nvlist_add.c => lib/libnv/tests/nvlist_add_test.c (100%) rename tools/regression/lib/libnv/nvlist_exists.c => lib/libnv/tests/nvlist_exists_test.c (100%) rename tools/regression/lib/libnv/nvlist_free.c => lib/libnv/tests/nvlist_free_test.c (100%) rename tools/regression/lib/libnv/nvlist_get.c => lib/libnv/tests/nvlist_get_test.c (100%) rename tools/regression/lib/libnv/nvlist_move.c => lib/libnv/tests/nvlist_move_test.c (100%) rename tools/regression/lib/libnv/nvlist_send_recv.c => lib/libnv/tests/nvlist_send_recv_test.c (100%) delete mode 100644 tools/regression/lib/libnv/Makefile diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 1f61599eddd..64bf426d0e0 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -87,6 +87,8 @@ .. libmp .. + libnv + .. .. libexec atf diff --git a/lib/libnv/Makefile b/lib/libnv/Makefile index 710c2950671..cad1ea4eba6 100644 --- a/lib/libnv/Makefile +++ b/lib/libnv/Makefile @@ -1,5 +1,7 @@ # $FreeBSD$ +.include + LIB= nv SHLIBDIR?= /lib SHLIB_MAJOR= 0 @@ -158,4 +160,8 @@ MLINKS+=nv.3 nvlist_existsv.3 \ WARNS?= 6 +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include diff --git a/lib/libnv/tests/Makefile b/lib/libnv/tests/Makefile new file mode 100644 index 00000000000..df1054960cd --- /dev/null +++ b/lib/libnv/tests/Makefile @@ -0,0 +1,17 @@ +# $FreeBSD$ + +TESTSDIR= ${TESTSBASE}/lib/libnv + +TAP_TESTS_C+= nvlist_add_test +TAP_TESTS_C+= nvlist_exists_test +TAP_TESTS_C+= nvlist_free_test +TAP_TESTS_C+= nvlist_get_test +TAP_TESTS_C+= nvlist_move_test +TAP_TESTS_C+= nvlist_send_recv_test + +DPADD+= ${LIBNV} +LDADD+= -lnv + +WARNS?= 6 + +.include diff --git a/tools/regression/lib/libnv/nvlist_add.c b/lib/libnv/tests/nvlist_add_test.c similarity index 100% rename from tools/regression/lib/libnv/nvlist_add.c rename to lib/libnv/tests/nvlist_add_test.c diff --git a/tools/regression/lib/libnv/nvlist_exists.c b/lib/libnv/tests/nvlist_exists_test.c similarity index 100% rename from tools/regression/lib/libnv/nvlist_exists.c rename to lib/libnv/tests/nvlist_exists_test.c diff --git a/tools/regression/lib/libnv/nvlist_free.c b/lib/libnv/tests/nvlist_free_test.c similarity index 100% rename from tools/regression/lib/libnv/nvlist_free.c rename to lib/libnv/tests/nvlist_free_test.c diff --git a/tools/regression/lib/libnv/nvlist_get.c b/lib/libnv/tests/nvlist_get_test.c similarity index 100% rename from tools/regression/lib/libnv/nvlist_get.c rename to lib/libnv/tests/nvlist_get_test.c diff --git a/tools/regression/lib/libnv/nvlist_move.c b/lib/libnv/tests/nvlist_move_test.c similarity index 100% rename from tools/regression/lib/libnv/nvlist_move.c rename to lib/libnv/tests/nvlist_move_test.c diff --git a/tools/regression/lib/libnv/nvlist_send_recv.c b/lib/libnv/tests/nvlist_send_recv_test.c similarity index 100% rename from tools/regression/lib/libnv/nvlist_send_recv.c rename to lib/libnv/tests/nvlist_send_recv_test.c diff --git a/tools/regression/lib/libnv/Makefile b/tools/regression/lib/libnv/Makefile deleted file mode 100644 index a64cb63fbe6..00000000000 --- a/tools/regression/lib/libnv/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# $FreeBSD$ - -TESTS= nvlist_add -TESTS+= nvlist_exists -TESTS+= nvlist_free -TESTS+= nvlist_get -TESTS+= nvlist_move -TESTS+= nvlist_send_recv - -CFLAGS= -O2 -pipe -fstack-protector -CFLAGS+=-Wsystem-headers -Werror -Wall -Wno-format-y2k -W -Wno-unused-parameter -CFLAGS+=-Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wreturn-type -CFLAGS+=-Wcast-qual -Wwrite-strings -Wswitch -Wshadow -Wunused-parameter -CFLAGS+=-Wcast-align -Wchar-subscripts -Winline -Wnested-externs -Wredundant-decls -CFLAGS+=-Wold-style-definition -Wno-pointer-sign -Wextra - -LDFLAGS+=-lnv - -all: ${TESTS} ${TESTS:=.t} - -.for TEST in ${TESTS} - -${TEST}: ${TEST}.c - ${CC} ${CFLAGS} ${LDFLAGS} ${@}.c -o $@ - -${TEST}.t: ${TEST} - @printf "#!/bin/sh\n\n%s/%s\n" ${.CURDIR} ${@:.t=} > $@ - -.endfor - -test: all - @prove -r ${.CURDIR} - -clean: - rm -f ${TESTS} ${TESTS:=.t}