From d4d96fd88c83a5640fdef408f1ff3f69db0a584c Mon Sep 17 00:00:00 2001 From: Juha Alanen Date: Thu, 23 Jan 2020 14:24:09 +0200 Subject: [test] Enable HTTP server on Android --- platform/android/src/test/test_runner.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'platform/android') diff --git a/platform/android/src/test/test_runner.cpp b/platform/android/src/test/test_runner.cpp index ec315fe27c..4f8b2165f8 100644 --- a/platform/android/src/test/test_runner.cpp +++ b/platform/android/src/test/test_runner.cpp @@ -2,12 +2,14 @@ #include "test_runner_common.hpp" #include +#include #include using namespace mbgl; using namespace mbgl::android; std::atomic running{true}; +std::atomic success{false}; std::once_flag done; ALooper* looper = NULL; @@ -23,6 +25,7 @@ void runner() { int status = mbgl::runTests(argv.size(), argv.data()); mbgl::Log::Info(mbgl::Event::General, "TestRunner finished with status: '%d'", status); running = false; + success = (status == 0); ALooper_wake(looper); } @@ -39,14 +42,14 @@ void android_main(struct android_app* app) { if (copyFile(env, app->activity->assetManager, zipFile, storagePath, "data.zip")) { if (chdir("/sdcard")) { mbgl::Log::Error(mbgl::Event::General, "Failed to change the directory to /sdcard"); - changeState(env, app, false); + changeState(env, app, success); } else { unZipFile(env, zipFile, "/sdcard/"); runnerThread = std::thread(runner); } } else { mbgl::Log::Error(mbgl::Event::General, "Failed to copy zip file '%s' to external storage", zipFile.c_str()); - changeState(env, app, false); + changeState(env, app, success); } int outFd, outEvents; @@ -62,7 +65,7 @@ void android_main(struct android_app* app) { std::call_once(done, [&] { mbgl::Log::Info(mbgl::Event::General, "TestRunner done"); runnerThread.join(); - changeState(env, app, true); + changeState(env, app, success); }); } -- cgit v1.2.1