diff options
| author | Mike Morris <michael.patrick.morris@gmail.com> | 2014-07-17 12:44:45 -0400 |
|---|---|---|
| committer | Mike Morris <michael.patrick.morris@gmail.com> | 2014-07-17 12:44:45 -0400 |
| commit | 4cb9972278c2121a87161e3b02b2071acc1ca8e1 (patch) | |
| tree | b0f017fda1740503c1bd7d5e3a28e586648d2e77 /test/test.gyp | |
| parent | 056f9e88d5214ae5752ec946666c756e2bf3d72b (diff) | |
| parent | fa4133a094a084527633038d2de1982ed4898a08 (diff) | |
| download | qtlocation-mapboxgl-4cb9972278c2121a87161e3b02b2071acc1ca8e1.tar.gz | |
Merge branch 'master' into fuzz-pipe
Conflicts:
bin/package.json
src/style/style_parser.cpp
test/fixtures/fixture_log.cpp
test/test.gyp
Diffstat (limited to 'test/test.gyp')
| -rw-r--r-- | test/test.gyp | 35 |
1 files changed, 26 insertions, 9 deletions
diff --git a/test/test.gyp b/test/test.gyp index 1a3915131c..f27344330b 100644 --- a/test/test.gyp +++ b/test/test.gyp @@ -71,7 +71,7 @@ ], "dependencies": [ "../deps/gtest/gtest.gyp:gtest", - "../llmr.gyp:llmr-x86" + "../mapboxgl.gyp:mapboxgl" ] }, { @@ -87,7 +87,7 @@ ], "dependencies": [ "../deps/gtest/gtest.gyp:gtest", - "../llmr.gyp:llmr-x86" + "../mapboxgl.gyp:mapboxgl" ] }, { @@ -103,7 +103,7 @@ ], "dependencies": [ "../deps/gtest/gtest.gyp:gtest", - "../llmr.gyp:llmr-x86" + "../mapboxgl.gyp:mapboxgl" ] }, { @@ -121,7 +121,7 @@ ], "dependencies": [ "../deps/gtest/gtest.gyp:gtest", - "../llmr.gyp:llmr-x86", + "../mapboxgl.gyp:mapboxgl" ] }, { @@ -137,7 +137,23 @@ ], "dependencies": [ "../deps/gtest/gtest.gyp:gtest", - "../llmr.gyp:llmr-x86" + "../mapboxgl.gyp:mapboxgl" + ] + }, + { + "target_name": "comparisons", + "product_name": "test_comparisons", + "type": "executable", + "libraries": [ + "-lpthread", + ], + "sources": [ + "./main.cpp", + "./comparisons.cpp", + ], + "dependencies": [ + "../deps/gtest/gtest.gyp:gtest", + "../mapboxgl.gyp:mapboxgl" ] }, { @@ -153,7 +169,7 @@ ], "dependencies": [ "../deps/gtest/gtest.gyp:gtest", - "../llmr.gyp:llmr-x86" + "../mapboxgl.gyp:mapboxgl" ] }, { @@ -169,7 +185,7 @@ ], "dependencies": [ "../deps/gtest/gtest.gyp:gtest", - "../llmr.gyp:llmr-x86" + "../mapboxgl.gyp:mapboxgl" ] }, { @@ -190,9 +206,9 @@ ], "dependencies": [ "../deps/gtest/gtest.gyp:gtest", - "../llmr.gyp:llmr-x86", + "../mapboxgl.gyp:mapboxgl", "link_gl", - '../llmr.gyp:copy_default_stylesheet', + '../mapboxgl.gyp:copy_default_stylesheet', ] }, { @@ -207,6 +223,7 @@ "functions", "headless", "style", + "comparisons", ], } ] |