Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/kyua-cli/tests/kyua-cli kyua-cli: fix build of ...
details: https://anonhg.NetBSD.org/src/rev/37d4ebba02e1
branches: trunk
changeset: 935287:37d4ebba02e1
user: lukem <lukem%NetBSD.org@localhost>
date: Mon Jun 29 08:54:58 2020 +0000
description:
kyua-cli: fix build of .cpp files
Fix assignment of SRCS for C++ sources that use .cpp instead of .cc.
diffstat:
external/bsd/kyua-cli/tests/kyua-cli/bootstrap/Makefile | 4 ++-
external/bsd/kyua-cli/tests/kyua-cli/cli/Makefile | 9 ++++++-
external/bsd/kyua-cli/tests/kyua-cli/engine/Makefile | 11 ++++++++-
external/bsd/kyua-cli/tests/kyua-cli/engine/drivers/Makefile | 10 +++++++-
external/bsd/kyua-cli/tests/kyua-cli/examples/Makefile | 9 ++++++-
external/bsd/kyua-cli/tests/kyua-cli/integration/helpers/Makefile | 10 +++++++-
external/bsd/kyua-cli/tests/kyua-cli/store/Makefile | 9 ++++++-
external/bsd/kyua-cli/tests/kyua-cli/utils/Makefile | 9 ++++++-
external/bsd/kyua-cli/tests/kyua-cli/utils/cmdline/Makefile | 9 ++++++-
external/bsd/kyua-cli/tests/kyua-cli/utils/config/Makefile | 9 ++++++-
external/bsd/kyua-cli/tests/kyua-cli/utils/format/Makefile | 9 ++++++-
external/bsd/kyua-cli/tests/kyua-cli/utils/fs/Makefile | 9 ++++++-
external/bsd/kyua-cli/tests/kyua-cli/utils/logging/Makefile | 9 ++++++-
external/bsd/kyua-cli/tests/kyua-cli/utils/process/Makefile | 10 +++++++-
external/bsd/kyua-cli/tests/kyua-cli/utils/signals/Makefile | 9 ++++++-
external/bsd/kyua-cli/tests/kyua-cli/utils/sqlite/Makefile | 9 ++++++-
external/bsd/kyua-cli/tests/kyua-cli/utils/text/Makefile | 9 ++++++-
17 files changed, 120 insertions(+), 33 deletions(-)
diffs (truncated from 468 to 300 lines):
diff -r 1507660a9eb2 -r 37d4ebba02e1 external/bsd/kyua-cli/tests/kyua-cli/bootstrap/Makefile
--- a/external/bsd/kyua-cli/tests/kyua-cli/bootstrap/Makefile Mon Jun 29 08:34:17 2020 +0000
+++ b/external/bsd/kyua-cli/tests/kyua-cli/bootstrap/Makefile Mon Jun 29 08:54:58 2020 +0000
@@ -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 @@
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
diff -r 1507660a9eb2 -r 37d4ebba02e1 external/bsd/kyua-cli/tests/kyua-cli/cli/Makefile
--- a/external/bsd/kyua-cli/tests/kyua-cli/cli/Makefile Mon Jun 29 08:34:17 2020 +0000
+++ b/external/bsd/kyua-cli/tests/kyua-cli/cli/Makefile Mon Jun 29 08:54:58 2020 +0000
@@ -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 @@
.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 @@
common_test \
config_test \
main_test
+TESTS_CXX+= ${test}
+SRCS.${test}= ${test}.cpp
+.endfor
.include <bsd.test.mk>
diff -r 1507660a9eb2 -r 37d4ebba02e1 external/bsd/kyua-cli/tests/kyua-cli/engine/Makefile
--- a/external/bsd/kyua-cli/tests/kyua-cli/engine/Makefile Mon Jun 29 08:34:17 2020 +0000
+++ b/external/bsd/kyua-cli/tests/kyua-cli/engine/Makefile Mon Jun 29 08:54:58 2020 +0000
@@ -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 @@
.PATH: ${SRCDIR}/engine
-TESTS_CXX= action_test \
+TESTS_CXX=
+.for test in \
+ action_test \
config_test \
context_test \
exceptions_test \
@@ -19,14 +21,19 @@
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
diff -r 1507660a9eb2 -r 37d4ebba02e1 external/bsd/kyua-cli/tests/kyua-cli/engine/drivers/Makefile
--- a/external/bsd/kyua-cli/tests/kyua-cli/engine/drivers/Makefile Mon Jun 29 08:34:17 2020 +0000
+++ b/external/bsd/kyua-cli/tests/kyua-cli/engine/drivers/Makefile Mon Jun 29 08:54:58 2020 +0000
@@ -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 @@
.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
diff -r 1507660a9eb2 -r 37d4ebba02e1 external/bsd/kyua-cli/tests/kyua-cli/examples/Makefile
--- a/external/bsd/kyua-cli/tests/kyua-cli/examples/Makefile Mon Jun 29 08:34:17 2020 +0000
+++ b/external/bsd/kyua-cli/tests/kyua-cli/examples/Makefile Mon Jun 29 08:54:58 2020 +0000
@@ -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 @@
.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>
diff -r 1507660a9eb2 -r 37d4ebba02e1 external/bsd/kyua-cli/tests/kyua-cli/integration/helpers/Makefile
--- a/external/bsd/kyua-cli/tests/kyua-cli/integration/helpers/Makefile Mon Jun 29 08:34:17 2020 +0000
+++ b/external/bsd/kyua-cli/tests/kyua-cli/integration/helpers/Makefile Mon Jun 29 08:54:58 2020 +0000
@@ -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 @@
.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 @@
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
diff -r 1507660a9eb2 -r 37d4ebba02e1 external/bsd/kyua-cli/tests/kyua-cli/store/Makefile
--- a/external/bsd/kyua-cli/tests/kyua-cli/store/Makefile Mon Jun 29 08:34:17 2020 +0000
+++ b/external/bsd/kyua-cli/tests/kyua-cli/store/Makefile Mon Jun 29 08:54:58 2020 +0000
@@ -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 @@
.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
diff -r 1507660a9eb2 -r 37d4ebba02e1 external/bsd/kyua-cli/tests/kyua-cli/utils/Makefile
--- a/external/bsd/kyua-cli/tests/kyua-cli/utils/Makefile Mon Jun 29 08:34:17 2020 +0000
+++ b/external/bsd/kyua-cli/tests/kyua-cli/utils/Makefile Mon Jun 29 08:54:58 2020 +0000
@@ -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 @@
.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 @@
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
diff -r 1507660a9eb2 -r 37d4ebba02e1 external/bsd/kyua-cli/tests/kyua-cli/utils/cmdline/Makefile
--- a/external/bsd/kyua-cli/tests/kyua-cli/utils/cmdline/Makefile Mon Jun 29 08:34:17 2020 +0000
+++ b/external/bsd/kyua-cli/tests/kyua-cli/utils/cmdline/Makefile Mon Jun 29 08:54:58 2020 +0000
@@ -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 @@
.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>
diff -r 1507660a9eb2 -r 37d4ebba02e1 external/bsd/kyua-cli/tests/kyua-cli/utils/config/Makefile
--- a/external/bsd/kyua-cli/tests/kyua-cli/utils/config/Makefile Mon Jun 29 08:34:17 2020 +0000
+++ b/external/bsd/kyua-cli/tests/kyua-cli/utils/config/Makefile Mon Jun 29 08:54:58 2020 +0000
@@ -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 @@
.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>
diff -r 1507660a9eb2 -r 37d4ebba02e1 external/bsd/kyua-cli/tests/kyua-cli/utils/format/Makefile
--- a/external/bsd/kyua-cli/tests/kyua-cli/utils/format/Makefile Mon Jun 29 08:34:17 2020 +0000
+++ b/external/bsd/kyua-cli/tests/kyua-cli/utils/format/Makefile Mon Jun 29 08:54:58 2020 +0000
@@ -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 @@
Home |
Main Index |
Thread Index |
Old Index