Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45fd6ace authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge "Make lots of tests run in parallel"

parents 43159bd1 323dc607

android/androidmk_test.go

+2 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ func customModuleFactory() Module { 
}



func TestAndroidMkSingleton_PassesUpdatedAndroidMkDataToCustomCallback(t *testing.T) {

	t.Parallel()

	bp := `

	custom {

		name: "foo",
@@ -103,6 +104,7 @@ func TestAndroidMkSingleton_PassesUpdatedAndroidMkDataToCustomCallback(t *testin 
}



func TestGetDistForGoals(t *testing.T) {

	t.Parallel()

	testCases := []struct {

		bp                     string

		expectedAndroidMkLines []string

android/apex_test.go

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import ( 
)



func Test_mergeApexVariations(t *testing.T) {

	t.Parallel()

	tests := []struct {

		name        string

		in          []ApexInfo

android/arch_test.go

+3 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ type NamedNoneFiltered struct { 
}



func TestFilterArchStruct(t *testing.T) {

	t.Parallel()

	tests := []struct {

		name     string

		in       interface{}
@@ -274,6 +275,7 @@ func archTestModuleFactory() Module { 
}



func TestArchMutator(t *testing.T) {

	t.Parallel()

	var buildOSVariants []string

	var buildOS32Variants []string

	switch runtime.GOOS {
@@ -385,6 +387,7 @@ func TestArchMutator(t *testing.T) { 
}



func TestArchMutatorNativeBridge(t *testing.T) {

	t.Parallel()

	bp := `

		// This module is only enabled for x86.

		module {

android/config_test.go

+3 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ 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".
@@ -74,6 +75,7 @@ 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())
@@ -86,6 +88,7 @@ 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")

android/csuite_config_test.go

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 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" }