From owner-svn-src-projects@freebsd.org Tue Sep 3 14:06:02 2019 Return-Path: Delivered-To: svn-src-projects@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4B5FFDC179 for ; Tue, 3 Sep 2019 14:06:00 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46N7yv1C3Lz4P4H; Tue, 3 Sep 2019 14:05:59 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1452) id 5908919F18; Tue, 3 Sep 2019 14:05:53 +0000 (UTC) X-Original-To: yuripv@localmail.freebsd.org Delivered-To: yuripv@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 030C214FB1; Sun, 31 Mar 2019 05:15:37 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 676E369A1B; Sun, 31 Mar 2019 05:15:36 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 538) id 1885B14F47; Sun, 31 Mar 2019 05:15:36 +0000 (UTC) Delivered-To: src-committers@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 04A5414F42 for ; Sun, 31 Mar 2019 05:15:33 +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 C19B169A13; Sun, 31 Mar 2019 05:15: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 9AFAD22129; Sun, 31 Mar 2019 05:15: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 x2V5FWqa001746; Sun, 31 Mar 2019 05:15:32 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2V5FWDK001745; Sun, 31 Mar 2019 05:15:32 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201903310515.x2V5FWDK001745@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r345745 - projects/capsicum-test/contrib/capsicum-test X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/capsicum-test/contrib/capsicum-test X-SVN-Commit-Revision: 345745 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk X-Loop: FreeBSD.org Sender: owner-src-committers@freebsd.org X-Rspamd-Queue-Id: 676E369A1B X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.92 / 15.00]; local_wl_from(0.00)[freebsd.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.92)[-0.921,0]; ASN(0.00)[asn:11403, ipnet:96.47.64.0/20, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] Status: O X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Tue, 03 Sep 2019 14:06:02 -0000 X-Original-Date: Sun, 31 Mar 2019 05:15:32 +0000 (UTC) X-List-Received-Date: Tue, 03 Sep 2019 14:06:02 -0000 Author: ngie Date: Sun Mar 31 05:15:32 2019 New Revision: 345745 URL: https://svnweb.freebsd.org/changeset/base/345745 Log: Refine r345743 Add backwards compatibility shim for versions of googletest without `GTEST_SKIP()` and https://github.com/google/googletest/pull/2203, e.g., the version of googletest in ports and the embedded version in the capsicum-test project, mapping to `GTEST_FAIL()`. The goal in this case was to make `capsicum-test` do a hard stop and not execute if the kernel didn't have capsicum support or `kern.trap_enotcap` was enabled. The only way to achieve this prior to https://github.com/google/googletest/pull/2203, was to trigger a fatal failure, e.g., call `GTEST_FAIL()`. Output the skip diagnostic message via std::cerr, instead of using the `GTEST_{FAIL,SKIP}()` macros. For some reason I don't yet understand, the diagnostic messages aren't being output when both macros are triggered, so there's a bug potentially with googletest version 1.8.1 (but not master) where it's not properly outputting the messages. Modified: projects/capsicum-test/contrib/capsicum-test/capsicum-test-main.cc Modified: projects/capsicum-test/contrib/capsicum-test/capsicum-test-main.cc ============================================================================== --- projects/capsicum-test/contrib/capsicum-test/capsicum-test-main.cc Sun Mar 31 04:57:50 2019 (r345744) +++ projects/capsicum-test/contrib/capsicum-test/capsicum-test-main.cc Sun Mar 31 05:15:32 2019 (r345745) @@ -33,6 +33,12 @@ class SetupEnvironment : public ::testing::Environment std::cerr << tmpdir << std::endl; } void CheckCapsicumSupport() { + // For versions of googletest that lack GTEST_SKIP. +#ifndef GTEST_SKIP +#define GTEST_SKIP GTEST_FAIL +#define GTEST_SKIP_defined +#endif + #ifdef __FreeBSD__ size_t trap_enotcap_enabled_len; int rc; @@ -41,9 +47,13 @@ class SetupEnvironment : public ::testing::Environment trap_enotcap_enabled_len = sizeof(trap_enotcap_enabled); if (feature_present("security_capabilities") == 0) { - GTEST_SKIP() << "Tests require a CAPABILITIES enabled kernel"; + // XXX (ngie): using std::cerr because 1.8.1 (with GTEST_SKIP support) + // isn't properly outputting skip diagnostic message here. + std::cerr << "Tests require a CAPABILITIES enabled kernel" << std::endl; + GTEST_SKIP(); } else { - std::cerr << "Running on a CAPABILITIES enabled kernel" << std::endl; + std::cerr << "Running on a CAPABILITIES enabled kernel - OK!" + << std::endl; } const char *oid = "kern.trap_enotcap"; rc = sysctlbyname(oid, &trap_enotcap_enabled, &trap_enotcap_enabled_len, @@ -52,11 +62,19 @@ class SetupEnvironment : public ::testing::Environment GTEST_FAIL() << "sysctlbyname failed: " << strerror(errno); } if (trap_enotcap_enabled) { - GTEST_SKIP() << "Sysctl " << oid << " enabled. " - << "Skipping tests to avoid non-determinism with results"; + // XXX (ngie): using std::cerr because 1.8.1 (with GTEST_SKIP support) + // isn't properly outputting skip diagnostic message here. + std::cerr << "Sysctl " << oid << " enabled. " + << "Skipping tests to avoid non-determinism with results" + << std::endl; + GTEST_SKIP(); } else { - std::cerr << "Sysctl " << oid << " not enabled." << std::endl; + std::cerr << "Sysctl " << oid << " not enabled - OK!" << std::endl; } +#endif /* FreeBSD */ + +#ifdef GTEST_SKIP_defined +#undef GTEST_SKIP #endif } void CreateTemporaryRoot() {