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

Commit fa07821d authored by Colin Cross's avatar Colin Cross
Browse files

Remove ioutil.TempDir from each android/soong/android test 

android_test.go already sets up a global buildDir, no need to create
one in each test.

Test: All soong tests
Change-Id: Ib85cbf78c604ad3cef64aa00b6bd812a81496e9e
parent 9d42425f

android/mutator_test.go

+0 −8
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ 
package android



import (

	"io/ioutil"

	"os"

	"reflect"

	"testing"
@@ -56,12 +54,6 @@ func addMissingDependenciesMutator(ctx TopDownMutatorContext) { 
}



func TestMutatorAddMissingDependencies(t *testing.T) {

	buildDir, err := ioutil.TempDir("", "soong_mutator_test")

	if err != nil {

		t.Fatal(err)

	}

	defer os.RemoveAll(buildDir)



	config := TestConfig(buildDir, nil)

	config.TestProductVariables.Allow_missing_dependencies = proptools.BoolPtr(true)

android/package_test.go

+2 −10
Original line number Diff line number Diff line 
package android



import (

	"io/ioutil"

	"os"

	"testing"

)
@@ -58,15 +56,9 @@ var packageTests = []struct { 
}



func TestPackage(t *testing.T) {

	buildDir, err := ioutil.TempDir("", "soong_package_test")

	if err != nil {

		t.Fatal(err)

	}

	defer os.RemoveAll(buildDir)



	for _, test := range packageTests {

		t.Run(test.name, func(t *testing.T) {

			_, errs := testPackage(buildDir, test.fs)

			_, errs := testPackage(test.fs)



			expectedErrors := test.expectedErrors

			if expectedErrors == nil {
@@ -89,7 +81,7 @@ func TestPackage(t *testing.T) { 
	}

}



func testPackage(buildDir string, fs map[string][]byte) (*TestContext, []error) {

func testPackage(fs map[string][]byte) (*TestContext, []error) {



	// Create a new config per test as visibility information is stored in the config.

	config := TestArchConfig(buildDir, nil)

android/path_properties_test.go

+0 −8
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ 
package android



import (

	"io/ioutil"

	"os"

	"reflect"

	"testing"

)
@@ -85,12 +83,6 @@ func TestPathDepsMutator(t *testing.T) { 
		},

	}



	buildDir, err := ioutil.TempDir("", "soong_path_properties_test")

	if err != nil {

		t.Fatal(err)

	}

	defer os.RemoveAll(buildDir)



	for _, test := range tests {

		t.Run(test.name, func(t *testing.T) {

			config := TestArchConfig(buildDir, nil)