From owner-svn-src-projects@freebsd.org Mon Apr 1 18:25:15 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 BEE54156BCD9 for ; Mon, 1 Apr 2019 18:25:15 +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 64DF08375E; Mon, 1 Apr 2019 18:25:15 +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 3A9F71A467; Mon, 1 Apr 2019 18:25:15 +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 x31IPFWR073385; Mon, 1 Apr 2019 18:25:15 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x31IPFYV073384; Mon, 1 Apr 2019 18:25:15 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201904011825.x31IPFYV073384@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Mon, 1 Apr 2019 18:25:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r345773 - 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: 345773 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 64DF08375E X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.969,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: Mon, 01 Apr 2019 18:25:16 -0000 Author: ngie Date: Mon Apr 1 18:25:14 2019 New Revision: 345773 URL: https://svnweb.freebsd.org/changeset/base/345773 Log: Import review changes 1. Collapse the declaration/assignment for `trap_enotcap_enabled_len` to reduce complexity. 2. Move the `GTEST_SKIP()` backwards compatible definition out into the global space. 3. Sort conditional platform #includes with __FreeBSD__ before __linux__. Requested by: David Drysdale [1,2], emaste [3] Pull Request: https://github.com/google/capsicum-test/pull/42 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 Mon Apr 1 18:17:48 2019 (r345772) +++ projects/capsicum-test/contrib/capsicum-test/capsicum-test-main.cc Mon Apr 1 18:25:14 2019 (r345773) @@ -1,9 +1,9 @@ #include -#if defined(__FreeBSD__) -#include -#elif defined(__linux__) +#ifdef __linux__ #include #include +#elif defined(__FreeBSD__) +#include #endif #include #include @@ -16,6 +16,11 @@ #include "gtest/gtest.h" #include "capsicum-test.h" +// For versions of googletest that lack GTEST_SKIP. +#ifndef GTEST_SKIP +#define GTEST_SKIP GTEST_FAIL +#endif + std::string tmpdir; class SetupEnvironment : public ::testing::Environment @@ -33,19 +38,11 @@ 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; bool trap_enotcap_enabled; + size_t trap_enotcap_enabled_len = sizeof(trap_enotcap_enabled); - trap_enotcap_enabled_len = sizeof(trap_enotcap_enabled); - if (feature_present("security_capabilities") == 0) { GTEST_SKIP() << "Skipping tests because capsicum support is not " << "enabled in the kernel."; @@ -61,10 +58,6 @@ class SetupEnvironment : public ::testing::Environment << "Skipping tests to avoid non-determinism with results"; } #endif /* FreeBSD */ - -#ifdef GTEST_SKIP_defined -#undef GTEST_SKIP -#endif } void CreateTemporaryRoot() { char *tmpdir_name = tempnam(nullptr, "cptst");