diff --git a/.github/config/android-arm.json b/.github/config/android-arm.json
index 253bde57e0e43..e8be887ccd2aa 100644
--- a/.github/config/android-arm.json
+++ b/.github/config/android-arm.json
@@ -4,21 +4,23 @@
"android-arm"
],
"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"
],
+ "gtest_targets": [
+ "base_unittests",
+ "blink_unittests",
+ "gin_unittests",
+ "gpu_unittests",
+ "ipc_tests",
+ "media_unittests",
+ "mojo_unittests",
+ "net_unittests",
+ "sql_unittests",
+ "url_unittests"
+ ],
"test_on_device": true,
"includes": [
{
diff --git a/.github/config/android-arm64.json b/.github/config/android-arm64.json
index 12ef5c46cc989..e90a3d101158a 100644
--- a/.github/config/android-arm64.json
+++ b/.github/config/android-arm64.json
@@ -4,21 +4,23 @@
"android-arm64"
],
"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"
],
+ "gtest_targets": [
+ "base_unittests",
+ "blink_unittests",
+ "gin_unittests",
+ "gpu_unittests",
+ "ipc_tests",
+ "media_unittests",
+ "mojo_unittests",
+ "net_unittests",
+ "sql_unittests",
+ "url_unittests"
+ ],
"test_on_device": true,
"includes": [
{
diff --git a/.github/config/android-x86.json b/.github/config/android-x86.json
index 262d0cfc8c446..a96814f41ba48 100644
--- a/.github/config/android-x86.json
+++ b/.github/config/android-x86.json
@@ -4,21 +4,23 @@
"android-x86"
],
"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"
],
+ "gtest_targets": [
+ "base_unittests",
+ "blink_unittests",
+ "gin_unittests",
+ "gpu_unittests",
+ "ipc_tests",
+ "media_unittests",
+ "mojo_unittests",
+ "net_unittests",
+ "sql_unittests",
+ "url_unittests"
+ ],
"includes": [
{
"name":"x86",
diff --git a/.github/config/chromium_android-arm.json b/.github/config/chromium_android-arm.json
index 9eac89f0b668f..52a8e509c1d1b 100644
--- a/.github/config/chromium_android-arm.json
+++ b/.github/config/chromium_android-arm.json
@@ -4,20 +4,22 @@
"chromium_android-arm"
],
"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"
],
+ "gtest_targets": [
+ "base_unittests",
+ "blink_unittests",
+ "gin_unittests",
+ "gpu_unittests",
+ "ipc_tests",
+ "media_unittests",
+ "mojo_unittests",
+ "net_unittests",
+ "sql_unittests",
+ "url_unittests"
+ ],
"includes": [
{
"name":"arm",
diff --git a/.github/config/chromium_android-arm64.json b/.github/config/chromium_android-arm64.json
index 1aea4037d668d..77a3541cadb1b 100644
--- a/.github/config/chromium_android-arm64.json
+++ b/.github/config/chromium_android-arm64.json
@@ -4,20 +4,22 @@
"chromium_android-arm64"
],
"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"
],
+ "gtest_targets": [
+ "base_unittests",
+ "blink_unittests",
+ "gin_unittests",
+ "gpu_unittests",
+ "ipc_tests",
+ "media_unittests",
+ "mojo_unittests",
+ "net_unittests",
+ "sql_unittests",
+ "url_unittests"
+ ],
"includes": [
{
"name":"arm64",
diff --git a/.github/config/chromium_android-x86.json b/.github/config/chromium_android-x86.json
index c97a39f99ec87..68a5ecab872ab 100644
--- a/.github/config/chromium_android-x86.json
+++ b/.github/config/chromium_android-x86.json
@@ -4,20 +4,22 @@
"chromium_android-x86"
],
"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"
],
+ "gtest_targets": [
+ "base_unittests",
+ "blink_unittests",
+ "gin_unittests",
+ "gpu_unittests",
+ "ipc_tests",
+ "media_unittests",
+ "mojo_unittests",
+ "net_unittests",
+ "sql_unittests",
+ "url_unittests"
+ ],
"includes": [
{
"name":"x86",
diff --git a/.github/config/chromium_linux.json b/.github/config/chromium_linux.json
index 01114cd966a66..3357d29ed02c3 100644
--- a/.github/config/chromium_linux.json
+++ b/.github/config/chromium_linux.json
@@ -4,17 +4,19 @@
"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"
+ "content_shell"
+ ],
+ "gtest_targets": [
+ "base_unittests",
+ "blink_unittests",
+ "gin_unittests",
+ "gpu_unittests",
+ "ipc_tests",
+ "media_unittests",
+ "mojo_unittests",
+ "net_unittests",
+ "sql_unittests",
+ "url_unittests"
],
"includes": [
{
diff --git a/.github/config/linux.json b/.github/config/linux.json
index dfacac9eadd2c..08afe7d0df46a 100644
--- a/.github/config/linux.json
+++ b/.github/config/linux.json
@@ -5,16 +5,18 @@
"linux-x64x11"
],
"targets": [
- "base_unittests",
- "cobalt:gn_all",
- "content_shell",
- "gin_unittests",
- "gpu_unittests",
- "ipc_tests",
- "media_unittests",
- "mojo_unittests",
- "sql_unittests",
- "url_unittests"
+ "content_shell",
+ "cobalt:gn_all"
+ ],
+ "gtest_targets": [
+ "base_unittests",
+ "ipc_tests",
+ "gin_unittests",
+ "gpu_unittests",
+ "media_unittests",
+ "mojo_unittests",
+ "sql_unittests",
+ "url_unittests"
],
"includes": [
{
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index bfd96b5d001c9..15405744faa1a 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -65,6 +65,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: |
+ gtest_targets=$(cat ${GITHUB_WORKSPACE}/.github/config/${{ inputs.platform }}.json | jq -c '.gtest_targets | join(" ")')
+ echo "gtest_targets=${gtest_targets}" >> $GITHUB_ENV
- id: set-includes
shell: bash
run: |
@@ -88,6 +93,7 @@ jobs:
outputs:
platforms: ${{ env.platforms }}
targets: ${{ env.targets }}
+ gtest_targets: ${{ env.gtest_targets }}
includes: ${{ env.includes }}
docker_service: ${{ env.docker_service }}
test_on_host: ${{ env.test_on_host }}
@@ -166,9 +172,10 @@ jobs:
# TODO(bug?): android debug builds are broken.
if: ${{ ! (contains(matrix.platform, 'android') && matrix.config == 'debug') }}
with:
- targets: ${{ needs.initialize.outputs.targets }}
- - name: Upload Test Artifacts
- if: matrix.config == 'devel'
+ targets: ${{ needs.initialize.outputs.targets }} ${{ needs.initialize.outputs.gtest_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'
uses: ./src/.github/actions/upload_test_artifacts
with:
test_artifacts_key: ${{ env.TEST_ARTIFACTS_KEY }}
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 656d567a5ec33..1bd9a0de3d133 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -4,8 +4,8 @@ services:
build:
context: cobalt/docker/linux
cache_from:
- - ghcr.io/youtube/cobalt/linux:latest
- image: ghcr.io/youtube/cobalt/linux:latest
+ - ghcr.io/youtube/cobalt_sandbox/linux:latest
+ image: ghcr.io/youtube/cobalt_sandbox/linux:latest
platform: linux/amd64
environment:
- DEPOT_TOOLS_UPDATE=0