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

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",