Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion e2etests/cvd/cvd_create_tests/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ func TestCvdCreate(t *testing.T) {
testcases := []struct {
branch string
target string
args []string
}{
{
branch: "aosp-android-latest-release",
Expand All @@ -38,6 +39,20 @@ func TestCvdCreate(t *testing.T) {
branch: "git_main-throttled-nightly",
target: "aosp_cf_x86_64_auto-trunk_staging-userdebug",
},
{
branch: "git_main-swcar-dev",
target: "aosp_cf_x86_64_sdv_core-trunk_staging-userdebug",
args: []string{
"--enable_sandbox=true",
},
},
{
branch: "git_main-swcar-dev",
target: "aosp_cf_x86_64_sdv_media-trunk_staging-userdebug",
args: []string{
"--enable_sandbox=true",
},
},
}
c := e2etests.TestContext{}
for _, tc := range testcases {
Expand All @@ -52,7 +67,9 @@ func TestCvdCreate(t *testing.T) {
t.Fatal(err)
}

if err := c.CVDCreate(e2etests.CreateArgs{}); err != nil {
if err := c.CVDCreate(e2etests.CreateArgs{
Args: tc.args,
}); err != nil {
t.Fatal(err)
}

Expand Down
53 changes: 53 additions & 0 deletions e2etests/cvd/cvd_load_tests/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,59 @@ func TestCvdLoad(t *testing.T) {
"common": {
"host_package": "@ab\/aosp-android-latest-release\/aosp_cf_x86_64_only_phone-userdebug"
}
}`,
},
{
name: "GitSwCarDevSdv",
loadconfig: `
{
"instances": [
{
"name": "sdv-core",
"vm": {
"cpus": 2,
"memory_mb": 2048,
"crosvm": {
"enable_sandbox": true
}
},
"disk": {
"default_build": "@ab\/git_main-swcar-dev\/aosp_cf_x86_64_sdv_core-trunk_staging-userdebug"
},
"graphics": {
"gpu_mode": "none"
}
},
{
"name": "sdv-media",
"vm": {
"cpus": 4,
"memory_mb": 4096,
"crosvm": {
"enable_sandbox": true
}
},
"disk": {
"default_build": "@ab\/git_main-swcar-dev\/aosp_cf_x86_64_sdv_media-trunk_staging-userdebug"
},
"graphics": {
"displays": [
{
"width": 1920,
"height": 1080
}
],
"gpu_mode": "gfxstream_guest_angle_host_swiftshader"
}
}
],
"netsim_bt": false,
"metrics": {
"enable": true
},
"common": {
"host_package": "@ab\/git_main-swcar-dev\/aosp_cf_x86_64_sdv_media-trunk_staging-userdebug"
}
}`,
},
}
Expand Down
26 changes: 25 additions & 1 deletion e2etests/cvd/launch_cvd_tests/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ func TestLaunchCvd(t *testing.T) {
name string
branch string
target string
args []string
}{
{
name: "GitMainPhone",
Expand Down Expand Up @@ -61,6 +62,27 @@ func TestLaunchCvd(t *testing.T) {
branch: "git_android16-car-release",
target: "aosp_cf_x86_64_auto-userdebug",
},
{
name: "Car17Auto",
branch: "git_android17-car-release",
target: "aosp_cf_x86_64_auto-userdebug",
},
{
name: "GitSwCarDevSdvCore",
branch: "git_main-swcar-dev",
target: "aosp_cf_x86_64_sdv_core-trunk_staging-userdebug",
args: []string{
"--enable_sandbox=true",
},
},
{
name: "GitSwCarDevSdvMedia",
branch: "git_main-swcar-dev",
target: "aosp_cf_x86_64_sdv_media-trunk_staging-userdebug",
args: []string{
"--enable_sandbox=true",
},
},
Comment thread
chihchiachen marked this conversation as resolved.
{
name: "Aosp11GsiPhone",
branch: "aosp-android11-gsi",
Expand All @@ -80,7 +102,9 @@ func TestLaunchCvd(t *testing.T) {
t.Fatal(err)
}

if err := c.LaunchCVD(e2etests.CreateArgs{}); err != nil {
if err := c.LaunchCVD(e2etests.CreateArgs{
Args: tc.args,
}); err != nil {
t.Fatal(err)
}

Expand Down
Loading