Add git ignored metrics

7 files changed, 100 insertions, 9 deletions

diff --git a/.gitignore b/.gitignore
index d81b8c9727..33d3d987d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,7 +27,6 @@ xcuserdata
 /platform/ios/benchmark/assets/glyphs/DIN*
 /platform/ios/benchmark/assets/tiles/mapbox.mapbox-terrain-v2,mapbox.mapbox-streets-v6
 /platform/darwin/developer.xcconfig
-**/token
 /platform/macos/macos.xcworkspace/xcshareddata/macos.xcscmblueprint
 /platform/ios/ios.xcworkspace/xcshareddata/ios.xcscmblueprint
 /documentation
diff --git a/circle.yml b/circle.yml
index 5d28bccfdd..447b98f0a4 100644
--- a/circle.yml
+++ b/circle.yml
@@ -21,6 +21,7 @@ workflows:
       - next-build-template:
           name: next-android-x86-release
           executor_name: ubuntu-disco
+          target_is_android: true
           config_params: '-G Ninja -DCMAKE_INSTALL_PREFIX=workspace/$CIRCLE_JOB -DCMAKE_TOOLCHAIN_FILE=/opt/android/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_CCACHE=/usr/bin/ccache -DANDROID_ABI=x86'
           install: true
       - next-build-template:
@@ -189,10 +190,6 @@ workflows:
       - ios-sanitize-address-nightly
       - ios-static-analyzer-nightly
       - ios-static-analyzer-nightly-xcode10
-<<<<<<< HEAD
-
-=======
->>>>>>> [test-runner] Add pixel4 baseline metrics
 
 executors:
   ubuntu-disco:
diff --git a/platform/android/src/test/render_test_runner.cpp b/platform/android/src/test/render_test_runner.cpp
index c4b42c91e2..98197ce1cc 100644
--- a/platform/android/src/test/render_test_runner.cpp
+++ b/platform/android/src/test/render_test_runner.cpp
@@ -253,8 +253,7 @@ void android_main(struct android_app* app) {
         unZipFile(env, zipFile, storagePath);
 
         std::string configFile = storagePath + "/android-manifest.json";
-        std::vector<std::string> arguments = {
-            "mbgl-render-test-runner", "-p", configFile, "--probe=network", "--probe=gfx"};
+        std::vector<std::string> arguments = {"mbgl-render-test-runner", "-p", configFile};
         std::vector<char*> argv;
         for (const auto& arg : arguments) {
             argv.push_back((char*)arg.data());
diff --git a/render-test/android-manifest.json b/render-test/android-manifest.json
index c7a26d3b23..ddc91d1933 100644
--- a/render-test/android-manifest.json
+++ b/render-test/android-manifest.json
@@ -1,9 +1,10 @@
 {
     "base_test_path":"mapbox-gl-js/test/integration",
-    "expectation_paths":[],
+    "expectation_paths":["render-test/expected"],
     "ignore_paths":["ignores/ignores.json", "ignores/linux-ignores.json"],
     "vendor_path":"vendor",
     "asset_path": "mapbox-gl-js/test/integration",
     "result_path":"/sdcard/",
+    "probes": ["probeGFX", "probeNetwork"],
     "metric_path":"render-test/metrics/android"
 }
\ No newline at end of file
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 3086dd8b06..aed98772c9 100644
--- a/render-test/android/app/src/main/assets/to_zip.txt
+++ b/render-test/android/app/src/main/assets/to_zip.txt
@@ -13,5 +13,6 @@ vendor/mapbox-gl-styles/styles/
 vendor/mapbox-gl-styles/sprites/
 vendor/mvt-fixtures/real-world/
 ignores/
-render-test/metrics/android
+render-test/metrics/android/
+render-test/expected/
 android-manifest.json
\ No newline at end of file
diff --git a/render-test/metrics/android/render-tests/icon-image/token/metrics.json b/render-test/metrics/android/render-tests/icon-image/token/metrics.json
new file mode 100644
index 0000000000..54cb2c0a34
--- /dev/null
+++ b/render-test/metrics/android/render-tests/icon-image/token/metrics.json
@@ -0,0 +1,47 @@
+{
+    "memory": [
+        [
+            "probeMemory - default - end",
+            4208284,
+            9466
+        ],
+        [
+            "probeMemory - default - start",
+            32,
+            1
+        ]
+    ],
+    "network": [
+        [
+            "probeNetwork - default - end",
+            2,
+            211659
+        ],
+        [
+            "probeNetwork - default - start",
+            0,
+            0
+        ]
+    ],
+    "gfx": [
+        [
+            "probeGFX - default - end",
+            1,
+            4,
+            9,
+            1,
+            [
+                25088,
+                25088
+            ],
+            [
+                46,
+                46
+            ],
+            [
+                320,
+                320
+            ]
+        ]
+    ]
+}
\ No newline at end of file
diff --git a/render-test/metrics/android/render-tests/text-field/token/metrics.json b/render-test/metrics/android/render-tests/text-field/token/metrics.json
new file mode 100644
index 0000000000..656864373f
--- /dev/null
+++ b/render-test/metrics/android/render-tests/text-field/token/metrics.json
@@ -0,0 +1,47 @@
+{
+    "memory": [
+        [
+            "probeMemory - default - end",
+            311155,
+            1511
+        ],
+        [
+            "probeMemory - default - start",
+            32,
+            1
+        ]
+    ],
+    "network": [
+        [
+            "probeNetwork - default - end",
+            1,
+            84942
+        ],
+        [
+            "probeNetwork - default - start",
+            0,
+            0
+        ]
+    ],
+    "gfx": [
+        [
+            "probeGFX - default - end",
+            1,
+            4,
+            9,
+            1,
+            [
+                36568,
+                36568
+            ],
+            [
+                142,
+                142
+            ],
+            [
+                1344,
+                1344
+            ]
+        ]
+    ]
+}
\ No newline at end of file