tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed and enabled iOS render tests (#937)

Browse Source
This commit is contained in:
Alex Cristici
2023-03-24 19:34:00 +02:00
committed by GitHub
parent 7ff17fd634
commit 6c4918374a
5 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
metrics/expectations/platform-ios/render-tests/line-dasharray/overscaled/expected.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

BIN
metrics/expectations/platform-ios/render-tests/sprites/2x-screen-2x-pattern/expected.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.3 KiB

1
platform/ios/ios.cmake
View File

@@ -1,4 +1,5 @@
option(MBGL_WITH_IOS_CCACHE "Enable ccache for iOS" OFF)
option(MBGL_IOS_RENDER_TEST "Include render tests" ON)
if(NOT DEFINED IOS_DEPLOYMENT_TARGET)
set(IOS_DEPLOYMENT_TARGET "11.0")

9
render-test/ios/ios_test_runner.cpp
View File

@@ -20,16 +20,13 @@ bool TestRunner::startTest(const std::string& manifestBasePath) {
int finishedTestCount = 0;
std::function<void()> testStatus = [&]() {
mbgl::Log::Info(mbgl::Event::General, "Current finished tests number is '%d' ", ++finishedTestCount);
mbgl::Log::Info(mbgl::Event::General, "Current finished tests number is '" + std::to_string(++finishedTestCount) + "' ");
};
mbgl::Log::Info(mbgl::Event::General, "Start running RenderTestRunner with manifest: '%s'", manifest.c_str());
mbgl::Log::Info(mbgl::Event::General, "Start running RenderTestRunner with manifest: '" + manifest + "' ");
auto result = mbgl::runRenderTests(static_cast<int>(argv.size() - 1), argv.data(), testStatus);
mbgl::Log::Info(mbgl::Event::General,
"End running RenderTestRunner with manifest: '%s' with result value %d",
manifest.c_str(),
result);
mbgl::Log::Info(mbgl::Event::General, "End running RenderTestRunner with manifest: '" + manifest + "' with result value " + std::to_string(result));
return result == 0;
};

3
vendor/zip-archive.cmake vendored
View File

@@ -7,7 +7,7 @@ add_library(
${CMAKE_CURRENT_LIST_DIR}/zip-archive/SSZipArchive/SSZipArchive.h
${CMAKE_CURRENT_LIST_DIR}/zip-archive/SSZipArchive/SSZipArchive.m
${CMAKE_CURRENT_LIST_DIR}/zip-archive/SSZipArchive/SSZipCommon.h
${CMAKE_CURRENT_LIST_DIR}/zip-archive/SSZipArchive/ZipArchive.h
${CMAKE_CURRENT_LIST_DIR}/zip-archive/SSZipArchive/include/ZipArchive.h
${CMAKE_CURRENT_LIST_DIR}/zip-archive/SSZipArchive/minizip/mz.h
${CMAKE_CURRENT_LIST_DIR}/zip-archive/SSZipArchive/minizip/mz_compat.c
${CMAKE_CURRENT_LIST_DIR}/zip-archive/SSZipArchive/minizip/mz_compat.h
@@ -57,5 +57,6 @@ target_compile_definitions(
HAVE_STDINT_H
HAVE_WZAES
HAVE_ZLIB
ZLIB_COMPAT
)
set_property(TARGET mbgl-vendor-zip-archive PROPERTY FOLDER RenderTestApp)