diff options
author | epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-06-15 18:49:21 +0000 |
---|---|---|
committer | epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-06-15 18:49:21 +0000 |
commit | d33f75c7becf39bf14aff90f8e3de33206c1a698 (patch) | |
tree | c2bd22665d683bcc86202fee17d882fb6ef25612 | |
parent | 8a12c0430aebfc2451d87426a98f79a191ed70d9 (diff) |
Move PointTest.cpp out of tests/core into tests/ ; the other arrangement was
"clever" but was causing build problems.
git-svn-id: http://skia.googlecode.com/svn/trunk@1604 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r-- | gyp/core.gyp | 12 | ||||
-rw-r--r-- | gyp/tests.gyp | 2 | ||||
-rw-r--r-- | tests/PointTest.cpp (renamed from tests/core/PointTest.cpp) | 0 |
3 files changed, 1 insertions, 13 deletions
diff --git a/gyp/core.gyp b/gyp/core.gyp index 90d340081d..b5bc962122 100644 --- a/gyp/core.gyp +++ b/gyp/core.gyp @@ -330,18 +330,6 @@ 'opts.gyp:opts' ], }, - { - 'target_name': 'core_tests', - 'type': 'static_library', - 'direct_dependent_settings': { - 'sources': [ - '../tests/core/PointTest.cpp', - ], - 'include_dirs': [ - '../tests', - ], - }, - }, ], } diff --git a/gyp/tests.gyp b/gyp/tests.gyp index fa2e17910d..1823b43845 100644 --- a/gyp/tests.gyp +++ b/gyp/tests.gyp @@ -52,6 +52,7 @@ '../tests/PathMeasureTest.cpp', '../tests/PathTest.cpp', '../tests/PDFPrimitivesTest.cpp', + '../tests/PointTest.cpp', '../tests/Reader32Test.cpp', '../tests/RefDictTest.cpp', '../tests/RegionTest.cpp', @@ -69,7 +70,6 @@ ], 'dependencies': [ 'core.gyp:core', - 'core.gyp:core_tests', 'effects.gyp:effects', 'experimental.gyp:experimental', 'images.gyp:images', diff --git a/tests/core/PointTest.cpp b/tests/PointTest.cpp index dc13b303f0..dc13b303f0 100644 --- a/tests/core/PointTest.cpp +++ b/tests/PointTest.cpp |