diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2014-10-31 16:33:45 -0400 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2014-10-31 16:33:45 -0400 |
| commit | a50042349c002dcac2812c0ee046025b36ee45a4 (patch) | |
| tree | 6e996229aead47a6d9a8f1e2c702454cc2110f56 /test | |
| parent | 8dda6482fa429e01da087a690ca7d9cde3a7abc0 (diff) | |
| parent | ffc42cac0232cb4c30ed946717414174fd42de8b (diff) | |
| download | qtlocation-mapboxgl-a50042349c002dcac2812c0ee046025b36ee45a4.tar.gz | |
Merge branch 'master' into platform-image
Diffstat (limited to 'test')
| -rw-r--r-- | test/fixtures/fixture_request.cpp | 2 | ||||
| -rw-r--r-- | test/headless.cpp | 2 | ||||
| m--------- | test/suite | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/test/fixtures/fixture_request.cpp b/test/fixtures/fixture_request.cpp index f3b41681a6..cc01760ae1 100644 --- a/test/fixtures/fixture_request.cpp +++ b/test/fixtures/fixture_request.cpp @@ -16,7 +16,7 @@ const std::string base_directory = []{ fn.erase(fn.find_last_of("/")); fn.erase(fn.find_last_of("/")); fn.erase(fn.find_last_of("/")); - return fn + "/node_modules/mapbox-gl-test-suite/"; + return fn + "/test/suite/"; }(); namespace mbgl { diff --git a/test/headless.cpp b/test/headless.cpp index 0f4e100271..4605d7f288 100644 --- a/test/headless.cpp +++ b/test/headless.cpp @@ -20,7 +20,7 @@ const std::string base_directory = []{ std::string fn = __FILE__; fn.erase(fn.find_last_of("/")); fn.erase(fn.find_last_of("/")); - return fn + "/node_modules/mapbox-gl-test-suite/"; + return fn + "/test/suite/"; }(); auto display_ = std::make_shared<mbgl::HeadlessDisplay>(); diff --git a/test/suite b/test/suite new file mode 160000 +Subproject 1651a3df444ff83c98f6eff00679d6b84dc8845 |