Merge pull request #2203 from ngie-eign:issue-2189
1f3b098ef3af
Actions

Authored by Gennadiy Civil <misterg@google.com> on Apr 3 2019, 23:15.

Description

Merge pull request #2203 from ngie-eign:issue-2189

PiperOrigin-RevId: 241803437

Committed

Gennadiy Civil <misterg@google.com>

Apr 3 2019, 23:15

Pushed

• trottet

Dec 4 2019, 13:52

Parents

Branches

Unknown

Tags

Unknown

Gennadiy Civil <misterg@google.com> committed R9484:1f3b098ef3af: Merge pull request #2203 from ngie-eign:issue-2189 (authored by Gennadiy Civil <misterg@google.com>).Apr 3 2019, 23:15

	Commit			Author	Details	Committed
	67c75ff8baf4			Enji Cooper	Handle GTEST_SKIP() when calling `Environment::SetUp()`	Mar 30 2019

				Path
	M			googletest/CMakeLists.txt
	M			googletest/Makefile.am
	M			googletest/docs/advanced.md
	M			googletest/src/gtest.cc
	M			googletest/test/BUILD.bazel
	P			googletest/test/gtest_skip_environment_check_output_test.py Copied from googletest/test/googletest-param-test-invalid-name2-test.py
	P			googletest/test/gtest_skip_in_environment_setup_test.cc Copied from googletest/test/googletest-param-test-invalid-name1-test_.cc