Update mac_unopt.json

flutter · Oct 15, 2024 · 4bdfdbe · 4bdfdbe
1 parent e1bfb46
commit 4bdfdbe
Showing 1 changed file with 18 additions and 70 deletions.
diff --git a/ci/builders/mac_unopt.json b/ci/builders/mac_unopt.json
@@ -14,7 +14,7 @@
             },
             "gn": [
                 "--target-dir",
-                "ci/host_debug_tests",
+                "ci/host_debug_arm64_tests",
                 "--runtime-mode",
                 "debug",
                 "--mac-cpu",
@@ -27,10 +27,10 @@
                 "--no-goma",
                 "--xcode-symlinks"
             ],
-            "name": "ci/host_debug_tests",
+            "name": "ci/host_debug_arm64_tests",
             "description": "Produces debug mode arm64 macOS host-side tooling and builds host-side unit tests for arm64 macOS.",
             "ninja": {
-                "config": "ci/host_debug_tests",
+                "config": "ci/host_debug_arm64_tests",
                 "targets": []
             },
             "properties": {
@@ -46,7 +46,7 @@
                     "parameters": [
                         "--quiet",
                         "--variant",
-                        "ci/host_debug_tests",
+                        "ci/host_debug_arm64_tests",
                         "--type",
                         "dart,dart-host,engine",
                         "--engine-capture-core-dump"
@@ -67,7 +67,7 @@
             },
             "gn": [
                 "--target-dir",
-                "ci/host_profile_tests",
+                "ci/host_profile_arm64_tests",
                 "--runtime-mode",
                 "profile",
                 "--mac-cpu",
@@ -79,10 +79,10 @@
                 "--no-goma",
                 "--xcode-symlinks"
             ],
-            "name": "ci/host_profile_tests",
+            "name": "ci/host_profile_arm64_tests",
             "description": "Produces profile mode arm64 macOS host-side tooling and builds host-side unit tests for arm64 macOS.",
             "ninja": {
-                "config": "ci/host_profile_tests",
+                "config": "ci/host_profile_arm64_tests",
                 "targets": []
             },
             "properties": {
@@ -98,7 +98,7 @@
                     "parameters": [
                         "--quiet",
                         "--variant",
-                        "ci/host_profile_tests",
+                        "ci/host_profile_arm64_tests",
                         "--type",
                         "dart,dart-host,engine",
                         "--engine-capture-core-dump"
@@ -119,7 +119,7 @@
             },
             "gn": [
                 "--target-dir",
-                "ci/host_release_tests",
+                "ci/host_release_arm64_tests",
                 "--runtime-mode",
                 "release",
                 "--mac-cpu",
@@ -132,10 +132,10 @@
                 "--no-goma",
                 "--xcode-symlinks"
             ],
-            "name": "ci/host_release_tests",
+            "name": "ci/host_release_arm64_tests",
             "description": "Produces release mode arm64 macOS host-side tooling and builds host-side unit tests for arm64 macOS.",
             "ninja": {
-                "config": "ci/host_release_tests",
+                "config": "ci/host_release_arm64_tests",
                 "targets": []
             },
             "properties": {
@@ -151,7 +151,7 @@
                     "parameters": [
                         "--quiet",
                         "--variant",
-                        "ci/host_release_tests",
+                        "ci/host_release_arm64_tests",
                         "--type",
                         "dart,dart-host,engine"
                     ]
@@ -216,64 +216,6 @@
                 }
             ]
         },
-        {
-            "cas_archive": false,
-            "drone_dimensions": [
-                "device_type=none",
-                "os=Mac-13|Mac-14",
-                "cpu=arm64"
-            ],
-            "gclient_variables": {
-                "download_android_deps": false,
-                "use_rbe": true
-            },
-            "gn": [
-                "--target-dir",
-                "ci/host_debug_unopt",
-                "--runtime-mode",
-                "debug",
-                "--mac-cpu",
-                "arm64",
-                "--unoptimized",
-                "--no-lto",
-                "--prebuilt-dart-sdk",
-                "--enable-impeller-3d",
-                "--rbe",
-                "--no-goma",
-                "--xcode-symlinks"
-            ],
-            "name": "ci/host_debug_unopt",
-            "description": "Builds a debug mode unopt arm64 macOS engine and runs host-side tests.",
-            "ninja": {
-                "config": "ci/host_debug_unopt",
-                "targets": []
-            },
-            "properties": {
-                "$flutter/osx_sdk": {
-                    "sdk_version": "15a240d"
-                }
-            },
-            "tests": [
-                {
-                    "language": "python3",
-                    "name": "Host Tests for host_debug_unopt",
-                    "script": "flutter/testing/run_tests.py",
-                    "parameters": [
-                        "--quiet",
-                        "--variant",
-                        "ci/host_debug_unopt",
-                        "--type",
-                        "dart,dart-host,engine",
-                        "--engine-capture-core-dump"
-                    ]
-                },
-                {
-                    "name": "Tests of tools/gn",
-                    "language": "python3",
-                    "script": "flutter/tools/gn_test.py"
-                }
-            ]
-        },
         {
             "cas_archive": false,
             "properties": {
@@ -361,6 +303,7 @@
                 "--prebuilt-dart-sdk",
                 "--mac-cpu",
                 "arm64",
+                "--enable-impeller-3d",
                 "--rbe",
                 "--no-goma",
                 "--xcode-symlinks",
@@ -392,6 +335,11 @@
                         "--engine-capture-core-dump",
                         "--no-skia-gold"
                     ]
+                },
+                {
+                    "name": "Tests of tools/gn",
+                    "language": "python3",
+                    "script": "flutter/tools/gn_test.py"
                 }
             ]
         },