Date: Sat, 30 Mar 2019 21:04:08 +0000 (UTC) From: Enji Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r345740 - in projects/capsicum-test: contrib/googletest/googletest contrib/googletest/googletest/docs contrib/googletest/googletest/test lib/googletest/gtest_main/tests Message-ID: <201903302104.x2UL48MS043660@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Sat Mar 30 21:04:08 2019 New Revision: 345740 URL: https://svnweb.freebsd.org/changeset/base/345740 Log: Import the proof-of-concept fix in D19765 I'm using this to complete the TODO items in D19758. Added: projects/capsicum-test/contrib/googletest/googletest/test/gtest_skip_in_environment_setup_test.cc (contents, props changed) Modified: projects/capsicum-test/contrib/googletest/googletest/CMakeLists.txt projects/capsicum-test/contrib/googletest/googletest/Makefile.am projects/capsicum-test/contrib/googletest/googletest/docs/advanced.md projects/capsicum-test/contrib/googletest/googletest/test/BUILD.bazel projects/capsicum-test/lib/googletest/gtest_main/tests/Makefile Modified: projects/capsicum-test/contrib/googletest/googletest/CMakeLists.txt ============================================================================== --- projects/capsicum-test/contrib/googletest/googletest/CMakeLists.txt Sat Mar 30 18:00:44 2019 (r345739) +++ projects/capsicum-test/contrib/googletest/googletest/CMakeLists.txt Sat Mar 30 21:04:08 2019 (r345740) @@ -217,6 +217,7 @@ if (gtest_build_tests) test/gtest-typed-test2_test.cc) cxx_test(gtest_unittest gtest_main) cxx_test(gtest-unittest-api_test gtest) + cxx_test(gtest_skip_in_environment_setup_test gtest_main) cxx_test(gtest_skip_test gtest_main) ############################################################ Modified: projects/capsicum-test/contrib/googletest/googletest/Makefile.am ============================================================================== --- projects/capsicum-test/contrib/googletest/googletest/Makefile.am Sat Mar 30 18:00:44 2019 (r345739) +++ projects/capsicum-test/contrib/googletest/googletest/Makefile.am Sat Mar 30 21:04:08 2019 (r345740) @@ -290,6 +290,12 @@ test_gtest_all_test_SOURCES = test/gtest_all_test.cc test_gtest_all_test_LDADD = lib/libgtest_main.la \ lib/libgtest.la +TESTS += test/gtest_skip_in_environment_setup_test +check_PROGRAMS += test/gtest_skip_in_environment_setup_test +test_gtest_skip_in_environment_setup_test_SOURCES = test/gtest_skip_in_environment_setup_test.cc +test_gtest_skip_in_environment_setup_test_LDADD= lib/libgtest_main.la \ + lib/libgtest.la + # Tests that fused gtest files compile and work. FUSED_GTEST_SRC = \ fused-src/gtest/gtest-all.cc \ Modified: projects/capsicum-test/contrib/googletest/googletest/docs/advanced.md ============================================================================== --- projects/capsicum-test/contrib/googletest/googletest/docs/advanced.md Sat Mar 30 18:00:44 2019 (r345739) +++ projects/capsicum-test/contrib/googletest/googletest/docs/advanced.md Sat Mar 30 21:04:08 2019 (r345740) @@ -1289,8 +1289,10 @@ Environment* AddGlobalTestEnvironment(Environment* env ``` Now, when `RUN_ALL_TESTS()` is called, it first calls the `SetUp()` method of -the environment object, then runs the tests if there was no fatal failures, and -finally calls `TearDown()` of the environment object. +each environment object, then runs the tests if none of the environments +reported fatal failures and `GTEST_SKIP()` was not called. `RUN_ALL_TESTS()` +always calls `TearDown()` with each environment object, regardless of whether +or not the tests were run. It's OK to register multiple environment objects. In this case, their `SetUp()` will be called in the order they are registered, and their `TearDown()` will be Modified: projects/capsicum-test/contrib/googletest/googletest/test/BUILD.bazel ============================================================================== --- projects/capsicum-test/contrib/googletest/googletest/test/BUILD.bazel Sat Mar 30 18:00:44 2019 (r345739) +++ projects/capsicum-test/contrib/googletest/googletest/test/BUILD.bazel Sat Mar 30 21:04:08 2019 (r345740) @@ -311,6 +311,13 @@ cc_binary( deps = ["//:gtest"], ) +cc_test( + name = "gtest_skip_in_environment_setup_test", + size = "small", + srcs = ["gtest_skip_in_environment_setup_test.cc"], + deps = ["//:gtest_main"], +) + py_test( name = "googletest-list-tests-unittest", size = "small", Added: projects/capsicum-test/contrib/googletest/googletest/test/gtest_skip_in_environment_setup_test.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/capsicum-test/contrib/googletest/googletest/test/gtest_skip_in_environment_setup_test.cc Sat Mar 30 21:04:08 2019 (r345740) @@ -0,0 +1,60 @@ +// Copyright 2019, Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// This test verifies that skipping in the environment results in the +// testcases being skipped. +// +// This is a reproduction case for +// https://github.com/google/googletest/issues/2189 . + +#include <iostream> +#include <gtest/gtest.h> + +class SetupEnvironment : public testing::Environment { +public: + void SetUp() override { + GTEST_SKIP() << "Skipping the entire environment"; + } +}; + +TEST(Test, AlwaysPasses) { + EXPECT_EQ(true, true); +} + +TEST(Test, AlwaysFails) { + EXPECT_EQ(true, false); +} + +int main(int argc, char **argv) { + testing::InitGoogleTest(&argc, argv); + + testing::AddGlobalTestEnvironment(new SetupEnvironment()); + + return (RUN_ALL_TESTS()); +} Modified: projects/capsicum-test/lib/googletest/gtest_main/tests/Makefile ============================================================================== --- projects/capsicum-test/lib/googletest/gtest_main/tests/Makefile Sat Mar 30 18:00:44 2019 (r345739) +++ projects/capsicum-test/lib/googletest/gtest_main/tests/Makefile Sat Mar 30 21:04:08 2019 (r345740) @@ -19,6 +19,7 @@ GTESTS+= gtest_sole_header_test GTESTS+= googletest-test-part-test GTESTS+= gtest-typed-test_test GTESTS+= gtest_skip_test +GTESTS+= gtest_skip_in_environment_setup_test GTESTS+= gtest_unittest CXXFLAGS+= -I${GOOGLETEST_SRCROOT}/include
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903302104.x2UL48MS043660>