Add ios platform dependent expectation and ignores; Run prepare scprit via cmake

9 files changed, 28 insertions, 6 deletions

diff --git a/.gitignore b/.gitignore
index a09e877519..b12fb8a380 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,6 +49,11 @@ render-test/android/package.json
 render-test/android/app/app.iml
 render-test/android/android.iml
 
+# IOS RenderTestRunner
+render-test/ios/codesigning/*.xcent
+render-test/ios/fastlane/README.md
+test-data/
+
 # Generated file from npm/yarn
 package-lock.json
 
diff --git a/circle.yml b/circle.yml
index bc097ed99c..a12e15616e 100644
--- a/circle.yml
+++ b/circle.yml
@@ -709,7 +709,7 @@ jobs:
       - run:
           name: Build IOS RenderTestApp
           command: |
-            cd render-test/ios && ./setup_test_data.sh
+            cd render-test/ios
             cmake ../../next -B Build -G Xcode -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphoneos -DIOS_RENDER_TESTING=ON
             cd Build
             xcodebuild -sdk iphoneos -project Mapbox\ GL\ Native.xcodeproj -scheme RenderTestApp build-for-testing -arch arm64 CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -configuration Release
diff --git a/metrics/expectations/platform-ios/render-tests/combinations/fill-translucent--symbol-translucent/expected.png b/metrics/expectations/platform-ios/render-tests/combinations/fill-translucent--symbol-translucent/expected.png
new file mode 100644
index 0000000000..38016b2511
--- /dev/null
+++ b/metrics/expectations/platform-ios/render-tests/combinations/fill-translucent--symbol-translucent/expected.png
diff --git a/metrics/expectations/platform-ios/render-tests/combinations/symbol-translucent--fill-translucent/expected.png b/metrics/expectations/platform-ios/render-tests/combinations/symbol-translucent--fill-translucent/expected.png
new file mode 100644
index 0000000000..99dce20d0c
--- /dev/null
+++ b/metrics/expectations/platform-ios/render-tests/combinations/symbol-translucent--fill-translucent/expected.png
diff --git a/metrics/expectations/platform-ios/render-tests/line-dasharray/overscaled/expected.png b/metrics/expectations/platform-ios/render-tests/line-dasharray/overscaled/expected.png
new file mode 100644
index 0000000000..0c30f8feae
--- /dev/null
+++ b/metrics/expectations/platform-ios/render-tests/line-dasharray/overscaled/expected.png
diff --git a/metrics/ignores/platform-ios.json b/metrics/ignores/platform-ios.json
new file mode 100644
index 0000000000..1dce0e9f79
--- /dev/null
+++ b/metrics/ignores/platform-ios.json
@@ -0,0 +1,12 @@
+{
+    "render-tests/icon-text-fit/enlargen-both": "Needs to be investigated and fixed.",
+    "render-tests/line-pattern/overscaled": "Needs to be investigated and fixed.",
+    "render-tests/runtime-styling/image-update-pattern": "Needs to be investigated and fixed.",
+    "render-tests/runtime-styling/image-add-pattern": "Needs to be investigated and fixed.",
+    "render-tests/text-font/chinese": "Needs to be investigated and fixed.",
+    "render-tests/regressions/mapbox-gl-native#9976": "Needs to be investigated and fixed.",
+    "render-tests/regressions/mapbox-gl-js#2305": "Needs to be investigated and fixed.",
+    "render-tests/regressions/mapbox-gl-js#5911a": "Needs to be investigated and fixed.",
+    "render-tests/text-field/formatted-images": "Needs to be investigated and fixed.",
+    "render-tests/symbol-visibility/visible": "Needs to be investigated and fixed."
+}
\ No newline at end of file
diff --git a/metrics/next-ios-render-test-runner-style.json b/metrics/next-ios-render-test-runner-style.json
index fbee81962c..7b0e267728 100644
--- a/metrics/next-ios-render-test-runner-style.json
+++ b/metrics/next-ios-render-test-runner-style.json
@@ -2,10 +2,12 @@
     "base_test_path": "integration",
     "cache_path": "cache-style.db",
     "expectation_paths": [
-        "expectations/platform-all"
+        "expectations/platform-all",
+        "expectations/platform-ios"
     ],
     "ignore_paths": [
         "ignores/platform-all.json",
-        "ignores/platform-macos.json"
+        "ignores/platform-macos.json",
+        "ignores/platform-ios.json"
     ]
 }
\ No newline at end of file
diff --git a/next/platform/ios/ios.cmake b/next/platform/ios/ios.cmake
index 68dc05deb9..287ba141b5 100644
--- a/next/platform/ios/ios.cmake
+++ b/next/platform/ios/ios.cmake
@@ -95,6 +95,12 @@ target_link_libraries(
 
 if(IOS_RENDER_TESTING)
     set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
+
+    set(PREPARE_CMD "${MBGL_ROOT}/render-test/ios/setup_test_data.sh")
+    message("COMMAND: ${PREPARE_CMD}")
+    execute_process(COMMAND ${PREPARE_CMD} RESULT_VARIABLE CMD_ERROR)
+    message(STATUS "CMD_ERROR:" ${CMD_ERROR})
+
     set(RESOURCES ${MBGL_ROOT}/render-test/ios/Main.storyboard ${MBGL_ROOT}/render-test/ios/LaunchScreen.storyboard ${MBGL_ROOT}/test-data)
 
     set(PUBLIC_HEADER ${MBGL_ROOT}/render-test/ios/iosTestRunner.h)
@@ -114,7 +120,6 @@ if(IOS_RENDER_TESTING)
     )
 
     initialize_ios_target(RenderTestApp)
-
     # Turn on ARC
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fobjc-arc")
 
diff --git a/render-test/ios/setup_test_data.sh b/render-test/ios/setup_test_data.sh
index 10bd0f0e41..9a1dc83820 100755
--- a/render-test/ios/setup_test_data.sh
+++ b/render-test/ios/setup_test_data.sh
@@ -7,8 +7,6 @@ cp -r ../../mapbox-gl-js/test/integration/render-tests ../../test-data/integrati
 cp -r ../../mapbox-gl-js/test/integration/query-tests ../../test-data/integration/
 cp -r ../../metrics/expectations ../../test-data/
 cp -r ../../metrics/ignores ../../test-data/
-# cp -r ../../metrics/tests/
-# cp -r ../../metrics/next-android-render-test-runner/
 cp -r ../../metrics/next-ios-render-test-runner-style.json ../../test-data/
 cp -r ../../metrics/cache-metrics.db ../../test-data/
 cp -r ../../metrics/cache-style.db ../../test-data/
\ No newline at end of file