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

diff --git a/gyp/core.gyp b/gyp/core.gyp
index 90d3400..b5bc962 100644 (file)
--- 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 fa2e179..1823b43 100644 (file)
--- 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
similarity index 100%
rename from tests/core/PointTest.cpp
rename to tests/PointTest.cpp