From owner-svn-src-projects@freebsd.org Sun Mar 31 23:18:13 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 0892F1570376 for ; Sun, 31 Mar 2019 23:18:13 +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 9BD8E954A7; Sun, 31 Mar 2019 23:18:12 +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 7163B5D66; Sun, 31 Mar 2019 23:18:12 +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 x2VNIC1w070402; Sun, 31 Mar 2019 23:18:12 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2VNICvp070401; Sun, 31 Mar 2019 23:18:12 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201903312318.x2VNICvp070401@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 23:18:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r345759 - 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: 345759 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 9BD8E954A7 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_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.975,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] 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 23:18:13 -0000 Author: ngie Date: Sun Mar 31 23:18:12 2019 New Revision: 345759 URL: https://svnweb.freebsd.org/changeset/base/345759 Log: Apply suggestions * Sort preprocessor define blocks. * Reword messages when skipping due to missing prereqs. Requested by: emaste (https://github.com/google/capsicum-test/pull/42) * Remove diagnostic `std::cerr`'s, since the root-cause for the checks not working before was found and addressed in D19765. 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 21:34:58 2019 (r345758) +++ projects/capsicum-test/contrib/capsicum-test/capsicum-test-main.cc Sun Mar 31 23:18:12 2019 (r345759) @@ -1,9 +1,9 @@ #include -#ifdef __linux__ +#if defined(__FreeBSD__) +#include +#elif defined(__linux__) #include #include -#elif defined(__FreeBSD__) -#include #endif #include #include @@ -47,10 +47,8 @@ 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"; - } else { - std::cerr << "Running on a CAPABILITIES enabled kernel - OK!" - << std::endl; + GTEST_SKIP() << "Skipping tests because capsicum support is not " + << "enabled in the kernel."; } const char *oid = "kern.trap_enotcap"; rc = sysctlbyname(oid, &trap_enotcap_enabled, &trap_enotcap_enabled_len, @@ -61,8 +59,6 @@ class SetupEnvironment : public ::testing::Environment if (trap_enotcap_enabled) { GTEST_SKIP() << "Sysctl " << oid << " enabled. " << "Skipping tests to avoid non-determinism with results"; - } else { - std::cerr << "Sysctl " << oid << " not enabled - OK!" << std::endl; } #endif /* FreeBSD */