Parcourir la source

Revert "Make lots of tests run in parallel"

This reverts commit 323dc60712491c71ccdc5363c42df61f0a192487.

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

Change-Id: Iee168e9fbb4210569e6cffcc23e60d111403abb8
Colin Cross il y a 3 ans
Parent
commit
405af07859
100 fichiers modifiés avec 0 ajouts et 615 suppressions
  1. 0 2
      android/androidmk_test.go
  2. 0 1
      android/apex_test.go
  3. 0 3
      android/arch_test.go
  4. 0 3
      android/config_test.go
  5. 0 1
      android/csuite_config_test.go
  6. 0 2
      android/defaults_test.go
  7. 0 2
      android/depset_test.go
  8. 0 2
      android/expand_test.go
  9. 0 3
      android/module_test.go
  10. 0 4
      android/mutator_test.go
  11. 0 20
      android/namespace_test.go
  12. 0 1
      android/neverallow_test.go
  13. 0 11
      android/onceper_test.go
  14. 0 1
      android/package_test.go
  15. 0 1
      android/path_properties_test.go
  16. 0 10
      android/paths_test.go
  17. 0 1
      android/prebuilt_test.go
  18. 0 3
      android/rule_builder_test.go
  19. 0 1
      android/soong_config_modules_test.go
  20. 0 3
      android/soongconfig/modules_test.go
  21. 0 11
      android/util_test.go
  22. 0 3
      android/variable_test.go
  23. 0 1
      android/visibility_test.go
  24. 0 1
      androidmk/androidmk/androidmk_test.go
  25. 0 3
      androidmk/parser/make_strings_test.go
  26. 0 1
      androidmk/parser/parser_test.go
  27. 0 105
      apex/apex_test.go
  28. 0 2
      apex/vndk_test.go
  29. 0 1
      bpf/bpf_test.go
  30. 0 14
      bpfix/bpfix/bpfix_test.go
  31. 0 56
      cc/cc_test.go
  32. 0 1
      cc/compiler_test.go
  33. 0 1
      cc/config/tidy_test.go
  34. 0 1
      cc/gen_test.go
  35. 0 2
      cc/genrule_test.go
  36. 0 2
      cc/library_headers_test.go
  37. 0 4
      cc/library_test.go
  38. 0 1
      cc/object_test.go
  39. 0 7
      cc/prebuilt_test.go
  40. 0 1
      cc/proto_test.go
  41. 0 1
      cc/sdk_test.go
  42. 0 1
      cc/test_data_test.go
  43. 0 1
      cmd/diff_target_files/allow_list_test.go
  44. 0 1
      cmd/diff_target_files/compare_test.go
  45. 0 1
      cmd/diff_target_files/glob_test.go
  46. 0 3
      cmd/extract_apks/main_test.go
  47. 0 1
      cmd/extract_linker/main_test.go
  48. 0 1
      cmd/host_bionic_inject/host_bionic_inject_test.go
  49. 0 2
      cmd/javac_wrapper/javac_wrapper_test.go
  50. 0 2
      cmd/merge_zips/merge_zips_test.go
  51. 0 1
      cmd/multiproduct_kati/main_test.go
  52. 0 2
      cmd/path_interposer/main_test.go
  53. 0 1
      cmd/soong_build/bazel_overlay_test.go
  54. 0 2
      cmd/zip2zip/zip2zip_test.go
  55. 0 3
      dexpreopt/dexpreopt_test.go
  56. 0 12
      etc/prebuilt_etc_test.go
  57. 0 41
      finder/finder_test.go
  58. 0 1
      finder/fs/fs_test.go
  59. 0 1
      finder/fs/readdir_test.go
  60. 0 4
      genrule/genrule_test.go
  61. 0 2
      jar/jar_test.go
  62. 0 9
      java/androidmk_test.go
  63. 0 48
      java/app_test.go
  64. 0 2
      java/device_host_converter_test.go
  65. 0 2
      java/dexpreopt_bootjars_test.go
  66. 0 1
      java/dexpreopt_test.go
  67. 0 5
      java/hiddenapi_singleton_test.go
  68. 0 2
      java/jacoco_test.go
  69. 0 45
      java/java_test.go
  70. 0 5
      java/jdeps_test.go
  71. 0 3
      java/kotlin_test.go
  72. 0 3
      java/plugin_test.go
  73. 0 1
      java/sdk_test.go
  74. 0 2
      makedeps/deps_test.go
  75. 0 1
      partner/androidmk/androidmk_test.go
  76. 0 1
      python/python_test.go
  77. 0 3
      remoteexec/remoteexec_test.go
  78. 0 5
      rust/binary_test.go
  79. 0 2
      rust/bindgen_test.go
  80. 0 1
      rust/builder_test.go
  81. 0 1
      rust/clippy_test.go
  82. 0 5
      rust/compiler_test.go
  83. 0 3
      rust/coverage_test.go
  84. 0 8
      rust/library_test.go
  85. 0 1
      rust/protobuf_test.go
  86. 0 7
      rust/rust_test.go
  87. 0 1
      rust/source_provider_test.go
  88. 0 2
      rust/test_test.go
  89. 0 2
      sdk/bp_test.go
  90. 0 28
      sdk/cc_sdk_test.go
  91. 0 1
      sdk/exports_test.go
  92. 0 22
      sdk/java_sdk_test.go
  93. 0 5
      sdk/sdk_test.go
  94. 0 5
      sh/sh_binary_test.go
  95. 0 1
      symbol_inject/elf_test.go
  96. 0 1
      symbol_inject/macho_test.go
  97. 0 1
      symbol_inject/pe_test.go
  98. 0 1
      symbol_inject/symbol_inject_test.go
  99. 0 1
      sysprop/sysprop_test.go
  100. 0 1
      ui/build/cleanbuild_test.go

+ 0 - 2
android/androidmk_test.go

@@ -68,7 +68,6 @@ func customModuleFactory() Module {
 }
 
 func TestAndroidMkSingleton_PassesUpdatedAndroidMkDataToCustomCallback(t *testing.T) {
-	t.Parallel()
 	bp := `
 	custom {
 		name: "foo",
@@ -104,7 +103,6 @@ func TestAndroidMkSingleton_PassesUpdatedAndroidMkDataToCustomCallback(t *testin
 }
 
 func TestGetDistForGoals(t *testing.T) {
-	t.Parallel()
 	testCases := []struct {
 		bp                     string
 		expectedAndroidMkLines []string

+ 0 - 1
android/apex_test.go

@@ -20,7 +20,6 @@ import (
 )
 
 func Test_mergeApexVariations(t *testing.T) {
-	t.Parallel()
 	tests := []struct {
 		name        string
 		in          []ApexInfo

+ 0 - 3
android/arch_test.go

@@ -36,7 +36,6 @@ type NamedNoneFiltered struct {
 }
 
 func TestFilterArchStruct(t *testing.T) {
-	t.Parallel()
 	tests := []struct {
 		name     string
 		in       interface{}
@@ -275,7 +274,6 @@ func archTestModuleFactory() Module {
 }
 
 func TestArchMutator(t *testing.T) {
-	t.Parallel()
 	var buildOSVariants []string
 	var buildOS32Variants []string
 	switch runtime.GOOS {
@@ -387,7 +385,6 @@ func TestArchMutator(t *testing.T) {
 }
 
 func TestArchMutatorNativeBridge(t *testing.T) {
-	t.Parallel()
 	bp := `
 		// This module is only enabled for x86.
 		module {

+ 0 - 3
android/config_test.go

@@ -58,7 +58,6 @@ func (c *configType) SetDefaultConfig() {
 
 // tests that ValidateConfigAnnotation works
 func TestValidateConfigAnnotations(t *testing.T) {
-	t.Parallel()
 	config := configType{}
 	err := validateConfigAnnotations(&config)
 	expectedError := `Field configType.PopulateMe has tag json:"omitempty" which specifies to change its json field name to "omitempty".
@@ -75,7 +74,6 @@ Did you mean to use an annotation of ",omitempty"?
 
 // run validateConfigAnnotations against each type that might have json annotations
 func TestProductConfigAnnotations(t *testing.T) {
-	t.Parallel()
 	err := validateConfigAnnotations(&productVariables{})
 	if err != nil {
 		t.Errorf(err.Error())
@@ -88,7 +86,6 @@ func TestProductConfigAnnotations(t *testing.T) {
 }
 
 func TestMissingVendorConfig(t *testing.T) {
-	t.Parallel()
 	c := &config{}
 	if c.VendorConfig("test").Bool("not_set") {
 		t.Errorf("Expected false")

+ 0 - 1
android/csuite_config_test.go

@@ -32,7 +32,6 @@ func testCSuiteConfig(test *testing.T, bpFileContents string) *TestContext {
 }
 
 func TestCSuiteConfig(t *testing.T) {
-	t.Parallel()
 	ctx := testCSuiteConfig(t, `
 csuite_config { name: "plain"}
 csuite_config { name: "with_manifest", test_config: "manifest.xml" }

+ 0 - 2
android/defaults_test.go

@@ -59,7 +59,6 @@ func defaultsTestDefaultsFactory() Module {
 }
 
 func TestDefaults(t *testing.T) {
-	t.Parallel()
 	bp := `
 		defaults {
 			name: "transitive",
@@ -103,7 +102,6 @@ func TestDefaults(t *testing.T) {
 }
 
 func TestDefaultsAllowMissingDependencies(t *testing.T) {
-	t.Parallel()
 	bp := `
 		defaults {
 			name: "defaults",

+ 0 - 2
android/depset_test.go

@@ -64,7 +64,6 @@ func ExampleDepSet_ToSortedList() {
 // Tests based on Bazel's ExpanderTestBase.java to ensure compatibility
 // https://github.com/bazelbuild/bazel/blob/master/src/test/java/com/google/devtools/build/lib/collect/nestedset/ExpanderTestBase.java
 func TestDepSet(t *testing.T) {
-	t.Parallel()
 	a := PathForTesting("a")
 	b := PathForTesting("b")
 	c := PathForTesting("c")
@@ -275,7 +274,6 @@ func TestDepSet(t *testing.T) {
 }
 
 func TestDepSetInvalidOrder(t *testing.T) {
-	t.Parallel()
 	orders := []DepSetOrder{POSTORDER, PREORDER, TOPOLOGICAL}
 
 	run := func(t *testing.T, order1, order2 DepSetOrder) {

+ 0 - 2
android/expand_test.go

@@ -163,7 +163,6 @@ var expandTestCases = []struct {
 }
 
 func TestExpand(t *testing.T) {
-	t.Parallel()
 	for _, test := range expandTestCases {
 		got, err := Expand(test.in, func(s string) (string, error) {
 			s, _, err := expander(s)
@@ -180,7 +179,6 @@ func TestExpand(t *testing.T) {
 }
 
 func TestExpandNinjaEscaped(t *testing.T) {
-	t.Parallel()
 	for _, test := range expandTestCases {
 		got, err := ExpandNinjaEscaped(test.in, expander)
 		if err != nil && !test.err {

+ 0 - 3
android/module_test.go

@@ -19,7 +19,6 @@ import (
 )
 
 func TestSrcIsModule(t *testing.T) {
-	t.Parallel()
 	type args struct {
 		s string
 	}
@@ -67,7 +66,6 @@ func TestSrcIsModule(t *testing.T) {
 }
 
 func TestSrcIsModuleWithTag(t *testing.T) {
-	t.Parallel()
 	type args struct {
 		s string
 	}
@@ -166,7 +164,6 @@ func depsModuleFactory() Module {
 }
 
 func TestErrorDependsOnDisabledModule(t *testing.T) {
-	t.Parallel()
 	ctx := NewTestContext()
 	ctx.RegisterModuleType("deps", depsModuleFactory)
 

+ 0 - 4
android/mutator_test.go

@@ -59,7 +59,6 @@ func addMissingDependenciesMutator(ctx TopDownMutatorContext) {
 }
 
 func TestMutatorAddMissingDependencies(t *testing.T) {
-	t.Parallel()
 	bp := `
 		test {
 			name: "foo",
@@ -93,7 +92,6 @@ func TestMutatorAddMissingDependencies(t *testing.T) {
 }
 
 func TestModuleString(t *testing.T) {
-	t.Parallel()
 	ctx := NewTestContext()
 
 	var moduleStrings []string
@@ -192,7 +190,6 @@ func TestModuleString(t *testing.T) {
 }
 
 func TestFinalDepsPhase(t *testing.T) {
-	t.Parallel()
 	ctx := NewTestContext()
 
 	finalGot := map[string]int{}
@@ -270,7 +267,6 @@ func TestFinalDepsPhase(t *testing.T) {
 }
 
 func TestNoCreateVariationsInFinalDeps(t *testing.T) {
-	t.Parallel()
 	ctx := NewTestContext()
 
 	checkErr := func() {

+ 0 - 20
android/namespace_test.go

@@ -24,7 +24,6 @@ import (
 )
 
 func TestDependingOnModuleInSameNamespace(t *testing.T) {
-	t.Parallel()
 	ctx := setupTest(t,
 		map[string]string{
 			"dir1": `
@@ -49,7 +48,6 @@ func TestDependingOnModuleInSameNamespace(t *testing.T) {
 }
 
 func TestDependingOnModuleInRootNamespace(t *testing.T) {
-	t.Parallel()
 	ctx := setupTest(t,
 		map[string]string{
 			".": `
@@ -72,7 +70,6 @@ func TestDependingOnModuleInRootNamespace(t *testing.T) {
 }
 
 func TestImplicitlyImportRootNamespace(t *testing.T) {
-	t.Parallel()
 	_ = setupTest(t,
 		map[string]string{
 			".": `
@@ -95,7 +92,6 @@ func TestImplicitlyImportRootNamespace(t *testing.T) {
 }
 
 func TestDependingOnBlueprintModuleInRootNamespace(t *testing.T) {
-	t.Parallel()
 	_ = setupTest(t,
 		map[string]string{
 			".": `
@@ -118,7 +114,6 @@ func TestDependingOnBlueprintModuleInRootNamespace(t *testing.T) {
 }
 
 func TestDependingOnModuleInImportedNamespace(t *testing.T) {
-	t.Parallel()
 	ctx := setupTest(t,
 		map[string]string{
 			"dir1": `
@@ -148,7 +143,6 @@ func TestDependingOnModuleInImportedNamespace(t *testing.T) {
 }
 
 func TestDependingOnModuleInNonImportedNamespace(t *testing.T) {
-	t.Parallel()
 	_, errs := setupTestExpectErrs(
 		map[string]string{
 			"dir1": `
@@ -189,7 +183,6 @@ Module "a" can be found in these namespaces: ["dir1" "dir2"]`),
 }
 
 func TestDependingOnModuleByFullyQualifiedReference(t *testing.T) {
-	t.Parallel()
 	ctx := setupTest(t,
 		map[string]string{
 			"dir1": `
@@ -217,7 +210,6 @@ func TestDependingOnModuleByFullyQualifiedReference(t *testing.T) {
 }
 
 func TestSameNameInTwoNamespaces(t *testing.T) {
-	t.Parallel()
 	ctx := setupTest(t,
 		map[string]string{
 			"dir1": `
@@ -268,7 +260,6 @@ func TestSameNameInTwoNamespaces(t *testing.T) {
 }
 
 func TestSearchOrder(t *testing.T) {
-	t.Parallel()
 	ctx := setupTest(t,
 		map[string]string{
 			"dir1": `
@@ -357,7 +348,6 @@ func TestSearchOrder(t *testing.T) {
 }
 
 func TestTwoNamespacesCanImportEachOther(t *testing.T) {
-	t.Parallel()
 	_ = setupTest(t,
 		map[string]string{
 			"dir1": `
@@ -388,7 +378,6 @@ func TestTwoNamespacesCanImportEachOther(t *testing.T) {
 }
 
 func TestImportingNonexistentNamespace(t *testing.T) {
-	t.Parallel()
 	_, errs := setupTestExpectErrs(
 		map[string]string{
 			"dir1": `
@@ -413,7 +402,6 @@ func TestImportingNonexistentNamespace(t *testing.T) {
 }
 
 func TestNamespacesDontInheritParentNamespaces(t *testing.T) {
-	t.Parallel()
 	_, errs := setupTestExpectErrs(
 		map[string]string{
 			"dir1": `
@@ -445,7 +433,6 @@ Module "a" can be found in these namespaces: ["dir1"]`),
 }
 
 func TestModulesDoReceiveParentNamespace(t *testing.T) {
-	t.Parallel()
 	_ = setupTest(t,
 		map[string]string{
 			"dir1": `
@@ -468,7 +455,6 @@ func TestModulesDoReceiveParentNamespace(t *testing.T) {
 }
 
 func TestNamespaceImportsNotTransitive(t *testing.T) {
-	t.Parallel()
 	_, errs := setupTestExpectErrs(
 		map[string]string{
 			"dir1": `
@@ -510,7 +496,6 @@ Module "a" can be found in these namespaces: ["dir1"]`),
 }
 
 func TestTwoNamepacesInSameDir(t *testing.T) {
-	t.Parallel()
 	_, errs := setupTestExpectErrs(
 		map[string]string{
 			"dir1": `
@@ -531,7 +516,6 @@ func TestTwoNamepacesInSameDir(t *testing.T) {
 }
 
 func TestNamespaceNotAtTopOfFile(t *testing.T) {
-	t.Parallel()
 	_, errs := setupTestExpectErrs(
 		map[string]string{
 			"dir1": `
@@ -553,7 +537,6 @@ func TestNamespaceNotAtTopOfFile(t *testing.T) {
 }
 
 func TestTwoModulesWithSameNameInSameNamespace(t *testing.T) {
-	t.Parallel()
 	_, errs := setupTestExpectErrs(
 		map[string]string{
 			"dir1": `
@@ -579,7 +562,6 @@ func TestTwoModulesWithSameNameInSameNamespace(t *testing.T) {
 }
 
 func TestDeclaringNamespaceInNonAndroidBpFile(t *testing.T) {
-	t.Parallel()
 	_, errs := setupTestFromFiles(
 		map[string][]byte{
 			"Android.bp": []byte(`
@@ -603,7 +585,6 @@ func TestDeclaringNamespaceInNonAndroidBpFile(t *testing.T) {
 
 // so that the generated .ninja file will have consistent names
 func TestConsistentNamespaceNames(t *testing.T) {
-	t.Parallel()
 	ctx := setupTest(t,
 		map[string]string{
 			"dir1": "soong_namespace{}",
@@ -623,7 +604,6 @@ func TestConsistentNamespaceNames(t *testing.T) {
 
 // so that the generated .ninja file will have consistent names
 func TestRename(t *testing.T) {
-	t.Parallel()
 	_ = setupTest(t,
 		map[string]string{
 			"dir1": `

+ 0 - 1
android/neverallow_test.go

@@ -343,7 +343,6 @@ var neverallowTests = []struct {
 }
 
 func TestNeverallow(t *testing.T) {
-	t.Parallel()
 	for _, test := range neverallowTests {
 		// Create a test per config to allow for test specific config, e.g. test rules.
 		config := TestConfig(buildDir, nil, "", test.fs)

+ 0 - 11
android/onceper_test.go

@@ -20,7 +20,6 @@ import (
 )
 
 func TestOncePer_Once(t *testing.T) {
-	t.Parallel()
 	once := OncePer{}
 	key := NewOnceKey("key")
 
@@ -37,7 +36,6 @@ func TestOncePer_Once(t *testing.T) {
 }
 
 func TestOncePer_Once_wait(t *testing.T) {
-	t.Parallel()
 	once := OncePer{}
 	key := NewOnceKey("key")
 
@@ -53,7 +51,6 @@ func TestOncePer_Once_wait(t *testing.T) {
 }
 
 func TestOncePer_Get(t *testing.T) {
-	t.Parallel()
 	once := OncePer{}
 	key := NewOnceKey("key")
 
@@ -70,7 +67,6 @@ func TestOncePer_Get(t *testing.T) {
 }
 
 func TestOncePer_Get_panic(t *testing.T) {
-	t.Parallel()
 	once := OncePer{}
 	key := NewOnceKey("key")
 
@@ -86,7 +82,6 @@ func TestOncePer_Get_panic(t *testing.T) {
 }
 
 func TestOncePer_Get_wait(t *testing.T) {
-	t.Parallel()
 	once := OncePer{}
 	key := NewOnceKey("key")
 
@@ -102,7 +97,6 @@ func TestOncePer_Get_wait(t *testing.T) {
 }
 
 func TestOncePer_OnceStringSlice(t *testing.T) {
-	t.Parallel()
 	once := OncePer{}
 	key := NewOnceKey("key")
 
@@ -119,7 +113,6 @@ func TestOncePer_OnceStringSlice(t *testing.T) {
 }
 
 func TestOncePer_Once2StringSlice(t *testing.T) {
-	t.Parallel()
 	once := OncePer{}
 	key := NewOnceKey("key")
 
@@ -136,7 +129,6 @@ func TestOncePer_Once2StringSlice(t *testing.T) {
 }
 
 func TestNewOnceKey(t *testing.T) {
-	t.Parallel()
 	once := OncePer{}
 	key1 := NewOnceKey("key")
 	key2 := NewOnceKey("key")
@@ -154,7 +146,6 @@ func TestNewOnceKey(t *testing.T) {
 }
 
 func TestNewCustomOnceKey(t *testing.T) {
-	t.Parallel()
 	type key struct {
 		key string
 	}
@@ -175,7 +166,6 @@ func TestNewCustomOnceKey(t *testing.T) {
 }
 
 func TestOncePerReentrant(t *testing.T) {
-	t.Parallel()
 	once := OncePer{}
 	key1 := NewOnceKey("key")
 	key2 := NewOnceKey("key")
@@ -188,7 +178,6 @@ func TestOncePerReentrant(t *testing.T) {
 
 // Test that a recovered panic in a Once function doesn't deadlock
 func TestOncePerPanic(t *testing.T) {
-	t.Parallel()
 	once := OncePer{}
 	key := NewOnceKey("key")
 

+ 0 - 1
android/package_test.go

@@ -56,7 +56,6 @@ var packageTests = []struct {
 }
 
 func TestPackage(t *testing.T) {
-	t.Parallel()
 	for _, test := range packageTests {
 		t.Run(test.name, func(t *testing.T) {
 			_, errs := testPackage(test.fs)

+ 0 - 1
android/path_properties_test.go

@@ -59,7 +59,6 @@ func (p *pathDepsMutatorTestModule) GenerateAndroidBuildActions(ctx ModuleContex
 }
 
 func TestPathDepsMutator(t *testing.T) {
-	t.Parallel()
 	tests := []struct {
 		name string
 		bp   string

+ 0 - 10
android/paths_test.go

@@ -110,7 +110,6 @@ var validatePathTestCases = append(commonValidatePathTestCases, []strsTestCase{
 }...)
 
 func TestValidateSafePath(t *testing.T) {
-	t.Parallel()
 	for _, testCase := range validateSafePathTestCases {
 		t.Run(strings.Join(testCase.in, ","), func(t *testing.T) {
 			ctx := &configErrorWrapper{}
@@ -124,7 +123,6 @@ func TestValidateSafePath(t *testing.T) {
 }
 
 func TestValidatePath(t *testing.T) {
-	t.Parallel()
 	for _, testCase := range validatePathTestCases {
 		t.Run(strings.Join(testCase.in, ","), func(t *testing.T) {
 			ctx := &configErrorWrapper{}
@@ -138,7 +136,6 @@ func TestValidatePath(t *testing.T) {
 }
 
 func TestOptionalPath(t *testing.T) {
-	t.Parallel()
 	var path OptionalPath
 	checkInvalidOptionalPath(t, path)
 
@@ -256,7 +253,6 @@ func pathTestConfig(buildDir string) Config {
 }
 
 func TestPathForModuleInstall(t *testing.T) {
-	t.Parallel()
 	testConfig := pathTestConfig("")
 
 	hostTarget := Target{Os: Linux, Arch: Arch{ArchType: X86}}
@@ -661,7 +657,6 @@ func TestPathForModuleInstall(t *testing.T) {
 }
 
 func TestDirectorySortedPaths(t *testing.T) {
-	t.Parallel()
 	config := TestConfig("out", nil, "", map[string][]byte{
 		"Android.bp": nil,
 		"a.txt":      nil,
@@ -744,7 +739,6 @@ func TestDirectorySortedPaths(t *testing.T) {
 }
 
 func TestMaybeRel(t *testing.T) {
-	t.Parallel()
 	testCases := []struct {
 		name   string
 		base   string
@@ -802,7 +796,6 @@ func TestMaybeRel(t *testing.T) {
 }
 
 func TestPathForSource(t *testing.T) {
-	t.Parallel()
 	testCases := []struct {
 		name     string
 		buildDir string
@@ -1035,7 +1028,6 @@ func testPathForModuleSrc(t *testing.T, buildDir string, tests []pathForModuleSr
 }
 
 func TestPathsForModuleSrc(t *testing.T) {
-	t.Parallel()
 	tests := []pathForModuleSrcTestCase{
 		{
 			name: "path",
@@ -1131,7 +1123,6 @@ func TestPathsForModuleSrc(t *testing.T) {
 }
 
 func TestPathForModuleSrc(t *testing.T) {
-	t.Parallel()
 	tests := []pathForModuleSrcTestCase{
 		{
 			name: "path",
@@ -1199,7 +1190,6 @@ func TestPathForModuleSrc(t *testing.T) {
 }
 
 func TestPathsForModuleSrc_AllowMissingDependencies(t *testing.T) {
-	t.Parallel()
 	bp := `
 		test {
 			name: "foo",

+ 0 - 1
android/prebuilt_test.go

@@ -262,7 +262,6 @@ var prebuiltsTests = []struct {
 }
 
 func TestPrebuilts(t *testing.T) {
-	t.Parallel()
 	fs := map[string][]byte{
 		"prebuilt_file": nil,
 		"source_file":   nil,

+ 0 - 3
android/rule_builder_test.go

@@ -264,7 +264,6 @@ func ExampleRuleBuilderCommand_NinjaEscapedString() {
 }
 
 func TestRuleBuilder(t *testing.T) {
-	t.Parallel()
 	fs := map[string][]byte{
 		"dep_fixer":  nil,
 		"input":      nil,
@@ -456,7 +455,6 @@ func testRuleBuilder_Build(ctx BuilderContext, in Path, out, outDep, outDir Writ
 }
 
 func TestRuleBuilder_Build(t *testing.T) {
-	t.Parallel()
 	fs := map[string][]byte{
 		"bar": nil,
 		"cp":  nil,
@@ -548,7 +546,6 @@ func TestRuleBuilder_Build(t *testing.T) {
 }
 
 func Test_ninjaEscapeExceptForSpans(t *testing.T) {
-	t.Parallel()
 	type args struct {
 		s     string
 		spans [][2]int

+ 0 - 1
android/soong_config_modules_test.go

@@ -38,7 +38,6 @@ func soongConfigTestModuleFactory() Module {
 func (t soongConfigTestModule) GenerateAndroidBuildActions(ModuleContext) {}
 
 func TestSoongConfigModule(t *testing.T) {
-	t.Parallel()
 	configBp := `
 		soong_config_module_type {
 			name: "acme_test_defaults",

+ 0 - 3
android/soongconfig/modules_test.go

@@ -20,7 +20,6 @@ import (
 )
 
 func Test_CanonicalizeToProperty(t *testing.T) {
-	t.Parallel()
 	tests := []struct {
 		name string
 		arg  string
@@ -67,7 +66,6 @@ func Test_CanonicalizeToProperty(t *testing.T) {
 }
 
 func Test_typeForPropertyFromPropertyStruct(t *testing.T) {
-	t.Parallel()
 	tests := []struct {
 		name     string
 		ps       interface{}
@@ -188,7 +186,6 @@ func Test_typeForPropertyFromPropertyStruct(t *testing.T) {
 }
 
 func Test_createAffectablePropertiesType(t *testing.T) {
-	t.Parallel()
 	tests := []struct {
 		name                 string
 		affectableProperties []string

+ 0 - 11
android/util_test.go

@@ -60,7 +60,6 @@ var firstUniqueStringsTestCases = []struct {
 }
 
 func TestFirstUniqueStrings(t *testing.T) {
-	t.Parallel()
 	f := func(t *testing.T, imp func([]string) []string, in, want []string) {
 		t.Helper()
 		out := imp(in)
@@ -121,7 +120,6 @@ var lastUniqueStringsTestCases = []struct {
 }
 
 func TestLastUniqueStrings(t *testing.T) {
-	t.Parallel()
 	for _, testCase := range lastUniqueStringsTestCases {
 		out := LastUniqueStrings(testCase.in)
 		if !reflect.DeepEqual(out, testCase.out) {
@@ -134,7 +132,6 @@ func TestLastUniqueStrings(t *testing.T) {
 }
 
 func TestJoinWithPrefix(t *testing.T) {
-	t.Parallel()
 	testcases := []struct {
 		name     string
 		input    []string
@@ -174,7 +171,6 @@ func TestJoinWithPrefix(t *testing.T) {
 }
 
 func TestIndexList(t *testing.T) {
-	t.Parallel()
 	input := []string{"a", "b", "c"}
 
 	testcases := []struct {
@@ -214,7 +210,6 @@ func TestIndexList(t *testing.T) {
 }
 
 func TestInList(t *testing.T) {
-	t.Parallel()
 	input := []string{"a"}
 
 	testcases := []struct {
@@ -246,7 +241,6 @@ func TestInList(t *testing.T) {
 }
 
 func TestPrefixInList(t *testing.T) {
-	t.Parallel()
 	prefixes := []string{"a", "b"}
 
 	testcases := []struct {
@@ -282,7 +276,6 @@ func TestPrefixInList(t *testing.T) {
 }
 
 func TestFilterList(t *testing.T) {
-	t.Parallel()
 	input := []string{"a", "b", "c", "c", "b", "d", "a"}
 	filter := []string{"a", "c"}
 	remainder, filtered := FilterList(input, filter)
@@ -307,7 +300,6 @@ func TestFilterList(t *testing.T) {
 }
 
 func TestRemoveListFromList(t *testing.T) {
-	t.Parallel()
 	input := []string{"a", "b", "c", "d", "a", "c", "d"}
 	filter := []string{"a", "c"}
 	expected := []string{"b", "d", "d"}
@@ -322,7 +314,6 @@ func TestRemoveListFromList(t *testing.T) {
 }
 
 func TestRemoveFromList(t *testing.T) {
-	t.Parallel()
 	testcases := []struct {
 		name          string
 		key           string
@@ -426,7 +417,6 @@ func ExampleCopyOf_append() {
 }
 
 func TestSplitFileExt(t *testing.T) {
-	t.Parallel()
 	t.Run("soname with version", func(t *testing.T) {
 		root, suffix, ext := SplitFileExt("libtest.so.1.0.30")
 		expected := "libtest"
@@ -492,7 +482,6 @@ func TestSplitFileExt(t *testing.T) {
 }
 
 func Test_Shard(t *testing.T) {
-	t.Parallel()
 	type args struct {
 		strings   []string
 		shardSize int

+ 0 - 3
android/variable_test.go

@@ -112,7 +112,6 @@ var printfIntoPropertyTestCases = []printfIntoPropertyTestCase{
 }
 
 func TestPrintfIntoProperty(t *testing.T) {
-	t.Parallel()
 	for _, testCase := range printfIntoPropertyTestCases {
 		s := testCase.in
 		v := reflect.ValueOf(&s).Elem()
@@ -158,7 +157,6 @@ func testProductVariableModuleFactoryFactory(props interface{}) func() Module {
 }
 
 func TestProductVariables(t *testing.T) {
-	t.Parallel()
 	ctx := NewTestContext()
 	// A module type that has a srcs property but not a cflags property.
 	ctx.RegisterModuleType("module1", testProductVariableModuleFactoryFactory(&struct {
@@ -267,7 +265,6 @@ func productVariablesDefaultsTestDefaultsFactory() Module {
 
 // Test a defaults module that supports more product variable properties than the target module.
 func TestProductVariablesDefaults(t *testing.T) {
-	t.Parallel()
 	bp := `
 		defaults {
 			name: "defaults",

+ 0 - 1
android/visibility_test.go

@@ -1140,7 +1140,6 @@ var visibilityTests = []struct {
 }
 
 func TestVisibility(t *testing.T) {
-	t.Parallel()
 	for _, test := range visibilityTests {
 		t.Run(test.name, func(t *testing.T) {
 			ctx, errs := testVisibility(buildDir, test.fs)

+ 0 - 1
androidmk/androidmk/androidmk_test.go

@@ -1449,7 +1449,6 @@ runtime_resource_overlay {
 }
 
 func TestEndToEnd(t *testing.T) {
-	t.Parallel()
 	for i, test := range testCases {
 		expected, err := bpfix.Reformat(test.expected)
 		if err != nil {

+ 0 - 3
androidmk/parser/make_strings_test.go

@@ -89,7 +89,6 @@ var splitNTestCases = []struct {
 }
 
 func TestMakeStringSplitN(t *testing.T) {
-	t.Parallel()
 	for _, test := range splitNTestCases {
 		got := test.in.SplitN(test.sep, test.n)
 		gotString := dumpArray(got)
@@ -119,7 +118,6 @@ var valueTestCases = []struct {
 }
 
 func TestMakeStringValue(t *testing.T) {
-	t.Parallel()
 	for _, test := range valueTestCases {
 		got := test.in.Value(nil)
 		if got != test.expected {
@@ -163,7 +161,6 @@ var splitWordsTestCases = []struct {
 }
 
 func TestMakeStringWords(t *testing.T) {
-	t.Parallel()
 	for _, test := range splitWordsTestCases {
 		got := test.in.Words()
 		gotString := dumpArray(got)

+ 0 - 1
androidmk/parser/parser_test.go

@@ -37,7 +37,6 @@ var parserTestCases = []struct {
 }
 
 func TestParse(t *testing.T) {
-	t.Parallel()
 	for _, test := range parserTestCases {
 		t.Run(test.name, func(t *testing.T) {
 			p := NewParser(test.name, bytes.NewBufferString(test.in))

+ 0 - 105
apex/apex_test.go

@@ -345,7 +345,6 @@ func ensureListEmpty(t *testing.T, result []string) {
 
 // Minimal test
 func TestBasicApex(t *testing.T) {
-	t.Parallel()
 	ctx, config := testApex(t, `
 		apex_defaults {
 			name: "myapex-defaults",
@@ -598,7 +597,6 @@ func TestBasicApex(t *testing.T) {
 }
 
 func TestDefaults(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex_defaults {
 			name: "myapex-defaults",
@@ -673,7 +671,6 @@ func TestDefaults(t *testing.T) {
 }
 
 func TestApexManifest(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -695,7 +692,6 @@ func TestApexManifest(t *testing.T) {
 }
 
 func TestBasicZipApex(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -746,7 +742,6 @@ func TestBasicZipApex(t *testing.T) {
 }
 
 func TestApexWithStubs(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -939,7 +934,6 @@ func TestApexWithStubsWithMinSdkVersion(t *testing.T) {
 }
 
 func TestApexWithExplicitStubsDependency(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex2",
@@ -1027,7 +1021,6 @@ func TestApexWithExplicitStubsDependency(t *testing.T) {
 }
 
 func TestApexWithRuntimeLibsDependency(t *testing.T) {
-	t.Parallel()
 	/*
 		myapex
 		  |
@@ -1097,7 +1090,6 @@ func TestApexWithRuntimeLibsDependency(t *testing.T) {
 }
 
 func TestRuntimeApexShouldInstallHwasanIfLibcDependsOnIt(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, "", func(fs map[string][]byte, config android.Config) {
 		bp := `
 		apex {
@@ -1161,7 +1153,6 @@ func TestRuntimeApexShouldInstallHwasanIfLibcDependsOnIt(t *testing.T) {
 }
 
 func TestRuntimeApexShouldInstallHwasanIfHwaddressSanitized(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, "", func(fs map[string][]byte, config android.Config) {
 		bp := `
 		apex {
@@ -1223,7 +1214,6 @@ func TestRuntimeApexShouldInstallHwasanIfHwaddressSanitized(t *testing.T) {
 }
 
 func TestApexDependsOnLLNDKTransitively(t *testing.T) {
-	t.Parallel()
 	testcases := []struct {
 		name          string
 		minSdkVersion string
@@ -1313,7 +1303,6 @@ func TestApexDependsOnLLNDKTransitively(t *testing.T) {
 }
 
 func TestApexWithSystemLibsStubs(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -1404,7 +1393,6 @@ func TestApexWithSystemLibsStubs(t *testing.T) {
 }
 
 func TestApexMinSdkVersion_NativeModulesShouldBeBuiltAgainstStubs(t *testing.T) {
-	t.Parallel()
 	// there are three links between liba --> libz
 	// 1) myapex -> libx -> liba -> libz    : this should be #29 link, but fallback to #28
 	// 2) otherapex -> liby -> liba -> libz : this should be #30 link
@@ -1491,7 +1479,6 @@ func TestApexMinSdkVersion_NativeModulesShouldBeBuiltAgainstStubs(t *testing.T)
 }
 
 func TestApexMinSdkVersion_SupportsCodeNames(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -1541,7 +1528,6 @@ func TestApexMinSdkVersion_SupportsCodeNames(t *testing.T) {
 }
 
 func TestApexMinSdkVersion_DefaultsToLatest(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -1587,7 +1573,6 @@ func TestApexMinSdkVersion_DefaultsToLatest(t *testing.T) {
 }
 
 func TestPlatformUsesLatestStubsFromApexes(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -1635,7 +1620,6 @@ func TestPlatformUsesLatestStubsFromApexes(t *testing.T) {
 }
 
 func TestQApexesUseLatestStubsInBundledBuildsAndHWASAN(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -1675,7 +1659,6 @@ func TestQApexesUseLatestStubsInBundledBuildsAndHWASAN(t *testing.T) {
 }
 
 func TestQTargetApexUsesStaticUnwinder(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -1706,7 +1689,6 @@ func TestQTargetApexUsesStaticUnwinder(t *testing.T) {
 }
 
 func TestApexMinSdkVersion_ErrorIfIncompatibleStubs(t *testing.T) {
-	t.Parallel()
 	testApexError(t, `"libz" .*: not found a version\(<=29\)`, `
 		apex {
 			name: "myapex",
@@ -1742,7 +1724,6 @@ func TestApexMinSdkVersion_ErrorIfIncompatibleStubs(t *testing.T) {
 }
 
 func TestApexMinSdkVersion_ErrorIfIncompatibleVersion(t *testing.T) {
-	t.Parallel()
 	testApexError(t, `module "mylib".*: should support min_sdk_version\(29\)`, `
 		apex {
 			name: "myapex",
@@ -1771,7 +1752,6 @@ func TestApexMinSdkVersion_ErrorIfIncompatibleVersion(t *testing.T) {
 }
 
 func TestApexMinSdkVersion_Okay(t *testing.T) {
-	t.Parallel()
 	testApex(t, `
 		apex {
 			name: "myapex",
@@ -1822,7 +1802,6 @@ func TestApexMinSdkVersion_Okay(t *testing.T) {
 }
 
 func TestJavaStableSdkVersion(t *testing.T) {
-	t.Parallel()
 	testCases := []struct {
 		name          string
 		expectedError string
@@ -1940,7 +1919,6 @@ func TestJavaStableSdkVersion(t *testing.T) {
 }
 
 func TestApexMinSdkVersion_ErrorIfDepIsNewer(t *testing.T) {
-	t.Parallel()
 	testApexError(t, `module "mylib2".*: should support min_sdk_version\(29\) for "myapex"`, `
 		apex {
 			name: "myapex",
@@ -1982,7 +1960,6 @@ func TestApexMinSdkVersion_ErrorIfDepIsNewer(t *testing.T) {
 }
 
 func TestApexMinSdkVersion_ErrorIfDepIsNewer_Java(t *testing.T) {
-	t.Parallel()
 	testApexError(t, `module "bar".*: should support min_sdk_version\(29\) for "myapex"`, `
 		apex {
 			name: "myapex",
@@ -2018,7 +1995,6 @@ func TestApexMinSdkVersion_ErrorIfDepIsNewer_Java(t *testing.T) {
 }
 
 func TestApexMinSdkVersion_OkayEvenWhenDepIsNewer_IfItSatisfiesApexMinSdkVersion(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -2072,7 +2048,6 @@ func TestApexMinSdkVersion_OkayEvenWhenDepIsNewer_IfItSatisfiesApexMinSdkVersion
 }
 
 func TestFilesInSubDir(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -2135,7 +2110,6 @@ func TestFilesInSubDir(t *testing.T) {
 }
 
 func TestFilesInSubDirWhenNativeBridgeEnabled(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -2194,7 +2168,6 @@ func TestFilesInSubDirWhenNativeBridgeEnabled(t *testing.T) {
 }
 
 func TestUseVendor(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -2249,7 +2222,6 @@ func TestUseVendor(t *testing.T) {
 }
 
 func TestUseVendorNotAllowedForSystemApexes(t *testing.T) {
-	t.Parallel()
 	testApexError(t, `module "myapex" .*: use_vendor: not allowed`, `
 		apex {
 			name: "myapex",
@@ -2282,7 +2254,6 @@ func TestUseVendorNotAllowedForSystemApexes(t *testing.T) {
 }
 
 func TestUseVendorFailsIfNotVendorAvailable(t *testing.T) {
-	t.Parallel()
 	testApexError(t, `dependency "mylib" of "myapex" missing variant:\n.*image:vendor`, `
 		apex {
 			name: "myapex",
@@ -2307,7 +2278,6 @@ func TestUseVendorFailsIfNotVendorAvailable(t *testing.T) {
 }
 
 func TestVendorApex(t *testing.T) {
-	t.Parallel()
 	ctx, config := testApex(t, `
 		apex {
 			name: "myapex",
@@ -2353,7 +2323,6 @@ func TestVendorApex(t *testing.T) {
 }
 
 func TestVendorApex_use_vndk_as_stable(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -2407,7 +2376,6 @@ func TestVendorApex_use_vndk_as_stable(t *testing.T) {
 }
 
 func TestApex_withPrebuiltFirmware(t *testing.T) {
-	t.Parallel()
 	testCases := []struct {
 		name           string
 		additionalProp string
@@ -2444,7 +2412,6 @@ func TestApex_withPrebuiltFirmware(t *testing.T) {
 }
 
 func TestAndroidMk_UseVendorRequired(t *testing.T) {
-	t.Parallel()
 	ctx, config := testApex(t, `
 		apex {
 			name: "myapex",
@@ -2479,7 +2446,6 @@ func TestAndroidMk_UseVendorRequired(t *testing.T) {
 }
 
 func TestAndroidMk_VendorApexRequired(t *testing.T) {
-	t.Parallel()
 	ctx, config := testApex(t, `
 		apex {
 			name: "myapex",
@@ -2511,7 +2477,6 @@ func TestAndroidMk_VendorApexRequired(t *testing.T) {
 }
 
 func TestAndroidMkWritesCommonProperties(t *testing.T) {
-	t.Parallel()
 	ctx, config := testApex(t, `
 		apex {
 			name: "myapex",
@@ -2541,7 +2506,6 @@ func TestAndroidMkWritesCommonProperties(t *testing.T) {
 }
 
 func TestStaticLinking(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -2586,7 +2550,6 @@ func TestStaticLinking(t *testing.T) {
 }
 
 func TestKeys(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex_keytest",
@@ -2643,7 +2606,6 @@ func TestKeys(t *testing.T) {
 }
 
 func TestCertificate(t *testing.T) {
-	t.Parallel()
 	t.Run("if unspecified, it defaults to DefaultAppCertificate", func(t *testing.T) {
 		ctx, _ := testApex(t, `
 			apex {
@@ -2772,7 +2734,6 @@ func TestCertificate(t *testing.T) {
 }
 
 func TestMacro(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -2900,7 +2861,6 @@ func TestMacro(t *testing.T) {
 }
 
 func TestHeaderLibsDependency(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -3044,7 +3004,6 @@ func ensureExactContents(t *testing.T, ctx *android.TestContext, moduleName, var
 }
 
 func TestVndkApexCurrent(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex_vndk {
 			name: "myapex",
@@ -3098,7 +3057,6 @@ func TestVndkApexCurrent(t *testing.T) {
 }
 
 func TestVndkApexWithPrebuilt(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex_vndk {
 			name: "myapex",
@@ -3181,7 +3139,6 @@ func vndkLibrariesTxtFiles(vers ...string) (result string) {
 }
 
 func TestVndkApexVersion(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex_vndk {
 			name: "myapex_v27",
@@ -3248,7 +3205,6 @@ func TestVndkApexVersion(t *testing.T) {
 }
 
 func TestVndkApexErrorWithDuplicateVersion(t *testing.T) {
-	t.Parallel()
 	testApexError(t, `module "myapex_v27.*" .*: vndk_version: 27 is already defined in "myapex_v27.*"`, `
 		apex_vndk {
 			name: "myapex_v27",
@@ -3295,7 +3251,6 @@ func TestVndkApexErrorWithDuplicateVersion(t *testing.T) {
 }
 
 func TestVndkApexNameRule(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex_vndk {
 			name: "myapex",
@@ -3327,7 +3282,6 @@ func TestVndkApexNameRule(t *testing.T) {
 }
 
 func TestVndkApexSkipsNativeBridgeSupportedModules(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex_vndk {
 			name: "myapex",
@@ -3366,7 +3320,6 @@ func TestVndkApexSkipsNativeBridgeSupportedModules(t *testing.T) {
 }
 
 func TestVndkApexDoesntSupportNativeBridgeSupported(t *testing.T) {
-	t.Parallel()
 	testApexError(t, `module "myapex" .*: native_bridge_supported: .* doesn't support native bridge binary`, `
 		apex_vndk {
 			name: "myapex",
@@ -3397,7 +3350,6 @@ func TestVndkApexDoesntSupportNativeBridgeSupported(t *testing.T) {
 }
 
 func TestVndkApexWithBinder32(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex_vndk {
 			name: "myapex_v27",
@@ -3464,7 +3416,6 @@ func TestVndkApexWithBinder32(t *testing.T) {
 }
 
 func TestVndkApexShouldNotProvideNativeLibs(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex_vndk {
 			name: "myapex",
@@ -3499,7 +3450,6 @@ func TestVndkApexShouldNotProvideNativeLibs(t *testing.T) {
 }
 
 func TestDependenciesInApexManifest(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex_nodep",
@@ -3604,7 +3554,6 @@ func TestDependenciesInApexManifest(t *testing.T) {
 }
 
 func TestApexName(t *testing.T) {
-	t.Parallel()
 	ctx, config := testApex(t, `
 		apex {
 			name: "myapex",
@@ -3649,7 +3598,6 @@ func TestApexName(t *testing.T) {
 }
 
 func TestNonTestApex(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -3702,7 +3650,6 @@ func TestNonTestApex(t *testing.T) {
 }
 
 func TestTestApex(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex_test {
 			name: "myapex",
@@ -3751,7 +3698,6 @@ func TestTestApex(t *testing.T) {
 }
 
 func TestApexWithTarget(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -3842,7 +3788,6 @@ func TestApexWithTarget(t *testing.T) {
 }
 
 func TestApexWithShBinary(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -3871,7 +3816,6 @@ func TestApexWithShBinary(t *testing.T) {
 }
 
 func TestApexInVariousPartition(t *testing.T) {
-	t.Parallel()
 	testcases := []struct {
 		propName, parition, flattenedPartition string
 	}{
@@ -3916,7 +3860,6 @@ func TestApexInVariousPartition(t *testing.T) {
 }
 
 func TestFileContexts_FindInDefaultLocationIfNotSet(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -3935,7 +3878,6 @@ func TestFileContexts_FindInDefaultLocationIfNotSet(t *testing.T) {
 }
 
 func TestFileContexts_ShouldBeUnderSystemSepolicyForSystemApexes(t *testing.T) {
-	t.Parallel()
 	testApexError(t, `"myapex" .*: file_contexts: should be under system/sepolicy`, `
 		apex {
 			name: "myapex",
@@ -3954,7 +3896,6 @@ func TestFileContexts_ShouldBeUnderSystemSepolicyForSystemApexes(t *testing.T) {
 }
 
 func TestFileContexts_ProductSpecificApexes(t *testing.T) {
-	t.Parallel()
 	testApexError(t, `"myapex" .*: file_contexts: cannot find`, `
 		apex {
 			name: "myapex",
@@ -3992,7 +3933,6 @@ func TestFileContexts_ProductSpecificApexes(t *testing.T) {
 }
 
 func TestFileContexts_SetViaFileGroup(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -4020,7 +3960,6 @@ func TestFileContexts_SetViaFileGroup(t *testing.T) {
 }
 
 func TestApexKeyFromOtherModule(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex_key {
 			name: "myapex.key",
@@ -4054,7 +3993,6 @@ func TestApexKeyFromOtherModule(t *testing.T) {
 }
 
 func TestPrebuilt(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		prebuilt_apex {
 			name: "myapex",
@@ -4078,7 +4016,6 @@ func TestPrebuilt(t *testing.T) {
 }
 
 func TestPrebuiltFilenameOverride(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		prebuilt_apex {
 			name: "myapex",
@@ -4096,7 +4033,6 @@ func TestPrebuiltFilenameOverride(t *testing.T) {
 }
 
 func TestPrebuiltOverrides(t *testing.T) {
-	t.Parallel()
 	ctx, config := testApex(t, `
 		prebuilt_apex {
 			name: "myapex.prebuilt",
@@ -4117,7 +4053,6 @@ func TestPrebuiltOverrides(t *testing.T) {
 }
 
 func TestApexWithTests(t *testing.T) {
-	t.Parallel()
 	ctx, config := testApex(t, `
 		apex_test {
 			name: "myapex",
@@ -4229,7 +4164,6 @@ func TestApexWithTests(t *testing.T) {
 }
 
 func TestInstallExtraFlattenedApexes(t *testing.T) {
-	t.Parallel()
 	ctx, config := testApex(t, `
 		apex {
 			name: "myapex",
@@ -4253,7 +4187,6 @@ func TestInstallExtraFlattenedApexes(t *testing.T) {
 }
 
 func TestApexUsesOtherApex(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -4314,7 +4247,6 @@ func TestApexUsesOtherApex(t *testing.T) {
 }
 
 func TestApexUsesFailsIfNotProvided(t *testing.T) {
-	t.Parallel()
 	testApexError(t, `uses: "commonapex" does not provide native_shared_libs`, `
 		apex {
 			name: "myapex",
@@ -4355,7 +4287,6 @@ func TestApexUsesFailsIfNotProvided(t *testing.T) {
 }
 
 func TestApexUsesFailsIfUseVenderMismatch(t *testing.T) {
-	t.Parallel()
 	testApexError(t, `use_vendor: "commonapex" has different value of use_vendor`, `
 		apex {
 			name: "myapex",
@@ -4381,7 +4312,6 @@ func TestApexUsesFailsIfUseVenderMismatch(t *testing.T) {
 }
 
 func TestErrorsIfDepsAreNotEnabled(t *testing.T) {
-	t.Parallel()
 	testApexError(t, `module "myapex" .* depends on disabled module "libfoo"`, `
 		apex {
 			name: "myapex",
@@ -4428,7 +4358,6 @@ func TestErrorsIfDepsAreNotEnabled(t *testing.T) {
 }
 
 func TestApexWithApps(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -4507,7 +4436,6 @@ func TestApexWithApps(t *testing.T) {
 }
 
 func TestApexWithAppImports(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -4556,7 +4484,6 @@ func TestApexWithAppImports(t *testing.T) {
 }
 
 func TestApexWithAppImportsPrefer(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -4598,7 +4525,6 @@ func TestApexWithAppImportsPrefer(t *testing.T) {
 }
 
 func TestApexWithTestHelperApp(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -4630,7 +4556,6 @@ func TestApexWithTestHelperApp(t *testing.T) {
 }
 
 func TestApexPropertiesShouldBeDefaultable(t *testing.T) {
-	t.Parallel()
 	// libfoo's apex_available comes from cc_defaults
 	testApexError(t, `requires "libfoo" that is not available for the APEX`, `
 	apex {
@@ -4665,7 +4590,6 @@ func TestApexPropertiesShouldBeDefaultable(t *testing.T) {
 }
 
 func TestApexAvailable_DirectDep(t *testing.T) {
-	t.Parallel()
 	// libfoo is not available to myapex, but only to otherapex
 	testApexError(t, "requires \"libfoo\" that is not available for the APEX", `
 	apex {
@@ -4701,7 +4625,6 @@ func TestApexAvailable_DirectDep(t *testing.T) {
 }
 
 func TestApexAvailable_IndirectDep(t *testing.T) {
-	t.Parallel()
 	// libbbaz is an indirect dep
 	testApexError(t, `requires "libbaz" that is not available for the APEX. Dependency path:
 .*via tag apex\.dependencyTag.*name:sharedLib.*
@@ -4746,7 +4669,6 @@ func TestApexAvailable_IndirectDep(t *testing.T) {
 }
 
 func TestApexAvailable_InvalidApexName(t *testing.T) {
-	t.Parallel()
 	testApexError(t, "\"otherapex\" is not a valid module name", `
 	apex {
 		name: "myapex",
@@ -4806,7 +4728,6 @@ func TestApexAvailable_InvalidApexName(t *testing.T) {
 }
 
 func TestApexAvailable_CheckForPlatform(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 	apex {
 		name: "myapex",
@@ -4869,7 +4790,6 @@ func TestApexAvailable_CheckForPlatform(t *testing.T) {
 }
 
 func TestApexAvailable_CreatedForApex(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 	apex {
 		name: "myapex",
@@ -4904,7 +4824,6 @@ func TestApexAvailable_CreatedForApex(t *testing.T) {
 }
 
 func TestOverrideApex(t *testing.T) {
-	t.Parallel()
 	ctx, config := testApex(t, `
 		apex {
 			name: "myapex",
@@ -4988,7 +4907,6 @@ func TestOverrideApex(t *testing.T) {
 }
 
 func TestLegacyAndroid10Support(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -5044,7 +4962,6 @@ var filesForSdkLibrary = map[string][]byte{
 }
 
 func TestJavaSDKLibrary(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -5077,7 +4994,6 @@ func TestJavaSDKLibrary(t *testing.T) {
 }
 
 func TestJavaSDKLibrary_WithinApex(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -5125,7 +5041,6 @@ func TestJavaSDKLibrary_WithinApex(t *testing.T) {
 }
 
 func TestJavaSDKLibrary_CrossBoundary(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -5171,7 +5086,6 @@ func TestJavaSDKLibrary_CrossBoundary(t *testing.T) {
 }
 
 func TestJavaSDKLibrary_ImportPreferred(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, ``,
 		withFiles(map[string][]byte{
 			"apex/a.java":             nil,
@@ -5257,7 +5171,6 @@ func TestJavaSDKLibrary_ImportPreferred(t *testing.T) {
 }
 
 func TestJavaSDKLibrary_ImportOnly(t *testing.T) {
-	t.Parallel()
 	testApexError(t, `java_libs: "foo" is not configured to be compiled into dex`, `
 		apex {
 			name: "myapex",
@@ -5284,7 +5197,6 @@ func TestJavaSDKLibrary_ImportOnly(t *testing.T) {
 }
 
 func TestCompatConfig(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -5319,7 +5231,6 @@ func TestCompatConfig(t *testing.T) {
 }
 
 func TestRejectNonInstallableJavaLibrary(t *testing.T) {
-	t.Parallel()
 	testApexError(t, `"myjar" is not configured to be compiled into dex`, `
 		apex {
 			name: "myapex",
@@ -5345,7 +5256,6 @@ func TestRejectNonInstallableJavaLibrary(t *testing.T) {
 }
 
 func TestCarryRequiredModuleNames(t *testing.T) {
-	t.Parallel()
 	ctx, config := testApex(t, `
 		apex {
 			name: "myapex",
@@ -5384,7 +5294,6 @@ func TestCarryRequiredModuleNames(t *testing.T) {
 }
 
 func TestSymlinksFromApexToSystem(t *testing.T) {
-	t.Parallel()
 	bp := `
 		apex {
 			name: "myapex",
@@ -5514,7 +5423,6 @@ func TestSymlinksFromApexToSystem(t *testing.T) {
 }
 
 func TestSymlinksFromApexToSystemRequiredModuleNames(t *testing.T) {
-	t.Parallel()
 	ctx, config := testApex(t, `
 		apex {
 			name: "myapex",
@@ -5566,7 +5474,6 @@ func TestSymlinksFromApexToSystemRequiredModuleNames(t *testing.T) {
 }
 
 func TestApexWithJniLibs(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -5608,7 +5515,6 @@ func TestApexWithJniLibs(t *testing.T) {
 }
 
 func TestApexMutatorsDontRunIfDisabled(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -5630,7 +5536,6 @@ func TestApexMutatorsDontRunIfDisabled(t *testing.T) {
 }
 
 func TestAppBundle(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -5661,7 +5566,6 @@ func TestAppBundle(t *testing.T) {
 }
 
 func TestAppSetBundle(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -5836,7 +5740,6 @@ func testNoUpdatableJarsInBootImage(t *testing.T, errmsg string, transformDexpre
 }
 
 func TestUpdatable_should_set_min_sdk_version(t *testing.T) {
-	t.Parallel()
 	testApexError(t, `"myapex" .*: updatable: updatable APEXes should set min_sdk_version`, `
 		apex {
 			name: "myapex",
@@ -5853,7 +5756,6 @@ func TestUpdatable_should_set_min_sdk_version(t *testing.T) {
 }
 
 func TestNoUpdatableJarsInBootImage(t *testing.T) {
-	t.Parallel()
 	var err string
 	var transform func(*dexpreopt.GlobalConfig)
 
@@ -5990,7 +5892,6 @@ func testApexPermittedPackagesRules(t *testing.T, errmsg, bp string, apexBootJar
 }
 
 func TestApexPermittedPackagesRules(t *testing.T) {
-	t.Parallel()
 	testcases := []struct {
 		name            string
 		expectedError   string
@@ -6074,7 +5975,6 @@ func TestApexPermittedPackagesRules(t *testing.T) {
 }
 
 func TestTestFor(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -6132,7 +6032,6 @@ func intPtr(i int) *int {
 }
 
 func TestApexSet(t *testing.T) {
-	t.Parallel()
 	ctx, config := testApex(t, `
 		apex_set {
 			name: "myapex",
@@ -6172,7 +6071,6 @@ func TestApexSet(t *testing.T) {
 }
 
 func TestNoStaticLinkingToStubsLib(t *testing.T) {
-	t.Parallel()
 	testApexError(t, `.*required by "mylib" is a native library providing stub.*`, `
 		apex {
 			name: "myapex",
@@ -6209,7 +6107,6 @@ func TestNoStaticLinkingToStubsLib(t *testing.T) {
 }
 
 func TestApexKeysTxt(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -6250,7 +6147,6 @@ func TestApexKeysTxt(t *testing.T) {
 }
 
 func TestAllowedFiles(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -6306,7 +6202,6 @@ func TestAllowedFiles(t *testing.T) {
 }
 
 func TestNonPreferredPrebuiltDependency(t *testing.T) {
-	t.Parallel()
 	_, _ = testApex(t, `
 		apex {
 			name: "myapex",

+ 0 - 2
apex/vndk_test.go

@@ -9,7 +9,6 @@ import (
 )
 
 func TestVndkApexForVndkLite(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex_vndk {
 			name: "myapex",
@@ -63,7 +62,6 @@ func TestVndkApexForVndkLite(t *testing.T) {
 }
 
 func TestVndkApexUsesVendorVariant(t *testing.T) {
-	t.Parallel()
 	bp := `
 		apex_vndk {
 			name: "myapex",

+ 0 - 1
bpf/bpf_test.go

@@ -66,7 +66,6 @@ func testContext(config android.Config) *android.TestContext {
 }
 
 func TestBpfDataDependency(t *testing.T) {
-	t.Parallel()
 	bp := `
 		bpf {
 			name: "bpf.o",

+ 0 - 14
bpfix/bpfix/bpfix_test.go

@@ -116,7 +116,6 @@ func implFilterListTest(t *testing.T, local_include_dirs []string, export_includ
 }
 
 func TestSimplifyKnownVariablesDuplicatingEachOther(t *testing.T) {
-	t.Parallel()
 	// TODO use []Expression{} once buildTree above can support it (which is after b/38325146 is done)
 	implFilterListTest(t, []string{"include"}, []string{"include"}, nil)
 	implFilterListTest(t, []string{"include1"}, []string{"include2"}, []string{"include1"})
@@ -170,7 +169,6 @@ func runPass(t *testing.T, in, out string, innerTest func(*Fixer) error) {
 }
 
 func TestMergeMatchingProperties(t *testing.T) {
-	t.Parallel()
 	tests := []struct {
 		name string
 		in   string
@@ -260,7 +258,6 @@ func TestMergeMatchingProperties(t *testing.T) {
 }
 
 func TestReorderCommonProperties(t *testing.T) {
-	t.Parallel()
 	var tests = []struct {
 		name string
 		in   string
@@ -347,7 +344,6 @@ func TestReorderCommonProperties(t *testing.T) {
 }
 
 func TestRemoveMatchingModuleListProperties(t *testing.T) {
-	t.Parallel()
 	var tests = []struct {
 		name string
 		in   string
@@ -503,7 +499,6 @@ func TestRemoveMatchingModuleListProperties(t *testing.T) {
 }
 
 func TestReplaceJavaStaticLibs(t *testing.T) {
-	t.Parallel()
 	tests := []struct {
 		name string
 		in   string
@@ -562,7 +557,6 @@ func TestReplaceJavaStaticLibs(t *testing.T) {
 }
 
 func TestRewritePrebuilts(t *testing.T) {
-	t.Parallel()
 	tests := []struct {
 		name string
 		in   string
@@ -629,7 +623,6 @@ func TestRewritePrebuilts(t *testing.T) {
 }
 
 func TestRewriteCtsModuleTypes(t *testing.T) {
-	t.Parallel()
 	tests := []struct {
 		name string
 		in   string
@@ -701,7 +694,6 @@ func TestRewriteCtsModuleTypes(t *testing.T) {
 }
 
 func TestRewritePrebuiltEtc(t *testing.T) {
-	t.Parallel()
 	tests := []struct {
 		name string
 		in   string
@@ -777,7 +769,6 @@ func TestRewritePrebuiltEtc(t *testing.T) {
 }
 
 func TestRewriteAndroidTest(t *testing.T) {
-	t.Parallel()
 	tests := []struct {
 		name string
 		in   string
@@ -811,7 +802,6 @@ func TestRewriteAndroidTest(t *testing.T) {
 }
 
 func TestRewriteAndroidAppImport(t *testing.T) {
-	t.Parallel()
 	tests := []struct {
 		name string
 		in   string
@@ -861,7 +851,6 @@ func TestRewriteAndroidAppImport(t *testing.T) {
 }
 
 func TestRemoveEmptyLibDependencies(t *testing.T) {
-	t.Parallel()
 	tests := []struct {
 		name string
 		in   string
@@ -916,7 +905,6 @@ func TestRemoveEmptyLibDependencies(t *testing.T) {
 }
 
 func TestRemoveHidlInterfaceTypes(t *testing.T) {
-	t.Parallel()
 	tests := []struct {
 		name string
 		in   string
@@ -948,7 +936,6 @@ func TestRemoveHidlInterfaceTypes(t *testing.T) {
 }
 
 func TestRemoveSoongConfigBoolVariable(t *testing.T) {
-	t.Parallel()
 	tests := []struct {
 		name string
 		in   string
@@ -1013,7 +1000,6 @@ func TestRemoveSoongConfigBoolVariable(t *testing.T) {
 }
 
 func TestRemovePdkProperty(t *testing.T) {
-	t.Parallel()
 	tests := []struct {
 		name string
 		in   string

+ 0 - 56
cc/cc_test.go

@@ -128,7 +128,6 @@ const (
 )
 
 func TestFuchsiaDeps(t *testing.T) {
-	t.Parallel()
 	t.Helper()
 
 	bp := `
@@ -166,7 +165,6 @@ func TestFuchsiaDeps(t *testing.T) {
 }
 
 func TestFuchsiaTargetDecl(t *testing.T) {
-	t.Parallel()
 	t.Helper()
 
 	bp := `
@@ -193,7 +191,6 @@ func TestFuchsiaTargetDecl(t *testing.T) {
 }
 
 func TestVendorSrc(t *testing.T) {
-	t.Parallel()
 	ctx := testCc(t, `
 		cc_library {
 			name: "libTest",
@@ -324,7 +321,6 @@ func checkVndkLibrariesOutput(t *testing.T, ctx *android.TestContext, module str
 }
 
 func TestVndk(t *testing.T) {
-	t.Parallel()
 	bp := `
 		cc_library {
 			name: "libvndk",
@@ -451,7 +447,6 @@ func TestVndk(t *testing.T) {
 }
 
 func TestVndkWithHostSupported(t *testing.T) {
-	t.Parallel()
 	ctx := testCc(t, `
 		cc_library {
 			name: "libvndk_host_supported",
@@ -486,7 +481,6 @@ func TestVndkWithHostSupported(t *testing.T) {
 }
 
 func TestVndkLibrariesTxtAndroidMk(t *testing.T) {
-	t.Parallel()
 	bp := `
 		vndk_libraries_txt {
 			name: "llndk.libraries.txt",
@@ -502,7 +496,6 @@ func TestVndkLibrariesTxtAndroidMk(t *testing.T) {
 }
 
 func TestVndkUsingCoreVariant(t *testing.T) {
-	t.Parallel()
 	bp := `
 		cc_library {
 			name: "libvndk",
@@ -550,7 +543,6 @@ func TestVndkUsingCoreVariant(t *testing.T) {
 }
 
 func TestDataLibs(t *testing.T) {
-	t.Parallel()
 	bp := `
 		cc_test_library {
 			name: "test_lib",
@@ -601,7 +593,6 @@ func TestDataLibs(t *testing.T) {
 }
 
 func TestDataLibsRelativeInstallPath(t *testing.T) {
-	t.Parallel()
 	bp := `
 		cc_test_library {
 			name: "test_lib",
@@ -649,7 +640,6 @@ func TestDataLibsRelativeInstallPath(t *testing.T) {
 }
 
 func TestVndkWhenVndkVersionIsNotSet(t *testing.T) {
-	t.Parallel()
 	ctx := testCcNoVndk(t, `
 		cc_library {
 			name: "libvndk",
@@ -673,7 +663,6 @@ func TestVndkWhenVndkVersionIsNotSet(t *testing.T) {
 }
 
 func TestVndkDepError(t *testing.T) {
-	t.Parallel()
 	// Check whether an error is emitted when a VNDK lib depends on a system lib.
 	testCcError(t, "dependency \".*\" of \".*\" missing variant", `
 		cc_library {
@@ -853,7 +842,6 @@ func TestVndkDepError(t *testing.T) {
 }
 
 func TestDoubleLoadbleDep(t *testing.T) {
-	t.Parallel()
 	// okay to link : LLNDK -> double_loadable VNDK
 	testCc(t, `
 		cc_library {
@@ -959,7 +947,6 @@ func TestDoubleLoadbleDep(t *testing.T) {
 }
 
 func TestVendorSnapshotCapture(t *testing.T) {
-	t.Parallel()
 	bp := `
 	cc_library {
 		name: "libvndk",
@@ -1093,7 +1080,6 @@ func TestVendorSnapshotCapture(t *testing.T) {
 }
 
 func TestVendorSnapshotUse(t *testing.T) {
-	t.Parallel()
 	frameworkBp := `
 	cc_library {
 		name: "libvndk",
@@ -1303,7 +1289,6 @@ func TestVendorSnapshotUse(t *testing.T) {
 }
 
 func TestVendorSnapshotSanitizer(t *testing.T) {
-	t.Parallel()
 	bp := `
 	vendor_snapshot_static {
 		name: "libsnapshot",
@@ -1344,7 +1329,6 @@ func assertExcludeFromVendorSnapshotIs(t *testing.T, c *Module, expected bool) {
 }
 
 func TestVendorSnapshotExclude(t *testing.T) {
-	t.Parallel()
 
 	// This test verifies that the exclude_from_vendor_snapshot property
 	// makes its way from the Android.bp source file into the module data
@@ -1452,7 +1436,6 @@ func TestVendorSnapshotExclude(t *testing.T) {
 }
 
 func TestVendorSnapshotExcludeInVendorProprietaryPathErrors(t *testing.T) {
-	t.Parallel()
 
 	// This test verifies that using the exclude_from_vendor_snapshot
 	// property on a module in a vendor proprietary path generates an
@@ -1493,7 +1476,6 @@ func TestVendorSnapshotExcludeInVendorProprietaryPathErrors(t *testing.T) {
 }
 
 func TestVendorSnapshotExcludeWithVendorAvailable(t *testing.T) {
-	t.Parallel()
 
 	// This test verifies that using the exclude_from_vendor_snapshot
 	// property on a module that is vendor available generates an error. A
@@ -1537,7 +1519,6 @@ func TestVendorSnapshotExcludeWithVendorAvailable(t *testing.T) {
 }
 
 func TestDoubleLoadableDepError(t *testing.T) {
-	t.Parallel()
 	// Check whether an error is emitted when a LLNDK depends on a non-double_loadable VNDK lib.
 	testCcError(t, "module \".*\" variant \".*\": link.* \".*\" which is not LL-NDK, VNDK-SP, .*double_loadable", `
 		cc_library {
@@ -1658,7 +1639,6 @@ func TestDoubleLoadableDepError(t *testing.T) {
 }
 
 func TestVndkExt(t *testing.T) {
-	t.Parallel()
 	// This test checks the VNDK-Ext properties.
 	bp := `
 		cc_library {
@@ -1741,7 +1721,6 @@ func TestVndkExt(t *testing.T) {
 }
 
 func TestVndkExtWithoutBoardVndkVersion(t *testing.T) {
-	t.Parallel()
 	// This test checks the VNDK-Ext properties when BOARD_VNDK_VERSION is not set.
 	ctx := testCcNoVndk(t, `
 		cc_library {
@@ -1772,7 +1751,6 @@ func TestVndkExtWithoutBoardVndkVersion(t *testing.T) {
 }
 
 func TestVndkExtWithoutProductVndkVersion(t *testing.T) {
-	t.Parallel()
 	// This test checks the VNDK-Ext properties when PRODUCT_PRODUCT_VNDK_VERSION is not set.
 	ctx := testCc(t, `
 		cc_library {
@@ -1803,7 +1781,6 @@ func TestVndkExtWithoutProductVndkVersion(t *testing.T) {
 }
 
 func TestVndkExtError(t *testing.T) {
-	t.Parallel()
 	// This test ensures an error is emitted in ill-formed vndk-ext definition.
 	testCcError(t, "must set `vendor: true` or `product_specific: true` to set `extends: \".*\"`", `
 		cc_library {
@@ -1889,7 +1866,6 @@ func TestVndkExtError(t *testing.T) {
 }
 
 func TestVndkExtInconsistentSupportSystemProcessError(t *testing.T) {
-	t.Parallel()
 	// This test ensures an error is emitted for inconsistent support_system_process.
 	testCcError(t, "module \".*\" with mismatched support_system_process", `
 		cc_library {
@@ -1937,7 +1913,6 @@ func TestVndkExtInconsistentSupportSystemProcessError(t *testing.T) {
 }
 
 func TestVndkExtVendorAvailableFalseError(t *testing.T) {
-	t.Parallel()
 	// This test ensures an error is emitted when a VNDK-Ext library extends a VNDK library
 	// with `vendor_available: false`.
 	testCcError(t, "`extends` refers module \".*\" which does not have `vendor_available: true`", `
@@ -1984,7 +1959,6 @@ func TestVndkExtVendorAvailableFalseError(t *testing.T) {
 }
 
 func TestVendorModuleUseVndkExt(t *testing.T) {
-	t.Parallel()
 	// This test ensures a vendor module can depend on a VNDK-Ext library.
 	testCc(t, `
 		cc_library {
@@ -2037,7 +2011,6 @@ func TestVendorModuleUseVndkExt(t *testing.T) {
 }
 
 func TestVndkExtUseVendorLib(t *testing.T) {
-	t.Parallel()
 	// This test ensures a VNDK-Ext library can depend on a vendor library.
 	testCc(t, `
 		cc_library {
@@ -2100,7 +2073,6 @@ func TestVndkExtUseVendorLib(t *testing.T) {
 }
 
 func TestProductVndkExtDependency(t *testing.T) {
-	t.Parallel()
 	bp := `
 		cc_library {
 			name: "libvndk",
@@ -2166,7 +2138,6 @@ func TestProductVndkExtDependency(t *testing.T) {
 }
 
 func TestVndkSpExtUseVndkError(t *testing.T) {
-	t.Parallel()
 	// This test ensures an error is emitted if a VNDK-SP-Ext library depends on a VNDK
 	// library.
 	testCcError(t, "module \".*\" variant \".*\": \\(.*\\) should not link to \".*\"", `
@@ -2249,7 +2220,6 @@ func TestVndkSpExtUseVndkError(t *testing.T) {
 }
 
 func TestVndkUseVndkExtError(t *testing.T) {
-	t.Parallel()
 	// This test ensures an error is emitted if a VNDK/VNDK-SP library depends on a
 	// VNDK-Ext/VNDK-SP-Ext library.
 	testCcError(t, "dependency \".*\" of \".*\" missing variant", `
@@ -2389,7 +2359,6 @@ func TestVndkUseVndkExtError(t *testing.T) {
 }
 
 func TestEnforceProductVndkVersion(t *testing.T) {
-	t.Parallel()
 	bp := `
 		cc_library {
 			name: "libllndk",
@@ -2464,7 +2433,6 @@ func TestEnforceProductVndkVersion(t *testing.T) {
 }
 
 func TestEnforceProductVndkVersionErrors(t *testing.T) {
-	t.Parallel()
 	testCcErrorProductVndk(t, "dependency \".*\" of \".*\" missing variant:\n.*image:product.VER", `
 		cc_library {
 			name: "libprod",
@@ -2545,7 +2513,6 @@ func TestEnforceProductVndkVersionErrors(t *testing.T) {
 }
 
 func TestMakeLinkType(t *testing.T) {
-	t.Parallel()
 	bp := `
 		cc_library {
 			name: "libvndk",
@@ -2739,7 +2706,6 @@ var splitListForSizeTestCases = []struct {
 }
 
 func TestSplitListForSize(t *testing.T) {
-	t.Parallel()
 	for _, testCase := range splitListForSizeTestCases {
 		out, _ := splitListForSize(android.PathsForTesting(testCase.in...), testCase.size)
 
@@ -2925,7 +2891,6 @@ func parseModuleDeps(text string) (modulesInOrder []android.Path, allDeps map[an
 }
 
 func TestLinkReordering(t *testing.T) {
-	t.Parallel()
 	for _, testCase := range staticLinkDepOrderTestCases {
 		errs := []string{}
 
@@ -2988,7 +2953,6 @@ func getOutputPaths(ctx *android.TestContext, variant string, moduleNames []stri
 }
 
 func TestStaticLibDepReordering(t *testing.T) {
-	t.Parallel()
 	ctx := testCc(t, `
 	cc_library {
 		name: "a",
@@ -3027,7 +2991,6 @@ func TestStaticLibDepReordering(t *testing.T) {
 }
 
 func TestStaticLibDepReorderingWithShared(t *testing.T) {
-	t.Parallel()
 	ctx := testCc(t, `
 	cc_library {
 		name: "a",
@@ -3074,7 +3037,6 @@ func checkEquals(t *testing.T, message string, expected, actual interface{}) {
 }
 
 func TestLlndkLibrary(t *testing.T) {
-	t.Parallel()
 	ctx := testCc(t, `
 	cc_library {
 		name: "libllndk",
@@ -3103,7 +3065,6 @@ func TestLlndkLibrary(t *testing.T) {
 }
 
 func TestLlndkHeaders(t *testing.T) {
-	t.Parallel()
 	ctx := testCc(t, `
 	llndk_headers {
 		name: "libllndk_headers",
@@ -3197,7 +3158,6 @@ const runtimeLibAndroidBp = `
 `
 
 func TestRuntimeLibs(t *testing.T) {
-	t.Parallel()
 	ctx := testCc(t, runtimeLibAndroidBp)
 
 	// runtime_libs for core variants use the module names without suffixes.
@@ -3221,7 +3181,6 @@ func TestRuntimeLibs(t *testing.T) {
 }
 
 func TestExcludeRuntimeLibs(t *testing.T) {
-	t.Parallel()
 	ctx := testCc(t, runtimeLibAndroidBp)
 
 	variant := "android_arm64_armv8-a_shared"
@@ -3234,7 +3193,6 @@ func TestExcludeRuntimeLibs(t *testing.T) {
 }
 
 func TestRuntimeLibsNoVndk(t *testing.T) {
-	t.Parallel()
 	ctx := testCcNoVndk(t, runtimeLibAndroidBp)
 
 	// If DeviceVndkVersion is not defined, then runtime_libs are copied as-is.
@@ -3272,7 +3230,6 @@ const staticLibAndroidBp = `
 `
 
 func TestStaticLibDepExport(t *testing.T) {
-	t.Parallel()
 	ctx := testCc(t, staticLibAndroidBp)
 
 	// Check the shared version of lib2.
@@ -3360,7 +3317,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}
 		CheckBadCompilerFlags(ctx, "", []string{testCase.in})
@@ -3374,7 +3330,6 @@ func TestCompilerFlags(t *testing.T) {
 }
 
 func TestVendorPublicLibraries(t *testing.T) {
-	t.Parallel()
 	ctx := testCc(t, `
 	cc_library_headers {
 		name: "libvendorpublic_headers",
@@ -3441,7 +3396,6 @@ func TestVendorPublicLibraries(t *testing.T) {
 }
 
 func TestRecovery(t *testing.T) {
-	t.Parallel()
 	ctx := testCc(t, `
 		cc_library_shared {
 			name: "librecovery",
@@ -3477,7 +3431,6 @@ func TestRecovery(t *testing.T) {
 }
 
 func TestDataLibsPrebuiltSharedTestLibrary(t *testing.T) {
-	t.Parallel()
 	bp := `
 		cc_prebuilt_test_library_shared {
 			name: "test_lib",
@@ -3524,7 +3477,6 @@ func TestDataLibsPrebuiltSharedTestLibrary(t *testing.T) {
 }
 
 func TestVersionedStubs(t *testing.T) {
-	t.Parallel()
 	ctx := testCc(t, `
 		cc_library_shared {
 			name: "libFoo",
@@ -3589,7 +3541,6 @@ func TestVersionedStubs(t *testing.T) {
 }
 
 func TestVersioningMacro(t *testing.T) {
-	t.Parallel()
 	for _, tc := range []struct{ moduleName, expected string }{
 		{"libc", "__LIBC_API__"},
 		{"libfoo", "__LIBFOO_API__"},
@@ -3602,7 +3553,6 @@ func TestVersioningMacro(t *testing.T) {
 }
 
 func TestStaticExecutable(t *testing.T) {
-	t.Parallel()
 	ctx := testCc(t, `
 		cc_binary {
 			name: "static_test",
@@ -3628,7 +3578,6 @@ func TestStaticExecutable(t *testing.T) {
 }
 
 func TestStaticDepsOrderWithStubs(t *testing.T) {
-	t.Parallel()
 	ctx := testCc(t, `
 		cc_binary {
 			name: "mybin",
@@ -3669,7 +3618,6 @@ func TestStaticDepsOrderWithStubs(t *testing.T) {
 }
 
 func TestErrorsIfAModuleDependsOnDisabled(t *testing.T) {
-	t.Parallel()
 	testCcError(t, `module "libA" .* depends on disabled module "libB"`, `
 		cc_library {
 			name: "libA",
@@ -3690,7 +3638,6 @@ func TestErrorsIfAModuleDependsOnDisabled(t *testing.T) {
 // Simple smoke test for the cc_fuzz target that ensures the rule compiles
 // correctly.
 func TestFuzzTarget(t *testing.T) {
-	t.Parallel()
 	ctx := testCc(t, `
 		cc_fuzz {
 			name: "fuzz_smoke_test",
@@ -3702,7 +3649,6 @@ func TestFuzzTarget(t *testing.T) {
 }
 
 func TestAidl(t *testing.T) {
-	t.Parallel()
 }
 
 func assertString(t *testing.T, got, expected string) {
@@ -3733,7 +3679,6 @@ func assertMapKeys(t *testing.T, m map[string]string, expected []string) {
 }
 
 func TestDefaults(t *testing.T) {
-	t.Parallel()
 	ctx := testCc(t, `
 		cc_defaults {
 			name: "defaults",
@@ -3798,7 +3743,6 @@ func TestDefaults(t *testing.T) {
 }
 
 func TestProductVariableDefaults(t *testing.T) {
-	t.Parallel()
 	bp := `
 		cc_defaults {
 			name: "libfoo_defaults",

+ 0 - 1
cc/compiler_test.go

@@ -19,7 +19,6 @@ import (
 )
 
 func TestIsThirdParty(t *testing.T) {
-	t.Parallel()
 	shouldFail := []string{
 		"external/foo/",
 		"vendor/bar/",

+ 0 - 1
cc/config/tidy_test.go

@@ -19,7 +19,6 @@ import (
 )
 
 func TestTidyChecksForDir(t *testing.T) {
-	t.Parallel()
 	testCases := []struct {
 		input    string
 		expected string

+ 0 - 1
cc/gen_test.go

@@ -21,7 +21,6 @@ import (
 )
 
 func TestGen(t *testing.T) {
-	t.Parallel()
 	t.Run("simple", func(t *testing.T) {
 		ctx := testCc(t, `
 		cc_library_shared {

+ 0 - 2
cc/genrule_test.go

@@ -30,7 +30,6 @@ func testGenruleContext(config android.Config) *android.TestContext {
 }
 
 func TestArchGenruleCmd(t *testing.T) {
-	t.Parallel()
 	fs := map[string][]byte{
 		"tool": nil,
 		"foo":  nil,
@@ -79,7 +78,6 @@ func TestArchGenruleCmd(t *testing.T) {
 }
 
 func TestLibraryGenruleCmd(t *testing.T) {
-	t.Parallel()
 	bp := `
 		cc_library {
 			name: "libboth",

+ 0 - 2
cc/library_headers_test.go

@@ -20,7 +20,6 @@ import (
 )
 
 func TestLibraryHeaders(t *testing.T) {
-	t.Parallel()
 	ctx := testCc(t, `
 	cc_library_headers {
 		name: "headers",
@@ -42,7 +41,6 @@ func TestLibraryHeaders(t *testing.T) {
 }
 
 func TestPrebuiltLibraryHeaders(t *testing.T) {
-	t.Parallel()
 	ctx := testCc(t, `
 	cc_prebuilt_library_headers {
 		name: "headers",

+ 0 - 4
cc/library_test.go

@@ -22,7 +22,6 @@ import (
 )
 
 func TestLibraryReuse(t *testing.T) {
-	t.Parallel()
 	t.Run("simple", func(t *testing.T) {
 		ctx := testCc(t, `
 		cc_library {
@@ -191,7 +190,6 @@ func TestLibraryReuse(t *testing.T) {
 }
 
 func TestStubsVersions(t *testing.T) {
-	t.Parallel()
 	bp := `
 		cc_library {
 			name: "libfoo",
@@ -215,7 +213,6 @@ func TestStubsVersions(t *testing.T) {
 }
 
 func TestStubsVersions_NotSorted(t *testing.T) {
-	t.Parallel()
 	bp := `
 		cc_library {
 			name: "libfoo",
@@ -231,7 +228,6 @@ func TestStubsVersions_NotSorted(t *testing.T) {
 }
 
 func TestStubsVersions_ParseError(t *testing.T) {
-	t.Parallel()
 	bp := `
 		cc_library {
 			name: "libfoo",

+ 0 - 1
cc/object_test.go

@@ -19,7 +19,6 @@ import (
 )
 
 func TestLinkerScript(t *testing.T) {
-	t.Parallel()
 	t.Run("script", func(t *testing.T) {
 		testCc(t, `
 		cc_object {

+ 0 - 7
cc/prebuilt_test.go

@@ -43,7 +43,6 @@ func testPrebuilt(t *testing.T, bp string, fs map[string][]byte) *android.TestCo
 }
 
 func TestPrebuilt(t *testing.T) {
-	t.Parallel()
 	bp := `
 		cc_library {
 			name: "liba",
@@ -173,7 +172,6 @@ func TestPrebuilt(t *testing.T) {
 }
 
 func TestPrebuiltLibraryShared(t *testing.T) {
-	t.Parallel()
 	ctx := testPrebuilt(t, `
 	cc_prebuilt_library_shared {
 		name: "libtest",
@@ -191,7 +189,6 @@ func TestPrebuiltLibraryShared(t *testing.T) {
 }
 
 func TestPrebuiltLibraryStatic(t *testing.T) {
-	t.Parallel()
 	ctx := testPrebuilt(t, `
 	cc_prebuilt_library_static {
 		name: "libtest",
@@ -206,7 +203,6 @@ func TestPrebuiltLibraryStatic(t *testing.T) {
 }
 
 func TestPrebuiltLibrary(t *testing.T) {
-	t.Parallel()
 	ctx := testPrebuilt(t, `
 	cc_prebuilt_library {
 		name: "libtest",
@@ -233,7 +229,6 @@ func TestPrebuiltLibrary(t *testing.T) {
 }
 
 func TestPrebuiltLibraryStem(t *testing.T) {
-	t.Parallel()
 	ctx := testPrebuilt(t, `
 	cc_prebuilt_library {
 		name: "libfoo",
@@ -261,7 +256,6 @@ func TestPrebuiltLibraryStem(t *testing.T) {
 }
 
 func TestPrebuiltLibrarySharedStem(t *testing.T) {
-	t.Parallel()
 	ctx := testPrebuilt(t, `
 	cc_prebuilt_library_shared {
 		name: "libfoo",
@@ -280,7 +274,6 @@ func TestPrebuiltLibrarySharedStem(t *testing.T) {
 }
 
 func TestPrebuiltSymlinkedHostBinary(t *testing.T) {
-	t.Parallel()
 	if android.BuildOs != android.Linux {
 		t.Skipf("Skipping host prebuilt testing that is only supported on %s not %s", android.Linux, android.BuildOs)
 	}

+ 0 - 1
cc/proto_test.go

@@ -22,7 +22,6 @@ import (
 )
 
 func TestProto(t *testing.T) {
-	t.Parallel()
 	t.Run("simple", func(t *testing.T) {
 		ctx := testCc(t, `
 		cc_library_shared {

+ 0 - 1
cc/sdk_test.go

@@ -21,7 +21,6 @@ import (
 )
 
 func TestSdkMutator(t *testing.T) {
-	t.Parallel()
 	bp := `
 		cc_library {
 			name: "libsdk",

+ 0 - 1
cc/test_data_test.go

@@ -109,7 +109,6 @@ var testDataTests = []struct {
 }
 
 func TestDataTests(t *testing.T) {
-	t.Parallel()
 	buildDir, err := ioutil.TempDir("", "soong_test_test")
 	if err != nil {
 		t.Fatal(err)

+ 0 - 1
cmd/diff_target_files/allow_list_test.go

@@ -58,7 +58,6 @@ c
 var f2 = bytesToZipArtifactFile("dir/f2", nil)
 
 func Test_applyAllowLists(t *testing.T) {
-	t.Parallel()
 	type args struct {
 		diff       zipDiff
 		allowLists []allowList

+ 0 - 1
cmd/diff_target_files/compare_test.go

@@ -21,7 +21,6 @@ import (
 )
 
 func TestDiffTargetFilesLists(t *testing.T) {
-	t.Parallel()
 	zipArtifactFile := func(name string, crc32 uint32, size uint64) *ZipArtifactFile {
 		return &ZipArtifactFile{
 			File: &zip.File{

+ 0 - 1
cmd/diff_target_files/glob_test.go

@@ -19,7 +19,6 @@ import (
 )
 
 func TestMatch(t *testing.T) {
-	t.Parallel()
 	testCases := []struct {
 		pattern, name string
 		match         bool

+ 0 - 3
cmd/extract_apks/main_test.go

@@ -37,7 +37,6 @@ type testDesc struct {
 }
 
 func TestSelectApks_ApkSet(t *testing.T) {
-	t.Parallel()
 	testCases := []testDesc{
 		{
 			protoText: `
@@ -267,7 +266,6 @@ variant {
 }
 
 func TestSelectApks_ApexSet(t *testing.T) {
-	t.Parallel()
 	testCases := []testDesc{
 		{
 			protoText: `
@@ -444,7 +442,6 @@ type testCaseWriteApks struct {
 }
 
 func TestWriteApks(t *testing.T) {
-	t.Parallel()
 	testCases := []testCaseWriteApks{
 		{
 			name:       "splits",

+ 0 - 1
cmd/extract_linker/main_test.go

@@ -51,7 +51,6 @@ var bytesToAsmTestCases = []struct {
 }
 
 func TestBytesToAsm(t *testing.T) {
-	t.Parallel()
 	for _, testcase := range bytesToAsmTestCases {
 		t.Run(testcase.name, func(t *testing.T) {
 			buf := bytes.Buffer{}

+ 0 - 1
cmd/host_bionic_inject/host_bionic_inject_test.go

@@ -100,7 +100,6 @@ func linkerOffset() []elf.Symbol {
 }
 
 func TestCheckLinker(t *testing.T) {
-	t.Parallel()
 	cases := []struct {
 		name   string
 		err    error

+ 0 - 2
cmd/javac_wrapper/javac_wrapper_test.go

@@ -93,7 +93,6 @@ warning: [options] bootstrap class path not set in conjunction with -source 1.9\
 }
 
 func TestJavacColorize(t *testing.T) {
-	t.Parallel()
 	for i, test := range testCases {
 		t.Run(strconv.Itoa(i), func(t *testing.T) {
 			buf := new(bytes.Buffer)
@@ -111,7 +110,6 @@ func TestJavacColorize(t *testing.T) {
 }
 
 func TestSubprocess(t *testing.T) {
-	t.Parallel()
 	t.Run("failure", func(t *testing.T) {
 		exitCode, err := Main(ioutil.Discard, "test", []string{"sh", "-c", "exit 9"})
 		if err != nil {

+ 0 - 2
cmd/merge_zips/merge_zips_test.go

@@ -85,7 +85,6 @@ func (tiz *testInputZip) IsOpen() bool {
 }
 
 func TestMergeZips(t *testing.T) {
-	t.Parallel()
 	testCases := []struct {
 		name             string
 		in               [][]testZipEntry
@@ -362,7 +361,6 @@ func (diz *DummyInpuZip) IsOpen() bool {
 }
 
 func TestInputZipsManager(t *testing.T) {
-	t.Parallel()
 	const nInputZips = 20
 	const nMaxOpenZips = 10
 	izm := NewInputZipsManager(20, 10)

+ 0 - 1
cmd/multiproduct_kati/main_test.go

@@ -21,7 +21,6 @@ import (
 )
 
 func TestSplitList(t *testing.T) {
-	t.Parallel()
 	testcases := []struct {
 		inputCount int
 		shardCount int

+ 0 - 2
cmd/path_interposer/main_test.go

@@ -61,7 +61,6 @@ func setup(t *testing.T) string {
 }
 
 func TestInterposer(t *testing.T) {
-	t.Parallel()
 	interposer := setup(t)
 
 	logConfig := func(name string) paths.PathConfig {
@@ -181,7 +180,6 @@ func TestInterposer(t *testing.T) {
 }
 
 func TestMissingPath(t *testing.T) {
-	t.Parallel()
 	interposer := setup(t)
 	err := os.Remove(interposer + "_origpath")
 	if err != nil {

+ 0 - 1
cmd/soong_build/bazel_overlay_test.go

@@ -64,7 +64,6 @@ func customModuleFactory() android.Module {
 }
 
 func TestGenerateBazelOverlayFromBlueprint(t *testing.T) {
-	t.Parallel()
 	testCases := []struct {
 		bp                  string
 		expectedBazelTarget string

+ 0 - 2
cmd/zip2zip/zip2zip_test.go

@@ -416,7 +416,6 @@ func errorString(e error) string {
 }
 
 func TestZip2Zip(t *testing.T) {
-	t.Parallel()
 	for _, testCase := range testCases {
 		t.Run(testCase.name, func(t *testing.T) {
 			inputBuf := &bytes.Buffer{}
@@ -473,7 +472,6 @@ func TestZip2Zip(t *testing.T) {
 }
 
 func TestConstantPartOfPattern(t *testing.T) {
-	t.Parallel()
 	testCases := []struct{ in, out string }{
 		{
 			in:  "",

+ 0 - 3
dexpreopt/dexpreopt_test.go

@@ -61,7 +61,6 @@ func testModuleConfig(ctx android.PathContext, name, partition string) *ModuleCo
 }
 
 func TestDexPreopt(t *testing.T) {
-	t.Parallel()
 	config := android.TestConfig("out", nil, "", nil)
 	ctx := android.PathContextForTesting(config)
 	globalSoong := GlobalSoongConfigForTests(config)
@@ -84,7 +83,6 @@ func TestDexPreopt(t *testing.T) {
 }
 
 func TestDexPreoptSystemOther(t *testing.T) {
-	t.Parallel()
 	config := android.TestConfig("out", nil, "", nil)
 	ctx := android.PathContextForTesting(config)
 	globalSoong := GlobalSoongConfigForTests(config)
@@ -145,7 +143,6 @@ func TestDexPreoptSystemOther(t *testing.T) {
 }
 
 func TestDexPreoptProfile(t *testing.T) {
-	t.Parallel()
 	config := android.TestConfig("out", nil, "", nil)
 	ctx := android.PathContextForTesting(config)
 	globalSoong := GlobalSoongConfigForTests(config)

+ 0 - 12
etc/prebuilt_etc_test.go

@@ -102,7 +102,6 @@ func testPrebuiltEtcError(t *testing.T, pattern, bp string) {
 	t.Fatalf("missing expected error %q (0 errors are returned)", pattern)
 }
 func TestPrebuiltEtcVariants(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testPrebuiltEtc(t, `
 		prebuilt_etc {
 			name: "foo.conf",
@@ -137,7 +136,6 @@ func TestPrebuiltEtcVariants(t *testing.T) {
 }
 
 func TestPrebuiltEtcOutputPath(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testPrebuiltEtc(t, `
 		prebuilt_etc {
 			name: "foo.conf",
@@ -153,7 +151,6 @@ func TestPrebuiltEtcOutputPath(t *testing.T) {
 }
 
 func TestPrebuiltEtcGlob(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testPrebuiltEtc(t, `
 		prebuilt_etc {
 			name: "my_foo",
@@ -178,7 +175,6 @@ func TestPrebuiltEtcGlob(t *testing.T) {
 }
 
 func TestPrebuiltEtcAndroidMk(t *testing.T) {
-	t.Parallel()
 	ctx, config := testPrebuiltEtc(t, `
 		prebuilt_etc {
 			name: "foo",
@@ -215,7 +211,6 @@ func TestPrebuiltEtcAndroidMk(t *testing.T) {
 }
 
 func TestPrebuiltEtcRelativeInstallPathInstallDirPath(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testPrebuiltEtc(t, `
 		prebuilt_etc {
 			name: "foo.conf",
@@ -232,7 +227,6 @@ func TestPrebuiltEtcRelativeInstallPathInstallDirPath(t *testing.T) {
 }
 
 func TestPrebuiltEtcCannotSetRelativeInstallPathAndSubDir(t *testing.T) {
-	t.Parallel()
 	testPrebuiltEtcError(t, "relative_install_path is set. Cannot set sub_dir", `
 		prebuilt_etc {
 			name: "foo.conf",
@@ -244,7 +238,6 @@ func TestPrebuiltEtcCannotSetRelativeInstallPathAndSubDir(t *testing.T) {
 }
 
 func TestPrebuiltEtcHost(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testPrebuiltEtc(t, `
 		prebuilt_etc_host {
 			name: "foo.conf",
@@ -260,7 +253,6 @@ func TestPrebuiltEtcHost(t *testing.T) {
 }
 
 func TestPrebuiltUserShareInstallDirPath(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testPrebuiltEtc(t, `
 		prebuilt_usr_share {
 			name: "foo.conf",
@@ -277,7 +269,6 @@ func TestPrebuiltUserShareInstallDirPath(t *testing.T) {
 }
 
 func TestPrebuiltUserShareHostInstallDirPath(t *testing.T) {
-	t.Parallel()
 	ctx, config := testPrebuiltEtc(t, `
 		prebuilt_usr_share_host {
 			name: "foo.conf",
@@ -295,7 +286,6 @@ func TestPrebuiltUserShareHostInstallDirPath(t *testing.T) {
 }
 
 func TestPrebuiltFontInstallDirPath(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testPrebuiltEtc(t, `
 		prebuilt_font {
 			name: "foo.conf",
@@ -311,7 +301,6 @@ func TestPrebuiltFontInstallDirPath(t *testing.T) {
 }
 
 func TestPrebuiltFirmwareDirPath(t *testing.T) {
-	t.Parallel()
 	targetPath := buildDir + "/target/product/test_device"
 	tests := []struct {
 		description  string
@@ -348,7 +337,6 @@ func TestPrebuiltFirmwareDirPath(t *testing.T) {
 }
 
 func TestPrebuiltDSPDirPath(t *testing.T) {
-	t.Parallel()
 	targetPath := filepath.Join(buildDir, "/target/product/test_device")
 	tests := []struct {
 		description  string

+ 0 - 41
finder/finder_test.go

@@ -122,7 +122,6 @@ func testAgainstSeveralThreadcounts(t *testing.T, tester func(t *testing.T, numT
 // end of utils, start of individual tests
 
 func TestSingleFile(t *testing.T) {
-	t.Parallel()
 	runSimpleTest(t,
 		[]string{"findme.txt"},
 		[]string{"findme.txt"},
@@ -130,7 +129,6 @@ func TestSingleFile(t *testing.T) {
 }
 
 func TestIncludeFiles(t *testing.T) {
-	t.Parallel()
 	runSimpleTest(t,
 		[]string{"findme.txt", "skipme.txt"},
 		[]string{"findme.txt"},
@@ -138,7 +136,6 @@ func TestIncludeFiles(t *testing.T) {
 }
 
 func TestNestedDirectories(t *testing.T) {
-	t.Parallel()
 	runSimpleTest(t,
 		[]string{"findme.txt", "skipme.txt", "subdir/findme.txt", "subdir/skipme.txt"},
 		[]string{"findme.txt", "subdir/findme.txt"},
@@ -146,7 +143,6 @@ func TestNestedDirectories(t *testing.T) {
 }
 
 func TestEmptyDirectory(t *testing.T) {
-	t.Parallel()
 	runSimpleTest(t,
 		[]string{},
 		[]string{},
@@ -154,7 +150,6 @@ func TestEmptyDirectory(t *testing.T) {
 }
 
 func TestEmptyPath(t *testing.T) {
-	t.Parallel()
 	filesystem := newFs()
 	root := "/tmp"
 	fs.Create(t, filepath.Join(root, "findme.txt"), filesystem)
@@ -175,7 +170,6 @@ func TestEmptyPath(t *testing.T) {
 }
 
 func TestFilesystemRoot(t *testing.T) {
-	t.Parallel()
 
 	testWithNumThreads := func(t *testing.T, numThreads int) {
 		filesystem := newFs()
@@ -203,7 +197,6 @@ func TestFilesystemRoot(t *testing.T) {
 }
 
 func TestNonexistentDir(t *testing.T) {
-	t.Parallel()
 	filesystem := newFs()
 	fs.Create(t, "/tmp/findme.txt", filesystem)
 
@@ -222,7 +215,6 @@ func TestNonexistentDir(t *testing.T) {
 }
 
 func TestExcludeDirs(t *testing.T) {
-	t.Parallel()
 	filesystem := newFs()
 	fs.Create(t, "/tmp/exclude/findme.txt", filesystem)
 	fs.Create(t, "/tmp/exclude/subdir/findme.txt", filesystem)
@@ -251,7 +243,6 @@ func TestExcludeDirs(t *testing.T) {
 }
 
 func TestPruneFiles(t *testing.T) {
-	t.Parallel()
 	filesystem := newFs()
 	fs.Create(t, "/tmp/out/findme.txt", filesystem)
 	fs.Create(t, "/tmp/out/.ignore-out-dir", filesystem)
@@ -284,7 +275,6 @@ func TestPruneFiles(t *testing.T) {
 // TestRootDir tests that the value of RootDirs is used
 // tests of the filesystem root are in TestFilesystemRoot
 func TestRootDir(t *testing.T) {
-	t.Parallel()
 	filesystem := newFs()
 	fs.Create(t, "/tmp/a/findme.txt", filesystem)
 	fs.Create(t, "/tmp/a/subdir/findme.txt", filesystem)
@@ -309,7 +299,6 @@ func TestRootDir(t *testing.T) {
 }
 
 func TestUncachedDir(t *testing.T) {
-	t.Parallel()
 	filesystem := newFs()
 	fs.Create(t, "/tmp/a/findme.txt", filesystem)
 	fs.Create(t, "/tmp/a/subdir/findme.txt", filesystem)
@@ -337,7 +326,6 @@ func TestUncachedDir(t *testing.T) {
 }
 
 func TestSearchingForFilesExcludedFromCache(t *testing.T) {
-	t.Parallel()
 	// setup filesystem
 	filesystem := newFs()
 	fs.Create(t, "/tmp/findme.txt", filesystem)
@@ -365,7 +353,6 @@ func TestSearchingForFilesExcludedFromCache(t *testing.T) {
 }
 
 func TestRelativeFilePaths(t *testing.T) {
-	t.Parallel()
 	filesystem := newFs()
 
 	fs.Create(t, "/tmp/ignore/hi.txt", filesystem)
@@ -410,7 +397,6 @@ func TestRelativeFilePaths(t *testing.T) {
 // have to run this test with the race-detector (`go test -race src/android/soong/finder/*.go`)
 // for there to be much chance of the test actually detecting any error that may be present
 func TestRootDirsContainedInOtherRootDirs(t *testing.T) {
-	t.Parallel()
 	filesystem := newFs()
 
 	fs.Create(t, "/tmp/a/b/c/d/e/f/g/h/i/j/findme.txt", filesystem)
@@ -432,7 +418,6 @@ func TestRootDirsContainedInOtherRootDirs(t *testing.T) {
 }
 
 func TestFindFirst(t *testing.T) {
-	t.Parallel()
 	filesystem := newFs()
 	fs.Create(t, "/tmp/a/hi.txt", filesystem)
 	fs.Create(t, "/tmp/b/hi.txt", filesystem)
@@ -457,7 +442,6 @@ func TestFindFirst(t *testing.T) {
 }
 
 func TestConcurrentFindSameDirectory(t *testing.T) {
-	t.Parallel()
 
 	testWithNumThreads := func(t *testing.T, numThreads int) {
 		filesystem := newFs()
@@ -509,7 +493,6 @@ func TestConcurrentFindSameDirectory(t *testing.T) {
 }
 
 func TestConcurrentFindDifferentDirectories(t *testing.T) {
-	t.Parallel()
 	filesystem := newFs()
 
 	// create a bunch of files and directories
@@ -573,7 +556,6 @@ func TestConcurrentFindDifferentDirectories(t *testing.T) {
 }
 
 func TestStrangelyFormattedPaths(t *testing.T) {
-	t.Parallel()
 	filesystem := newFs()
 
 	fs.Create(t, "/tmp/findme.txt", filesystem)
@@ -599,7 +581,6 @@ func TestStrangelyFormattedPaths(t *testing.T) {
 }
 
 func TestCorruptedCacheHeader(t *testing.T) {
-	t.Parallel()
 	filesystem := newFs()
 
 	fs.Create(t, "/tmp/findme.txt", filesystem)
@@ -624,7 +605,6 @@ func TestCorruptedCacheHeader(t *testing.T) {
 }
 
 func TestCanUseCache(t *testing.T) {
-	t.Parallel()
 	// setup filesystem
 	filesystem := newFs()
 	fs.Create(t, "/tmp/findme.txt", filesystem)
@@ -671,7 +651,6 @@ func TestCanUseCache(t *testing.T) {
 }
 
 func TestCorruptedCacheBody(t *testing.T) {
-	t.Parallel()
 	// setup filesystem
 	filesystem := newFs()
 	fs.Create(t, "/tmp/findme.txt", filesystem)
@@ -736,7 +715,6 @@ func TestCorruptedCacheBody(t *testing.T) {
 }
 
 func TestStatCalls(t *testing.T) {
-	t.Parallel()
 	// setup filesystem
 	filesystem := newFs()
 	fs.Create(t, "/tmp/a/findme.txt", filesystem)
@@ -760,7 +738,6 @@ func TestStatCalls(t *testing.T) {
 }
 
 func TestFileAdded(t *testing.T) {
-	t.Parallel()
 	// setup filesystem
 	filesystem := newFs()
 	fs.Create(t, "/tmp/ignoreme.txt", filesystem)
@@ -803,7 +780,6 @@ func TestFileAdded(t *testing.T) {
 }
 
 func TestDirectoriesAdded(t *testing.T) {
-	t.Parallel()
 	// setup filesystem
 	filesystem := newFs()
 	fs.Create(t, "/tmp/ignoreme.txt", filesystem)
@@ -848,7 +824,6 @@ func TestDirectoriesAdded(t *testing.T) {
 }
 
 func TestDirectoryAndSubdirectoryBothUpdated(t *testing.T) {
-	t.Parallel()
 	// setup filesystem
 	filesystem := newFs()
 	fs.Create(t, "/tmp/hi1.txt", filesystem)
@@ -889,7 +864,6 @@ func TestDirectoryAndSubdirectoryBothUpdated(t *testing.T) {
 }
 
 func TestFileDeleted(t *testing.T) {
-	t.Parallel()
 	// setup filesystem
 	filesystem := newFs()
 	fs.Create(t, "/tmp/ignoreme.txt", filesystem)
@@ -930,7 +904,6 @@ func TestFileDeleted(t *testing.T) {
 }
 
 func TestDirectoriesDeleted(t *testing.T) {
-	t.Parallel()
 	// setup filesystem
 	filesystem := newFs()
 	fs.Create(t, "/tmp/findme.txt", filesystem)
@@ -986,7 +959,6 @@ func TestDirectoriesDeleted(t *testing.T) {
 }
 
 func TestDirectoriesMoved(t *testing.T) {
-	t.Parallel()
 	// setup filesystem
 	filesystem := newFs()
 	fs.Create(t, "/tmp/findme.txt", filesystem)
@@ -1045,7 +1017,6 @@ func TestDirectoriesMoved(t *testing.T) {
 }
 
 func TestDirectoriesSwapped(t *testing.T) {
-	t.Parallel()
 	// setup filesystem
 	filesystem := newFs()
 	fs.Create(t, "/tmp/findme.txt", filesystem)
@@ -1161,7 +1132,6 @@ func runFsReplacementTest(t *testing.T, fs1 *fs.MockFs, fs2 *fs.MockFs) {
 }
 
 func TestChangeOfDevice(t *testing.T) {
-	t.Parallel()
 	fs1 := newFs()
 	// not as fine-grained mounting controls as a real filesystem, but should be adequate
 	fs1.SetDeviceNumber(0)
@@ -1173,7 +1143,6 @@ func TestChangeOfDevice(t *testing.T) {
 }
 
 func TestChangeOfUserOrHost(t *testing.T) {
-	t.Parallel()
 	fs1 := newFs()
 	fs1.SetViewId("me@here")
 
@@ -1184,7 +1153,6 @@ func TestChangeOfUserOrHost(t *testing.T) {
 }
 
 func TestConsistentCacheOrdering(t *testing.T) {
-	t.Parallel()
 	// setup filesystem
 	filesystem := newFs()
 	for i := 0; i < 5; i++ {
@@ -1237,7 +1205,6 @@ func TestConsistentCacheOrdering(t *testing.T) {
 }
 
 func TestNumSyscallsOfSecondFind(t *testing.T) {
-	t.Parallel()
 	// setup filesystem
 	filesystem := newFs()
 	fs.Create(t, "/tmp/findme.txt", filesystem)
@@ -1268,7 +1235,6 @@ func TestNumSyscallsOfSecondFind(t *testing.T) {
 }
 
 func TestChangingParamsOfSecondFind(t *testing.T) {
-	t.Parallel()
 	// setup filesystem
 	filesystem := newFs()
 	fs.Create(t, "/tmp/findme.txt", filesystem)
@@ -1299,7 +1265,6 @@ func TestChangingParamsOfSecondFind(t *testing.T) {
 }
 
 func TestSymlinkPointingToFile(t *testing.T) {
-	t.Parallel()
 	// setup filesystem
 	filesystem := newFs()
 	fs.Create(t, "/tmp/a/hi.txt", filesystem)
@@ -1336,7 +1301,6 @@ func TestSymlinkPointingToFile(t *testing.T) {
 }
 
 func TestSymlinkPointingToDirectory(t *testing.T) {
-	t.Parallel()
 	// setup filesystem
 	filesystem := newFs()
 	fs.Create(t, "/tmp/dir/hi.txt", filesystem)
@@ -1371,7 +1335,6 @@ func TestSymlinkPointingToDirectory(t *testing.T) {
 // TestAddPruneFile confirms that adding a prune-file (into a directory for which we
 // already had a cache) causes the directory to be ignored
 func TestAddPruneFile(t *testing.T) {
-	t.Parallel()
 	// setup filesystem
 	filesystem := newFs()
 	fs.Create(t, "/tmp/out/hi.txt", filesystem)
@@ -1410,7 +1373,6 @@ func TestAddPruneFile(t *testing.T) {
 }
 
 func TestUpdatingDbIffChanged(t *testing.T) {
-	t.Parallel()
 	// setup filesystem
 	filesystem := newFs()
 	fs.Create(t, "/tmp/a/hi.txt", filesystem)
@@ -1470,7 +1432,6 @@ func TestUpdatingDbIffChanged(t *testing.T) {
 }
 
 func TestDirectoryNotPermitted(t *testing.T) {
-	t.Parallel()
 	// setup filesystem
 	filesystem := newFs()
 	fs.Create(t, "/tmp/hi.txt", filesystem)
@@ -1519,7 +1480,6 @@ func TestDirectoryNotPermitted(t *testing.T) {
 }
 
 func TestFileNotPermitted(t *testing.T) {
-	t.Parallel()
 	// setup filesystem
 	filesystem := newFs()
 	fs.Create(t, "/tmp/hi.txt", filesystem)
@@ -1542,7 +1502,6 @@ func TestFileNotPermitted(t *testing.T) {
 }
 
 func TestCacheEntryPathUnexpectedError(t *testing.T) {
-	t.Parallel()
 	// setup filesystem
 	filesystem := newFs()
 	fs.Create(t, "/tmp/a/hi.txt", filesystem)

+ 0 - 1
finder/fs/fs_test.go

@@ -20,7 +20,6 @@ import (
 )
 
 func TestMockFs_LstatStatSymlinks(t *testing.T) {
-	t.Parallel()
 	// setup filesystem
 	filesystem := NewMockFs(nil)
 	Create(t, "/tmp/realdir/hi.txt", filesystem)

+ 0 - 1
finder/fs/readdir_test.go

@@ -22,7 +22,6 @@ import (
 )
 
 func TestParseDirent(t *testing.T) {
-	t.Parallel()
 	testCases := []struct {
 		name string
 		in   []byte

+ 0 - 4
genrule/genrule_test.go

@@ -125,7 +125,6 @@ func testConfig(bp string, fs map[string][]byte) android.Config {
 }
 
 func TestGenruleCmd(t *testing.T) {
-	t.Parallel()
 	testcases := []struct {
 		name string
 		prop string
@@ -504,7 +503,6 @@ func TestGenruleCmd(t *testing.T) {
 }
 
 func TestGenruleHashInputs(t *testing.T) {
-	t.Parallel()
 
 	// The basic idea here is to verify that the sbox command (which is
 	// in the Command field of the generate rule) contains a hash of the
@@ -592,7 +590,6 @@ func TestGenruleHashInputs(t *testing.T) {
 }
 
 func TestGenSrcs(t *testing.T) {
-	t.Parallel()
 	testcases := []struct {
 		name string
 		prop string
@@ -685,7 +682,6 @@ func TestGenSrcs(t *testing.T) {
 }
 
 func TestGenruleDefaults(t *testing.T) {
-	t.Parallel()
 	bp := `
 				genrule_defaults {
 					name: "gen_defaults1",

+ 0 - 2
jar/jar_test.go

@@ -21,7 +21,6 @@ import (
 )
 
 func TestGetJavaPackage(t *testing.T) {
-	t.Parallel()
 	type args struct {
 		r   io.Reader
 		src string
@@ -79,7 +78,6 @@ func TestGetJavaPackage(t *testing.T) {
 }
 
 func Test_javaIdentRune(t *testing.T) {
-	t.Parallel()
 	// runes that should be valid anywhere in an identifier
 	validAnywhere := []rune{
 		// letters, $, _

+ 0 - 9
java/androidmk_test.go

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

+ 0 - 48
java/app_test.go

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

+ 0 - 2
java/device_host_converter_test.go

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

+ 0 - 2
java/dexpreopt_bootjars_test.go

@@ -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))

+ 0 - 1
java/dexpreopt_test.go

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

+ 0 - 5
java/hiddenapi_singleton_test.go

@@ -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

+ 0 - 2
java/jacoco_test.go

@@ -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

+ 0 - 45
java/java_test.go

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

+ 0 - 5
java/jdeps_test.go

@@ -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)

+ 0 - 3
java/kotlin_test.go

@@ -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 {

+ 0 - 3
java/plugin_test.go

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

+ 0 - 1
java/sdk_test.go

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

+ 0 - 2
makedeps/deps_test.go

@@ -23,7 +23,6 @@ import (
 )
 
 func TestParse(t *testing.T) {
-	t.Parallel()
 	testCases := []struct {
 		name   string
 		input  string
@@ -340,7 +339,6 @@ func BenchmarkParsing(b *testing.B) {
 }
 
 func TestDepPrint(t *testing.T) {
-	t.Parallel()
 	testCases := []struct {
 		name   string
 		input  Deps

+ 0 - 1
partner/androidmk/androidmk_test.go

@@ -54,7 +54,6 @@ cc_library_shared {
 }
 
 func TestEndToEnd(t *testing.T) {
-	t.Parallel()
 	for i, test := range testCases {
 		expected, err := bpfix.Reformat(test.expected)
 		if err != nil {

+ 0 - 1
python/python_test.go

@@ -326,7 +326,6 @@ var (
 )
 
 func TestPythonModule(t *testing.T) {
-	t.Parallel()
 	for _, d := range data {
 		t.Run(d.desc, func(t *testing.T) {
 			config := android.TestConfig(buildDir, nil, "", d.mockFiles)

+ 0 - 3
remoteexec/remoteexec_test.go

@@ -22,7 +22,6 @@ import (
 )
 
 func TestTemplate(t *testing.T) {
-	t.Parallel()
 	tests := []struct {
 		name   string
 		params *REParams
@@ -68,7 +67,6 @@ func TestTemplate(t *testing.T) {
 }
 
 func TestNoVarTemplate(t *testing.T) {
-	t.Parallel()
 	params := &REParams{
 		Labels:      map[string]string{"type": "compile", "lang": "cpp", "compiler": "clang"},
 		Inputs:      []string{"$in"},
@@ -85,7 +83,6 @@ func TestNoVarTemplate(t *testing.T) {
 }
 
 func TestTemplateDeterminism(t *testing.T) {
-	t.Parallel()
 	r := &REParams{
 		Labels:      map[string]string{"type": "compile", "lang": "cpp", "compiler": "clang"},
 		Inputs:      []string{"$in"},

+ 0 - 5
rust/binary_test.go

@@ -23,7 +23,6 @@ import (
 
 // Test that rustlibs default linkage is correct for binaries.
 func TestBinaryLinkage(t *testing.T) {
-	t.Parallel()
 	ctx := testRust(t, `
 		rust_binary {
 			name: "fizz-buzz",
@@ -87,7 +86,6 @@ func TestBinaryPreferRlib(t *testing.T) {
 
 // Test that the path returned by HostToolPath is correct
 func TestHostToolPath(t *testing.T) {
-	t.Parallel()
 	ctx := testRust(t, `
 		rust_binary_host {
 			name: "fizz-buzz",
@@ -102,7 +100,6 @@ func TestHostToolPath(t *testing.T) {
 
 // Test that the flags being passed to rust_binary modules are as expected
 func TestBinaryFlags(t *testing.T) {
-	t.Parallel()
 	ctx := testRust(t, `
 		rust_binary_host {
 			name: "fizz-buzz",
@@ -146,7 +143,6 @@ func TestStaticBinaryFlags(t *testing.T) {
 }
 
 func TestLinkObjects(t *testing.T) {
-	t.Parallel()
 	ctx := testRust(t, `
 		rust_binary {
 			name: "fizz-buzz",
@@ -166,7 +162,6 @@ func TestLinkObjects(t *testing.T) {
 
 // Test that stripped versions are correctly generated and used.
 func TestStrippedBinary(t *testing.T) {
-	t.Parallel()
 	ctx := testRust(t, `
 		rust_binary {
 			name: "foo",

+ 0 - 2
rust/bindgen_test.go

@@ -20,7 +20,6 @@ import (
 )
 
 func TestRustBindgen(t *testing.T) {
-	t.Parallel()
 	ctx := testRust(t, `
 		rust_bindgen {
 			name: "libbindgen",
@@ -67,7 +66,6 @@ func TestRustBindgen(t *testing.T) {
 }
 
 func TestRustBindgenCustomBindgen(t *testing.T) {
-	t.Parallel()
 	ctx := testRust(t, `
 		rust_bindgen {
 			name: "libbindgen",

+ 0 - 1
rust/builder_test.go

@@ -17,7 +17,6 @@ package rust
 import "testing"
 
 func TestSourceProviderCollision(t *testing.T) {
-	t.Parallel()
 	testRustError(t, "multiple source providers generate the same filename output: bindings.rs", `
 		rust_binary {
 			name: "source_collider",

+ 0 - 1
rust/clippy_test.go

@@ -21,7 +21,6 @@ import (
 )
 
 func TestClippy(t *testing.T) {
-	t.Parallel()
 
 	bp := `
 		// foo uses the default value of clippy_lints

+ 0 - 5
rust/compiler_test.go

@@ -23,7 +23,6 @@ import (
 
 // Test that feature flags are being correctly generated.
 func TestFeaturesToFlags(t *testing.T) {
-	t.Parallel()
 	ctx := testRust(t, `
 		rust_library_host_dylib {
 			name: "libfoo",
@@ -45,7 +44,6 @@ func TestFeaturesToFlags(t *testing.T) {
 
 // Test that we reject multiple source files.
 func TestEnforceSingleSourceFile(t *testing.T) {
-	t.Parallel()
 
 	singleSrcError := "srcs can only contain one path for a rust file and source providers prefixed by \":\""
 
@@ -80,7 +78,6 @@ func TestEnforceSingleSourceFile(t *testing.T) {
 }
 
 func TestInstallDir(t *testing.T) {
-	t.Parallel()
 	ctx := testRust(t, `
 		rust_library_dylib {
 			name: "libfoo",
@@ -111,7 +108,6 @@ func TestInstallDir(t *testing.T) {
 }
 
 func TestLints(t *testing.T) {
-	t.Parallel()
 
 	bp := `
 		// foo uses the default value of lints
@@ -184,7 +180,6 @@ func TestLints(t *testing.T) {
 
 // Test that devices are linking the stdlib dynamically
 func TestStdDeviceLinkage(t *testing.T) {
-	t.Parallel()
 	ctx := testRust(t, `
 		rust_binary {
 			name: "fizz",

+ 0 - 3
rust/coverage_test.go

@@ -23,7 +23,6 @@ import (
 
 // Test that coverage flags are being correctly generated.
 func TestCoverageFlags(t *testing.T) {
-	t.Parallel()
 	ctx := testRustCov(t, `
 		rust_library {
 			name: "libfoo_cov",
@@ -99,7 +98,6 @@ func TestCoverageFlags(t *testing.T) {
 
 // Test coverage files are included correctly
 func TestCoverageZip(t *testing.T) {
-	t.Parallel()
 	ctx := testRustCov(t, `
 		rust_library {
 			name: "libfoo",
@@ -176,7 +174,6 @@ func TestCoverageZip(t *testing.T) {
 }
 
 func TestCoverageDeps(t *testing.T) {
-	t.Parallel()
 	ctx := testRustCov(t, `
 		rust_binary {
 			name: "fizz",

+ 0 - 8
rust/library_test.go

@@ -23,7 +23,6 @@ import (
 
 // Test that variants are being generated correctly, and that crate-types are correct.
 func TestLibraryVariants(t *testing.T) {
-	t.Parallel()
 
 	ctx := testRust(t, `
 		rust_library_host {
@@ -72,7 +71,6 @@ func TestLibraryVariants(t *testing.T) {
 
 // Test that dylibs are not statically linking the standard library.
 func TestDylibPreferDynamic(t *testing.T) {
-	t.Parallel()
 	ctx := testRust(t, `
 		rust_library_host_dylib {
 			name: "libfoo",
@@ -88,7 +86,6 @@ func TestDylibPreferDynamic(t *testing.T) {
 }
 
 func TestValidateLibraryStem(t *testing.T) {
-	t.Parallel()
 	testRustError(t, "crate_name must be defined.", `
 			rust_library_host {
 				name: "libfoo",
@@ -126,7 +123,6 @@ func TestValidateLibraryStem(t *testing.T) {
 }
 
 func TestSharedLibrary(t *testing.T) {
-	t.Parallel()
 	ctx := testRust(t, `
 		rust_ffi_shared {
 			name: "libfoo",
@@ -149,7 +145,6 @@ func TestSharedLibrary(t *testing.T) {
 }
 
 func TestStaticLibraryLinkage(t *testing.T) {
-	t.Parallel()
 	ctx := testRust(t, `
 		rust_ffi_static {
 			name: "libfoo",
@@ -167,7 +162,6 @@ func TestStaticLibraryLinkage(t *testing.T) {
 
 // Test that variants pull in the right type of rustlib autodep
 func TestAutoDeps(t *testing.T) {
-	t.Parallel()
 
 	ctx := testRust(t, `
                 rust_library_host {
@@ -215,7 +209,6 @@ func TestAutoDeps(t *testing.T) {
 
 // Test that stripped versions are correctly generated and used.
 func TestStrippedLibrary(t *testing.T) {
-	t.Parallel()
 	ctx := testRust(t, `
 		rust_library_dylib {
 			name: "libfoo",
@@ -247,7 +240,6 @@ func TestStrippedLibrary(t *testing.T) {
 }
 
 func TestLibstdLinkage(t *testing.T) {
-	t.Parallel()
 	ctx := testRust(t, `
 		rust_library {
 			name: "libfoo",

+ 0 - 1
rust/protobuf_test.go

@@ -20,7 +20,6 @@ import (
 )
 
 func TestRustProtobuf(t *testing.T) {
-	t.Parallel()
 	ctx := testRust(t, `
 		rust_protobuf {
 			name: "librust_proto",

+ 0 - 7
rust/rust_test.go

@@ -177,7 +177,6 @@ func (tctx testRustCtx) parseError(t *testing.T, pattern string) {
 
 // Test that we can extract the link path from a lib path.
 func TestLinkPathFromFilePath(t *testing.T) {
-	t.Parallel()
 	barPath := android.PathForTesting("out/soong/.intermediates/external/libbar/libbar/linux_glibc_x86_64_shared/libbar.so")
 	libName := linkPathFromFilePath(barPath)
 	expectedResult := "out/soong/.intermediates/external/libbar/libbar/linux_glibc_x86_64_shared/"
@@ -189,7 +188,6 @@ func TestLinkPathFromFilePath(t *testing.T) {
 
 // Test to make sure dependencies are being picked up correctly.
 func TestDepsTracking(t *testing.T) {
-	t.Parallel()
 	ctx := testRust(t, `
 		rust_ffi_host_static {
 			name: "libstatic",
@@ -251,7 +249,6 @@ func TestDepsTracking(t *testing.T) {
 }
 
 func TestSourceProviderDeps(t *testing.T) {
-	t.Parallel()
 	ctx := testRust(t, `
 		rust_binary {
 			name: "fizz-buzz-dep",
@@ -339,7 +336,6 @@ func TestSourceProviderDeps(t *testing.T) {
 }
 
 func TestSourceProviderTargetMismatch(t *testing.T) {
-	t.Parallel()
 	// This might error while building the dependency tree or when calling depsToPaths() depending on the lunched
 	// target, which results in two different errors. So don't check the error, just confirm there is one.
 	testRustError(t, ".*", `
@@ -362,7 +358,6 @@ func TestSourceProviderTargetMismatch(t *testing.T) {
 
 // Test to make sure proc_macros use host variants when building device modules.
 func TestProcMacroDeviceDeps(t *testing.T) {
-	t.Parallel()
 	ctx := testRust(t, `
 		rust_library_host_rlib {
 			name: "libbar",
@@ -390,7 +385,6 @@ func TestProcMacroDeviceDeps(t *testing.T) {
 
 // Test that no_stdlibs suppresses dependencies on rust standard libraries
 func TestNoStdlibs(t *testing.T) {
-	t.Parallel()
 	ctx := testRust(t, `
 		rust_binary {
 			name: "fizz-buzz",
@@ -406,7 +400,6 @@ func TestNoStdlibs(t *testing.T) {
 
 // Test that libraries provide both 32-bit and 64-bit variants.
 func TestMultilib(t *testing.T) {
-	t.Parallel()
 	ctx := testRust(t, `
 		rust_library_rlib {
 			name: "libfoo",

+ 0 - 1
rust/source_provider_test.go

@@ -21,7 +21,6 @@ import (
 var stemRequiredError = "source_stem property is undefined but required for rust_bindgen modules"
 
 func TestSourceProviderRequiredFields(t *testing.T) {
-	t.Parallel()
 	testRustError(t, stemRequiredError, `
 		rust_bindgen {
 			name: "libbindgen",

+ 0 - 2
rust/test_test.go

@@ -22,7 +22,6 @@ import (
 )
 
 func TestRustTest(t *testing.T) {
-	t.Parallel()
 	ctx := testRust(t, `
 		rust_test_host {
 			name: "my_test",
@@ -38,7 +37,6 @@ func TestRustTest(t *testing.T) {
 }
 
 func TestRustTestLinkage(t *testing.T) {
-	t.Parallel()
 	ctx := testRust(t, `
 		rust_test {
 			name: "my_test",

+ 0 - 2
sdk/bp_test.go

@@ -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}
 

+ 0 - 28
sdk/cc_sdk_test.go

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

+ 0 - 1
sdk/exports_test.go

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

+ 0 - 22
sdk/java_sdk_test.go

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

+ 0 - 5
sdk/sdk_test.go

@@ -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{

+ 0 - 5
sh/sh_binary_test.go

@@ -61,7 +61,6 @@ func testShBinary(t *testing.T, bp string) (*android.TestContext, android.Config
 }
 
 func TestShTestSubDir(t *testing.T) {
-	t.Parallel()
 	ctx, config := testShBinary(t, `
 		sh_test {
 			name: "foo",
@@ -82,7 +81,6 @@ func TestShTestSubDir(t *testing.T) {
 }
 
 func TestShTest(t *testing.T) {
-	t.Parallel()
 	ctx, config := testShBinary(t, `
 		sh_test {
 			name: "foo",
@@ -113,7 +111,6 @@ func TestShTest(t *testing.T) {
 }
 
 func TestShTest_dataModules(t *testing.T) {
-	t.Parallel()
 	ctx, config := testShBinary(t, `
 		sh_test {
 			name: "foo",
@@ -173,7 +170,6 @@ func TestShTest_dataModules(t *testing.T) {
 }
 
 func TestShTestHost(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testShBinary(t, `
 		sh_test_host {
 			name: "foo",
@@ -194,7 +190,6 @@ func TestShTestHost(t *testing.T) {
 }
 
 func TestShTestHost_dataDeviceModules(t *testing.T) {
-	t.Parallel()
 	ctx, config := testShBinary(t, `
 		sh_test_host {
 			name: "foo",

+ 0 - 1
symbol_inject/elf_test.go

@@ -20,7 +20,6 @@ import (
 )
 
 func TestElfSymbolTable(t *testing.T) {
-	t.Parallel()
 	testCases := []struct {
 		file         *mockElfFile
 		symbol       string

+ 0 - 1
symbol_inject/macho_test.go

@@ -21,7 +21,6 @@ import (
 )
 
 func TestMachoSymbolTable(t *testing.T) {
-	t.Parallel()
 	testCases := []struct {
 		file         *macho.File
 		symbol       string

+ 0 - 1
symbol_inject/pe_test.go

@@ -21,7 +21,6 @@ import (
 )
 
 func TestPESymbolTable(t *testing.T) {
-	t.Parallel()
 	testCases := []struct {
 		file         *pe.File
 		symbol       string

+ 0 - 1
symbol_inject/symbol_inject_test.go

@@ -21,7 +21,6 @@ import (
 )
 
 func TestCopyAndInject(t *testing.T) {
-	t.Parallel()
 	s := "abcdefghijklmnopqrstuvwxyz"
 	testCases := []struct {
 		offset   uint64

+ 0 - 1
sysprop/sysprop_test.go

@@ -158,7 +158,6 @@ func test(t *testing.T, bp string) *android.TestContext {
 }
 
 func TestSyspropLibrary(t *testing.T) {
-	t.Parallel()
 	ctx := test(t, `
 		sysprop_library {
 			name: "sysprop-platform",

+ 0 - 1
ui/build/cleanbuild_test.go

@@ -27,7 +27,6 @@ import (
 )
 
 func TestCleanOldFiles(t *testing.T) {
-	t.Parallel()
 	dir, err := ioutil.TempDir("", "testcleanoldfiles")
 	if err != nil {
 		t.Fatal(err)

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff