mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-07 00:50:50 +00:00
Apply lessons learned in r344345 on gtest_main tests
The key difference is that some of the programs were previously being compiled and installed as tests, which is incorrect. Treat them like helpers instead.
This commit is contained in:
parent
dae8f2468d
commit
140b363941
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/projects/import-googletest-1.8.1/; revision=344346
|
@ -20,15 +20,30 @@ GTESTS+= googletest-test-part-test
|
|||
GTESTS+= gtest-typed-test_test
|
||||
GTESTS+= gtest_unittest
|
||||
|
||||
.for test in ${GTESTS}
|
||||
SRCS.${test}= gtest_main.cc
|
||||
.endfor
|
||||
|
||||
CXXFLAGS+= -I${GOOGLETEST_SRCROOT}/include
|
||||
CXXFLAGS+= -I${GOOGLETEST_SRCROOT}
|
||||
|
||||
SRCS.gtest-typed-test_test+= gtest-typed-test2_test.cc
|
||||
HELPERS+= gtest_help_test_
|
||||
HELPERS+= gtest_xml_outfile1_test_
|
||||
HELPERS+= gtest_xml_outfile2_test_
|
||||
|
||||
LIBADD= gtest
|
||||
BINDIR= ${TESTSDIR}
|
||||
PROGS_CXX+= ${HELPERS}
|
||||
|
||||
SRCS.gtest-typed-test_test= \
|
||||
gtest-typed-test_test.cc \
|
||||
gtest-typed-test2_test.cc
|
||||
|
||||
SRCS.gtest_prod_test= \
|
||||
gtest_prod_test.cc \
|
||||
production.cc
|
||||
|
||||
LIBADD+= gtest gtest_main
|
||||
|
||||
LIBADD.googletest-port-test+= pthread
|
||||
LIBADD.gtest_unittest+= pthread
|
||||
|
||||
# XXX: https://github.com/google/googletest/pull/2119
|
||||
NO_WERROR=
|
||||
|
||||
.include <bsd.test.mk>
|
||||
|
|
Loading…
Reference in a new issue