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 16:26:22 +0200 |
commit | 41324842b294d9d38eb42f1b8726e270510614e0 (patch) | |
tree | b92364de715385bbb05e5a45e4448b48507ce062 /platform/android | |
parent | 75f8530ed1d9213691b652cd6fa4ce22054645b1 (diff) | |
download | qtlocation-mapboxgl-41324842b294d9d38eb42f1b8726e270510614e0.tar.gz |
[test-runner] Allow to define filter inside manifest file
Command line option is still available and allows to override filter
that is defined in a manifest file.
Diffstat (limited to 'platform/android')
-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..d0af8d21a6 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); } |