summaryrefslogtreecommitdiffstats
path: root/lib/atf
diff options
context:
space:
mode:
authorjmmv <jmmv@FreeBSD.org>2013-11-17 23:12:55 +0000
committerjmmv <jmmv@FreeBSD.org>2013-11-17 23:12:55 +0000
commit3f9944eeba112b77a2694fb1bb51591b29d15932 (patch)
tree756e02a4b958e8c9eb7e544720a6db8fb160ba8f /lib/atf
parent3422c417105d437900c7dd99c74ba5a0a99ff25b (diff)
downloadFreeBSD-src-3f9944eeba112b77a2694fb1bb51591b29d15932.zip
FreeBSD-src-3f9944eeba112b77a2694fb1bb51591b29d15932.tar.gz
Fix the build of some ATF tests.
When building various programs from a single Makefile, program-specific variables are of the form <VAR>.<PROG>, not <VAR>_<PROG>. Fix this obvious typo to fix the build when WITH_TESTS=yes. I am not sure how this ever worked before given that manual inspection of bsd.progs.mk clearly shows that the expected character between the two components is a dot and not an underscore... but I suspect the changes in r258095 exposed this oddity. Approved by: rpaulo (mentor)
Diffstat (limited to 'lib/atf')
-rw-r--r--lib/atf/libatf-c++/tests/Makefile4
-rw-r--r--lib/atf/libatf-c/tests/Makefile10
-rw-r--r--lib/atf/tests/test-programs/Makefile2
3 files changed, 8 insertions, 8 deletions
diff --git a/lib/atf/libatf-c++/tests/Makefile b/lib/atf/libatf-c++/tests/Makefile
index 68eacde..db10fce 100644
--- a/lib/atf/libatf-c++/tests/Makefile
+++ b/lib/atf/libatf-c++/tests/Makefile
@@ -23,7 +23,7 @@ FILES+= unused_test.cpp
tests_test \
utils_test
ATF_TESTS_CXX+= ${_T}
-SRCS_${_T}= ${_T}.cpp test_helpers.cpp
+SRCS.${_T}= ${_T}.cpp test_helpers.cpp
.endfor
ATF_TESTS_SH= pkg_config_test
@@ -41,7 +41,7 @@ ATF_TESTS_SH= pkg_config_test
text_test \
ui_test
ATF_TESTS_CXX+= ${_T}
-SRCS_${_T}= ${_T}.cpp test_helpers.cpp
+SRCS.${_T}= ${_T}.cpp test_helpers.cpp
.endfor
.include <atf.test.mk>
diff --git a/lib/atf/libatf-c/tests/Makefile b/lib/atf/libatf-c/tests/Makefile
index db04f1f..856c3d7 100644
--- a/lib/atf/libatf-c/tests/Makefile
+++ b/lib/atf/libatf-c/tests/Makefile
@@ -33,7 +33,7 @@ FILES+= unused_test.c
tp_test \
utils_test
ATF_TESTS_C+= ${_T}
-SRCS_${_T}= ${_T}.c test_helpers.c
+SRCS.${_T}= ${_T}.c test_helpers.c
.endfor
ATF_TESTS_SH= pkg_config_test
@@ -51,12 +51,12 @@ ATF_TESTS_SH= pkg_config_test
text_test \
user_test
ATF_TESTS_C+= ${_T}
-SRCS_${_T}= ${_T}.c test_helpers.c
+SRCS.${_T}= ${_T}.c test_helpers.c
.endfor
PROGS+= process_helpers
-SRCS_process_helpers= process_helpers.c
-MAN_process_helpers= # defined
-BINDIR_process_helpers= ${TESTSDIR}
+SRCS.process_helpers= process_helpers.c
+MAN.process_helpers= # defined
+BINDIR.process_helpers= ${TESTSDIR}
.include <atf.test.mk>
diff --git a/lib/atf/tests/test-programs/Makefile b/lib/atf/tests/test-programs/Makefile
index cbbe7b3..f1ba9f5 100644
--- a/lib/atf/tests/test-programs/Makefile
+++ b/lib/atf/tests/test-programs/Makefile
@@ -13,7 +13,7 @@ CFLAGS+= -I${ATF}
ATF_TESTS_C= c_helpers
ATF_TESTS_CXX= cpp_helpers
-SRCS_cpp_helpers= cpp_helpers.cpp
+SRCS.cpp_helpers= cpp_helpers.cpp
ATF_TESTS_SH= sh_helpers
.for _T in config_test expect_test fork_test meta_data_test result_test srcdir_test
OpenPOWER on IntegriCloud