未验证 提交 141176b9 编写于 作者: P Petr Hosek 提交者: GitHub

Migrate all uses of gtest to googletest (#4755)

gtest is an old version that predates the googletest and googlemock
merger, all tests should be using the newer googletest that's being
kept in sync with the upstream version.
上级 c609dcdd
......@@ -132,9 +132,6 @@ deps = {
'src/third_party/benchmark':
Var('fuchsia_git') + '/third_party/benchmark' + '@' + '296537bc48d380adf21567c5d736ab79f5363d22',
'src/third_party/gtest':
Var('fuchsia_git') + '/third_party/gtest' + '@' + 'c00f82917331efbbd27124b537e4ccc915a02b72',
'src/third_party/googletest':
Var('fuchsia_git') + '/third_party/googletest' + '@' + '2072b0053d3537fa5e8d222e34c759987aae1320',
......
......@@ -10,7 +10,7 @@
#include <cmath>
#include "flutter/flow/matrix_decomposition.h"
#include "third_party/gtest/include/gtest/gtest.h"
#include "gtest/gtest.h"
TEST(MatrixDecomposition, Rotation) {
SkMatrix44 matrix = SkMatrix44::I();
......
......@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "flutter/flow/raster_cache.h"
#include "third_party/gtest/include/gtest/gtest.h"
#include "gtest/gtest.h"
#include "third_party/skia/include/core/SkPicture.h"
#include "third_party/skia/include/core/SkPictureRecorder.h"
......
......@@ -268,6 +268,6 @@ executable("wtf_unittests") {
# Does not use $flutter_root/testing because it needs and provides its own main
# function in RunAllTests.cpp.
"//third_party/gtest",
"//third_party/googletest:gtest",
]
}
......@@ -12,7 +12,7 @@ source_set("testing") {
]
public_deps = [
"//third_party/gtest",
"//third_party/googletest:gtest",
]
public_configs = [ "$flutter_root:config" ]
......
......@@ -177,7 +177,7 @@ executable("txt_unittests") {
deps = [
":txt",
"//third_party/gtest",
"//third_party/googletest:gtest",
] + txt_common_executable_deps
}
......
......@@ -24,7 +24,7 @@
#include "lib/fxl/macros.h"
#include "minikin/FontCollection.h"
#include "minikin/FontFamily.h"
#include "third_party/gtest/include/gtest/gtest_prod.h"
#include "third_party/googletest/googletest/include/gtest/gtest_prod.h" // nogncheck
#include "third_party/skia/include/core/SkRefCnt.h"
#include "third_party/skia/include/ports/SkFontMgr.h"
#include "txt/asset_font_manager.h"
......
......@@ -28,7 +28,7 @@
#include "paint_record.h"
#include "paragraph_style.h"
#include "styled_runs.h"
#include "third_party/gtest/include/gtest/gtest_prod.h"
#include "third_party/googletest/googletest/include/gtest/gtest_prod.h" // nogncheck
#include "third_party/skia/include/core/SkRect.h"
#include "utils/WindowsUtils.h"
......
......@@ -21,7 +21,7 @@
#include <vector>
#include "text_style.h"
#include "third_party/gtest/include/gtest/gtest_prod.h"
#include "third_party/googletest/googletest/include/gtest/gtest_prod.h" // nogncheck
#include "utils/WindowsUtils.h"
namespace txt {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册