[metrics] Isolate binary size metrics

Will give us a better view of what changed and by how much. Otherwise
the test stops at the first failure.

24 files changed, 231 insertions, 106 deletions

diff --git a/metrics/tests/binary-size/shared-library/expected.png b/metrics/tests/binary-size/android-arm64-v8a/expected.png
index 63740e7305..63740e7305 100644
--- a/metrics/tests/binary-size/shared-library/expected.png
+++ b/metrics/tests/binary-size/android-arm64-v8a/expected.png
diff --git a/metrics/tests/binary-size/android-arm64-v8a/metrics.json b/metrics/tests/binary-size/android-arm64-v8a/metrics.json
new file mode 100644
index 0000000000..df5bfedd78
--- /dev/null
+++ b/metrics/tests/binary-size/android-arm64-v8a/metrics.json
@@ -0,0 +1,9 @@
+{
+    "file-size": [
+        [
+            "android-arm64-v8a",
+            "/src/workspace/next-android-arm64-v8a-release/lib/libmapbox-gl.so",
+            6496584
+        ]
+    ]
+}
diff --git a/metrics/tests/binary-size/android-arm64-v8a/style.json b/metrics/tests/binary-size/android-arm64-v8a/style.json
new file mode 100644
index 0000000000..e03001ffef
--- /dev/null
+++ b/metrics/tests/binary-size/android-arm64-v8a/style.json
@@ -0,0 +1,22 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "operations": [
+        ["probeFileSize", "android-arm64-v8a", "/src/workspace/next-android-arm64-v8a-release/lib/libmapbox-gl.so", 0.01]
+      ],
+      "width": 64,
+      "height": 64
+    }
+  },
+  "sources": {},
+  "layers": [
+    {
+      "id": "background",
+      "type": "background",
+      "paint": {
+        "background-color": "green"
+      }
+    }
+  ]
+}
diff --git a/metrics/tests/binary-size/tools/expected.png b/metrics/tests/binary-size/android-armeabi-v7a/expected.png
index 63740e7305..63740e7305 100644
--- a/metrics/tests/binary-size/tools/expected.png
+++ b/metrics/tests/binary-size/android-armeabi-v7a/expected.png
diff --git a/metrics/tests/binary-size/android-armeabi-v7a/metrics.json b/metrics/tests/binary-size/android-armeabi-v7a/metrics.json
new file mode 100644
index 0000000000..5969b3e8df
--- /dev/null
+++ b/metrics/tests/binary-size/android-armeabi-v7a/metrics.json
@@ -0,0 +1,9 @@
+{
+    "file-size": [
+        [
+            "android-armeabi-v7a",
+            "/src/workspace/next-android-armeabi-v7a-release/lib/libmapbox-gl.so",
+            3072756
+        ]
+    ]
+}
diff --git a/metrics/tests/binary-size/android-armeabi-v7a/style.json b/metrics/tests/binary-size/android-armeabi-v7a/style.json
new file mode 100644
index 0000000000..78ec439e5e
--- /dev/null
+++ b/metrics/tests/binary-size/android-armeabi-v7a/style.json
@@ -0,0 +1,22 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "operations": [
+        ["probeFileSize", "android-armeabi-v7a", "/src/workspace/next-android-armeabi-v7a-release/lib/libmapbox-gl.so", 0.01]
+      ],
+      "width": 64,
+      "height": 64
+    }
+  },
+  "sources": {},
+  "layers": [
+    {
+      "id": "background",
+      "type": "background",
+      "paint": {
+        "background-color": "green"
+      }
+    }
+  ]
+}
diff --git a/metrics/tests/binary-size/android-x86/expected.png b/metrics/tests/binary-size/android-x86/expected.png
new file mode 100644
index 0000000000..63740e7305
--- /dev/null
+++ b/metrics/tests/binary-size/android-x86/expected.png
diff --git a/metrics/tests/binary-size/android-x86/metrics.json b/metrics/tests/binary-size/android-x86/metrics.json
new file mode 100644
index 0000000000..70b07959af
--- /dev/null
+++ b/metrics/tests/binary-size/android-x86/metrics.json
@@ -0,0 +1,9 @@
+{
+    "file-size": [
+        [
+            "android-x86",
+            "/src/workspace/next-android-x86-release/lib/libmapbox-gl.so",
+            6988568
+        ]
+    ]
+}
diff --git a/metrics/tests/binary-size/android-x86/style.json b/metrics/tests/binary-size/android-x86/style.json
new file mode 100644
index 0000000000..0db28e9803
--- /dev/null
+++ b/metrics/tests/binary-size/android-x86/style.json
@@ -0,0 +1,22 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "operations": [
+        ["probeFileSize", "android-x86", "/src/workspace/next-android-x86-release/lib/libmapbox-gl.so", 0.01]
+      ],
+      "width": 64,
+      "height": 64
+    }
+  },
+  "sources": {},
+  "layers": [
+    {
+      "id": "background",
+      "type": "background",
+      "paint": {
+        "background-color": "green"
+      }
+    }
+  ]
+}
diff --git a/metrics/tests/binary-size/android-x86_64/expected.png b/metrics/tests/binary-size/android-x86_64/expected.png
new file mode 100644
index 0000000000..63740e7305
--- /dev/null
+++ b/metrics/tests/binary-size/android-x86_64/expected.png
diff --git a/metrics/tests/binary-size/android-x86_64/metrics.json b/metrics/tests/binary-size/android-x86_64/metrics.json
new file mode 100644
index 0000000000..9e39b5a3d5
--- /dev/null
+++ b/metrics/tests/binary-size/android-x86_64/metrics.json
@@ -0,0 +1,9 @@
+{
+    "file-size": [
+        [
+            "android-x86_64",
+            "/src/workspace/next-android-x86_64-release/lib/libmapbox-gl.so",
+            7106920
+        ]
+    ]
+}
diff --git a/metrics/tests/binary-size/shared-library/style.json b/metrics/tests/binary-size/android-x86_64/style.json
index aecc114165..0d60c63a7a 100644
--- a/metrics/tests/binary-size/shared-library/style.json
+++ b/metrics/tests/binary-size/android-x86_64/style.json
@@ -3,9 +3,6 @@
   "metadata": {
     "test": {
       "operations": [
-        ["probeFileSize", "android-arm64-v8a", "/src/workspace/next-android-arm64-v8a-release/lib/libmapbox-gl.so", 0.01],
-        ["probeFileSize", "android-armeabi-v7a", "/src/workspace/next-android-armeabi-v7a-release/lib/libmapbox-gl.so", 0.01],
-        ["probeFileSize", "android-x86-release", "/src/workspace/next-android-x86-release/lib/libmapbox-gl.so", 0.01],
         ["probeFileSize", "android-x86_64", "/src/workspace/next-android-x86_64-release/lib/libmapbox-gl.so", 0.01]
       ],
       "width": 64,
diff --git a/metrics/tests/binary-size/linux-clang8/expected.png b/metrics/tests/binary-size/linux-clang8/expected.png
new file mode 100644
index 0000000000..63740e7305
--- /dev/null
+++ b/metrics/tests/binary-size/linux-clang8/expected.png
diff --git a/metrics/tests/binary-size/linux-clang8/metrics.json b/metrics/tests/binary-size/linux-clang8/metrics.json
new file mode 100644
index 0000000000..7af3f79ea6
--- /dev/null
+++ b/metrics/tests/binary-size/linux-clang8/metrics.json
@@ -0,0 +1,19 @@
+{
+    "file-size": [
+        [
+            "mbgl-glfw",
+            "/src/workspace/next-linux-clang8-release/bin/mbgl-glfw",
+            6225032
+        ],
+        [
+            "mbgl-offline",
+            "/src/workspace/next-linux-clang8-release/bin/mbgl-offline",
+            5532376
+        ],
+        [
+            "mbgl-render",
+            "/src/workspace/next-linux-clang8-release/bin/mbgl-render",
+            6151096
+        ]
+    ]
+}
diff --git a/metrics/tests/binary-size/linux-clang8/style.json b/metrics/tests/binary-size/linux-clang8/style.json
new file mode 100644
index 0000000000..7af68d5359
--- /dev/null
+++ b/metrics/tests/binary-size/linux-clang8/style.json
@@ -0,0 +1,24 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "operations": [
+        ["probeFileSize", "mbgl-glfw", "/src/workspace/next-linux-clang8-release/bin/mbgl-glfw", 0.01],
+        ["probeFileSize", "mbgl-offline", "/src/workspace/next-linux-clang8-release/bin/mbgl-offline", 0.01],
+        ["probeFileSize", "mbgl-render", "/src/workspace/next-linux-clang8-release/bin/mbgl-render", 0.01]
+      ],
+      "width": 64,
+      "height": 64
+    }
+  },
+  "sources": {},
+  "layers": [
+    {
+      "id": "background",
+      "type": "background",
+      "paint": {
+        "background-color": "green"
+      }
+    }
+  ]
+}
diff --git a/metrics/tests/binary-size/linux-gcc8/expected.png b/metrics/tests/binary-size/linux-gcc8/expected.png
new file mode 100644
index 0000000000..63740e7305
--- /dev/null
+++ b/metrics/tests/binary-size/linux-gcc8/expected.png
diff --git a/metrics/tests/binary-size/linux-gcc8/metrics.json b/metrics/tests/binary-size/linux-gcc8/metrics.json
new file mode 100644
index 0000000000..4a1e61f068
--- /dev/null
+++ b/metrics/tests/binary-size/linux-gcc8/metrics.json
@@ -0,0 +1,19 @@
+{
+    "file-size": [
+        [
+            "mbgl-glfw",
+            "/src/workspace/next-linux-gcc8-release/bin/mbgl-glfw",
+            7205192
+        ],
+        [
+            "mbgl-offline",
+            "/src/workspace/next-linux-gcc8-release/bin/mbgl-offline",
+            6357224
+        ],
+        [
+            "mbgl-render",
+            "/src/workspace/next-linux-gcc8-release/bin/mbgl-render",
+            7143752
+        ]
+    ]
+}
diff --git a/metrics/tests/binary-size/linux-gcc8/style.json b/metrics/tests/binary-size/linux-gcc8/style.json
new file mode 100644
index 0000000000..8ace1f82ab
--- /dev/null
+++ b/metrics/tests/binary-size/linux-gcc8/style.json
@@ -0,0 +1,24 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "operations": [
+        ["probeFileSize", "mbgl-glfw", "/src/workspace/next-linux-gcc8-release/bin/mbgl-glfw", 0.01],
+        ["probeFileSize", "mbgl-offline", "/src/workspace/next-linux-gcc8-release/bin/mbgl-offline", 0.01],
+        ["probeFileSize", "mbgl-render", "/src/workspace/next-linux-gcc8-release/bin/mbgl-render", 0.01]
+      ],
+      "width": 64,
+      "height": 64
+    }
+  },
+  "sources": {},
+  "layers": [
+    {
+      "id": "background",
+      "type": "background",
+      "paint": {
+        "background-color": "green"
+      }
+    }
+  ]
+}
diff --git a/metrics/tests/binary-size/macos-xcode11/expected.png b/metrics/tests/binary-size/macos-xcode11/expected.png
new file mode 100644
index 0000000000..63740e7305
--- /dev/null
+++ b/metrics/tests/binary-size/macos-xcode11/expected.png
diff --git a/metrics/tests/binary-size/macos-xcode11/metrics.json b/metrics/tests/binary-size/macos-xcode11/metrics.json
new file mode 100644
index 0000000000..9a4ffebd13
--- /dev/null
+++ b/metrics/tests/binary-size/macos-xcode11/metrics.json
@@ -0,0 +1,19 @@
+{
+    "file-size": [
+        [
+            "mbgl-glfw",
+            "/src/workspace/next-macos-xcode11-release/bin/mbgl-glfw",
+            5439932
+        ],
+        [
+            "mbgl-offline",
+            "/src/workspace/next-macos-xcode11-release/bin/mbgl-offline",
+            5334136
+        ],
+        [
+            "mbgl-render",
+            "/src/workspace/next-macos-xcode11-release/bin/mbgl-render",
+            5384420
+        ]
+    ]
+}
diff --git a/metrics/tests/binary-size/macos-xcode11/style.json b/metrics/tests/binary-size/macos-xcode11/style.json
new file mode 100644
index 0000000000..1c2e8123f9
--- /dev/null
+++ b/metrics/tests/binary-size/macos-xcode11/style.json
@@ -0,0 +1,24 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "operations": [
+        ["probeFileSize", "mbgl-glfw", "/src/workspace/next-macos-xcode11-release/bin/mbgl-glfw", 0.01],
+        ["probeFileSize", "mbgl-offline", "/src/workspace/next-macos-xcode11-release/bin/mbgl-offline", 0.01],
+        ["probeFileSize", "mbgl-render", "/src/workspace/next-macos-xcode11-release/bin/mbgl-render", 0.01]
+      ],
+      "width": 64,
+      "height": 64
+    }
+  },
+  "sources": {},
+  "layers": [
+    {
+      "id": "background",
+      "type": "background",
+      "paint": {
+        "background-color": "green"
+      }
+    }
+  ]
+}
diff --git a/metrics/tests/binary-size/shared-library/metrics.json b/metrics/tests/binary-size/shared-library/metrics.json
deleted file mode 100644
index 4501fd0f4a..0000000000
--- a/metrics/tests/binary-size/shared-library/metrics.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "file-size": [
-        [
-            "android-arm64-v8a",
-            "/src/workspace/next-android-arm64-v8a-release/lib/libmapbox-gl.so",
-            6496584
-        ],
-        [
-            "android-armeabi-v7a",
-            "/src/workspace/next-android-armeabi-v7a-release/lib/libmapbox-gl.so",
-            3072756
-        ],
-        [
-            "android-x86-release",
-            "/src/workspace/next-android-x86-release/lib/libmapbox-gl.so",
-            6988568
-        ],
-        [
-            "android-x86_64",
-            "/src/workspace/next-android-x86_64-release/lib/libmapbox-gl.so",
-            7106920
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/tests/binary-size/tools/metrics.json b/metrics/tests/binary-size/tools/metrics.json
deleted file mode 100644
index 457db1c4dc..0000000000
--- a/metrics/tests/binary-size/tools/metrics.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-    "file-size": [
-        [
-            "linux-clang8-mbgl-glfw",
-            "/src/workspace/next-linux-clang8-release/bin/mbgl-glfw",
-            6225032
-        ],
-        [
-            "linux-clang8-mbgl-offline",
-            "/src/workspace/next-linux-clang8-release/bin/mbgl-offline",
-            5532376
-        ],
-        [
-            "linux-clang8-mbgl-render",
-            "/src/workspace/next-linux-clang8-release/bin/mbgl-render",
-            6151096
-        ],
-        [
-            "linux-gcc8-mbgl-glfw",
-            "/src/workspace/next-linux-gcc8-release/bin/mbgl-glfw",
-            7205192
-        ],
-        [
-            "linux-gcc8-mbgl-offline",
-            "/src/workspace/next-linux-gcc8-release/bin/mbgl-offline",
-            6357224
-        ],
-        [
-            "linux-gcc8-mbgl-render",
-            "/src/workspace/next-linux-gcc8-release/bin/mbgl-render",
-            7143752
-        ],
-        [
-            "macos-xcode11-mbgl-glfw",
-            "/src/workspace/next-macos-xcode11-release/bin/mbgl-glfw",
-            5439932
-        ],
-        [
-            "macos-xcode11-mbgl-offline",
-            "/src/workspace/next-macos-xcode11-release/bin/mbgl-offline",
-            5334136
-        ],
-        [
-            "macos-xcode11-mbgl-render",
-            "/src/workspace/next-macos-xcode11-release/bin/mbgl-render",
-            5384420
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/metrics/tests/binary-size/tools/style.json b/metrics/tests/binary-size/tools/style.json
deleted file mode 100644
index c1af092bc5..0000000000
--- a/metrics/tests/binary-size/tools/style.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 8,
-  "metadata": {
-    "test": {
-      "operations": [
-        ["probeFileSize", "linux-clang8-mbgl-glfw", "/src/workspace/next-linux-clang8-release/bin/mbgl-glfw", 0.01],
-        ["probeFileSize", "linux-clang8-mbgl-offline", "/src/workspace/next-linux-clang8-release/bin/mbgl-offline", 0.01],
-        ["probeFileSize", "linux-clang8-mbgl-render", "/src/workspace/next-linux-clang8-release/bin/mbgl-render", 0.01],
-        ["probeFileSize", "linux-gcc8-mbgl-glfw", "/src/workspace/next-linux-gcc8-release/bin/mbgl-glfw", 0.01],
-        ["probeFileSize", "linux-gcc8-mbgl-offline", "/src/workspace/next-linux-gcc8-release/bin/mbgl-offline", 0.01],
-        ["probeFileSize", "linux-gcc8-mbgl-render", "/src/workspace/next-linux-gcc8-release/bin/mbgl-render", 0.01],
-        ["probeFileSize", "macos-xcode11-mbgl-glfw", "/src/workspace/next-macos-xcode11-release/bin/mbgl-glfw", 0.01],
-        ["probeFileSize", "macos-xcode11-mbgl-offline", "/src/workspace/next-macos-xcode11-release/bin/mbgl-offline", 0.01],
-        ["probeFileSize", "macos-xcode11-mbgl-render", "/src/workspace/next-macos-xcode11-release/bin/mbgl-render", 0.01]
-      ],
-      "width": 64,
-      "height": 64
-    }
-  },
-  "sources": {},
-  "layers": [
-    {
-      "id": "background",
-      "type": "background",
-      "paint": {
-        "background-color": "green"
-      }
-    }
-  ]
-}