Chromium Code Reviews| Index: BUILD.gn |
| diff --git a/BUILD.gn b/BUILD.gn |
| index d1daccb59874f7d102465741c997f0bf716c2344..0f898bfe7dfd031d6630c75e0d8e5d457a8feee0 100644 |
| --- a/BUILD.gn |
| +++ b/BUILD.gn |
| @@ -378,6 +378,7 @@ test_lib("flags") { |
| test_lib("tool_utils") { |
| public_include_dirs = [ |
| "tools", |
| + "tools/debugger", |
| "tools/timer", |
| ] |
| sources = [ |
| @@ -387,6 +388,12 @@ test_lib("tool_utils") { |
| "tools/ProcStats.cpp", |
| "tools/Resources.cpp", |
| "tools/ThermalManager.cpp", |
| + "tools/UrlDataManager.cpp", |
| + "tools/debugger/SkDebugCanvas.cpp", |
| + "tools/debugger/SkDrawCommand.cpp", |
| + "tools/debugger/SkJsonWriteBuffer.cpp", |
| + "tools/debugger/SkObjectParser.cpp", |
| + "tools/debugger/SkOverdrawMode.cpp", |
| "tools/picture_utils.cpp", |
| "tools/random_parse_path.cpp", |
| "tools/sk_tool_utils.cpp", |
| @@ -395,6 +402,7 @@ test_lib("tool_utils") { |
| ] |
| deps = [ |
| ":flags", |
| + "//third_party/libpng", |
| ] |
| } |
| @@ -415,6 +423,34 @@ test_lib("gm") { |
| ] |
| } |
| +tests_sources = exec_script("gyp/find.py", |
|
jcgregorio
2016/08/02 19:58:04
Are we going to have the same problem here, i.e. a
|
| + [ |
| + rebase_path("tests"), |
| + "*.c*", |
| + ], |
| + "list lines", |
| + []) |
| + |
| +test_lib("tests") { |
| + public_include_dirs = [ "tests" ] |
| + sources = tests_sources - [ |
| + rebase_path("tests/FontMgrAndroidParserTest.cpp"), # Android only |
| + rebase_path("tests/PathOpsSkpClipTest.cpp"), # alternate main |
| + rebase_path("tests/RTConfRegistryTest.cpp"), # TODO: delete |
| + rebase_path("tests/SkSLErrorTest.cpp"), # TODO: make work |
| + rebase_path("tests/SkpSkGrTest.cpp"), # doesn't compile |
| + rebase_path("tests/skia_test.cpp"), # alternate main |
| + ] |
| + deps = [ |
| + ":flags", |
| + ":gpu_tool_utils", |
| + ":skia", |
| + ":tool_utils", |
| + "//third_party/libpng", |
| + "//third_party/zlib", |
| + ] |
| +} |
| + |
| bench_sources = exec_script("gyp/find.py", |
| [ |
| rebase_path("bench"), |
| @@ -445,9 +481,6 @@ if (!is_component_build) { # Our test tools use many non-SK_API APIs... |
| "dm/DM.cpp", |
| "dm/DMJsonWriter.cpp", |
| "dm/DMSrcSink.cpp", |
| - |
| - # TODO: tests for real |
| - "tests/Test.cpp", |
| ] |
| include_dirs = [ "tests" ] |
| deps = [ |
| @@ -455,6 +488,7 @@ if (!is_component_build) { # Our test tools use many non-SK_API APIs... |
| ":gm", |
| ":gpu_tool_utils", |
| ":skia", |
| + ":tests", |
| ":tool_utils", |
| "//third_party/jsoncpp", |
| "//third_party/libpng", |