Break out test targets into a separate config

b/354062546
youtube · Dec 14, 2024 · c41d14b · c41d14b
1 parent bd53a69
commit c41d14b
Show file tree

Hide file tree

Showing 9 changed files with 78 additions and 56 deletions.
diff --git a/.github/config/android-arm.json b/.github/config/android-arm.json
@@ -4,20 +4,22 @@
         "android-arm"
     ],
     "targets": [
+        "ipc_tests",
+        "content_shell",
+        "system_webview_apk",
+        "system_webview_shell_apk",
+        "cobalt:gn_all"
+    ],
+    "test_targets": [
         "base_unittests",
         "sql_unittests",
         "net_unittests",
         "url_unittests",
-        "ipc_tests",
         "mojo_unittests",
         "gpu_unittests",
         "gin_unittests",
         "blink_unittests",
-        "media_unittests",
-        "content_shell",
-        "system_webview_apk",
-        "system_webview_shell_apk",
-        "cobalt:gn_all"
+        "media_unittests"
     ],
     "test_on_device": true,
     "includes": [

diff --git a/.github/config/android-arm64.json b/.github/config/android-arm64.json
@@ -4,20 +4,21 @@
         "android-arm64"
     ],
     "targets": [
+        "ipc_tests",
+        "content_shell",
+        "system_webview_apk",
+        "system_webview_shell_apk",
+        "cobalt:gn_all"
+    ],
+    "test_targets": [
         "base_unittests",
         "sql_unittests",
         "net_unittests",
         "url_unittests",
-        "ipc_tests",
         "mojo_unittests",
         "gpu_unittests",
         "gin_unittests",
-        "blink_unittests",
-        "media_unittests",
-        "content_shell",
-        "system_webview_apk",
-        "system_webview_shell_apk",
-        "cobalt:gn_all"
+        "blink_unittests"
     ],
     "test_on_device": true,
     "includes": [

diff --git a/.github/config/android-x86.json b/.github/config/android-x86.json
@@ -4,20 +4,23 @@
         "android-x86"
     ],
     "targets": [
+        "ipc_tests",
+        "content_shell",
+        "system_webview_apk",
+        "system_webview_shell_apk",
+        "cobalt:gn_all"
+    ],
+    "test_targets": [
         "base_unittests",
         "sql_unittests",
         "net_unittests",
         "url_unittests",
-        "ipc_tests",
         "mojo_unittests",
         "gpu_unittests",
         "gin_unittests",
         "blink_unittests",
-        "media_unittests",
-        "content_shell",
-        "system_webview_apk",
-        "system_webview_shell_apk",
-        "cobalt:gn_all"
+        "media_unittests"
+
     ],
     "includes": [
         {

diff --git a/.github/config/chromium_android-arm.json b/.github/config/chromium_android-arm.json
@@ -4,19 +4,21 @@
         "chromium_android-arm"
     ],
     "targets": [
+        "ipc_tests",
+        "content_shell",
+        "system_webview_apk",
+        "system_webview_shell_apk"
+    ],
+    "test_targets": [
         "base_unittests",
         "sql_unittests",
         "net_unittests",
         "url_unittests",
-        "ipc_tests",
         "mojo_unittests",
         "gpu_unittests",
         "gin_unittests",
         "blink_unittests",
-        "media_unittests",
-        "content_shell",
-        "system_webview_apk",
-        "system_webview_shell_apk"
+        "media_unittests"
     ],
     "includes": [
         {

diff --git a/.github/config/chromium_android-arm64.json b/.github/config/chromium_android-arm64.json
@@ -4,19 +4,21 @@
         "chromium_android-arm64"
     ],
     "targets": [
+        "ipc_tests",
+        "content_shell",
+        "system_webview_apk",
+        "system_webview_shell_apk"
+    ],
+    "test_targets": [
         "base_unittests",
         "sql_unittests",
         "net_unittests",
         "url_unittests",
-        "ipc_tests",
         "mojo_unittests",
         "gpu_unittests",
         "gin_unittests",
         "blink_unittests",
-        "media_unittests",
-        "content_shell",
-        "system_webview_apk",
-        "system_webview_shell_apk"
+        "media_unittests"
     ],
     "includes": [
         {

diff --git a/.github/config/chromium_android-x86.json b/.github/config/chromium_android-x86.json
@@ -4,19 +4,21 @@
         "chromium_android-x86"
     ],
     "targets": [
+        "ipc_tests",
+        "content_shell",
+        "system_webview_apk",
+        "system_webview_shell_apk"
+    ],
+    "test_targets": [
         "base_unittests",
         "sql_unittests",
         "net_unittests",
         "url_unittests",
-        "ipc_tests",
         "mojo_unittests",
         "gpu_unittests",
         "gin_unittests",
         "blink_unittests",
-        "media_unittests",
-        "content_shell",
-        "system_webview_apk",
-        "system_webview_shell_apk"
+        "media_unittests"
     ],
     "includes": [
         {

diff --git a/.github/config/chromium_linux.json b/.github/config/chromium_linux.json
@@ -4,18 +4,20 @@
       "chromium_linux-x64x11"
     ],
     "targets": [
-        "base_unittests",
-        "sql_unittests",
-        "net_unittests",
-        "url_unittests",
-        "ipc_tests",
-        "mojo_unittests",
-        "gpu_unittests",
-        "gin_unittests",
-        "blink_unittests",
-        "media_unittests",
-        "content_shell"
+      "ipc_tests",
+      "content_shell"
     ],
+    "test_targets": [
+      "base_unittests",
+      "sql_unittests",
+      "net_unittests",
+      "url_unittests",
+      "mojo_unittests",
+      "gpu_unittests",
+      "gin_unittests",
+      "blink_unittests",
+      "media_unittests"
+  ],
     "includes": [
       {
         "name":"x64",

diff --git a/.github/config/linux.json b/.github/config/linux.json
@@ -5,17 +5,19 @@
       "linux-x64x11"
     ],
     "targets": [
- 	"base_unittests",
-        "sql_unittests",
-        "url_unittests",
-        "ipc_tests",
-        "mojo_unittests",
-        "gpu_unittests",
-        "gin_unittests",
-        "media_unittests",
-        "content_shell",
-        "cobalt:gn_all"
+      "ipc_tests",
+      "content_shell",
+      "cobalt:gn_all"
     ],
+    "test_targets": [
+      "base_unittests",
+      "sql_unittests",
+      "url_unittests",
+      "mojo_unittests",
+      "gpu_unittests",
+      "gin_unittests",
+      "media_unittests"
+ ],
     "includes": [
       {
         "name":"x64",

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -62,6 +62,11 @@ jobs:
         run: |
           targets=$(cat ${GITHUB_WORKSPACE}/.github/config/${{ inputs.platform }}.json | jq -c '.targets  | join(" ")')
           echo "targets=${targets}" >> $GITHUB_ENV
+      - id: set-test-targets
+        shell: bash
+        run: |
+          test_targets=$(cat ${GITHUB_WORKSPACE}/.github/config/${{ inputs.platform }}.json | jq -c '.test_targets  | join(" ")')
+          echo "test_targets=${test_targets}" >> $GITHUB_ENV
       - id: set-includes
         shell: bash
         run: |
@@ -85,6 +90,7 @@ jobs:
     outputs:
       platforms: ${{ env.platforms }}
       targets: ${{ env.targets }}
+      test_targets: ${{ env.test_targets }}
       includes: ${{ env.includes }}
       docker_service: ${{ env.docker_service }}
       test_on_host: ${{ env.test_on_host }}
@@ -159,7 +165,7 @@ jobs:
         # TODO(bug?): android debug builds are broken.
         if: ${{ ! (startsWith(matrix.platform, 'android') && matrix.config == 'debug') }}
         with:
-          targets: ${{ needs.initialize.outputs.targets }}
+          targets: join(${{ needs.initialize.outputs.targets }}${{ needs.initialize.outputs.test_targets }})
           test_artifacts_key: ${{ env.TEST_ARTIFACTS_KEY }}
       - name: Upload On Device Test Artifacts
         if: matrix.config == 'devel' && needs.initialize.outputs.test_on_device == 'true'