diff options
author | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2019-12-03 13:15:45 +0200 |
---|---|---|
committer | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2019-12-03 14:25:38 +0200 |
commit | 060b1429e041f8d2eb6b36f4e4b963182c582e85 (patch) | |
tree | fad8f968607a8ac64dd40c004ecc9dc49207cbf2 /platform/android/src/test/render_test_runner.cpp | |
parent | 1ad1358c8e2f4f37bc8ec076db5770bd647452fd (diff) | |
download | qtlocation-mapboxgl-060b1429e041f8d2eb6b36f4e4b963182c582e85.tar.gz |
[test-runner] Allow to define filter inside manifest fileupstream/alexshalamov_add_filter_to_manifest
Command line option is still available and allows to override filter
that is defined in a manifest file.
Diffstat (limited to 'platform/android/src/test/render_test_runner.cpp')
-rw-r--r-- | platform/android/src/test/render_test_runner.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/platform/android/src/test/render_test_runner.cpp b/platform/android/src/test/render_test_runner.cpp index 0d2400ac74..f4a4072925 100644 --- a/platform/android/src/test/render_test_runner.cpp +++ b/platform/android/src/test/render_test_runner.cpp @@ -252,10 +252,10 @@ void android_main(struct android_app* app) { } else { unZipFile(env, zipFile, storagePath); - auto runTestWithManifest = [&storagePath, &app, &outFd, &outEvents, &source]( - const std::string manifest, const std::string filter = {}) -> bool { + auto runTestWithManifest = + [&storagePath, &app, &outFd, &outEvents, &source](const std::string manifest) -> bool { const std::string configFile = storagePath + manifest; - std::vector<std::string> arguments = {"mbgl-render-test-runner", "-p", configFile, filter}; + std::vector<std::string> arguments = {"mbgl-render-test-runner", "-p", configFile}; std::vector<char*> argv; for (const auto& arg : arguments) { argv.push_back(const_cast<char*>(arg.data())); @@ -279,7 +279,7 @@ void android_main(struct android_app* app) { return result; }; runTestWithManifest("/android-manifest-probe-network-gfx.json"); - runTestWithManifest("/android-manifest-probe-memory.json", "--filter=real-world"); + runTestWithManifest("/android-manifest-probe-memory.json"); mbgl::Log::Info(mbgl::Event::General, "All tests are finished!"); changeState(env, app); } |