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

Add target for iOS render test to Bazel (#1277)

Browse Source 
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
This commit is contained in:
Bart Louwers
2023-06-28 16:41:21 +02:00
committed by GitHub
parent 0cc65337fa
commit 9374765cb8
16 changed files with 328 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ios-ci.yml vendored
View File

@@ -135,6 +135,8 @@ jobs:
run: make ios-uitest
# size test
- name: Copy example config
run: cp bazel/example_config.bzl bazel/config.bzl
- name: Build app for size test & output size
working-directory: ./

9
WORKSPACE
View File

@@ -48,3 +48,12 @@ load(
)
xcodeproj_rules_dependencies()
load(
"@build_bazel_rules_apple//apple:apple.bzl",
"provisioning_profile_repository",
)
provisioning_profile_repository(
name = "local_provisioning_profiles",
)

1
bazel/flags.bzl
View File

@@ -11,6 +11,7 @@ WARNING_FLAGS = [
"-Wno-unused-parameter",
"-Wno-unused-variable",
"-Wno-variadic-macros",
"-Wno-unknown-pragmas",
] + select({
"//:ios": [
"-Wno-newline-eof",

26
metrics/BUILD.bazel
View File

@@ -1,18 +1,26 @@
filegroup(
name = "render-test-files",
srcs = glob([
"cache-style.db",
srcs = glob(
[
"integration/**",
"tests/**",
"linux-gcc8-release/**",
"expectations/platform-all/**",
"ignores/**",
"ios-render-test-runner/**", # iOS only
"expectations/platform-ios/**", # iOS only
],
allow_empty = False,
) + [
"cache-metrics.db",
"integration/**",
"tests/**",
"linux-gcc8-release/**",
"expectations/platform-all/**",
"ignores/**",
]) + [
"cache-style.db",
"ios-render-test-runner-metrics.json", # iOS only
"ios-render-test-runner-style.json", # iOS only
"linux-gcc8-release-metrics.json",
"linux-gcc8-release-style.json",
],
visibility = [
"//render-test:__pkg__",
"//platform/ios/test/common:__pkg__",
"//render-test:__subpackages__",
],
)

31
platform/ios/BUILD.bazel
View File

@@ -1,13 +1,15 @@
load("@build_bazel_rules_apple//apple:apple.bzl", "apple_static_xcframework", "apple_xcframework")
load("@build_bazel_rules_apple//apple:apple.bzl", "apple_static_xcframework", "apple_xcframework", "local_provisioning_profile")
load("@build_bazel_rules_apple//apple:ios.bzl", "ios_application", "ios_framework")
load("@build_bazel_rules_apple//apple:resources.bzl", "apple_resource_bundle")
load("//bazel:flags.bzl", "CPP_FLAGS", "MAPLIBRE_FLAGS", "WARNING_FLAGS")
load(
"@rules_xcodeproj//xcodeproj:defs.bzl",
"top_level_target",
"xcode_provisioning_profile",
"xcodeproj",
)
load("bazel/macros.bzl", "info_plist")
load("bazel/config.bzl", "APPLE_MOBILE_PROVISIONING_PROFILE_TEAM_ID")
# This list of public headers is from what Mapbox vendors with their dynamic framework
# If we forget one the build will fail, and if we add too many there will be a warning
@@ -460,6 +462,7 @@ ios_application(
],
infoplists = ["platform/ios/app/Info.plist"],
minimum_os_version = "12.0",
provisioning_profile = "xcode_profile",
resources = _IOS_APPLICATION_RESOURCES,
visibility = ["//visibility:public"],
deps = [
@@ -502,15 +505,39 @@ genrule(
""",
)
local_provisioning_profile(
name = "provisioning_profile",
profile_name = "iOS Team Provisioning Profile: *",
team_id = APPLE_MOBILE_PROVISIONING_PROFILE_TEAM_ID,
)
xcode_provisioning_profile(
name = "xcode_profile",
managed_by_xcode = True,
provisioning_profile = ":provisioning_profile",
visibility = ["//visibility:public"],
)
xcodeproj(
name = "xcodeproj",
build_mode = "xcode",
minimum_xcode_version = "14",
project_name = "MapLibre",
tags = ["manual"],
top_level_targets = [
top_level_target(
"App",
target_environments = ["simulator"],
target_environments = [
"simulator",
"device",
],
),
top_level_target(
"//render-test/ios:RenderTest",
target_environments = [
"simulator",
"device",
],
),
],
)

1
platform/ios/bazel/.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
/config.bzl

1
platform/ios/bazel/example_config.bzl Normal file
View File

@@ -0,0 +1 @@
APPLE_MOBILE_PROVISIONING_PROFILE_TEAM_ID = "TC45MCF93C"

48
platform/ios/test/common/BUILD.bazel Normal file
View File

@@ -0,0 +1,48 @@
load("@build_bazel_rules_apple//apple:ios.bzl", "ios_application")
cc_library(
name = "ios_test_runner_lib",
srcs = [
"ios_test_runner.hpp",
],
includes = [
".",
],
visibility = [
"//render-test/ios:__pkg__",
],
)
objc_library(
name = "render_test_app_srcs",
srcs = [
"AppDelegate.h",
"AppDelegate.m",
"main.m",
],
data = [
"LaunchScreen.storyboard",
"Main.storyboard",
],
deps = [
"ios_test_runner_lib",
],
)
ios_application(
name = "RenderTestApp",
bundle_id = "org.maplibre.RenderTestApp",
families = ["iphone"],
infoplists = [
"//render-test/ios:Info.plist",
],
minimum_os_version = "12.0",
provisioning_profile = "//platform/ios:xcode_profile",
visibility = [
"//visibility:public",
],
deps = [
"render_test_app_srcs",
"//render-test/ios:render_test_ios_src",
],
)

1
platform/ios/test/common/iosTestRunner.mm
View File

@@ -25,6 +25,7 @@
NSError *error;
NSFileManager *fileManager = [NSFileManager defaultManager];
NSString *bundleRoot = [[NSBundle mainBundle] bundlePath];
NSArray *bundleContents = [fileManager contentsOfDirectoryAtPath: bundleRoot error: &error];
NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
NSString *documentsDir = [paths objectAtIndex: 0];

29
render-test/BUILD.bazel
View File

@@ -10,11 +10,12 @@ cc_library(
],
visibility = [
"//platform/default:__pkg__",
"//render-test/ios:__pkg__",
],
)
cc_test(
name = "render-test",
cc_library(
name = "render-test-srcs",
srcs = glob(
[
"*.cpp",
@@ -23,21 +24,33 @@ cc_test(
) + [
"include/mbgl/render_test.hpp",
],
copts = CPP_FLAGS + MAPLIBRE_FLAGS,
includes = [
"include",
],
visibility = [
"//render-test/ios:__pkg__",
],
deps = [
"//expression-test:test_runner_common",
] + select({
"//:ios": ["//platform/ios:sdk"],
"//:linux": ["//platform/linux:impl"],
}),
)
cc_test(
name = "render-test",
args = [
"--manifestPath",
"metrics/linux-gcc8-release-style.json",
],
copts = CPP_FLAGS + MAPLIBRE_FLAGS,
data = [
"//metrics:render-test-files",
],
includes = [
"include",
],
deps = [
"//expression-test:test_runner_common",
"render-test-srcs",
"//platform/default:render-test-bin",
"//platform/linux:impl",
"//vendor:mapbox-base",
],
)

66
render-test/ios/BUILD.bazel Normal file
View File

@@ -0,0 +1,66 @@
load("//bazel:flags.bzl", "CPP_FLAGS", "MAPLIBRE_FLAGS")
load("@build_bazel_rules_apple//apple:ios.bzl", "ios_unit_test")
load("@build_bazel_rules_apple//apple:resources.bzl", "apple_resource_bundle")
apple_resource_bundle(
name = "TestData",
infoplists = [
"Empty.plist",
],
structured_resources = [
"//metrics:render-test-files",
],
)
objc_library(
name = "tests",
testonly = True,
srcs = [
"tests/Tests.m",
],
deps = [
"render_test_ios_src",
],
)
objc_library(
name = "render_test_ios_src",
srcs = [
"iosTestRunner.h",
"iosTestRunner.mm",
"ios_test_runner.cpp",
],
copts = CPP_FLAGS + MAPLIBRE_FLAGS,
data = [
"TestData",
],
includes = [
".",
],
visibility = [
"//platform/ios/test/common:__pkg__",
],
deps = [
"//:mbgl-core",
"//platform/ios/test/common:ios_test_runner_lib",
"//render-test:render-test-lib",
"//render-test:render-test-srcs",
"//vendor:zip-archive",
],
)
ios_unit_test(
name = "RenderTest",
minimum_os_version = "12.0",
provisioning_profile = "//platform/ios:xcode_profile",
runner = "@build_bazel_rules_apple//apple/testing/default_runner:ios_xctestrun_ordered_runner",
test_host = "//platform/ios/test/common:RenderTestApp",
visibility = [
"//visibility:public",
],
deps = [":tests"],
)
exports_files([
"Info.plist",
])

18
render-test/ios/Empty.plist Normal file
View File

@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleIdentifier</key>
<string>org.maplibre.$(PRODUCT_NAME)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleVersion</key>
<string>1.0</string>
</dict>
</plist>

12
render-test/ios/Info.plist
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN""http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
@@ -9,15 +9,15 @@
<key>CFBundleExecutable</key>
<string>RenderTestApp</string>
<key>CFBundleIdentifier</key>
<string>com.mapbox.RenderTestApp</string>
<string>org.maplibre.RenderTestApp</string>
<key>CFBundleGetInfoString</key>
<string>com.mapbox.RenderTestApp</string>
<string>org.maplibre.RenderTestApp</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>1.0</string>
<key>CFBundleLongVersionString</key>
<string>1.0</string>
<key>CFBundleName</key>
<string>com.mapbox.RenderTestApp</string>
<string>org.maplibre.RenderTestApp</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
@@ -28,10 +28,6 @@
<string>7877</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>NSHumanReadableCopyright</key>
<string>© 2014–2020 Mapbox</string>
<key>LSMinimumSystemVersion</key>
<string>${MACOSX_DEPLOYMENT_TARGET}</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UILaunchStoryboardName</key>

183
render-test/ios/iosTestRunner.mm
View File

@@ -25,117 +25,102 @@
-(instancetype)init
{
self = [super init];
if (self) {
self.testStatus = NO;
self.runner = new TestRunner();
NSString *path = nil;
NSError *error;
NSFileManager *fileManager = [NSFileManager defaultManager];
NSString *bundleRoot = [[NSBundle mainBundle] bundlePath];
NSArray *bundleContents = [fileManager contentsOfDirectoryAtPath: bundleRoot error: &error];
NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
NSString *documentsDir = [paths objectAtIndex: 0];
for (uint32_t i = 0; i < bundleContents.count; i++) {
NSString *dirName = [bundleContents objectAtIndex: i];
if ([dirName isEqualToString:@"test-data"]) {
NSString *destinationPath = [documentsDir stringByAppendingPathComponent: dirName];
//Using NSFileManager we can perform many file system operations.
BOOL success = [fileManager fileExistsAtPath: destinationPath];
if (success) {
success = [fileManager removeItemAtPath:destinationPath error:NULL];
}
break;
}
if (!self) {
return nil;
}
self.testStatus = NO;
self.runner = new TestRunner();
NSError *error;
BOOL success;
NSFileManager *fileManager = [NSFileManager defaultManager];
NSString *xcTestBundleRoot = [[NSBundle bundleForClass:[self class]] resourcePath];
NSString *testDataDir = [xcTestBundleRoot stringByAppendingString:@"/TestData.bundle"];
NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
NSString *documentsDir = [paths objectAtIndex: 0];
NSString *destinationPath = [documentsDir stringByAppendingPathComponent: @"test-data"];
NSString *path = destinationPath;
// delete destinationPath if it exists
if ([fileManager fileExistsAtPath:destinationPath]) {
success = [fileManager removeItemAtPath: destinationPath error: &error];
if (!success) {
NSAssert1(0, @"Failed to delete '%@'.", destinationPath);
}
for (uint32_t i = 0; i < bundleContents.count; i++) {
NSString *dirName = [bundleContents objectAtIndex: i];
if ([dirName isEqualToString:@"test-data"]) {
NSString *destinationPath = [documentsDir stringByAppendingPathComponent: dirName];
BOOL success = [fileManager fileExistsAtPath: destinationPath];
if (!success) {
NSString *copyDirPath = [[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent: dirName];
}
success = [fileManager copyItemAtPath: copyDirPath toPath: destinationPath error: &error];
if (!success){
NSAssert1(0, @"Failed to copy file '%@'.", [error localizedDescription]);
NSLog(@"Failed to copy %@ file, error %@", dirName, [error localizedDescription]);
}
else {
path = destinationPath;
NSLog(@"File copied %@ OK", dirName);
}
}
else {
NSLog(@"File exits %@, skip copy", dirName);
}
break;
}
success = [fileManager copyItemAtPath: testDataDir toPath: destinationPath error: &error];
if (!success){
NSAssert1(0, @"Failed to copy file '%@'.", [error localizedDescription]);
NSLog(@"Failed to copy %@ file, error %@", testDataDir, [error localizedDescription]);
}
else {
path = destinationPath;
NSLog(@"File copied %@ OK", testDataDir);
}
if (path) {
std::string basePath = std::string([path UTF8String]);
self.testStatus = self.runner->startTest(basePath) ? YES : NO;
self.styleResultPath = [path stringByAppendingPathComponent:@"/ios-render-test-runner-style.html"];
self.metricResultPath = [path stringByAppendingPathComponent:@"/ios-render-test-runner-metrics.html"];
BOOL fileFound = [fileManager fileExistsAtPath: self.styleResultPath];
if (fileFound == NO) {
NSLog(@"Style test result file '%@' doese not exit ", self.styleResultPath);
self.testStatus = NO;
}
if (path) {
std::string basePath = std::string([path UTF8String]);
self.testStatus = self.runner->startTest(basePath) ? YES : NO;
self.styleResultPath = [path stringByAppendingPathComponent:@"/ios-render-test-runner-style.html"];
self.metricResultPath = [path stringByAppendingPathComponent:@"/ios-render-test-runner-metrics.html"];
fileFound = [fileManager fileExistsAtPath: self.metricResultPath];
if (fileFound == NO) {
NSLog(@"Metric test result file '%@' doese not exit ", self.metricResultPath);
self.testStatus = NO;
}
BOOL fileFound = [fileManager fileExistsAtPath: self.styleResultPath];
if (fileFound == NO) {
NSLog(@"Style test result file '%@' doese not exit ", self.styleResultPath);
self.testStatus = NO;
}
fileFound = [fileManager fileExistsAtPath: self.metricResultPath];
if (fileFound == NO) {
NSLog(@"Metric test result file '%@' doese not exit ", self.metricResultPath);
self.testStatus = NO;
}
NSString *rebaselinePath = [path stringByAppendingPathComponent:@"/baselines"];
BOOL needArchiving = NO;
BOOL isDir = NO;
NSArray *subpaths = [[NSArray alloc] init];
if ([fileManager fileExistsAtPath:rebaselinePath isDirectory: &isDir] && isDir){
subpaths = [fileManager subpathsAtPath:rebaselinePath];
for(NSString *path in subpaths)
NSString *rebaselinePath = [path stringByAppendingPathComponent:@"/baselines"];
BOOL needArchiving = NO;
BOOL isDir = NO;
NSArray *subpaths = [[NSArray alloc] init];
if ([fileManager fileExistsAtPath:rebaselinePath isDirectory: &isDir] && isDir){
subpaths = [fileManager subpathsAtPath:rebaselinePath];
for(NSString *path in subpaths)
{
NSString *longPath = [rebaselinePath stringByAppendingPathComponent:path];
if([fileManager fileExistsAtPath:longPath isDirectory:&isDir] && !isDir)
{
NSString *longPath = [rebaselinePath stringByAppendingPathComponent:path];
if([fileManager fileExistsAtPath:longPath isDirectory:&isDir] && !isDir)
{
needArchiving = YES;
break;
}
needArchiving = YES;
break;
}
}
}
else {
NSLog(@"Metric path '%@' doese not exit ", rebaselinePath);
}
if (needArchiving) {
NSString *archivePath = [path stringByAppendingString:@"/metrics.zip"];
BOOL success = [SSZipArchive createZipFileAtPath:archivePath
withContentsOfDirectory:rebaselinePath
keepParentDirectory:NO
compressionLevel:-1
password:nil
AES:YES
progressHandler:nil];
if (success) {
NSLog(@"Successfully archive all of the metrics into metrics.zip");
self.metricPath = archivePath;
}
else {
NSLog(@"Metric path '%@' doese not exit ", rebaselinePath);
}
if (needArchiving) {
NSString *archivePath = [path stringByAppendingString:@"/metrics.zip"];
BOOL success = [SSZipArchive createZipFileAtPath:archivePath
withContentsOfDirectory:rebaselinePath
keepParentDirectory:NO
compressionLevel:-1
password:nil
AES:YES
progressHandler:nil];
if (success) {
NSLog(@"Successfully archive all of the metrics into metrics.zip");
self.metricPath = archivePath;
}
else {
NSLog(@"Failed to archive rebaselined metrics into metrics.zip");
}
NSLog(@"Failed to archive rebaselined metrics into metrics.zip");
}
}
delete self.runner;
self.runner = nullptr;
}
delete self.runner;
self.runner = nullptr;
return self;
}

7
render-test/runner.cpp
View File

@@ -814,7 +814,14 @@ void TestRunner::run(TestMetadata& metadata) {
auto it = std::find_if(symbols.begin(), symbols.end(), [isIcon, box](const auto& a) {
return a.isIcon == isIcon && a.location.min == box.min && a.location.max == box.max;
});
// TODO: remove usage of std::codecvt_utf8
// https://github.com/maplibre/maplibre-native/issues/1269
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
static std::wstring_convert<std::codecvt_utf8<char16_t>, char16_t> cv;
#pragma clang diagnostic pop
if (it == symbols.end()) {
symbols.push_back({tileId, box, placed, isIcon});
return;

19
vendor/BUILD.bazel vendored
View File

@@ -104,6 +104,24 @@ cc_library(
visibility = ["//visibility:public"],
)
objc_library(
name = "zip-archive",
srcs = [
"zip-archive/SSZipArchive/SSZipArchive.h",
"zip-archive/SSZipArchive/SSZipArchive.m",
"zip-archive/SSZipArchive/SSZipCommon.h",
] + glob(
[
"zip-archive/SSZipArchive/minizip/*.c",
"zip-archive/SSZipArchive/minizip/*.h",
],
allow_empty = False,
),
defines = ["ZLIB_COMPAT"],
includes = ["zip-archive/SSZipArchive"],
visibility = ["//visibility:public"],
)
# vendor/boost-files.json
cc_library(
name = "boost",
@@ -192,6 +210,7 @@ cc_library(
hdrs = glob(["icu/include/unicode/*.h"]),
copts = CPP_FLAGS + [
"-Wno-c11-extensions",
"-Wno-conversion",
],
includes = ["icu/include"],
visibility = ["//visibility:public"],