From owner-svn-src-projects@freebsd.org Wed Feb 20 01:11:32 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9735914E05BC for ; Wed, 20 Feb 2019 01:11:32 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 370B485200; Wed, 20 Feb 2019 01:11:32 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1C44525EB6; Wed, 20 Feb 2019 01:11:32 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1K1BV5B030370; Wed, 20 Feb 2019 01:11:31 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1K1BVRI030366; Wed, 20 Feb 2019 01:11:31 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201902200111.x1K1BVRI030366@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Wed, 20 Feb 2019 01:11:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r344329 - in projects/import-googletest-1.8.1: cddl/usr.sbin/zfsd/tests lib/googletest/gmock/tests lib/googletest/gmock_main/tests lib/googletest/gtest/tests lib/googletest/gtest_main/t... X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: in projects/import-googletest-1.8.1: cddl/usr.sbin/zfsd/tests lib/googletest/gmock/tests lib/googletest/gmock_main/tests lib/googletest/gtest/tests lib/googletest/gtest_main/tests X-SVN-Commit-Revision: 344329 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 370B485200 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.980,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Feb 2019 01:11:32 -0000 Author: ngie Date: Wed Feb 20 01:11:30 2019 New Revision: 344329 URL: https://svnweb.freebsd.org/changeset/base/344329 Log: Use `GTESTS` instead of `PLAIN_TESTS_CXX` The former is from googletest.test.mk, whereas the latter is from plain.test.mk. As noted in r344328, Kyua will adopt more native GoogleTest support. Thus, it's more desirable to make the test interface more of an opaque blackbox for the testcase implementer. Modified: projects/import-googletest-1.8.1/cddl/usr.sbin/zfsd/tests/Makefile projects/import-googletest-1.8.1/lib/googletest/gmock/tests/Makefile projects/import-googletest-1.8.1/lib/googletest/gmock_main/tests/Makefile projects/import-googletest-1.8.1/lib/googletest/gtest/tests/Makefile projects/import-googletest-1.8.1/lib/googletest/gtest_main/tests/Makefile Modified: projects/import-googletest-1.8.1/cddl/usr.sbin/zfsd/tests/Makefile ============================================================================== --- projects/import-googletest-1.8.1/cddl/usr.sbin/zfsd/tests/Makefile Wed Feb 20 01:09:03 2019 (r344328) +++ projects/import-googletest-1.8.1/cddl/usr.sbin/zfsd/tests/Makefile Wed Feb 20 01:11:30 2019 (r344329) @@ -3,13 +3,10 @@ .include "${.CURDIR}/../Makefile.common" .PATH: ${.CURDIR:H} -PLAIN_TESTS_CXX= zfsd_unittest -SRCS.zfsd_unittest:= ${SRCS:Nzfsd_main.cc} -SRCS.zfsd_unittest+= libmocks.c zfsd_unittest.cc -SRCS= +GTESTS= zfsd_unittest -# Use #include in test programs. -INCFLAGS+= -I${.CURDIR:H:H} +SRCS.zfsd_unittest:= ${SRCS:Nzfsd_main.cc} +SRCS.zfsd_unittest+= libmocks.c zfsd_unittest.cc LIBDADD.zfsd_unittest+= gmock_main Modified: projects/import-googletest-1.8.1/lib/googletest/gmock/tests/Makefile ============================================================================== --- projects/import-googletest-1.8.1/lib/googletest/gmock/tests/Makefile Wed Feb 20 01:09:03 2019 (r344328) +++ projects/import-googletest-1.8.1/lib/googletest/gmock/tests/Makefile Wed Feb 20 01:11:30 2019 (r344329) @@ -1,8 +1,8 @@ # $FreeBSD$ -PLAIN_TESTS_CXX+= gmock_stress_test +GTESTS+= gmock_stress_test -LIBADD+= gmock +LIBADD+= gmock # XXX: https://github.com/google/googletest/pull/2119 NO_WERROR= Modified: projects/import-googletest-1.8.1/lib/googletest/gmock_main/tests/Makefile ============================================================================== --- projects/import-googletest-1.8.1/lib/googletest/gmock_main/tests/Makefile Wed Feb 20 01:09:03 2019 (r344328) +++ projects/import-googletest-1.8.1/lib/googletest/gmock_main/tests/Makefile Wed Feb 20 01:11:30 2019 (r344329) @@ -4,27 +4,27 @@ .PATH: ${GOOGLEMOCK_SRCROOT}/src ${GOOGLEMOCK_SRCROOT}/test -PLAIN_TESTS_CXX+= gmock-actions_test -PLAIN_TESTS_CXX+= gmock-cardinalities_test -PLAIN_TESTS_CXX+= gmock-ex_test -PLAIN_TESTS_CXX+= gmock-generated-actions_test -PLAIN_TESTS_CXX+= gmock-generated-function-mockers_test -PLAIN_TESTS_CXX+= gmock-generated-internal-utils_test -PLAIN_TESTS_CXX+= gmock-generated-matchers_test -PLAIN_TESTS_CXX+= gmock-internal-utils_test -PLAIN_TESTS_CXX+= gmock-matchers_test -PLAIN_TESTS_CXX+= gmock-more-actions_test -PLAIN_TESTS_CXX+= gmock-nice-strict_test -PLAIN_TESTS_CXX+= gmock-port_test -PLAIN_TESTS_CXX+= gmock-spec-builders_test -PLAIN_TESTS_CXX+= gmock_link_test -PLAIN_TESTS_CXX+= gmock_test +GTESTS+= gmock-actions_test +GTESTS+= gmock-cardinalities_test +GTESTS+= gmock-ex_test +GTESTS+= gmock-generated-actions_test +GTESTS+= gmock-generated-function-mockers_test +GTESTS+= gmock-generated-internal-utils_test +GTESTS+= gmock-generated-matchers_test +GTESTS+= gmock-internal-utils_test +GTESTS+= gmock-matchers_test +GTESTS+= gmock-more-actions_test +GTESTS+= gmock-nice-strict_test +GTESTS+= gmock-port_test +GTESTS+= gmock-spec-builders_test +GTESTS+= gmock_link_test +GTESTS+= gmock_test -CXXFLAGS+= -I${GOOGLEMOCK_SRCROOT}/include -CXXFLAGS+= -I${GOOGLEMOCK_SRCROOT} +CXXFLAGS+= -I${GOOGLEMOCK_SRCROOT}/include +CXXFLAGS+= -I${GOOGLEMOCK_SRCROOT} -.for test in ${PLAIN_TESTS_CXX} -SRCS.${test}= gmock_main.cc +.for test in ${GTESTS} +SRCS.${test}= gmock_main.cc .endfor SRCS.gmock_link_test+= gmock_link2_test.cc Modified: projects/import-googletest-1.8.1/lib/googletest/gtest/tests/Makefile ============================================================================== --- projects/import-googletest-1.8.1/lib/googletest/gtest/tests/Makefile Wed Feb 20 01:09:03 2019 (r344328) +++ projects/import-googletest-1.8.1/lib/googletest/gtest/tests/Makefile Wed Feb 20 01:11:30 2019 (r344329) @@ -4,27 +4,27 @@ .PATH: ${GOOGLETEST_SRCROOT}/src ${GOOGLETEST_SRCROOT}/test -PLAIN_TESTS_CXX+= gtest_environment_test -PLAIN_TESTS_CXX+= gtest_no_test_unittest -PLAIN_TESTS_CXX+= googletest-param-test-test -PLAIN_TESTS_CXX+= gtest_premature_exit_test -PLAIN_TESTS_CXX+= gtest_repeat_test -PLAIN_TESTS_CXX+= gtest_stress_test -PLAIN_TESTS_CXX+= gtest_throw_on_failure_ex_test -PLAIN_TESTS_CXX+= gtest-unittest-api_test +GTESTS+= gtest_environment_test +GTESTS+= gtest_no_test_unittest +GTESTS+= googletest-param-test-test +GTESTS+= gtest_premature_exit_test +GTESTS+= gtest_repeat_test +GTESTS+= gtest_stress_test +GTESTS+= gtest_throw_on_failure_ex_test +GTESTS+= gtest-unittest-api_test SRCS.googletest-param-test-test+= googletest-param-test-test.cc SRCS.googletest-param-test-test+= googletest-param-test2-test.cc SRCS.gtest_premature_exit_test+= gtest_premature_exit_test.cc -.for test in ${PLAIN_TESTS_CXX} +.for test in ${GTESTS} # XXX: linker error; no main(..) -#SRCS.${test}= gtest-all.cc -SRCS.${test}?= gtest_main.cc +#SRCS.${test}= gtest-all.cc +SRCS.${test}?= gtest_main.cc .endfor -CXXFLAGS+= -I${GOOGLETEST_SRCROOT}/include -CXXFLAGS+= -I${GOOGLETEST_SRCROOT} +CXXFLAGS+= -I${GOOGLETEST_SRCROOT}/include +CXXFLAGS+= -I${GOOGLETEST_SRCROOT} LIBADD= gtest 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 01:09:03 2019 (r344328) +++ projects/import-googletest-1.8.1/lib/googletest/gtest_main/tests/Makefile Wed Feb 20 01:11:30 2019 (r344329) @@ -4,28 +4,28 @@ .PATH: ${GOOGLETEST_SRCROOT}/src ${GOOGLETEST_SRCROOT}/test -PLAIN_TESTS_CXX+= googletest-death-test-test -PLAIN_TESTS_CXX+= googletest-filepath-test -PLAIN_TESTS_CXX+= googletest-linked-ptr-test -PLAIN_TESTS_CXX+= googletest-listener-test -PLAIN_TESTS_CXX+= gtest_main_unittest -PLAIN_TESTS_CXX+= googletest-message-test -PLAIN_TESTS_CXX+= googletest-options-test -PLAIN_TESTS_CXX+= googletest-port-test -PLAIN_TESTS_CXX+= gtest_pred_impl_unittest -PLAIN_TESTS_CXX+= googletest-printers-test -PLAIN_TESTS_CXX+= gtest_prod_test -PLAIN_TESTS_CXX+= gtest_sole_header_test -PLAIN_TESTS_CXX+= googletest-test-part-test -PLAIN_TESTS_CXX+= gtest-typed-test_test -PLAIN_TESTS_CXX+= gtest_unittest +GTESTS+= googletest-death-test-test +GTESTS+= googletest-filepath-test +GTESTS+= googletest-linked-ptr-test +GTESTS+= googletest-listener-test +GTESTS+= gtest_main_unittest +GTESTS+= googletest-message-test +GTESTS+= googletest-options-test +GTESTS+= googletest-port-test +GTESTS+= gtest_pred_impl_unittest +GTESTS+= googletest-printers-test +GTESTS+= gtest_prod_test +GTESTS+= gtest_sole_header_test +GTESTS+= googletest-test-part-test +GTESTS+= gtest-typed-test_test +GTESTS+= gtest_unittest -.for test in ${PLAIN_TESTS_CXX} -SRCS.${test}= gtest_main.cc +.for test in ${GTESTS} +SRCS.${test}= gtest_main.cc .endfor -CXXFLAGS+= -I${GOOGLETEST_SRCROOT}/include -CXXFLAGS+= -I${GOOGLETEST_SRCROOT} +CXXFLAGS+= -I${GOOGLETEST_SRCROOT}/include +CXXFLAGS+= -I${GOOGLETEST_SRCROOT} SRCS.gtest-typed-test_test+= gtest-typed-test2_test.cc