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

2
sdk/bp_test.go
View File

@@ -180,7 +180,6 @@ func (t removeFredTransformation) transformPropertySetAfterContents(name string,
}
func TestTransformRemoveProperty(t *testing.T) {
t.Parallel()
helper := &TestHelper{t}
@@ -196,7 +195,6 @@ func TestTransformRemoveProperty(t *testing.T) {
}
func TestTransformRemovePropertySet(t *testing.T) {
t.Parallel()
helper := &TestHelper{t}

28
sdk/cc_sdk_test.go
View File

@@ -40,7 +40,6 @@ func testSdkWithCc(t *testing.T, bp string) *testSdkResult {
// Contains tests for SDK members provided by the cc package.
func TestSingleDeviceOsAssumption(t *testing.T) {
t.Parallel()
// Mock a module with DeviceSupported() == true.
s := &sdk{}
android.InitAndroidArchModule(s, android.DeviceSupported, android.MultilibCommon)
@@ -55,7 +54,6 @@ func TestSingleDeviceOsAssumption(t *testing.T) {
}
func TestSdkIsCompileMultilibBoth(t *testing.T) {
t.Parallel()
result := testSdkWithCc(t, `
sdk {
name: "mysdk",
@@ -86,7 +84,6 @@ func TestSdkIsCompileMultilibBoth(t *testing.T) {
}
func TestSdkCompileMultilibOverride(t *testing.T) {
t.Parallel()
result := testSdkWithCc(t, `
sdk {
name: "mysdk",
@@ -178,7 +175,6 @@ sdk_snapshot {
}
func TestBasicSdkWithCc(t *testing.T) {
t.Parallel()
result := testSdkWithCc(t, `
sdk {
name: "mysdk",
@@ -285,7 +281,6 @@ func TestBasicSdkWithCc(t *testing.T) {
// Make sure the sdk can use host specific cc libraries static/shared and both.
func TestHostSdkWithCc(t *testing.T) {
t.Parallel()
testSdkWithCc(t, `
sdk {
name: "mysdk",
@@ -309,7 +304,6 @@ func TestHostSdkWithCc(t *testing.T) {
// Make sure the sdk can use cc libraries static/shared and both.
func TestSdkWithCc(t *testing.T) {
t.Parallel()
testSdkWithCc(t, `
sdk {
name: "mysdk",
@@ -340,7 +334,6 @@ func TestSdkWithCc(t *testing.T) {
}
func TestSnapshotWithObject(t *testing.T) {
t.Parallel()
result := testSdkWithCc(t, `
sdk {
name: "mysdk",
@@ -412,7 +405,6 @@ sdk_snapshot {
}
func TestSnapshotWithCcDuplicateHeaders(t *testing.T) {
t.Parallel()
result := testSdkWithCc(t, `
sdk {
name: "mysdk",
@@ -454,7 +446,6 @@ include/Test.h -> include/include/Test.h
// handling is tested with the sanitize clauses (but note there's a lot of
// built-in logic in sanitize.go that can affect those flags).
func TestSnapshotWithCcSharedLibraryCommonProperties(t *testing.T) {
t.Parallel()
result := testSdkWithCc(t, `
sdk {
name: "mysdk",
@@ -568,7 +559,6 @@ arm64/include/Arm64Test.h -> arm64/include/arm64/include/Arm64Test.h
}
func TestSnapshotWithCcBinary(t *testing.T) {
t.Parallel()
result := testSdkWithCc(t, `
module_exports {
name: "mymodule_exports",
@@ -633,7 +623,6 @@ module_exports_snapshot {
}
func TestMultipleHostOsTypesSnapshotWithCcBinary(t *testing.T) {
t.Parallel()
result := testSdkWithCc(t, `
module_exports {
name: "myexports",
@@ -760,7 +749,6 @@ module_exports_snapshot {
}
func TestSnapshotWithSingleHostOsType(t *testing.T) {
t.Parallel()
ctx, config := testSdkContext(`
cc_defaults {
name: "mydefaults",
@@ -924,7 +912,6 @@ module_exports_snapshot {
// Test that we support the necessary flags for the linker binary, which is
// special in several ways.
func TestSnapshotWithCcStaticNocrtBinary(t *testing.T) {
t.Parallel()
result := testSdkWithCc(t, `
module_exports {
name: "mymodule_exports",
@@ -1027,7 +1014,6 @@ module_exports_snapshot {
}
func TestSnapshotWithCcSharedLibrary(t *testing.T) {
t.Parallel()
result := testSdkWithCc(t, `
sdk {
name: "mysdk",
@@ -1121,7 +1107,6 @@ include/Test.h -> include/include/Test.h
}
func TestSnapshotWithCcSharedLibrarySharedLibs(t *testing.T) {
t.Parallel()
result := testSdkWithCc(t, `
sdk {
name: "mysdk",
@@ -1316,7 +1301,6 @@ sdk_snapshot {
}
func TestHostSnapshotWithCcSharedLibrary(t *testing.T) {
t.Parallel()
result := testSdkWithCc(t, `
sdk {
name: "mysdk",
@@ -1434,7 +1418,6 @@ include/Test.h -> include/include/Test.h
}
func TestMultipleHostOsTypesSnapshotWithCcSharedLibrary(t *testing.T) {
t.Parallel()
result := testSdkWithCc(t, `
sdk {
name: "mysdk",
@@ -1560,7 +1543,6 @@ sdk_snapshot {
}
func TestSnapshotWithCcStaticLibrary(t *testing.T) {
t.Parallel()
result := testSdkWithCc(t, `
module_exports {
name: "myexports",
@@ -1645,7 +1627,6 @@ include/Test.h -> include/include/Test.h
}
func TestHostSnapshotWithCcStaticLibrary(t *testing.T) {
t.Parallel()
result := testSdkWithCc(t, `
module_exports {
name: "myexports",
@@ -1760,7 +1741,6 @@ include/Test.h -> include/include/Test.h
}
func TestSnapshotWithCcLibrary(t *testing.T) {
t.Parallel()
result := testSdkWithCc(t, `
module_exports {
name: "myexports",
@@ -1858,7 +1838,6 @@ include/Test.h -> include/include/Test.h
}
func TestHostSnapshotWithMultiLib64(t *testing.T) {
t.Parallel()
result := testSdkWithCc(t, `
module_exports {
name: "myexports",
@@ -1966,7 +1945,6 @@ include/Test.h -> include/include/Test.h
}
func TestSnapshotWithCcHeadersLibrary(t *testing.T) {
t.Parallel()
result := testSdkWithCc(t, `
sdk {
name: "mysdk",
@@ -2015,7 +1993,6 @@ include/Test.h -> include/include/Test.h
}
func TestHostSnapshotWithCcHeadersLibrary(t *testing.T) {
t.Parallel()
result := testSdkWithCc(t, `
sdk {
name: "mysdk",
@@ -2098,7 +2075,6 @@ include/Test.h -> include/include/Test.h
}
func TestDeviceAndHostSnapshotWithCcHeadersLibrary(t *testing.T) {
t.Parallel()
result := testSdkWithCc(t, `
sdk {
name: "mysdk",
@@ -2194,7 +2170,6 @@ include-host/HostTest.h -> linux_glibc/include/include-host/HostTest.h
}
func TestSystemSharedLibPropagation(t *testing.T) {
t.Parallel()
result := testSdkWithCc(t, `
sdk {
name: "mysdk",
@@ -2432,7 +2407,6 @@ sdk_snapshot {
}
func TestStubsLibrary(t *testing.T) {
t.Parallel()
result := testSdkWithCc(t, `
sdk {
name: "mysdk",
@@ -2511,7 +2485,6 @@ sdk_snapshot {
}
func TestDeviceAndHostSnapshotWithStubsLibrary(t *testing.T) {
t.Parallel()
result := testSdkWithCc(t, `
sdk {
name: "mysdk",
@@ -2628,7 +2601,6 @@ sdk_snapshot {
}
func TestUniqueHostSoname(t *testing.T) {
t.Parallel()
result := testSdkWithCc(t, `
sdk {
name: "mysdk",

1
sdk/exports_test.go
View File

@@ -20,7 +20,6 @@ import (
// Ensure that module_exports generates a module_exports_snapshot module.
func TestModuleExportsSnapshot(t *testing.T) {
t.Parallel()
packageBp := `
module_exports {
name: "myexports",

22
sdk/java_sdk_test.go
View File

@@ -92,7 +92,6 @@ java_import {
// Contains tests for SDK members provided by the java package.
func TestSdkDependsOnSourceEvenWhenPrebuiltPreferred(t *testing.T) {
t.Parallel()
result := testSdkWithJava(t, `
sdk {
name: "mysdk",
@@ -142,7 +141,6 @@ sdk_snapshot {
}
func TestBasicSdkWithJavaLibrary(t *testing.T) {
t.Parallel()
result := testSdkWithJava(t, `
sdk {
name: "mysdk",
@@ -222,7 +220,6 @@ func TestBasicSdkWithJavaLibrary(t *testing.T) {
}
func TestSnapshotWithJavaHeaderLibrary(t *testing.T) {
t.Parallel()
result := testSdkWithJava(t, `
sdk {
name: "mysdk",
@@ -275,7 +272,6 @@ aidl/foo/bar/Test.aidl -> aidl/aidl/foo/bar/Test.aidl
}
func TestHostSnapshotWithJavaHeaderLibrary(t *testing.T) {
t.Parallel()
result := testSdkWithJava(t, `
sdk {
name: "mysdk",
@@ -336,7 +332,6 @@ aidl/foo/bar/Test.aidl -> aidl/aidl/foo/bar/Test.aidl
}
func TestDeviceAndHostSnapshotWithJavaHeaderLibrary(t *testing.T) {
t.Parallel()
result := testSdkWithJava(t, `
sdk {
name: "mysdk",
@@ -403,7 +398,6 @@ sdk_snapshot {
}
func TestSnapshotWithJavaImplLibrary(t *testing.T) {
t.Parallel()
result := testSdkWithJava(t, `
module_exports {
name: "myexports",
@@ -457,7 +451,6 @@ aidl/foo/bar/Test.aidl -> aidl/aidl/foo/bar/Test.aidl
}
func TestHostSnapshotWithJavaImplLibrary(t *testing.T) {
t.Parallel()
result := testSdkWithJava(t, `
module_exports {
name: "myexports",
@@ -518,7 +511,6 @@ aidl/foo/bar/Test.aidl -> aidl/aidl/foo/bar/Test.aidl
}
func TestSnapshotWithJavaTest(t *testing.T) {
t.Parallel()
result := testSdkWithJava(t, `
module_exports {
name: "myexports",
@@ -569,7 +561,6 @@ module_exports_snapshot {
}
func TestHostSnapshotWithJavaTest(t *testing.T) {
t.Parallel()
result := testSdkWithJava(t, `
module_exports {
name: "myexports",
@@ -642,7 +633,6 @@ func testSdkWithDroidstubs(t *testing.T, bp string) *testSdkResult {
// directly or indirectly from an APEX as droidstubs can never be a part of an
// apex.
func TestBasicSdkWithDroidstubs(t *testing.T) {
t.Parallel()
testSdkWithDroidstubs(t, `
sdk {
name: "mysdk",
@@ -673,7 +663,6 @@ func TestBasicSdkWithDroidstubs(t *testing.T) {
}
func TestSnapshotWithDroidstubs(t *testing.T) {
t.Parallel()
result := testSdkWithDroidstubs(t, `
module_exports {
name: "myexports",
@@ -719,7 +708,6 @@ module_exports_snapshot {
}
func TestHostSnapshotWithDroidstubs(t *testing.T) {
t.Parallel()
result := testSdkWithDroidstubs(t, `
module_exports {
name: "myexports",
@@ -774,7 +762,6 @@ module_exports_snapshot {
}
func TestSnapshotWithJavaSystemModules(t *testing.T) {
t.Parallel()
result := testSdkWithJava(t, `
sdk {
name: "mysdk",
@@ -869,7 +856,6 @@ sdk_snapshot {
}
func TestHostSnapshotWithJavaSystemModules(t *testing.T) {
t.Parallel()
result := testSdkWithJava(t, `
sdk {
name: "mysdk",
@@ -948,7 +934,6 @@ sdk_snapshot {
}
func TestDeviceAndHostSnapshotWithOsSpecificMembers(t *testing.T) {
t.Parallel()
result := testSdkWithJava(t, `
module_exports {
name: "myexports",
@@ -1076,7 +1061,6 @@ module_exports_snapshot {
}
func TestSnapshotWithJavaSdkLibrary(t *testing.T) {
t.Parallel()
result := testSdkWithJava(t, `
sdk {
name: "mysdk",
@@ -1181,7 +1165,6 @@ sdk_snapshot {
}
func TestSnapshotWithJavaSdkLibrary_SdkVersion_None(t *testing.T) {
t.Parallel()
result := testSdkWithJava(t, `
sdk {
name: "mysdk",
@@ -1246,7 +1229,6 @@ sdk_snapshot {
}
func TestSnapshotWithJavaSdkLibrary_SdkVersion_ForScope(t *testing.T) {
t.Parallel()
result := testSdkWithJava(t, `
sdk {
name: "mysdk",
@@ -1314,7 +1296,6 @@ sdk_snapshot {
}
func TestSnapshotWithJavaSdkLibrary_ApiScopes(t *testing.T) {
t.Parallel()
result := testSdkWithJava(t, `
sdk {
name: "mysdk",
@@ -1405,7 +1386,6 @@ sdk_snapshot {
}
func TestSnapshotWithJavaSdkLibrary_ModuleLib(t *testing.T) {
t.Parallel()
result := testSdkWithJava(t, `
sdk {
name: "mysdk",
@@ -1517,7 +1497,6 @@ sdk_snapshot {
}
func TestSnapshotWithJavaSdkLibrary_SystemServer(t *testing.T) {
t.Parallel()
result := testSdkWithJava(t, `
sdk {
name: "mysdk",
@@ -1608,7 +1587,6 @@ sdk_snapshot {
}
func TestSnapshotWithJavaSdkLibrary_NamingScheme(t *testing.T) {
t.Parallel()
result := testSdkWithJava(t, `
sdk {
name: "mysdk",

5
sdk/sdk_test.go
View File

@@ -35,7 +35,6 @@ func TestMain(m *testing.M) {
}
func TestDepNotInRequiredSdks(t *testing.T) {
t.Parallel()
testSdkError(t, `module "myjavalib".*depends on "otherlib".*that isn't part of the required SDKs:.*`, `
sdk {
name: "mysdk",
@@ -96,7 +95,6 @@ func TestDepNotInRequiredSdks(t *testing.T) {
// Ensure that prebuilt modules have the same effective visibility as the source
// modules.
func TestSnapshotVisibility(t *testing.T) {
t.Parallel()
packageBp := `
package {
default_visibility: ["//other/foo"],
@@ -304,7 +302,6 @@ func TestPrebuiltVisibilityProperty_AddPrivate(t *testing.T) {
}
func TestSDkInstall(t *testing.T) {
t.Parallel()
sdk := `
sdk {
name: "mysdk",
@@ -349,7 +346,6 @@ func (p *testPropertiesStruct) String() string {
var _ propertiesContainer = (*testPropertiesStruct)(nil)
func TestCommonValueOptimization(t *testing.T) {
t.Parallel()
common := &testPropertiesStruct{name: "common"}
structs := []propertiesContainer{
&testPropertiesStruct{
@@ -447,7 +443,6 @@ func TestCommonValueOptimization(t *testing.T) {
}
func TestCommonValueOptimization_InvalidArchSpecificVariants(t *testing.T) {
t.Parallel()
common := &testPropertiesStruct{name: "common"}
structs := []propertiesContainer{
&testPropertiesStruct{