StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Make lots of tests run in parallel"

Browse Source 
This reverts commit 323dc60712.

Reason for revert: Possible cause of test instability
Bug: 170513220
Test: soong tests

Change-Id: Iee168e9fbb4210569e6cffcc23e60d111403abb8
This commit is contained in:
Colin Cross
2020-10-10 01:30:30 +00:00
parent 6682ef42a4
commit 405af07859
116 changed files with 0 additions and 660 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
java/androidmk_test.go
View File

@@ -23,7 +23,6 @@ import (
)
func TestRequired(t *testing.T) {
t.Parallel()
ctx, config := testJava(t, `
java_library {
name: "foo",
@@ -43,7 +42,6 @@ func TestRequired(t *testing.T) {
}
func TestHostdex(t *testing.T) {
t.Parallel()
ctx, config := testJava(t, `
java_library {
name: "foo",
@@ -74,7 +72,6 @@ func TestHostdex(t *testing.T) {
}
func TestHostdexRequired(t *testing.T) {
t.Parallel()
ctx, config := testJava(t, `
java_library {
name: "foo",
@@ -106,7 +103,6 @@ func TestHostdexRequired(t *testing.T) {
}
func TestHostdexSpecificRequired(t *testing.T) {
t.Parallel()
ctx, config := testJava(t, `
java_library {
name: "foo",
@@ -140,7 +136,6 @@ func TestHostdexSpecificRequired(t *testing.T) {
}
func TestDistWithTag(t *testing.T) {
t.Parallel()
ctx, config := testJava(t, `
java_library {
name: "foo_without_tag",
@@ -177,7 +172,6 @@ func TestDistWithTag(t *testing.T) {
}
func TestDistWithDest(t *testing.T) {
t.Parallel()
ctx, config := testJava(t, `
java_library {
name: "foo",
@@ -214,7 +208,6 @@ func TestDistWithDest(t *testing.T) {
}
func TestDistsWithAllProperties(t *testing.T) {
t.Parallel()
ctx, config := testJava(t, `
java_library {
name: "foo",
@@ -272,7 +265,6 @@ func TestDistsWithAllProperties(t *testing.T) {
}
func TestDistsWithTag(t *testing.T) {
t.Parallel()
ctx, config := testJava(t, `
java_library {
name: "foo_without_tag",
@@ -320,7 +312,6 @@ func TestDistsWithTag(t *testing.T) {
}
func TestJavaSdkLibrary_RequireXmlPermissionFile(t *testing.T) {
t.Parallel()
ctx, config := testJava(t, `
java_sdk_library {
name: "foo-shared_library",

48
java/app_test.go
View File

@@ -67,7 +67,6 @@ func testApp(t *testing.T, bp string) *android.TestContext {
}
func TestApp(t *testing.T) {
t.Parallel()
for _, moduleType := range []string{"android_app", "android_library"} {
t.Run(moduleType, func(t *testing.T) {
ctx := testApp(t, moduleType+` {
@@ -114,7 +113,6 @@ func TestApp(t *testing.T) {
}
func TestAppSplits(t *testing.T) {
t.Parallel()
ctx := testApp(t, `
android_app {
name: "foo",
@@ -144,7 +142,6 @@ func TestAppSplits(t *testing.T) {
}
func TestAndroidAppSet(t *testing.T) {
t.Parallel()
ctx, config := testJava(t, `
android_app_set {
name: "foo",
@@ -173,7 +170,6 @@ func TestAndroidAppSet(t *testing.T) {
}
func TestAndroidAppSet_Variants(t *testing.T) {
t.Parallel()
bp := `
android_app_set {
name: "foo",
@@ -239,7 +235,6 @@ func TestAndroidAppSet_Variants(t *testing.T) {
}
func TestPlatformAPIs(t *testing.T) {
t.Parallel()
testJava(t, `
android_app {
name: "foo",
@@ -274,7 +269,6 @@ func TestPlatformAPIs(t *testing.T) {
}
func TestAndroidAppLinkType(t *testing.T) {
t.Parallel()
testJava(t, `
android_app {
name: "foo",
@@ -364,7 +358,6 @@ func TestAndroidAppLinkType(t *testing.T) {
}
func TestUpdatableApps(t *testing.T) {
t.Parallel()
testCases := []struct {
name string
bp string
@@ -486,7 +479,6 @@ func TestUpdatableApps(t *testing.T) {
}
func TestUpdatableApps_TransitiveDepsShouldSetMinSdkVersion(t *testing.T) {
t.Parallel()
testJavaError(t, `module "bar".*: should support min_sdk_version\(29\)`, cc.GatherRequiredDepsForTest(android.Android)+`
android_app {
name: "foo",
@@ -505,7 +497,6 @@ func TestUpdatableApps_TransitiveDepsShouldSetMinSdkVersion(t *testing.T) {
}
func TestUpdatableApps_JniLibsShouldShouldSupportMinSdkVersion(t *testing.T) {
t.Parallel()
testJava(t, cc.GatherRequiredDepsForTest(android.Android)+`
android_app {
name: "foo",
@@ -526,7 +517,6 @@ func TestUpdatableApps_JniLibsShouldShouldSupportMinSdkVersion(t *testing.T) {
}
func TestUpdatableApps_JniLibShouldBeBuiltAgainstMinSdkVersion(t *testing.T) {
t.Parallel()
bp := cc.GatherRequiredDepsForTest(android.Android) + `
android_app {
name: "foo",
@@ -581,7 +571,6 @@ func TestUpdatableApps_JniLibShouldBeBuiltAgainstMinSdkVersion(t *testing.T) {
}
func TestUpdatableApps_ErrorIfJniLibDoesntSupportMinSdkVersion(t *testing.T) {
t.Parallel()
bp := cc.GatherRequiredDepsForTest(android.Android) + `
android_app {
name: "foo",
@@ -602,7 +591,6 @@ func TestUpdatableApps_ErrorIfJniLibDoesntSupportMinSdkVersion(t *testing.T) {
}
func TestUpdatableApps_ErrorIfDepSdkVersionIsHigher(t *testing.T) {
t.Parallel()
bp := cc.GatherRequiredDepsForTest(android.Android) + `
android_app {
name: "foo",
@@ -632,7 +620,6 @@ func TestUpdatableApps_ErrorIfDepSdkVersionIsHigher(t *testing.T) {
}
func TestResourceDirs(t *testing.T) {
t.Parallel()
testCases := []struct {
name string
prop string
@@ -692,7 +679,6 @@ func TestResourceDirs(t *testing.T) {
}
func TestLibraryAssets(t *testing.T) {
t.Parallel()
bp := `
android_app {
name: "foo",
@@ -794,7 +780,6 @@ func TestLibraryAssets(t *testing.T) {
}
func TestAndroidResources(t *testing.T) {
t.Parallel()
testCases := []struct {
name string
enforceRROTargets []string
@@ -1085,7 +1070,6 @@ func checkSdkVersion(t *testing.T, config android.Config, expectedSdkVersion str
}
func TestAppSdkVersion(t *testing.T) {
t.Parallel()
testCases := []struct {
name string
sdkVersion string
@@ -1168,7 +1152,6 @@ func TestAppSdkVersion(t *testing.T) {
}
func TestVendorAppSdkVersion(t *testing.T) {
t.Parallel()
testCases := []struct {
name string
sdkVersion string
@@ -1232,7 +1215,6 @@ func TestVendorAppSdkVersion(t *testing.T) {
}
func TestJNIABI(t *testing.T) {
t.Parallel()
ctx, _ := testJava(t, cc.GatherRequiredDepsForTest(android.Android)+`
cc_library {
name: "libjni",
@@ -1307,7 +1289,6 @@ func TestJNIABI(t *testing.T) {
}
func TestAppSdkVersionByPartition(t *testing.T) {
t.Parallel()
testJavaError(t, "sdk_version must have a value when the module is located at vendor or product", `
android_app {
name: "foo",
@@ -1346,7 +1327,6 @@ func TestAppSdkVersionByPartition(t *testing.T) {
}
func TestJNIPackaging(t *testing.T) {
t.Parallel()
ctx, _ := testJava(t, cc.GatherRequiredDepsForTest(android.Android)+`
cc_library {
name: "libjni",
@@ -1438,7 +1418,6 @@ func TestJNIPackaging(t *testing.T) {
}
func TestJNISDK(t *testing.T) {
t.Parallel()
ctx, _ := testJava(t, cc.GatherRequiredDepsForTest(android.Android)+`
cc_library {
name: "libjni",
@@ -1556,7 +1535,6 @@ func TestJNISDK(t *testing.T) {
}
func TestCertificates(t *testing.T) {
t.Parallel()
testCases := []struct {
name string
bp string
@@ -1677,7 +1655,6 @@ func TestCertificates(t *testing.T) {
}
func TestRequestV4SigningFlag(t *testing.T) {
t.Parallel()
testCases := []struct {
name string
bp string
@@ -1738,7 +1715,6 @@ func TestRequestV4SigningFlag(t *testing.T) {
}
func TestPackageNameOverride(t *testing.T) {
t.Parallel()
testCases := []struct {
name string
bp string
@@ -1804,7 +1780,6 @@ func TestPackageNameOverride(t *testing.T) {
}
func TestInstrumentationTargetOverridden(t *testing.T) {
t.Parallel()
bp := `
android_app {
name: "foo",
@@ -1834,7 +1809,6 @@ func TestInstrumentationTargetOverridden(t *testing.T) {
}
func TestOverrideAndroidApp(t *testing.T) {
t.Parallel()
ctx, _ := testJava(t, `
android_app {
name: "foo",
@@ -2036,7 +2010,6 @@ func TestOverrideAndroidApp(t *testing.T) {
}
func TestOverrideAndroidAppDependency(t *testing.T) {
t.Parallel()
ctx, _ := testJava(t, `
android_app {
name: "foo",
@@ -2079,7 +2052,6 @@ func TestOverrideAndroidAppDependency(t *testing.T) {
}
func TestOverrideAndroidTest(t *testing.T) {
t.Parallel()
ctx, _ := testJava(t, `
android_app {
name: "foo",
@@ -2176,7 +2148,6 @@ func TestOverrideAndroidTest(t *testing.T) {
}
func TestAndroidTest_FixTestConfig(t *testing.T) {
t.Parallel()
ctx, _ := testJava(t, `
android_app {
name: "foo",
@@ -2258,7 +2229,6 @@ func TestAndroidTest_FixTestConfig(t *testing.T) {
}
func TestAndroidAppImport(t *testing.T) {
t.Parallel()
ctx, _ := testJava(t, `
android_app_import {
name: "foo",
@@ -2288,7 +2258,6 @@ func TestAndroidAppImport(t *testing.T) {
}
func TestAndroidAppImport_NoDexPreopt(t *testing.T) {
t.Parallel()
ctx, _ := testJava(t, `
android_app_import {
name: "foo",
@@ -2310,7 +2279,6 @@ func TestAndroidAppImport_NoDexPreopt(t *testing.T) {
}
func TestAndroidAppImport_Presigned(t *testing.T) {
t.Parallel()
ctx, _ := testJava(t, `
android_app_import {
name: "foo",
@@ -2339,7 +2307,6 @@ func TestAndroidAppImport_Presigned(t *testing.T) {
}
func TestAndroidAppImport_SigningLineage(t *testing.T) {
t.Parallel()
ctx, _ := testJava(t, `
android_app_import {
name: "foo",
@@ -2361,7 +2328,6 @@ func TestAndroidAppImport_SigningLineage(t *testing.T) {
}
func TestAndroidAppImport_DefaultDevCert(t *testing.T) {
t.Parallel()
ctx, _ := testJava(t, `
android_app_import {
name: "foo",
@@ -2391,7 +2357,6 @@ func TestAndroidAppImport_DefaultDevCert(t *testing.T) {
}
func TestAndroidAppImport_DpiVariants(t *testing.T) {
t.Parallel()
bp := `
android_app_import {
name: "foo",
@@ -2470,7 +2435,6 @@ func TestAndroidAppImport_DpiVariants(t *testing.T) {
}
func TestAndroidAppImport_Filename(t *testing.T) {
t.Parallel()
ctx, config := testJava(t, `
android_app_import {
name: "foo",
@@ -2518,7 +2482,6 @@ func TestAndroidAppImport_Filename(t *testing.T) {
}
func TestAndroidAppImport_ArchVariants(t *testing.T) {
t.Parallel()
// The test config's target arch is ARM64.
testCases := []struct {
name string
@@ -2582,7 +2545,6 @@ func TestAndroidAppImport_ArchVariants(t *testing.T) {
}
func TestAndroidTestImport(t *testing.T) {
t.Parallel()
ctx, config := testJava(t, `
android_test_import {
name: "foo",
@@ -2611,7 +2573,6 @@ func TestAndroidTestImport(t *testing.T) {
}
func TestAndroidTestImport_NoJinUncompressForPresigned(t *testing.T) {
t.Parallel()
ctx, _ := testJava(t, `
android_test_import {
name: "foo",
@@ -2649,7 +2610,6 @@ func TestAndroidTestImport_NoJinUncompressForPresigned(t *testing.T) {
}
func TestAndroidTestImport_Preprocessed(t *testing.T) {
t.Parallel()
ctx, _ := testJava(t, `
android_test_import {
name: "foo",
@@ -2686,7 +2646,6 @@ func TestAndroidTestImport_Preprocessed(t *testing.T) {
}
func TestStl(t *testing.T) {
t.Parallel()
ctx, _ := testJava(t, cc.GatherRequiredDepsForTest(android.Android)+`
cc_library {
name: "libjni",
@@ -2750,7 +2709,6 @@ func TestStl(t *testing.T) {
}
func TestUsesLibraries(t *testing.T) {
t.Parallel()
bp := `
java_sdk_library {
name: "foo",
@@ -2875,7 +2833,6 @@ func TestUsesLibraries(t *testing.T) {
}
func TestCodelessApp(t *testing.T) {
t.Parallel()
testCases := []struct {
name string
bp string
@@ -2952,7 +2909,6 @@ func TestCodelessApp(t *testing.T) {
}
func TestEmbedNotice(t *testing.T) {
t.Parallel()
ctx, _ := testJavaWithFS(t, cc.GatherRequiredDepsForTest(android.Android)+`
android_app {
name: "foo",
@@ -3062,7 +3018,6 @@ func TestEmbedNotice(t *testing.T) {
}
func TestUncompressDex(t *testing.T) {
t.Parallel()
testCases := []struct {
name string
bp string
@@ -3190,7 +3145,6 @@ func checkAapt2LinkFlag(t *testing.T, aapt2Flags, flagName, expectedValue string
}
func TestRuntimeResourceOverlay(t *testing.T) {
t.Parallel()
fs := map[string][]byte{
"baz/res/res/values/strings.xml": nil,
"bar/res/res/values/strings.xml": nil,
@@ -3295,7 +3249,6 @@ func TestRuntimeResourceOverlay(t *testing.T) {
}
func TestRuntimeResourceOverlay_JavaDefaults(t *testing.T) {
t.Parallel()
ctx, config := testJava(t, `
java_defaults {
name: "rro_defaults",
@@ -3355,7 +3308,6 @@ func TestRuntimeResourceOverlay_JavaDefaults(t *testing.T) {
}
func TestOverrideRuntimeResourceOverlay(t *testing.T) {
t.Parallel()
ctx, _ := testJava(t, `
runtime_resource_overlay {
name: "foo_overlay",

2
java/device_host_converter_test.go
View File

@@ -22,7 +22,6 @@ import (
)
func TestDeviceForHost(t *testing.T) {
t.Parallel()
bp := `
java_library {
name: "device_module",
@@ -103,7 +102,6 @@ func TestDeviceForHost(t *testing.T) {
}
func TestHostForDevice(t *testing.T) {
t.Parallel()
bp := `
java_library_host {
name: "host_module",

2
java/dexpreopt_bootjars_test.go
View File

@@ -84,7 +84,6 @@ func testDexpreoptBoot(t *testing.T, ruleFile string, expectedInputs, expectedOu
}
func TestDexpreoptBootJars(t *testing.T) {
t.Parallel()
ruleFile := "boot-foo.art"
expectedInputs := []string{
@@ -115,7 +114,6 @@ func TestDexpreoptBootJars(t *testing.T) {
// Changes to the boot.zip structure may break the ART APK scanner.
func TestDexpreoptBootZip(t *testing.T) {
t.Parallel()
ruleFile := "boot.zip"
ctx := android.PathContextForTesting(testConfig(nil, "", nil))

1
java/dexpreopt_test.go
View File

@@ -19,7 +19,6 @@ import (
)
func TestDexpreoptEnabled(t *testing.T) {
t.Parallel()
tests := []struct {
name string
bp string

5
java/hiddenapi_singleton_test.go
View File

@@ -58,7 +58,6 @@ func testHiddenAPIUnbundled(t *testing.T, unbundled bool) (*android.TestContext,
}
func TestHiddenAPISingleton(t *testing.T) {
t.Parallel()
ctx, _ := testHiddenAPIBootJars(t, `
java_library {
name: "foo",
@@ -76,7 +75,6 @@ func TestHiddenAPISingleton(t *testing.T) {
}
func TestHiddenAPISingletonWithPrebuilt(t *testing.T) {
t.Parallel()
ctx, _ := testHiddenAPIBootJars(t, `
java_import {
name: "foo",
@@ -94,7 +92,6 @@ func TestHiddenAPISingletonWithPrebuilt(t *testing.T) {
}
func TestHiddenAPISingletonWithPrebuiltUseSource(t *testing.T) {
t.Parallel()
ctx, _ := testHiddenAPIBootJars(t, `
java_library {
name: "foo",
@@ -124,7 +121,6 @@ func TestHiddenAPISingletonWithPrebuiltUseSource(t *testing.T) {
}
func TestHiddenAPISingletonWithPrebuiltOverrideSource(t *testing.T) {
t.Parallel()
ctx, _ := testHiddenAPIBootJars(t, `
java_library {
name: "foo",
@@ -154,7 +150,6 @@ func TestHiddenAPISingletonWithPrebuiltOverrideSource(t *testing.T) {
}
func TestHiddenAPISingletonSdks(t *testing.T) {
t.Parallel()
testCases := []struct {
name string
unbundledBuild bool

2
java/jacoco_test.go
View File

@@ -17,7 +17,6 @@ package java
import "testing"
func TestJacocoFilterToSpecs(t *testing.T) {
t.Parallel()
testCases := []struct {
name, in, out string
}{
@@ -67,7 +66,6 @@ func TestJacocoFilterToSpecs(t *testing.T) {
}
func TestJacocoFiltersToZipCommand(t *testing.T) {
t.Parallel()
testCases := []struct {
name string
includes, excludes []string

45
java/java_test.go
View File

@@ -177,7 +177,6 @@ func moduleToPath(name string) string {
}
func TestJavaLinkType(t *testing.T) {
t.Parallel()
testJava(t, `
java_library {
name: "foo",
@@ -266,7 +265,6 @@ func TestJavaLinkType(t *testing.T) {
}
func TestSimple(t *testing.T) {
t.Parallel()
ctx, _ := testJava(t, `
java_library {
name: "foo",
@@ -311,7 +309,6 @@ func TestSimple(t *testing.T) {
}
func TestExportedPlugins(t *testing.T) {
t.Parallel()
type Result struct {
library string
processors string
@@ -395,7 +392,6 @@ func TestExportedPlugins(t *testing.T) {
}
func TestSdkVersionByPartition(t *testing.T) {
t.Parallel()
testJavaError(t, "sdk_version must have a value when the module is located at vendor or product", `
java_library {
name: "foo",
@@ -431,7 +427,6 @@ func TestSdkVersionByPartition(t *testing.T) {
}
func TestArchSpecific(t *testing.T) {
t.Parallel()
ctx, _ := testJava(t, `
java_library {
name: "foo",
@@ -451,7 +446,6 @@ func TestArchSpecific(t *testing.T) {
}
func TestBinary(t *testing.T) {
t.Parallel()
ctx, _ := testJava(t, `
java_library_host {
name: "foo",
@@ -480,7 +474,6 @@ func TestBinary(t *testing.T) {
}
func TestHostBinaryNoJavaDebugInfoOverride(t *testing.T) {
t.Parallel()
bp := `
java_library {
name: "target_library",
@@ -516,7 +509,6 @@ func TestHostBinaryNoJavaDebugInfoOverride(t *testing.T) {
}
func TestPrebuilts(t *testing.T) {
t.Parallel()
ctx, _ := testJava(t, `
java_library {
name: "foo",
@@ -612,7 +604,6 @@ func assertDeepEquals(t *testing.T, message string, expected interface{}, actual
}
func TestJavaSdkLibraryImport(t *testing.T) {
t.Parallel()
ctx, _ := testJava(t, `
java_library {
name: "foo",
@@ -669,7 +660,6 @@ func TestJavaSdkLibraryImport(t *testing.T) {
}
func TestJavaSdkLibraryImport_WithSource(t *testing.T) {
t.Parallel()
ctx, _ := testJava(t, `
java_sdk_library {
name: "sdklib",
@@ -709,7 +699,6 @@ func TestJavaSdkLibraryImport_WithSource(t *testing.T) {
}
func TestJavaSdkLibraryImport_Preferred(t *testing.T) {
t.Parallel()
ctx, _ := testJava(t, `
java_sdk_library {
name: "sdklib",
@@ -747,7 +736,6 @@ func TestJavaSdkLibraryImport_Preferred(t *testing.T) {
}
func TestDefaults(t *testing.T) {
t.Parallel()
ctx, _ := testJava(t, `
java_defaults {
name: "defaults",
@@ -823,7 +811,6 @@ func TestDefaults(t *testing.T) {
}
func TestResources(t *testing.T) {
t.Parallel()
var table = []struct {
name string
prop string
@@ -930,7 +917,6 @@ func TestResources(t *testing.T) {
}
func TestIncludeSrcs(t *testing.T) {
t.Parallel()
ctx, _ := testJavaWithFS(t, `
java_library {
name: "foo",
@@ -998,7 +984,6 @@ func TestIncludeSrcs(t *testing.T) {
}
func TestGeneratedSources(t *testing.T) {
t.Parallel()
ctx, _ := testJavaWithFS(t, `
java_library {
name: "foo",
@@ -1035,7 +1020,6 @@ func TestGeneratedSources(t *testing.T) {
}
func TestTurbine(t *testing.T) {
t.Parallel()
ctx, _ := testJava(t, `
java_library {
name: "foo",
@@ -1085,7 +1069,6 @@ func TestTurbine(t *testing.T) {
}
func TestSharding(t *testing.T) {
t.Parallel()
ctx, _ := testJava(t, `
java_library {
name: "bar",
@@ -1104,7 +1087,6 @@ func TestSharding(t *testing.T) {
}
func TestDroiddoc(t *testing.T) {
t.Parallel()
ctx, _ := testJavaWithFS(t, `
droiddoc_exported_dir {
name: "droiddoc-templates-sdk",
@@ -1183,7 +1165,6 @@ func TestDroiddoc(t *testing.T) {
}
func TestDroiddocArgsAndFlagsCausesError(t *testing.T) {
t.Parallel()
testJavaError(t, "flags is set. Cannot set args", `
droiddoc_exported_dir {
name: "droiddoc-templates-sdk",
@@ -1230,7 +1211,6 @@ func TestDroiddocArgsAndFlagsCausesError(t *testing.T) {
}
func TestDroidstubs(t *testing.T) {
t.Parallel()
ctx, _ := testJavaWithFS(t, `
droiddoc_exported_dir {
name: "droiddoc-templates-sdk",
@@ -1287,7 +1267,6 @@ func TestDroidstubs(t *testing.T) {
}
func TestDroidstubsWithSystemModules(t *testing.T) {
t.Parallel()
ctx, _ := testJava(t, `
droidstubs {
name: "stubs-source-system-modules",
@@ -1347,7 +1326,6 @@ func checkSystemModulesUseByDroidstubs(t *testing.T, ctx *android.TestContext, m
}
func TestJarGenrules(t *testing.T) {
t.Parallel()
ctx, _ := testJava(t, `
java_library {
name: "foo",
@@ -1402,7 +1380,6 @@ func TestJarGenrules(t *testing.T) {
}
func TestExcludeFileGroupInSrcs(t *testing.T) {
t.Parallel()
ctx, _ := testJava(t, `
java_library {
name: "foo",
@@ -1429,7 +1406,6 @@ func TestExcludeFileGroupInSrcs(t *testing.T) {
}
func TestJavaLibrary(t *testing.T) {
t.Parallel()
config := testConfig(nil, "", map[string][]byte{
"libcore/Android.bp": []byte(`
java_library {
@@ -1467,7 +1443,6 @@ func TestJavaImport(t *testing.T) {
}
func TestJavaSdkLibrary(t *testing.T) {
t.Parallel()
ctx, _ := testJava(t, `
droiddoc_exported_dir {
name: "droiddoc-templates-sdk",
@@ -1606,7 +1581,6 @@ func TestJavaSdkLibrary(t *testing.T) {
}
func TestJavaSdkLibrary_DoNotAccessImplWhenItIsNotBuilt(t *testing.T) {
t.Parallel()
ctx, _ := testJava(t, `
java_sdk_library {
name: "foo",
@@ -1632,7 +1606,6 @@ func TestJavaSdkLibrary_DoNotAccessImplWhenItIsNotBuilt(t *testing.T) {
}
func TestJavaSdkLibrary_UseSourcesFromAnotherSdkLibrary(t *testing.T) {
t.Parallel()
testJava(t, `
java_sdk_library {
name: "foo",
@@ -1651,7 +1624,6 @@ func TestJavaSdkLibrary_UseSourcesFromAnotherSdkLibrary(t *testing.T) {
}
func TestJavaSdkLibrary_AccessOutputFiles_MissingScope(t *testing.T) {
t.Parallel()
testJavaError(t, `"foo" does not provide api scope system`, `
java_sdk_library {
name: "foo",
@@ -1670,7 +1642,6 @@ func TestJavaSdkLibrary_AccessOutputFiles_MissingScope(t *testing.T) {
}
func TestJavaSdkLibrary_Deps(t *testing.T) {
t.Parallel()
ctx, _ := testJava(t, `
java_sdk_library {
name: "sdklib",
@@ -1693,7 +1664,6 @@ func TestJavaSdkLibrary_Deps(t *testing.T) {
}
func TestJavaSdkLibraryImport_AccessOutputFiles(t *testing.T) {
t.Parallel()
testJava(t, `
java_sdk_library_import {
name: "foo",
@@ -1717,7 +1687,6 @@ func TestJavaSdkLibraryImport_AccessOutputFiles(t *testing.T) {
}
func TestJavaSdkLibraryImport_AccessOutputFiles_Invalid(t *testing.T) {
t.Parallel()
bp := `
java_sdk_library_import {
name: "foo",
@@ -1766,7 +1735,6 @@ func TestJavaSdkLibraryImport_AccessOutputFiles_Invalid(t *testing.T) {
}
func TestJavaSdkLibrary_InvalidScopes(t *testing.T) {
t.Parallel()
testJavaError(t, `module "foo": enabled api scope "system" depends on disabled scope "public"`, `
java_sdk_library {
name: "foo",
@@ -1785,7 +1753,6 @@ func TestJavaSdkLibrary_InvalidScopes(t *testing.T) {
}
func TestJavaSdkLibrary_SdkVersion_ForScope(t *testing.T) {
t.Parallel()
testJava(t, `
java_sdk_library {
name: "foo",
@@ -1800,7 +1767,6 @@ func TestJavaSdkLibrary_SdkVersion_ForScope(t *testing.T) {
}
func TestJavaSdkLibrary_ModuleLib(t *testing.T) {
t.Parallel()
testJava(t, `
java_sdk_library {
name: "foo",
@@ -1817,7 +1783,6 @@ func TestJavaSdkLibrary_ModuleLib(t *testing.T) {
}
func TestJavaSdkLibrary_SystemServer(t *testing.T) {
t.Parallel()
testJava(t, `
java_sdk_library {
name: "foo",
@@ -1834,7 +1799,6 @@ func TestJavaSdkLibrary_SystemServer(t *testing.T) {
}
func TestJavaSdkLibrary_MissingScope(t *testing.T) {
t.Parallel()
testJavaError(t, `requires api scope module-lib from foo but it only has \[\] available`, `
java_sdk_library {
name: "foo",
@@ -1854,7 +1818,6 @@ func TestJavaSdkLibrary_MissingScope(t *testing.T) {
}
func TestJavaSdkLibrary_FallbackScope(t *testing.T) {
t.Parallel()
testJava(t, `
java_sdk_library {
name: "foo",
@@ -1875,7 +1838,6 @@ func TestJavaSdkLibrary_FallbackScope(t *testing.T) {
}
func TestJavaSdkLibrary_DefaultToStubs(t *testing.T) {
t.Parallel()
ctx, _ := testJava(t, `
java_sdk_library {
name: "foo",
@@ -1951,7 +1913,6 @@ func (ctx *mockContext) PropertyErrorf(property, format string, args ...interfac
}
func TestCompilerFlags(t *testing.T) {
t.Parallel()
for _, testCase := range compilerFlagsTestCases {
ctx := &mockContext{result: true}
CheckKotlincFlags(ctx, []string{testCase.in})
@@ -1982,7 +1943,6 @@ func checkPatchModuleFlag(t *testing.T, ctx *android.TestContext, moduleName str
}
func TestPatchModule(t *testing.T) {
t.Parallel()
t.Run("Java language level 8", func(t *testing.T) {
// Test with legacy javac -source 1.8 -target 1.8
bp := `
@@ -2048,7 +2008,6 @@ func TestPatchModule(t *testing.T) {
}
func TestJavaSystemModules(t *testing.T) {
t.Parallel()
ctx, _ := testJava(t, `
java_system_modules {
name: "system-modules",
@@ -2083,7 +2042,6 @@ func TestJavaSystemModules(t *testing.T) {
}
func TestJavaSystemModulesImport(t *testing.T) {
t.Parallel()
ctx, _ := testJava(t, `
java_system_modules_import {
name: "system-modules",
@@ -2114,7 +2072,6 @@ func TestJavaSystemModulesImport(t *testing.T) {
}
func TestJavaLibraryWithSystemModules(t *testing.T) {
t.Parallel()
ctx, _ := testJava(t, `
java_library {
name: "lib-with-source-system-modules",
@@ -2171,7 +2128,6 @@ func checkBootClasspathForSystemModule(t *testing.T, ctx *android.TestContext, m
}
func TestAidlExportIncludeDirsFromImports(t *testing.T) {
t.Parallel()
ctx, _ := testJava(t, `
java_library {
name: "foo",
@@ -2196,7 +2152,6 @@ func TestAidlExportIncludeDirsFromImports(t *testing.T) {
}
func TestDataNativeBinaries(t *testing.T) {
t.Parallel()
ctx, config := testJava(t, `
java_test_host {
name: "foo",

5
java/jdeps_test.go
View File

@@ -22,7 +22,6 @@ import (
)
func TestCollectJavaLibraryPropertiesAddLibsDeps(t *testing.T) {
t.Parallel()
expected := []string{"Foo", "Bar"}
module := LibraryFactory().(*Library)
module.properties.Libs = append(module.properties.Libs, expected...)
@@ -36,7 +35,6 @@ func TestCollectJavaLibraryPropertiesAddLibsDeps(t *testing.T) {
}
func TestCollectJavaLibraryPropertiesAddStaticLibsDeps(t *testing.T) {
t.Parallel()
expected := []string{"Foo", "Bar"}
module := LibraryFactory().(*Library)
module.properties.Static_libs = append(module.properties.Static_libs, expected...)
@@ -50,7 +48,6 @@ func TestCollectJavaLibraryPropertiesAddStaticLibsDeps(t *testing.T) {
}
func TestCollectJavaLibraryPropertiesAddScrs(t *testing.T) {
t.Parallel()
expected := []string{"Foo", "Bar"}
module := LibraryFactory().(*Library)
module.expandIDEInfoCompiledSrcs = append(module.expandIDEInfoCompiledSrcs, expected...)
@@ -64,7 +61,6 @@ func TestCollectJavaLibraryPropertiesAddScrs(t *testing.T) {
}
func TestCollectJavaLibraryPropertiesAddAidlIncludeDirs(t *testing.T) {
t.Parallel()
expected := []string{"Foo", "Bar"}
module := LibraryFactory().(*Library)
module.deviceProperties.Aidl.Include_dirs = append(module.deviceProperties.Aidl.Include_dirs, expected...)
@@ -78,7 +74,6 @@ func TestCollectJavaLibraryPropertiesAddAidlIncludeDirs(t *testing.T) {
}
func TestCollectJavaLibraryPropertiesAddJarjarRules(t *testing.T) {
t.Parallel()
expected := "Jarjar_rules.txt"
module := LibraryFactory().(*Library)
module.expandJarjarRules = android.PathForTesting(expected)

3
java/kotlin_test.go
View File

@@ -22,7 +22,6 @@ import (
)
func TestKotlin(t *testing.T) {
t.Parallel()
ctx, _ := testJava(t, `
java_library {
name: "foo",
@@ -85,7 +84,6 @@ func TestKotlin(t *testing.T) {
}
func TestKapt(t *testing.T) {
t.Parallel()
ctx, _ := testJava(t, `
java_library {
name: "foo",
@@ -165,7 +163,6 @@ func TestKapt(t *testing.T) {
}
func TestKaptEncodeFlags(t *testing.T) {
t.Parallel()
// Compares the kaptEncodeFlags against the results of the example implementation at
// https://kotlinlang.org/docs/reference/kapt.html#apjavac-options-encoding
tests := []struct {

3
java/plugin_test.go
View File

@@ -20,7 +20,6 @@ import (
)
func TestNoPlugin(t *testing.T) {
t.Parallel()
ctx, _ := testJava(t, `
java_library {
name: "foo",
@@ -45,7 +44,6 @@ func TestNoPlugin(t *testing.T) {
}
func TestPlugin(t *testing.T) {
t.Parallel()
ctx, _ := testJava(t, `
java_library {
name: "foo",
@@ -85,7 +83,6 @@ func TestPlugin(t *testing.T) {
}
func TestPluginGeneratesApi(t *testing.T) {
t.Parallel()
ctx, _ := testJava(t, `
java_library {
name: "foo",

1
java/sdk_test.go
View File

@@ -27,7 +27,6 @@ import (
)
func TestClasspath(t *testing.T) {
t.Parallel()
var classpathTestcases = []struct {
name string
unbundled bool