aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorarcadia-devtools <arcadia-devtools@yandex-team.ru>2022-06-06 15:24:15 +0300
committerarcadia-devtools <arcadia-devtools@yandex-team.ru>2022-06-06 15:24:15 +0300
commite5e0e3e814cf0b04b0205a612df8a2bcb4086caa (patch)
treeb69b89d8aaaf26abb7e20f55bec2390df4721338
parentfd815f4c2cd2485f30c8ab9633c05a9d69ce9703 (diff)
downloadydb-e5e0e3e814cf0b04b0205a612df8a2bcb4086caa.tar.gz
intermediate changes
ref:08d61438e3d4f12bbc9f1ccbacd6c8f33dc02408
-rw-r--r--build/rules/go/extended_lint.yaml1
-rw-r--r--contrib/restricted/googletest/googlemock/CMakeLists.txt11
-rw-r--r--contrib/restricted/googletest/googlemock/gmock_main/.yandex_meta/licenses.list.txt96
-rw-r--r--contrib/restricted/googletest/googlemock/src/gmock_main.cc72
-rw-r--r--contrib/restricted/googletest/googletest/CMakeLists.txt5
5 files changed, 7 insertions, 178 deletions
diff --git a/build/rules/go/extended_lint.yaml b/build/rules/go/extended_lint.yaml
index c363a8f61a..476d2c3e0a 100644
--- a/build/rules/go/extended_lint.yaml
+++ b/build/rules/go/extended_lint.yaml
@@ -41,3 +41,4 @@ scopes:
- exhaustivestruct
a.yandex-team.ru/browser/backend:
- sqlclosecheck
+ - structtagcase
diff --git a/contrib/restricted/googletest/googlemock/CMakeLists.txt b/contrib/restricted/googletest/googlemock/CMakeLists.txt
index 34bc0daf8b..f2ee3a43c1 100644
--- a/contrib/restricted/googletest/googlemock/CMakeLists.txt
+++ b/contrib/restricted/googletest/googlemock/CMakeLists.txt
@@ -8,20 +8,17 @@
add_library(restricted-googletest-googlemock)
-target_compile_options(restricted-googletest-googlemock PUBLIC
- -DGTEST_HAS_ABSL=0
- -DGTEST_OS_FUCHSIA=0
- -DGTEST_HAS_STD_WSTRING=1
-)
target_include_directories(restricted-googletest-googlemock PUBLIC
+ ${CMAKE_SOURCE_DIR}/contrib/restricted/googletest/googlemock
${CMAKE_SOURCE_DIR}/contrib/restricted/googletest/googlemock/include
+ ${CMAKE_SOURCE_DIR}/contrib/restricted/googletest/googletest
${CMAKE_SOURCE_DIR}/contrib/restricted/googletest/googletest/include
)
target_include_directories(restricted-googletest-googlemock PRIVATE
- ${CMAKE_SOURCE_DIR}/contrib/restricted/googletest/googlemock/include
- ${CMAKE_SOURCE_DIR}/contrib/restricted/googletest/googletest/include
${CMAKE_SOURCE_DIR}/contrib/restricted/googletest/googlemock
+ ${CMAKE_SOURCE_DIR}/contrib/restricted/googletest/googlemock/include
${CMAKE_SOURCE_DIR}/contrib/restricted/googletest/googletest
+ ${CMAKE_SOURCE_DIR}/contrib/restricted/googletest/googletest/include
)
target_link_libraries(restricted-googletest-googlemock PUBLIC
contrib-libs-cxxsupp
diff --git a/contrib/restricted/googletest/googlemock/gmock_main/.yandex_meta/licenses.list.txt b/contrib/restricted/googletest/googlemock/gmock_main/.yandex_meta/licenses.list.txt
deleted file mode 100644
index c2e41973c1..0000000000
--- a/contrib/restricted/googletest/googlemock/gmock_main/.yandex_meta/licenses.list.txt
+++ /dev/null
@@ -1,96 +0,0 @@
-====================BSD-3-Clause====================
-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.
-
-====================COPYRIGHT====================
-Copyright 2008, Google Inc.
-All rights reserved.
-
-
-====================File: CONTRIBUTORS====================
-# This file contains a list of people who've made non-trivial
-# contribution to the Google C++ Testing Framework project. People
-# who commit code to the project are encouraged to add their names
-# here. Please keep the list sorted by first names.
-
-Ajay Joshi <jaj@google.com>
-Balázs Dán <balazs.dan@gmail.com>
-Benoit Sigoure <tsuna@google.com>
-Bharat Mediratta <bharat@menalto.com>
-Bogdan Piloca <boo@google.com>
-Chandler Carruth <chandlerc@google.com>
-Chris Prince <cprince@google.com>
-Chris Taylor <taylorc@google.com>
-Dan Egnor <egnor@google.com>
-Dave MacLachlan <dmaclach@gmail.com>
-David Anderson <danderson@google.com>
-Dean Sturtevant
-Eric Roman <eroman@chromium.org>
-Gene Volovich <gv@cite.com>
-Hady Zalek <hady.zalek@gmail.com>
-Hal Burch <gmock@hburch.com>
-Jeffrey Yasskin <jyasskin@google.com>
-Jim Keller <jimkeller@google.com>
-Joe Walnes <joe@truemesh.com>
-Jon Wray <jwray@google.com>
-Jói Sigurðsson <joi@google.com>
-Keir Mierle <mierle@gmail.com>
-Keith Ray <keith.ray@gmail.com>
-Kenton Varda <kenton@google.com>
-Kostya Serebryany <kcc@google.com>
-Krystian Kuzniarek <krystian.kuzniarek@gmail.com>
-Lev Makhlis
-Manuel Klimek <klimek@google.com>
-Mario Tanev <radix@google.com>
-Mark Paskin
-Markus Heule <markus.heule@gmail.com>
-Matthew Simmons <simmonmt@acm.org>
-Mika Raento <mikie@iki.fi>
-Mike Bland <mbland@google.com>
-Miklós Fazekas <mfazekas@szemafor.com>
-Neal Norwitz <nnorwitz@gmail.com>
-Nermin Ozkiranartli <nermin@google.com>
-Owen Carlsen <ocarlsen@google.com>
-Paneendra Ba <paneendra@google.com>
-Pasi Valminen <pasi.valminen@gmail.com>
-Patrick Hanna <phanna@google.com>
-Patrick Riley <pfr@google.com>
-Paul Menage <menage@google.com>
-Peter Kaminski <piotrk@google.com>
-Piotr Kaminski <piotrk@google.com>
-Preston Jackson <preston.a.jackson@gmail.com>
-Rainer Klaffenboeck <rainer.klaffenboeck@dynatrace.com>
-Russ Cox <rsc@google.com>
-Russ Rufer <russ@pentad.com>
-Sean Mcafee <eefacm@gmail.com>
-Sigurður Ásgeirsson <siggi@google.com>
-Sverre Sundsdal <sundsdal@gmail.com>
-Takeshi Yoshino <tyoshino@google.com>
-Tracy Bialik <tracy@pentad.com>
-Vadim Berman <vadimb@google.com>
-Vlad Losev <vladl@google.com>
-Wolfgang Klier <wklier@google.com>
-Zhanyong Wan <wan@google.com>
diff --git a/contrib/restricted/googletest/googlemock/src/gmock_main.cc b/contrib/restricted/googletest/googlemock/src/gmock_main.cc
deleted file mode 100644
index 18c500f663..0000000000
--- a/contrib/restricted/googletest/googlemock/src/gmock_main.cc
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright 2008, 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.
-
-
-#include <iostream>
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-#if GTEST_OS_ESP8266 || GTEST_OS_ESP32
-#if GTEST_OS_ESP8266
-extern "C" {
-#endif
-void setup() {
- // Since Google Mock depends on Google Test, InitGoogleMock() is
- // also responsible for initializing Google Test. Therefore there's
- // no need for calling testing::InitGoogleTest() separately.
- testing::InitGoogleMock();
-}
-void loop() { RUN_ALL_TESTS(); }
-#if GTEST_OS_ESP8266
-}
-#endif
-
-#else
-
-// MS C++ compiler/linker has a bug on Windows (not on Windows CE), which
-// causes a link error when _tmain is defined in a static library and UNICODE
-// is enabled. For this reason instead of _tmain, main function is used on
-// Windows. See the following link to track the current status of this bug:
-// https://web.archive.org/web/20170912203238/connect.microsoft.com/VisualStudio/feedback/details/394464/wmain-link-error-in-the-static-library
-// // NOLINT
-#if GTEST_OS_WINDOWS_MOBILE
-# include <tchar.h> // NOLINT
-
-GTEST_API_ int _tmain(int argc, TCHAR** argv) {
-#else
-GTEST_API_ int main(int argc, char** argv) {
-#endif // GTEST_OS_WINDOWS_MOBILE
- std::cout << "Running main() from gmock_main.cc\n";
- // Since Google Mock depends on Google Test, InitGoogleMock() is
- // also responsible for initializing Google Test. Therefore there's
- // no need for calling testing::InitGoogleTest() separately.
- testing::InitGoogleMock(&argc, argv);
- return RUN_ALL_TESTS();
-}
-#endif
diff --git a/contrib/restricted/googletest/googletest/CMakeLists.txt b/contrib/restricted/googletest/googletest/CMakeLists.txt
index 9cc89821cf..ae407a34ed 100644
--- a/contrib/restricted/googletest/googletest/CMakeLists.txt
+++ b/contrib/restricted/googletest/googletest/CMakeLists.txt
@@ -9,16 +9,15 @@
add_library(restricted-googletest-googletest)
target_compile_options(restricted-googletest-googletest PUBLIC
- -DGTEST_HAS_ABSL=0
- -DGTEST_OS_FUCHSIA=0
-DGTEST_HAS_STD_WSTRING=1
)
target_include_directories(restricted-googletest-googletest PUBLIC
+ ${CMAKE_SOURCE_DIR}/contrib/restricted/googletest/googletest
${CMAKE_SOURCE_DIR}/contrib/restricted/googletest/googletest/include
)
target_include_directories(restricted-googletest-googletest PRIVATE
- ${CMAKE_SOURCE_DIR}/contrib/restricted/googletest/googletest/include
${CMAKE_SOURCE_DIR}/contrib/restricted/googletest/googletest
+ ${CMAKE_SOURCE_DIR}/contrib/restricted/googletest/googletest/include
)
target_link_libraries(restricted-googletest-googletest PUBLIC
contrib-libs-cxxsupp