diff options
author | mek <mek@chromium.org> | 2015-01-07 09:51:35 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-01-07 17:52:19 +0000 |
commit | 164a39b1806a6261868bc6b2103e24b543251669 (patch) | |
tree | 77da445108e5596e6d29a88a7fad3c5b8953b06f /skia/skia_tests.gyp | |
parent | cf6d3b1224f37cce81e88b0240fbec160758c731 (diff) | |
download | chromium_src-164a39b1806a6261868bc6b2103e24b543251669.zip chromium_src-164a39b1806a6261868bc6b2103e24b543251669.tar.gz chromium_src-164a39b1806a6261868bc6b2103e24b543251669.tar.bz2 |
Revert of skia: Add 'skia_unittests' test suite for this directory. (patchset #12 id:220001 of https://codereview.chromium.org/815023003/)
Reason for revert:
Fails linking on the Mac GN builder:
http://build.chromium.org/p/chromium.mac/builders/Mac%20GN/builds/2094
duplicate symbol __ZN3gfx27SkMatrixToCGAffineTransformERK8SkMatrix in:
obj/skia/ext/skia_unittests.skia_utils_mac_unittest.o
obj/skia/ext/skia.skia_utils_mac.o
(and more similar issues)
Original issue's description:
> skia: Add 'skia_unittests' test suite for this directory.
>
> This should be a lightweight test suite that should allow a dev changing
> something in skia/ext to test it much more quickly than having to build
> all 'unit_tests' target just to run the tests from skia/ext.
>
> BUG=444058
> TEST=skia_unittests links and runs fine.
> R=danakj@chromium.org,thakis@chromium.org
>
> Committed: https://crrev.com/c87c3d2d949f9ba4f17627dc023b303c75b7635f
> Cr-Commit-Position: refs/heads/master@{#310310}
TBR=danakj@chromium.org,thakis@chromium.org,glider@chromium.org,sky@chromium.org,tfarina@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=444058
Review URL: https://codereview.chromium.org/816803003
Cr-Commit-Position: refs/heads/master@{#310314}
Diffstat (limited to 'skia/skia_tests.gyp')
-rw-r--r-- | skia/skia_tests.gyp | 65 |
1 files changed, 0 insertions, 65 deletions
diff --git a/skia/skia_tests.gyp b/skia/skia_tests.gyp deleted file mode 100644 index 250ff1f..0000000 --- a/skia/skia_tests.gyp +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -{ - 'variables': { - 'chromium_code': 1, - }, - 'targets': [ - { - 'target_name': 'skia_unittests', - 'type': '<(gtest_target_type)', - 'dependencies': [ - '../base/base.gyp:base', - '../base/base.gyp:run_all_unittests', - '../testing/gtest.gyp:gtest', - '../skia/skia.gyp:skia', - '../ui/gfx/gfx.gyp:gfx', - '../ui/gfx/gfx.gyp:gfx_geometry', - ], - 'sources': [ - 'ext/analysis_canvas_unittest.cc', - 'ext/bitmap_platform_device_mac_unittest.cc', - 'ext/convolver_unittest.cc', - 'ext/image_operations_unittest.cc', - 'ext/pixel_ref_utils_unittest.cc', - 'ext/platform_canvas_unittest.cc', - 'ext/recursive_gaussian_convolution_unittest.cc', - 'ext/refptr_unittest.cc', - 'ext/skia_utils_ios_unittest.mm', - 'ext/skia_utils_mac_unittest.mm', - 'ext/vector_canvas_unittest.cc', - ], - 'conditions': [ - ['OS != "win"', { - 'sources!': [ - 'ext/vector_canvas_unittest.cc', - ], - }], - ['OS != "win" and OS != "mac"', { - 'sources!': [ - 'ext/platform_canvas_unittest.cc', - ], - }], - ], - }, - ], - 'conditions': [ - ['OS == "android"', { - 'targets': [ - { - 'target_name': 'skia_unittests_apk', - 'type': 'none', - 'dependencies': [ - 'skia_unittests', - ], - 'variables': { - 'test_suite_name': 'skia_unittests', - }, - 'includes': [ '../build/apk_test.gypi' ], - }, - ], - }], - ], -} |