Module Name:    src
Committed By:   lukem
Date:           Mon Jun 29 08:55:00 UTC 2020

Modified Files:
        src/external/bsd/kyua-cli/tests/kyua-cli/bootstrap: Makefile
        src/external/bsd/kyua-cli/tests/kyua-cli/cli: Makefile
        src/external/bsd/kyua-cli/tests/kyua-cli/engine: Makefile
        src/external/bsd/kyua-cli/tests/kyua-cli/engine/drivers: Makefile
        src/external/bsd/kyua-cli/tests/kyua-cli/examples: Makefile
        src/external/bsd/kyua-cli/tests/kyua-cli/integration/helpers: Makefile
        src/external/bsd/kyua-cli/tests/kyua-cli/store: Makefile
        src/external/bsd/kyua-cli/tests/kyua-cli/utils: Makefile
        src/external/bsd/kyua-cli/tests/kyua-cli/utils/cmdline: Makefile
        src/external/bsd/kyua-cli/tests/kyua-cli/utils/config: Makefile
        src/external/bsd/kyua-cli/tests/kyua-cli/utils/format: Makefile
        src/external/bsd/kyua-cli/tests/kyua-cli/utils/fs: Makefile
        src/external/bsd/kyua-cli/tests/kyua-cli/utils/logging: Makefile
        src/external/bsd/kyua-cli/tests/kyua-cli/utils/process: Makefile
        src/external/bsd/kyua-cli/tests/kyua-cli/utils/signals: Makefile
        src/external/bsd/kyua-cli/tests/kyua-cli/utils/sqlite: Makefile
        src/external/bsd/kyua-cli/tests/kyua-cli/utils/text: Makefile

Log Message:
kyua-cli: fix build of .cpp files

Fix assignment of SRCS for C++ sources that use .cpp instead of .cc.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
    src/external/bsd/kyua-cli/tests/kyua-cli/bootstrap/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/external/bsd/kyua-cli/tests/kyua-cli/cli/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/external/bsd/kyua-cli/tests/kyua-cli/engine/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/external/bsd/kyua-cli/tests/kyua-cli/engine/drivers/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/external/bsd/kyua-cli/tests/kyua-cli/examples/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/external/bsd/kyua-cli/tests/kyua-cli/integration/helpers/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/external/bsd/kyua-cli/tests/kyua-cli/store/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/external/bsd/kyua-cli/tests/kyua-cli/utils/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/external/bsd/kyua-cli/tests/kyua-cli/utils/cmdline/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/external/bsd/kyua-cli/tests/kyua-cli/utils/config/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/external/bsd/kyua-cli/tests/kyua-cli/utils/format/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/external/bsd/kyua-cli/tests/kyua-cli/utils/fs/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/external/bsd/kyua-cli/tests/kyua-cli/utils/logging/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/external/bsd/kyua-cli/tests/kyua-cli/utils/process/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/external/bsd/kyua-cli/tests/kyua-cli/utils/signals/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/external/bsd/kyua-cli/tests/kyua-cli/utils/sqlite/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/external/bsd/kyua-cli/tests/kyua-cli/utils/text/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/kyua-cli/tests/kyua-cli/bootstrap/Makefile
diff -u src/external/bsd/kyua-cli/tests/kyua-cli/bootstrap/Makefile:1.1 src/external/bsd/kyua-cli/tests/kyua-cli/bootstrap/Makefile:1.2
--- src/external/bsd/kyua-cli/tests/kyua-cli/bootstrap/Makefile:1.1	Sat Feb 23 14:16:55 2013
+++ src/external/bsd/kyua-cli/tests/kyua-cli/bootstrap/Makefile	Mon Jun 29 08:54:58 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/02/23 14:16:55 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2020/06/29 08:54:58 lukem Exp $
 
 .include <bsd.init.mk>
 
@@ -12,12 +12,14 @@ FILESDIR=		${TESTSDIR}
 FILESMODE=		${BINMODE}
 
 PROGS_CXX=		atf_helpers
+SRCS.atf_helpers=	atf_helpers.cpp
 BINDIR.atf_helpers=	${TESTSDIR}
 MAN.atf_helpers=	# none
 LDADD.atf_helpers=	-latf-c++ -latf-c
 DPADD.atf_helpers=	${LIBATF_CXX} ${LIBATF_C}
 
 PROGS_CXX+=		plain_helpers
+SRCS.plain_helpers=	plain_helpers.cpp
 BINDIR.plain_helpers=	${TESTSDIR}
 MAN.plain_helpers=	# none
 

Index: src/external/bsd/kyua-cli/tests/kyua-cli/cli/Makefile
diff -u src/external/bsd/kyua-cli/tests/kyua-cli/cli/Makefile:1.1 src/external/bsd/kyua-cli/tests/kyua-cli/cli/Makefile:1.2
--- src/external/bsd/kyua-cli/tests/kyua-cli/cli/Makefile:1.1	Sat Feb 23 14:16:55 2013
+++ src/external/bsd/kyua-cli/tests/kyua-cli/cli/Makefile	Mon Jun 29 08:54:58 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/02/23 14:16:55 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2020/06/29 08:54:58 lukem Exp $
 
 KYUA_LIBS=	cli engine store engine utils
 
@@ -8,7 +8,9 @@ TESTSDIR=	${TESTSBASE}/kyua-cli/cli
 
 .PATH:		${SRCDIR}/cli
 
-TESTS_CXX=	cmd_about_test \
+TESTS_CXX=
+.for test in	\
+		cmd_about_test \
 		cmd_config_test \
 		cmd_db_exec_test \
 		cmd_db_migrate_test \
@@ -21,5 +23,8 @@ TESTS_CXX=	cmd_about_test \
 		common_test \
 		config_test \
 		main_test
+TESTS_CXX+=	${test}
+SRCS.${test}=	${test}.cpp
+.endfor
 
 .include <bsd.test.mk>

Index: src/external/bsd/kyua-cli/tests/kyua-cli/engine/Makefile
diff -u src/external/bsd/kyua-cli/tests/kyua-cli/engine/Makefile:1.1 src/external/bsd/kyua-cli/tests/kyua-cli/engine/Makefile:1.2
--- src/external/bsd/kyua-cli/tests/kyua-cli/engine/Makefile:1.1	Sat Feb 23 14:16:55 2013
+++ src/external/bsd/kyua-cli/tests/kyua-cli/engine/Makefile	Mon Jun 29 08:54:58 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/02/23 14:16:55 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2020/06/29 08:54:58 lukem Exp $
 
 KYUA_LIBS=	engine store engine utils
 
@@ -8,7 +8,9 @@ TESTSDIR=	${TESTSBASE}/kyua-cli/engine
 
 .PATH:		${SRCDIR}/engine
 
-TESTS_CXX=	action_test \
+TESTS_CXX=
+.for test in	\
+		action_test \
 		config_test \
 		context_test \
 		exceptions_test \
@@ -19,14 +21,19 @@ TESTS_CXX=	action_test \
 		test_program_test \
                 test_result_test \
 		testers_test
+TESTS_CXX+=	${test}
+SRCS.${test}=	${test}.cpp
+.endfor
 
 PROGS_CXX=			test_case_atf_helpers
+SRCS.test_case_atf_helpers=	test_case_atf_helpers.cpp
 BINDIR.test_case_atf_helpers=	${TESTSDIR}
 MAN.test_case_atf_helpers=	# none
 LDADD.test_case_atf_helpers=	-latf-c++ -latf-c
 DPADD.test_case_atf_helpers=	${LIBATF_CXX} ${LIBATF_C}
 
 PROGS_CXX+=			test_case_plain_helpers
+SRCS.test_case_plain_helpers=	test_case_plain_helpers.cpp
 BINDIR.test_case_plain_helpers=	${TESTSDIR}
 MAN.test_case_plain_helpers=	# none
 

Index: src/external/bsd/kyua-cli/tests/kyua-cli/engine/drivers/Makefile
diff -u src/external/bsd/kyua-cli/tests/kyua-cli/engine/drivers/Makefile:1.1 src/external/bsd/kyua-cli/tests/kyua-cli/engine/drivers/Makefile:1.2
--- src/external/bsd/kyua-cli/tests/kyua-cli/engine/drivers/Makefile:1.1	Sat Feb 23 14:16:55 2013
+++ src/external/bsd/kyua-cli/tests/kyua-cli/engine/drivers/Makefile	Mon Jun 29 08:54:58 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/02/23 14:16:55 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2020/06/29 08:54:58 lukem Exp $
 
 KYUA_LIBS=	engine store engine utils
 
@@ -8,12 +8,18 @@ TESTSDIR=	${TESTSBASE}/kyua-cli/engine/d
 
 .PATH:		${SRCDIR}/engine/drivers
 
-TESTS_CXX=	debug_test_test \
+TESTS_CXX=
+.for test in	\
+		debug_test_test \
 		list_tests_test \
 		run_tests_test \
 		scan_action_test
+TESTS_CXX+=	${test}
+SRCS.${test}=	${test}.cpp
+.endfor
 
 PROGS_CXX=			list_tests_helpers
+SRCS.list_tests_helpers=	list_tests_helpers.cpp
 BINDIR.list_tests_helpers=	${TESTSDIR}
 MAN.list_tests_helpers=		# none
 LDADD.list_tests_helpers=	-latf-c++ -latf-c

Index: src/external/bsd/kyua-cli/tests/kyua-cli/examples/Makefile
diff -u src/external/bsd/kyua-cli/tests/kyua-cli/examples/Makefile:1.1 src/external/bsd/kyua-cli/tests/kyua-cli/examples/Makefile:1.2
--- src/external/bsd/kyua-cli/tests/kyua-cli/examples/Makefile:1.1	Sat Feb 23 14:16:55 2013
+++ src/external/bsd/kyua-cli/tests/kyua-cli/examples/Makefile	Mon Jun 29 08:54:59 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/02/23 14:16:55 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2020/06/29 08:54:59 lukem Exp $
 
 KYUA_LIBS=	engine utils
 
@@ -8,6 +8,11 @@ TESTSDIR=	${TESTSBASE}/kyua-cli/examples
 
 .PATH:		${SRCDIR}/examples
 
-TESTS_CXX=	syntax_test
+TESTS_CXX=
+.for test in	\
+		syntax_test
+TESTS_CXX+=	${test}
+SRCS.${test}=	${test}.cpp
+.endfor
 
 .include <bsd.test.mk>

Index: src/external/bsd/kyua-cli/tests/kyua-cli/integration/helpers/Makefile
diff -u src/external/bsd/kyua-cli/tests/kyua-cli/integration/helpers/Makefile:1.1 src/external/bsd/kyua-cli/tests/kyua-cli/integration/helpers/Makefile:1.2
--- src/external/bsd/kyua-cli/tests/kyua-cli/integration/helpers/Makefile:1.1	Sat Feb 23 14:16:56 2013
+++ src/external/bsd/kyua-cli/tests/kyua-cli/integration/helpers/Makefile	Mon Jun 29 08:54:59 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/02/23 14:16:56 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2020/06/29 08:54:59 lukem Exp $
 
 .include <bsd.init.mk>
 
@@ -10,7 +10,9 @@ ATFFILE=	no
 
 .PATH:		${SRCDIR}/integration/helpers
 
-TESTS_CXX=	bogus_test_cases \
+TESTS_CXX=
+.for test in	\
+		bogus_test_cases \
 		config \
 		expect_all_pass \
 		expect_some_fail \
@@ -18,8 +20,12 @@ TESTS_CXX=	bogus_test_cases \
 		metadata \
 		simple_all_pass \
 		simple_some_fail
+TESTS_CXX+=	${test}
+SRCS.${test}=	${test}.cpp
+.endfor
 
 PROGS_CXX=			bad_test_program
+SRCS.bad_test_program=		bad_test_program.cpp
 BINDIR.bad_test_program=	${TESTSDIR}
 MAN.bad_test_program=		# none
 

Index: src/external/bsd/kyua-cli/tests/kyua-cli/store/Makefile
diff -u src/external/bsd/kyua-cli/tests/kyua-cli/store/Makefile:1.1 src/external/bsd/kyua-cli/tests/kyua-cli/store/Makefile:1.2
--- src/external/bsd/kyua-cli/tests/kyua-cli/store/Makefile:1.1	Sat Feb 23 14:16:56 2013
+++ src/external/bsd/kyua-cli/tests/kyua-cli/store/Makefile	Mon Jun 29 08:54:59 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/02/23 14:16:56 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2020/06/29 08:54:59 lukem Exp $
 
 KYUA_LIBS=	store engine utils
 
@@ -8,12 +8,17 @@ TESTSDIR=	${TESTSBASE}/kyua-cli/store
 
 .PATH:		${SRCDIR}/store
 
-TESTS_CXX=	backend_test \
+TESTS_CXX=
+.for test in	\
+		backend_test \
 		dbtypes_test \
 		exceptions_test \
 		metadata_test \
 		schema_inttest \
 		transaction_test
+TESTS_CXX+=	${test}
+SRCS.${test}=	${test}.cpp
+.endfor
 
 FILESDIR=	${TESTSDIR}
 FILESMODE=	444

Index: src/external/bsd/kyua-cli/tests/kyua-cli/utils/Makefile
diff -u src/external/bsd/kyua-cli/tests/kyua-cli/utils/Makefile:1.1 src/external/bsd/kyua-cli/tests/kyua-cli/utils/Makefile:1.2
--- src/external/bsd/kyua-cli/tests/kyua-cli/utils/Makefile:1.1	Sat Feb 23 14:16:56 2013
+++ src/external/bsd/kyua-cli/tests/kyua-cli/utils/Makefile	Mon Jun 29 08:54:59 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/02/23 14:16:56 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2020/06/29 08:54:59 lukem Exp $
 
 KYUA_LIBS=	utils
 
@@ -8,7 +8,9 @@ TESTSDIR=	${TESTSBASE}/kyua-cli/utils
 
 .PATH:		${SRCDIR}/utils
 
-TESTS_CXX=	auto_array_test \
+TESTS_CXX=
+.for test in	\
+		auto_array_test \
 		datetime_test \
 		env_test \
 		memory_test \
@@ -17,6 +19,9 @@ TESTS_CXX=	auto_array_test \
 		sanity_test \
 		stream_test \
 		units_test
+TESTS_CXX+=	${test}
+SRCS.${test}=	${test}.cpp
+.endfor
 
 TESTS_SUBDIRS+=	cmdline config format fs logging process signals sqlite text
 

Index: src/external/bsd/kyua-cli/tests/kyua-cli/utils/cmdline/Makefile
diff -u src/external/bsd/kyua-cli/tests/kyua-cli/utils/cmdline/Makefile:1.1 src/external/bsd/kyua-cli/tests/kyua-cli/utils/cmdline/Makefile:1.2
--- src/external/bsd/kyua-cli/tests/kyua-cli/utils/cmdline/Makefile:1.1	Sat Feb 23 14:16:56 2013
+++ src/external/bsd/kyua-cli/tests/kyua-cli/utils/cmdline/Makefile	Mon Jun 29 08:54:59 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/02/23 14:16:56 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2020/06/29 08:54:59 lukem Exp $
 
 KYUA_LIBS=	utils
 
@@ -8,12 +8,17 @@ TESTSDIR=	${TESTSBASE}/kyua-cli/utils/cm
 
 .PATH:		${SRCDIR}/utils/cmdline
 
-TESTS_CXX=	base_command_test \
+TESTS_CXX=
+.for test in	\
+		base_command_test \
 		commands_map_test \
 		exceptions_test \
 		globals_test \
 		options_test \
 		parser_test \
 		ui_test
+TESTS_CXX+=	${test}
+SRCS.${test}=	${test}.cpp
+.endfor
 
 .include <bsd.test.mk>

Index: src/external/bsd/kyua-cli/tests/kyua-cli/utils/config/Makefile
diff -u src/external/bsd/kyua-cli/tests/kyua-cli/utils/config/Makefile:1.1 src/external/bsd/kyua-cli/tests/kyua-cli/utils/config/Makefile:1.2
--- src/external/bsd/kyua-cli/tests/kyua-cli/utils/config/Makefile:1.1	Sat Feb 23 14:16:57 2013
+++ src/external/bsd/kyua-cli/tests/kyua-cli/utils/config/Makefile	Mon Jun 29 08:54:59 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/02/23 14:16:57 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2020/06/29 08:54:59 lukem Exp $
 
 KYUA_LIBS=	utils
 
@@ -8,11 +8,16 @@ TESTSDIR=	${TESTSBASE}/kyua-cli/utils/co
 
 .PATH:		${SRCDIR}/utils/config
 
-TESTS_CXX=	exceptions_test \
+TESTS_CXX=
+.for test in	\
+		exceptions_test \
 		keys_test \
 		lua_module_test \
 		nodes_test \
 		parser_test \
 		tree_test
+TESTS_CXX+=	${test}
+SRCS.${test}=	${test}.cpp
+.endfor
 
 .include <bsd.test.mk>

Index: src/external/bsd/kyua-cli/tests/kyua-cli/utils/format/Makefile
diff -u src/external/bsd/kyua-cli/tests/kyua-cli/utils/format/Makefile:1.1 src/external/bsd/kyua-cli/tests/kyua-cli/utils/format/Makefile:1.2
--- src/external/bsd/kyua-cli/tests/kyua-cli/utils/format/Makefile:1.1	Sat Feb 23 14:16:57 2013
+++ src/external/bsd/kyua-cli/tests/kyua-cli/utils/format/Makefile	Mon Jun 29 08:54:59 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/02/23 14:16:57 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2020/06/29 08:54:59 lukem Exp $
 
 KYUA_LIBS=	utils
 
@@ -8,7 +8,12 @@ TESTSDIR=	${TESTSBASE}/kyua-cli/utils/fo
 
 .PATH:		${SRCDIR}/utils/format
 
-TESTS_CXX=	exceptions_test \
+TESTS_CXX=
+.for test in	\
+		exceptions_test \
 		formatter_test
+TESTS_CXX+=	${test}
+SRCS.${test}=	${test}.cpp
+.endfor
 
 .include <bsd.test.mk>

Index: src/external/bsd/kyua-cli/tests/kyua-cli/utils/fs/Makefile
diff -u src/external/bsd/kyua-cli/tests/kyua-cli/utils/fs/Makefile:1.1 src/external/bsd/kyua-cli/tests/kyua-cli/utils/fs/Makefile:1.2
--- src/external/bsd/kyua-cli/tests/kyua-cli/utils/fs/Makefile:1.1	Sat Feb 23 14:16:57 2013
+++ src/external/bsd/kyua-cli/tests/kyua-cli/utils/fs/Makefile	Mon Jun 29 08:54:59 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/02/23 14:16:57 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2020/06/29 08:54:59 lukem Exp $
 
 KYUA_LIBS=	utils
 
@@ -8,10 +8,15 @@ TESTSDIR=	${TESTSBASE}/kyua-cli/utils/fs
 
 .PATH:		${SRCDIR}/utils/fs
 
-TESTS_CXX=	auto_cleaners_test \
+TESTS_CXX=
+.for test in	\
+		auto_cleaners_test \
 		exceptions_test \
 		lua_module_test \
 		operations_test \
 		path_test
+TESTS_CXX+=	${test}
+SRCS.${test}=	${test}.cpp
+.endfor
 
 .include <bsd.test.mk>

Index: src/external/bsd/kyua-cli/tests/kyua-cli/utils/logging/Makefile
diff -u src/external/bsd/kyua-cli/tests/kyua-cli/utils/logging/Makefile:1.1 src/external/bsd/kyua-cli/tests/kyua-cli/utils/logging/Makefile:1.2
--- src/external/bsd/kyua-cli/tests/kyua-cli/utils/logging/Makefile:1.1	Sat Feb 23 14:16:57 2013
+++ src/external/bsd/kyua-cli/tests/kyua-cli/utils/logging/Makefile	Mon Jun 29 08:54:59 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/02/23 14:16:57 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2020/06/29 08:54:59 lukem Exp $
 
 KYUA_LIBS=	utils
 
@@ -8,7 +8,12 @@ TESTSDIR=	${TESTSBASE}/kyua-cli/utils/lo
 
 .PATH:		${SRCDIR}/utils/logging
 
-TESTS_CXX=	macros_test \
+TESTS_CXX=
+.for test in	\
+		macros_test \
 		operations_test
+TESTS_CXX+=	${test}
+SRCS.${test}=	${test}.cpp
+.endfor
 
 .include <bsd.test.mk>

Index: src/external/bsd/kyua-cli/tests/kyua-cli/utils/process/Makefile
diff -u src/external/bsd/kyua-cli/tests/kyua-cli/utils/process/Makefile:1.1 src/external/bsd/kyua-cli/tests/kyua-cli/utils/process/Makefile:1.2
--- src/external/bsd/kyua-cli/tests/kyua-cli/utils/process/Makefile:1.1	Sat Feb 23 14:16:57 2013
+++ src/external/bsd/kyua-cli/tests/kyua-cli/utils/process/Makefile	Mon Jun 29 08:55:00 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/02/23 14:16:57 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2020/06/29 08:55:00 lukem Exp $
 
 KYUA_LIBS=	utils
 
@@ -8,13 +8,19 @@ TESTSDIR=	${TESTSBASE}/kyua-cli/utils/pr
 
 .PATH:		${SRCDIR}/utils/process
 
-TESTS_CXX=	child_test \
+TESTS_CXX=
+.for test in	\
+		child_test \
 		exceptions_test \
 		fdstream_test \
 		status_test \
 		systembuf_test
+TESTS_CXX+=	${test}
+SRCS.${test}=	${test}.cpp
+.endfor
 
 PROGS_CXX=	helpers
+SRCS.helpers=	helpers.cpp
 BINDIR.helpers=	${TESTSDIR}
 MAN.helpers=	# none
 

Index: src/external/bsd/kyua-cli/tests/kyua-cli/utils/signals/Makefile
diff -u src/external/bsd/kyua-cli/tests/kyua-cli/utils/signals/Makefile:1.1 src/external/bsd/kyua-cli/tests/kyua-cli/utils/signals/Makefile:1.2
--- src/external/bsd/kyua-cli/tests/kyua-cli/utils/signals/Makefile:1.1	Sat Feb 23 14:16:57 2013
+++ src/external/bsd/kyua-cli/tests/kyua-cli/utils/signals/Makefile	Mon Jun 29 08:55:00 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/02/23 14:16:57 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2020/06/29 08:55:00 lukem Exp $
 
 KYUA_LIBS=	utils
 
@@ -8,9 +8,14 @@ TESTSDIR=	${TESTSBASE}/kyua-cli/utils/si
 
 .PATH:		${SRCDIR}/utils/signals
 
-TESTS_CXX=	exceptions_test \
+TESTS_CXX=
+.for test in	\
+		exceptions_test \
 		interrupts_test \
 		misc_test \
 		programmer_test
+TESTS_CXX+=	${test}
+SRCS.${test}=	${test}.cpp
+.endfor
 
 .include <bsd.test.mk>

Index: src/external/bsd/kyua-cli/tests/kyua-cli/utils/sqlite/Makefile
diff -u src/external/bsd/kyua-cli/tests/kyua-cli/utils/sqlite/Makefile:1.1 src/external/bsd/kyua-cli/tests/kyua-cli/utils/sqlite/Makefile:1.2
--- src/external/bsd/kyua-cli/tests/kyua-cli/utils/sqlite/Makefile:1.1	Sat Feb 23 14:16:58 2013
+++ src/external/bsd/kyua-cli/tests/kyua-cli/utils/sqlite/Makefile	Mon Jun 29 08:55:00 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/02/23 14:16:58 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2020/06/29 08:55:00 lukem Exp $
 
 KYUA_LIBS=	utils
 
@@ -8,10 +8,15 @@ TESTSDIR=	${TESTSBASE}/kyua-cli/utils/sq
 
 .PATH:		${SRCDIR}/utils/sqlite
 
-TESTS_CXX=	c_gate_test \
+TESTS_CXX=
+.for test in	\
+		c_gate_test \
 		database_test \
 		exceptions_test \
 		statement_test \
 		transaction_test
+TESTS_CXX+=	${test}
+SRCS.${test}=	${test}.cpp
+.endfor
 
 .include <bsd.test.mk>

Index: src/external/bsd/kyua-cli/tests/kyua-cli/utils/text/Makefile
diff -u src/external/bsd/kyua-cli/tests/kyua-cli/utils/text/Makefile:1.1 src/external/bsd/kyua-cli/tests/kyua-cli/utils/text/Makefile:1.2
--- src/external/bsd/kyua-cli/tests/kyua-cli/utils/text/Makefile:1.1	Sat Feb 23 14:16:58 2013
+++ src/external/bsd/kyua-cli/tests/kyua-cli/utils/text/Makefile	Mon Jun 29 08:55:00 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/02/23 14:16:58 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2020/06/29 08:55:00 lukem Exp $
 
 KYUA_LIBS=	utils
 
@@ -8,9 +8,14 @@ TESTSDIR=	${TESTSBASE}/kyua-cli/utils/te
 
 .PATH:		${SRCDIR}/utils/text
 
-TESTS_CXX=	exceptions_test \
+TESTS_CXX=
+.for test in	\
+		exceptions_test \
 		operations_test \
 		table_test \
 		templates_test
+TESTS_CXX+=	${test}
+SRCS.${test}=	${test}.cpp
+.endfor
 
 .include <bsd.test.mk>

Reply via email to