From c5514276094022c62373a8a908f72754366d15e8 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 22 Mar 2018 05:19:14 +0000 Subject: Update gtest and gmock to 1.8.x. This applies parts of https://crrev.com/469551 and https://crrev.com/471303 to PDFium. Change-Id: Ifbb8e4c300bd276fe3c6fe60d19ebb1618be8936 Reviewed-on: https://pdfium-review.googlesource.com/28791 Commit-Queue: Lei Zhang Reviewed-by: dsinclair --- testing/gmock/BUILD.gn | 48 ++++++++++ testing/gmock/include/gmock/DEPS | 3 + testing/gmock/include/gmock/gmock-actions.h | 10 +++ .../gmock/gmock-generated-function-mockers.h | 10 +++ testing/gmock/include/gmock/gmock-matchers.h | 10 +++ testing/gmock/include/gmock/gmock.h | 10 +++ testing/gtest/BUILD.gn | 100 +++++++++++++++++++++ testing/gtest/empty.cc | 3 + testing/gtest/include/gtest/DEPS | 4 + testing/gtest/include/gtest/gtest.h | 10 +++ testing/gtest/include/gtest/gtest_prod.h | 10 +++ 11 files changed, 218 insertions(+) create mode 100644 testing/gmock/BUILD.gn create mode 100644 testing/gmock/include/gmock/DEPS create mode 100644 testing/gmock/include/gmock/gmock-actions.h create mode 100644 testing/gmock/include/gmock/gmock-generated-function-mockers.h create mode 100644 testing/gmock/include/gmock/gmock-matchers.h create mode 100644 testing/gmock/include/gmock/gmock.h create mode 100644 testing/gtest/BUILD.gn create mode 100644 testing/gtest/empty.cc create mode 100644 testing/gtest/include/gtest/DEPS create mode 100644 testing/gtest/include/gtest/gtest.h create mode 100644 testing/gtest/include/gtest/gtest_prod.h (limited to 'testing') diff --git a/testing/gmock/BUILD.gn b/testing/gmock/BUILD.gn new file mode 100644 index 0000000000..a22d8929e6 --- /dev/null +++ b/testing/gmock/BUILD.gn @@ -0,0 +1,48 @@ +# Copyright 2018 The PDFium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# The file/directory layout of Google Test is not yet considered stable. Until +# it stabilizes, Chromium code MUST use this target instead of reaching directly +# into //third_party/googletest. + +import("//build_overrides/build.gni") + +source_set("gmock") { + testonly = true + sources = [ + "include/gmock/gmock-actions.h", + "include/gmock/gmock-generated-function-mockers.h", + "include/gmock/gmock-matchers.h", + "include/gmock/gmock.h", + ] + deps = [ + "//third_party/googletest:gmock", + ] + + # TODO(crbug.com/806952): Depending on gmock_mutant only if build_with_chromium, + # because gmock_mutant depends on //base which uses C++14. Since gmock is a + # third_party library used by other projects it should not include C++14 only code. + if (build_with_chromium) { + # Allow Chromium targets depending on gmock to #include testing/gmock_mutant.h + # without triggering a `gn check` error. + public_deps = [ + "//testing:gmock_mutant", + ] + } + + public_configs = [ + "//third_party/googletest:gmock_config", + "//third_party/googletest:gtest_config", + ] +} + +# The file/directory layout of Google Test is not yet considered stable. Until +# it stabilizes, Chromium code MUST use this target instead of reaching directly +# into //third_party/googletest. +source_set("gmock_main") { + testonly = true + deps = [ + "//third_party/googletest:gmock_main", + ] +} diff --git a/testing/gmock/include/gmock/DEPS b/testing/gmock/include/gmock/DEPS new file mode 100644 index 0000000000..c817a8474e --- /dev/null +++ b/testing/gmock/include/gmock/DEPS @@ -0,0 +1,3 @@ +include_rules = [ + '+third_party/googletest/src/googlemock/include/gmock', +] diff --git a/testing/gmock/include/gmock/gmock-actions.h b/testing/gmock/include/gmock/gmock-actions.h new file mode 100644 index 0000000000..fb193e5dd9 --- /dev/null +++ b/testing/gmock/include/gmock/gmock-actions.h @@ -0,0 +1,10 @@ +// Copyright 2018 The PDFium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// The file/directory layout of Google Test is not yet considered stable. Until +// it stabilizes, Chromium code will use forwarding headers in testing/gtest +// and testing/gmock, instead of directly including files in +// third_party/googletest. + +#include "third_party/googletest/src/googlemock/include/gmock/gmock-actions.h" diff --git a/testing/gmock/include/gmock/gmock-generated-function-mockers.h b/testing/gmock/include/gmock/gmock-generated-function-mockers.h new file mode 100644 index 0000000000..57cbc0a044 --- /dev/null +++ b/testing/gmock/include/gmock/gmock-generated-function-mockers.h @@ -0,0 +1,10 @@ +// Copyright 2018 The PDFium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// The file/directory layout of Google Test is not yet considered stable. Until +// it stabilizes, Chromium code will use forwarding headers in testing/gtest +// and testing/gmock, instead of directly including files in +// third_party/googletest. + +#include "third_party/googletest/src/googlemock/include/gmock/gmock-generated-function-mockers.h" diff --git a/testing/gmock/include/gmock/gmock-matchers.h b/testing/gmock/include/gmock/gmock-matchers.h new file mode 100644 index 0000000000..25d25e9080 --- /dev/null +++ b/testing/gmock/include/gmock/gmock-matchers.h @@ -0,0 +1,10 @@ +// Copyright 2018 The PDFium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// The file/directory layout of Google Test is not yet considered stable. Until +// it stabilizes, Chromium code will use forwarding headers in testing/gtest +// and testing/gmock, instead of directly including files in +// third_party/googletest. + +#include "third_party/googletest/src/googlemock/include/gmock/gmock-matchers.h" diff --git a/testing/gmock/include/gmock/gmock.h b/testing/gmock/include/gmock/gmock.h new file mode 100644 index 0000000000..a344bcbf55 --- /dev/null +++ b/testing/gmock/include/gmock/gmock.h @@ -0,0 +1,10 @@ +// Copyright 2018 The PDFium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// The file/directory layout of Google Test is not yet considered stable. Until +// it stabilizes, Chromium code will use forwarding headers in testing/gtest +// and testing/gmock, instead of directly including files in +// third_party/googletest. + +#include "third_party/googletest/src/googlemock/include/gmock/gmock.h" diff --git a/testing/gtest/BUILD.gn b/testing/gtest/BUILD.gn new file mode 100644 index 0000000000..4c1ce37bcd --- /dev/null +++ b/testing/gtest/BUILD.gn @@ -0,0 +1,100 @@ +# Copyright 2018 The PDFium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build_overrides/gtest.gni") +if (is_ios) { + import("//build/config/coverage/coverage.gni") + import("//build/config/ios/ios_sdk.gni") + import("//build/buildflag_header.gni") +} + +config("gtest_direct_config") { + visibility = [ ":*" ] + defines = [ "UNIT_TEST" ] +} + +# The file/directory layout of Google Test is not yet considered stable. Until +# it stabilizes, Chromium code MUST use this target instead of reaching directly +# into //third_party/googletest. +static_library("gtest") { + testonly = true + + sources = [ + "include/gtest/gtest-death-test.h", + "include/gtest/gtest-message.h", + "include/gtest/gtest-param-test.h", + "include/gtest/gtest-spi.h", + "include/gtest/gtest.h", + "include/gtest/gtest_prod.h", + + # This is a workaround for the issues below. + # + # 1) This target needs to be a static_library (not a source set) on Mac to + # avoid the build errors in + # https://codereview.chromium.org/2779193002#msg82. + # 2) A static_library must have at least one source file, to avoid build + # errors on Mac and Windows. https://crbug.com/710334 + # 3) A static_library with complete_static_lib = true, which would not + # require adding the empty file, will result in duplicate symbols on + # Android. https://codereview.chromium.org/2852613002/#ps20001 + "empty.cc", + ] + public_deps = [ + "//third_party/googletest:gtest", + ] + + public_configs = [ ":gtest_direct_config" ] + + if (gtest_include_multiprocess) { + sources += [ + "../multiprocess_func_list.cc", + "../multiprocess_func_list.h", + ] + } + + if (gtest_include_platform_test) { + sources += [ "../platform_test.h" ] + } + + if ((is_mac || is_ios) && gtest_include_objc_support) { + if (is_ios) { + set_sources_assignment_filter([]) + } + sources += [ + "../gtest_mac.h", + "../gtest_mac.mm", + ] + if (gtest_include_platform_test) { + sources += [ "../platform_test_mac.mm" ] + } + set_sources_assignment_filter(sources_assignment_filter) + } + + if (is_ios && gtest_include_ios_coverage) { + sources += [ + "../coverage_util_ios.h", + "../coverage_util_ios.mm", + ] + deps = [ + ":ios_enable_coverage", + ] + } +} + +# The file/directory layout of Google Test is not yet considered stable. Until +# it stabilizes, Chromium code MUST use this target instead of reaching directly +# into //third_party/googletest. +source_set("gtest_main") { + testonly = true + deps = [ + "//third_party/googletest:gtest_main", + ] +} + +if (is_ios) { + buildflag_header("ios_enable_coverage") { + header = "ios_enable_coverage.h" + flags = [ "IOS_ENABLE_COVERAGE=$use_clang_coverage" ] + } +} diff --git a/testing/gtest/empty.cc b/testing/gtest/empty.cc new file mode 100644 index 0000000000..5186b599d2 --- /dev/null +++ b/testing/gtest/empty.cc @@ -0,0 +1,3 @@ +// Copyright 2018 The PDFium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. diff --git a/testing/gtest/include/gtest/DEPS b/testing/gtest/include/gtest/DEPS new file mode 100644 index 0000000000..eb5e079aed --- /dev/null +++ b/testing/gtest/include/gtest/DEPS @@ -0,0 +1,4 @@ +include_rules = [ + '+third_party/googletest/src/googletest/include/gtest', +] + diff --git a/testing/gtest/include/gtest/gtest.h b/testing/gtest/include/gtest/gtest.h new file mode 100644 index 0000000000..9425b25c15 --- /dev/null +++ b/testing/gtest/include/gtest/gtest.h @@ -0,0 +1,10 @@ +// Copyright 2018 The PDFium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// The file/directory layout of Google Test is not yet considered stable. Until +// it stabilizes, Chromium code will use forwarding headers in testing/gtest +// and testing/gmock, instead of directly including files in +// third_party/googletest. + +#include "third_party/googletest/src/googletest/include/gtest/gtest.h" diff --git a/testing/gtest/include/gtest/gtest_prod.h b/testing/gtest/include/gtest/gtest_prod.h new file mode 100644 index 0000000000..2d67b42013 --- /dev/null +++ b/testing/gtest/include/gtest/gtest_prod.h @@ -0,0 +1,10 @@ +// Copyright 2018 The PDFium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// The file/directory layout of Google Test is not yet considered stable. Until +// it stabilizes, Chromium code will use forwarding headers in testing/gtest +// and testing/gmock, instead of directly including files in +// third_party/googletest. + +#include "third_party/googletest/src/googletest/include/gtest/gtest_prod.h" -- cgit v1.2.3