[test-runner] Add error case to android ignore list

This reverts commit c308095527ca74888453e23a495ca8268443065c.

11 files changed, 13 insertions, 20 deletions

diff --git a/circle.yml b/circle.yml
index caf80420bd..6dec90a1c1 100644
--- a/circle.yml
+++ b/circle.yml
@@ -713,7 +713,7 @@ jobs:
           when: always
           command: |
             if [[ -n "${GCLOUD_SERVICE_ACCOUNT_JSON}" && -z "${SKIP_FIREBASE:-}" ]]; then
-              testResult=$(gsutil ls gs://test-lab-186672a0qp5bq-ycr70axads3nc/render-test-app-${CIRCLE_BUILD_NUM}/**/*.html | tail -1)
+              testResult=$(gsutil ls gs://test-lab-186672a0qp5bq-ycr70axads3nc/render-test-app-${CIRCLE_BUILD_NUM}/**/*.html)
               mkdir -p /tmp/tests/render-test-app
               gsutil cp $testResult /tmp/tests/render-test-app | true
             fi
diff --git a/next/platform/android/android.cmake b/next/platform/android/android.cmake
index 789c30c959..29bc9c1326 100644
--- a/next/platform/android/android.cmake
+++ b/next/platform/android/android.cmake
@@ -357,13 +357,7 @@ add_custom_command(
         -E
         copy
         ${MBGL_ROOT}/platform/node/test/ignores.json
-        ${MBGL_ROOT}/ignores/ignores.json
-    COMMAND
-        ${CMAKE_COMMAND}
-        -E
-        copy
-        ${MBGL_ROOT}/render-test/linux-ignores.json
-        ${MBGL_ROOT}/ignores/linux-ignores.json
+        ${MBGL_ROOT}/render-test/ignores/ignores.json
     COMMAND
         ${CMAKE_COMMAND}
         -E
@@ -375,11 +369,6 @@ add_custom_command(
     COMMAND
         ${CMAKE_COMMAND}
         -E
-        remove_directory
-        ${MBGL_ROOT}/ignores
-    COMMAND
-        ${CMAKE_COMMAND}
-        -E
         remove
         ${MBGL_ROOT}/android-manifest*
     WORKING_DIRECTORY ${MBGL_ROOT}
diff --git a/render-test/android-manifest-probe-memory.json b/render-test/android-manifest-probe-memory.json
index 4a48bc80a9..a90d39ee83 100644
--- a/render-test/android-manifest-probe-memory.json
+++ b/render-test/android-manifest-probe-memory.json
@@ -1,7 +1,7 @@
 {
     "base_test_path":"mapbox-gl-js/test/integration",
     "expectation_paths":["render-test/expected", "render-test/expected/android"],
-    "ignore_paths":["ignores/ignores.json", "ignores/linux-ignores.json"],
+    "ignore_paths":["render-test/ignores/ignores.json", "render-test/ignores/linux-ignores.json", "render-test/ignores/android-temp-fail.json"],
     "vendor_path":"vendor",
     "asset_path": "mapbox-gl-js/test/integration",
     "result_path":"/sdcard/",
diff --git a/render-test/android-manifest-probe-network-gfx.json b/render-test/android-manifest-probe-network-gfx.json
index e8300a036c..c7b45417d0 100644
--- a/render-test/android-manifest-probe-network-gfx.json
+++ b/render-test/android-manifest-probe-network-gfx.json
@@ -1,7 +1,7 @@
 {
     "base_test_path":"mapbox-gl-js/test/integration",
     "expectation_paths":["render-test/expected", "render-test/expected/android"],
-    "ignore_paths":["ignores/ignores.json", "ignores/linux-ignores.json"],
+    "ignore_paths":["render-test/ignores/ignores.json", "render-test/ignores/linux-ignores.json", "render-test/ignores/android-temp-fail.json"],
     "vendor_path":"vendor",
     "asset_path": "mapbox-gl-js/test/integration",
     "result_path":"/sdcard/",
diff --git a/render-test/android/app/src/main/assets/to_zip.txt b/render-test/android/app/src/main/assets/to_zip.txt
index 048e1aae1b..e440a7c514 100644
--- a/render-test/android/app/src/main/assets/to_zip.txt
+++ b/render-test/android/app/src/main/assets/to_zip.txt
@@ -12,7 +12,7 @@ mapbox-gl-js/test/integration/sprites/
 vendor/mapbox-gl-styles/styles/
 vendor/mapbox-gl-styles/sprites/
 vendor/mvt-fixtures/real-world/
-ignores/
+render-test/ignores/
 render-test/metrics/android/
 render-test/expected/
 android-manifest-probe-network-gfx.json
diff --git a/render-test/ignores/android-temp-fail.json b/render-test/ignores/android-temp-fail.json
new file mode 100644
index 0000000000..ade047047f
--- /dev/null
+++ b/render-test/ignores/android-temp-fail.json
@@ -0,0 +1,4 @@
+{
+  "render-tests/icon-text-fit/both-text-anchor-1x-image-2x-screen": "Temporarily fails as android test app does not derefence symbolinks in sprites folder.",
+  "render-tests/icon-text-fit/both-text-anchor-2x-image-1x-screen": "Temporarily fails as android test app does not derefence symbolinks in sprites folder."
+}
diff --git a/render-test/linux-ignores.json b/render-test/ignores/linux-ignores.json
index d5a1a85c6c..d5a1a85c6c 100644
--- a/render-test/linux-ignores.json
+++ b/render-test/ignores/linux-ignores.json
diff --git a/render-test/linux-manifest-probe-gfx-network.json b/render-test/linux-manifest-probe-gfx-network.json
index b63013ca18..fedf9fa6bd 100644
--- a/render-test/linux-manifest-probe-gfx-network.json
+++ b/render-test/linux-manifest-probe-gfx-network.json
@@ -1,7 +1,7 @@
 {
     "base_test_path":"../mapbox-gl-js/test/integration",
     "expectation_paths":["expected/"],
-    "ignore_paths":["../platform/node/test/ignores.json", "../render-test/linux-ignores.json"],
+    "ignore_paths":["../platform/node/test/ignores.json", "../render-test/ignores/linux-ignores.json"],
     "vendor_path":"../vendor",
     "asset_path": "../mapbox-gl-js/test/integration",
     "probes": ["probeGFX", "probeNetwork"],
diff --git a/render-test/linux-manifest-probe-memory.json b/render-test/linux-manifest-probe-memory.json
index 25b59e4a44..e21326875d 100644
--- a/render-test/linux-manifest-probe-memory.json
+++ b/render-test/linux-manifest-probe-memory.json
@@ -1,7 +1,7 @@
 {
     "base_test_path":"../mapbox-gl-js/test/integration",
     "expectation_paths":["expected/"],
-    "ignore_paths":["../platform/node/test/ignores.json", "../render-test/linux-ignores.json"],
+    "ignore_paths":["../platform/node/test/ignores.json", "../render-test/ignores/linux-ignores.json"],
     "vendor_path":"../vendor",
     "asset_path": "../mapbox-gl-js/test/integration",
     "probes": ["probeMemory"],
diff --git a/render-test/linux-manifest.json b/render-test/linux-manifest.json
index cc72a7446c..91b062c2cc 100644
--- a/render-test/linux-manifest.json
+++ b/render-test/linux-manifest.json
@@ -1,7 +1,7 @@
 {
     "base_test_path":"../mapbox-gl-js/test/integration",
     "expectation_paths":["expected/"],
-    "ignore_paths":["../platform/node/test/ignores.json", "../render-test/linux-ignores.json"],
+    "ignore_paths":["../platform/node/test/ignores.json", "../render-test/ignores/linux-ignores.json"],
     "vendor_path":"../vendor",
     "asset_path": "../mapbox-gl-js/test/integration"
 }
\ No newline at end of file
diff --git a/render-test/linux-query-manifest.json b/render-test/linux-query-manifest.json
index a6723f5519..6d2071b19f 100644
--- a/render-test/linux-query-manifest.json
+++ b/render-test/linux-query-manifest.json
@@ -1,6 +1,6 @@
 {
     "base_test_path":"../mapbox-gl-js/test/integration",
-    "ignore_paths":["../platform/node/test/ignores.json", "../render-test/linux-ignores.json"],
+    "ignore_paths":["../platform/node/test/ignores.json", "../render-test/ignores/linux-ignores.json"],
     "vendor_path":"../vendor",
     "asset_path": "../mapbox-gl-js/test/integration"
 }
\ No newline at end of file