diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | gyp/fixtures.gypi | 17 | ||||
| -rw-r--r-- | mapboxgl.gyp | 1 | ||||
| -rw-r--r-- | test/test.gyp | 3 |
4 files changed, 1 insertions, 22 deletions
diff --git a/.gitignore b/.gitignore index bce644c7e8..c907dbdec5 100644 --- a/.gitignore +++ b/.gitignore @@ -12,5 +12,3 @@ /src/shader/shaders_gl.cpp /src/shader/shaders_gles2.cpp /bin/style.bin.js -/test/fixtures/styles/index.html -/test/fixtures/style_parser/styles diff --git a/gyp/fixtures.gypi b/gyp/fixtures.gypi deleted file mode 100644 index 199865a6f3..0000000000 --- a/gyp/fixtures.gypi +++ /dev/null @@ -1,17 +0,0 @@ -{ - 'targets': [ - { 'target_name': 'copy_fixtures', - 'type': 'none', - 'hard_dependency': 1, - 'dependencies': [ - 'bundle_styles' - ], - 'copies': [ - { - 'files': [ '../styles' ], - 'destination': '../test/fixtures/style_parser' - } - ] - }, - ] -} diff --git a/mapboxgl.gyp b/mapboxgl.gyp index 69cc31016a..3978ebf0ad 100644 --- a/mapboxgl.gyp +++ b/mapboxgl.gyp @@ -3,7 +3,6 @@ './gyp/common.gypi', './gyp/shaders.gypi', './gyp/styles.gypi', - './gyp/fixtures.gypi', './gyp/certificates.gypi', './gyp/mbgl-core.gypi', './gyp/mbgl-platform.gypi', diff --git a/test/test.gyp b/test/test.gyp index 249be64076..8ae475d1c1 100644 --- a/test/test.gyp +++ b/test/test.gyp @@ -77,8 +77,7 @@ ], 'dependencies': [ '../deps/gtest/gtest.gyp:gtest', - '../mapboxgl.gyp:mbgl-standalone', - '../mapboxgl.gyp:copy_fixtures', + '../mapboxgl.gyp:mbgl-standalone' ], 'conditions': [ ['OS == "mac"', { 'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ] } |