diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2016-04-03 15:16:49 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-04-07 18:01:02 -0700 |
commit | f964e40e7e9220d08751d8607af61ac5a7c0794c (patch) | |
tree | d34ca5407188fe3d71396faa8a8acceb52d9bd4b /test/api | |
parent | f5d66f362272db034a311d2077dbdb2937c9bbdf (diff) | |
download | qtlocation-mapboxgl-f964e40e7e9220d08751d8607af61ac5a7c0794c.tar.gz |
[build] Refactor and simplify build system
* Main gyp files are now standardized as platform/<platform>/platform.gyp.
* Each platform gyp file defines appropriate loop_lib and headless_lib variables.
* Each platform gyp file includes mbgl.gypi, which defines base targets which may be useful to all platforms.
* CI targets are consistent across platforms: `make $(PLATFORM) && make test-$(PLATFORM)`.
* Renamed the "linux" test app to "glfw". It's now built in OS X CI.
* Android build flakiness is fixed.
* iOS CI builds the bench and iosapp targets.
* Mesa version is now in one place.
* CI scripts use bash "strict mode" and correct error handling.
* All build output goes to the build directory.
* Removed vestigial iOS/OS X/Android Travis scripts.
Diffstat (limited to 'test/api')
-rw-r--r-- | test/api/render_missing.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/test/api/render_missing.cpp b/test/api/render_missing.cpp index 8c3a1f8e52..f29a0c2b9c 100644 --- a/test/api/render_missing.cpp +++ b/test/api/render_missing.cpp @@ -45,15 +45,7 @@ TEST(API, TEST_REQUIRES_SERVER(RenderMissingTile)) { std::rethrow_exception(err); } catch (const std::exception& ex) { message = ex.what(); -#ifdef MBGL_HTTP_NSURL - EXPECT_STREQ("Could not connect to the server.", ex.what()); -#elif MBGL_HTTP_CURL - const char* prefix = "Couldn't connect to server:"; - EXPECT_EQ(0, strncmp(prefix, ex.what(), strlen(prefix))) << "Full message is: \"" - << ex.what() << "\""; -#else - FAIL(); -#endif + EXPECT_TRUE(message.find("connect") != std::string::npos); } promise.set_value(); }); |