Date: Wed, 20 Feb 2019 07:49:09 +0000 (UTC) From: Enji Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r344346 - projects/import-googletest-1.8.1/lib/googletest/gtest_main/tests Message-ID: <201902200749.x1K7n9xb036952@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Wed Feb 20 07:49:09 2019 New Revision: 344346 URL: https://svnweb.freebsd.org/changeset/base/344346 Log: 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. Modified: projects/import-googletest-1.8.1/lib/googletest/gtest_main/tests/Makefile Modified: projects/import-googletest-1.8.1/lib/googletest/gtest_main/tests/Makefile ============================================================================== --- projects/import-googletest-1.8.1/lib/googletest/gtest_main/tests/Makefile Wed Feb 20 07:29:50 2019 (r344345) +++ projects/import-googletest-1.8.1/lib/googletest/gtest_main/tests/Makefile Wed Feb 20 07:49:09 2019 (r344346) @@ -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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902200749.x1K7n9xb036952>