diff options
| author | thegeorg <thegeorg@yandex-team.com> | 2023-08-11 14:51:15 +0300 |
|---|---|---|
| committer | thegeorg <thegeorg@yandex-team.com> | 2023-08-11 16:06:25 +0300 |
| commit | 0435311e23125839259fb70cd5d5587d6b5a90a8 (patch) | |
| tree | 88b0c55ec7077827094e25728577110671754041 | |
| parent | 95d881de13521f9f5d4310978920044743695017 (diff) | |
| download | ydb-0435311e23125839259fb70cd5d5587d6b5a90a8.tar.gz | |
Acklowledge patch unacceptance
Upstreamed in https://github.com/google/googletest/pull/4327, but was not accepted by the maintainers.
| -rw-r--r-- | contrib/restricted/googletest/googletest/include/gtest/internal/gtest-death-test-internal.h | 4 | ||||
| -rw-r--r-- | contrib/restricted/googletest/googletest/include/gtest/internal/gtest-internal.h | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/contrib/restricted/googletest/googletest/include/gtest/internal/gtest-death-test-internal.h b/contrib/restricted/googletest/googletest/include/gtest/internal/gtest-death-test-internal.h index 08fa2294cf0..372fdbbea3c 100644 --- a/contrib/restricted/googletest/googletest/include/gtest/internal/gtest-death-test-internal.h +++ b/contrib/restricted/googletest/googletest/include/gtest/internal/gtest-death-test-internal.h @@ -227,7 +227,7 @@ inline Matcher<const ::std::string&> MakeDeathTestMatcher( #statement, \ ::testing::internal::MakeDeathTestMatcher(regex_or_matcher), \ __FILE__, __LINE__, >est_dt)) { \ - /* NOLINTNEXTLINE(cppcoreguidelines-avoid-goto, hicpp-avoid-goto) */ \ + /* NOLINTNEXTLINE(*-avoid-goto) */ \ goto GTEST_CONCAT_TOKEN_(gtest_label_, __LINE__); \ } \ if (gtest_dt != nullptr) { \ @@ -235,7 +235,7 @@ inline Matcher<const ::std::string&> MakeDeathTestMatcher( switch (gtest_dt->AssumeRole()) { \ case ::testing::internal::DeathTest::OVERSEE_TEST: \ if (!gtest_dt->Passed(predicate(gtest_dt->Wait()))) { \ - /* NOLINTNEXTLINE(cppcoreguidelines-avoid-goto, hicpp-avoid-goto) */ \ + /* NOLINTNEXTLINE(*-avoid-goto) */ \ goto GTEST_CONCAT_TOKEN_(gtest_label_, __LINE__); \ } \ break; \ diff --git a/contrib/restricted/googletest/googletest/include/gtest/internal/gtest-internal.h b/contrib/restricted/googletest/googletest/include/gtest/internal/gtest-internal.h index ab7d4f16d80..c9178f79efb 100644 --- a/contrib/restricted/googletest/googletest/include/gtest/internal/gtest-internal.h +++ b/contrib/restricted/googletest/googletest/include/gtest/internal/gtest-internal.h @@ -1404,7 +1404,7 @@ class NeverThrown { gtest_msg.value += " with description \""; \ gtest_msg.value += e.what(); \ gtest_msg.value += "\"."; \ - /* NOLINTNEXTLINE(cppcoreguidelines-avoid-goto, hicpp-avoid-goto) */ \ + /* NOLINTNEXTLINE(*-avoid-goto) */ \ goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__); \ } @@ -1428,14 +1428,14 @@ class NeverThrown { gtest_msg.value = "Expected: " #statement \ " throws an exception of type " #expected_exception \ ".\n Actual: it throws a different type."; \ - /* NOLINTNEXTLINE(cppcoreguidelines-avoid-goto, hicpp-avoid-goto) */ \ + /* NOLINTNEXTLINE(*-avoid-goto) */ \ goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__); \ } \ if (!gtest_caught_expected) { \ gtest_msg.value = "Expected: " #statement \ " throws an exception of type " #expected_exception \ ".\n Actual: it throws nothing."; \ - /* NOLINTNEXTLINE(cppcoreguidelines-avoid-goto, hicpp-avoid-goto) */ \ + /* NOLINTNEXTLINE(*-avoid-goto) */ \ goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__); \ } \ } else /*NOLINT*/ \ @@ -1451,7 +1451,7 @@ class NeverThrown { gtest_msg.value += " with description \""; \ gtest_msg.value += e.what(); \ gtest_msg.value += "\"."; \ - /* NOLINTNEXTLINE(cppcoreguidelines-avoid-goto, hicpp-avoid-goto) */ \ + /* NOLINTNEXTLINE(*-avoid-goto) */ \ goto GTEST_CONCAT_TOKEN_(gtest_label_testnothrow_, __LINE__); \ } @@ -1470,7 +1470,7 @@ class NeverThrown { GTEST_TEST_NO_THROW_CATCH_STD_EXCEPTION_() \ catch (...) { \ gtest_msg.value = "it throws."; \ - /* NOLINTNEXTLINE(cppcoreguidelines-avoid-goto, hicpp-avoid-goto) */ \ + /* NOLINTNEXTLINE(*-avoid-goto) */ \ goto GTEST_CONCAT_TOKEN_(gtest_label_testnothrow_, __LINE__); \ } \ } else \ @@ -1490,7 +1490,7 @@ class NeverThrown { gtest_caught_any = true; \ } \ if (!gtest_caught_any) { \ - /* NOLINTNEXTLINE(cppcoreguidelines-avoid-goto, hicpp-avoid-goto) */ \ + /* NOLINTNEXTLINE(*-avoid-goto) */ \ goto GTEST_CONCAT_TOKEN_(gtest_label_testanythrow_, __LINE__); \ } \ } else \ @@ -1518,7 +1518,7 @@ class NeverThrown { ::testing::internal::HasNewFatalFailureHelper gtest_fatal_failure_checker; \ GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \ if (gtest_fatal_failure_checker.has_new_fatal_failure()) { \ - /* NOLINTNEXTLINE(cppcoreguidelines-avoid-goto, hicpp-avoid-goto) */ \ + /* NOLINTNEXTLINE(*-avoid-goto) */ \ goto GTEST_CONCAT_TOKEN_(gtest_label_testnofatal_, __LINE__); \ } \ } else \ |