diff options
| author | 2025-01-31 17:02:52 -0800 | |
|---|---|---|
| committer | 2025-01-31 17:02:52 -0800 | |
| commit | 536ad66134dbc54b46be3f35cc563f1db67594ac (patch) | |
| tree | 264b7203f28be06bfafa06806aae9c1f8c8d144a /java/androidmk_test.go | |
| parent | 52dc1a7f9533c82d27a2c75cfabd0cbeb763f6ac (diff) | |
| parent | d5c643112afa3e935e112a7e87705b5398d3532b (diff) | |
Merge changes I39a75dab,I4c6640e7,I931216a5 into main
* changes:
Return android.Module from BottomUpMutatorContext methods
Add t.Parallel() to java tests
Run gofmt -w .
Diffstat (limited to 'java/androidmk_test.go')
| -rw-r--r-- | java/androidmk_test.go | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/java/androidmk_test.go b/java/androidmk_test.go index 1d98b180d..9306e72a3 100644 --- a/java/androidmk_test.go +++ b/java/androidmk_test.go @@ -23,6 +23,7 @@ import ( ) func TestRequired(t *testing.T) { + t.Parallel() ctx, _ := testJava(t, ` java_library { name: "foo", @@ -42,6 +43,7 @@ func TestRequired(t *testing.T) { } func TestHostdex(t *testing.T) { + t.Parallel() ctx, _ := testJava(t, ` java_library { name: "foo", @@ -72,6 +74,7 @@ func TestHostdex(t *testing.T) { } func TestHostdexRequired(t *testing.T) { + t.Parallel() ctx, _ := testJava(t, ` java_library { name: "foo", @@ -103,6 +106,7 @@ func TestHostdexRequired(t *testing.T) { } func TestHostdexSpecificRequired(t *testing.T) { + t.Parallel() ctx, _ := testJava(t, ` java_library { name: "foo", @@ -136,6 +140,7 @@ func TestHostdexSpecificRequired(t *testing.T) { } func TestJavaSdkLibrary_RequireXmlPermissionFile(t *testing.T) { + t.Parallel() result := android.GroupFixturePreparers( prepareForJavaTest, PrepareForTestWithJavaSdkLibraryFiles, @@ -173,6 +178,7 @@ func TestJavaSdkLibrary_RequireXmlPermissionFile(t *testing.T) { } func TestImportSoongDexJar(t *testing.T) { + t.Parallel() result := PrepareForTestWithJavaDefaultModules.RunTestWithBp(t, ` java_import { name: "my-java-import", @@ -191,6 +197,7 @@ func TestImportSoongDexJar(t *testing.T) { } func TestAndroidTestHelperApp_LocalDisableTestConfig(t *testing.T) { + t.Parallel() ctx, _ := testJava(t, ` android_test_helper_app { name: "foo", @@ -209,6 +216,7 @@ func TestAndroidTestHelperApp_LocalDisableTestConfig(t *testing.T) { } func TestGetOverriddenPackages(t *testing.T) { + t.Parallel() ctx, _ := testJava( t, ` android_app { @@ -255,6 +263,7 @@ func TestGetOverriddenPackages(t *testing.T) { } func TestJniAsRequiredDeps(t *testing.T) { + t.Parallel() ctx := android.GroupFixturePreparers( PrepareForTestWithJavaDefaultModules, cc.PrepareForTestWithCcDefaultModules, |