diff options
| author | Dino Radakovic <dinor@google.com> | 2023-06-14 13:40:34 (GMT) |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2023-06-14 13:41:11 (GMT) |
| commit | 4c7aee827e16aa338189b88f6e3aa6d3d927dba4 (patch) | |
| tree | 774787f82888ff578ee8d0fb88ca1e92b2e696fe /googletest/src | |
| parent | e9078161e6d35e31535b3d76086ffd5714050a1b (diff) | |
| download | googletest-4c7aee827e16aa338189b88f6e3aa6d3d927dba4.zip googletest-4c7aee827e16aa338189b88f6e3aa6d3d927dba4.tar.gz googletest-4c7aee827e16aa338189b88f6e3aa6d3d927dba4.tar.bz2 | |
Skip entire test suite with `GTEST_SKIP()` in `SetUpTestSuite`
Fixes #4273
PiperOrigin-RevId: 540254167
Change-Id: I2555740d10284223539035bf73f88554fcf73f8a
Diffstat (limited to 'googletest/src')
| -rw-r--r-- | googletest/src/gtest.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index fb7512c..a88ac25 100644 --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc @@ -3019,7 +3019,8 @@ void TestSuite::Run() { internal::HandleExceptionsInMethodIfSupported( this, &TestSuite::RunSetUpTestSuite, "SetUpTestSuite()"); - const bool skip_all = ad_hoc_test_result().Failed(); + const bool skip_all = + ad_hoc_test_result().Failed() || ad_hoc_test_result().Skipped(); start_timestamp_ = internal::GetTimeInMillis(); internal::Timer timer; |