From owner-svn-src-projects@freebsd.org Sun Mar 31 06:20:01 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 B2827154F08F for ; Sun, 31 Mar 2019 06:20:01 +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 49DAE6B932; Sun, 31 Mar 2019 06:20:01 +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 1EA9622B89; Sun, 31 Mar 2019 06:20:01 +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 x2V6K07W033416; Sun, 31 Mar 2019 06:20:00 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2V6K0ih033415; Sun, 31 Mar 2019 06:20:00 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201903310620.x2V6K0ih033415@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Sun, 31 Mar 2019 06:20:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r345749 - projects/kyua-use-googletest-test-interface/share/mk X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/kyua-use-googletest-test-interface/share/mk X-SVN-Commit-Revision: 345749 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 49DAE6B932 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.977,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,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: Sun, 31 Mar 2019 06:20:01 -0000 Author: ngie Date: Sun Mar 31 06:20:00 2019 New Revision: 345749 URL: https://svnweb.freebsd.org/changeset/base/345749 Log: Improve googletest integration with kyua This change modifies googletest.test.mk to use experimental googletest support in kyua, available as part of the `add-googletest-support` feature branch in https://github.com/ngie-eign/kyua. The experimental support provides test suite and test case level execution and result reporting, instead of requiring googletests to be run as the plain tests. As such, make the default GTESTS test engine interface googletest, providing a backwards compatibility knob, GTESTS_USE_PLAIN_TEST_INTERFACE, so end-users with older versions of kyua can run the googletest tests. While here, provide a per-PROG test interface hook for GTESTS. In short, not all of the googlemock and googletest provided tests conform to the format described in the googletest docs. Thus, they are better run as plain tests. Modified: projects/kyua-use-googletest-test-interface/share/mk/googletest.test.mk Modified: projects/kyua-use-googletest-test-interface/share/mk/googletest.test.mk ============================================================================== --- projects/kyua-use-googletest-test-interface/share/mk/googletest.test.mk Sun Mar 31 06:16:07 2019 (r345748) +++ projects/kyua-use-googletest-test-interface/share/mk/googletest.test.mk Sun Mar 31 06:20:00 2019 (r345749) @@ -26,6 +26,16 @@ # manpage. GTESTS?= +# Default test interface for googletest +# +# This knob should be used if the version of kyua in use doesn't support the +# `googletest` test interface. +.ifdef GTESTS_USE_PLAIN_TEST_INTERFACE +GTESTS_DEFAULT_TEST_INTERFACE= plain +.else +GTESTS_DEFAULT_TEST_INTERFACE= googletest +.endif + .if !empty(GTESTS) .include @@ -36,6 +46,6 @@ BINDIR.${_T}= ${TESTSDIR} CXXFLAGS.${_T}+= ${GTESTS_CXXFLAGS} MAN.${_T}?= # empty SRCS.${_T}?= ${_T}.cc -TEST_INTERFACE.${_T}= plain +TEST_INTERFACE.${_T}?= ${GTESTS_DEFAULT_TEST_INTERFACE} .endfor .endif