StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Share buildDir for android/soong/android tests

Browse Source 
There is no need to create a separate buildDir for each test
file, use TestMain to create a global one for the package.

Test: all soong tests
Change-Id: I435ee7aa88b7e0bb8ccc1ba79f82833a7accf3e9
This commit is contained in:
Colin Cross
2019-06-10 14:32:38 -07:00
parent 6c4f21f3a1
commit 2ffb9a8d7d
11 changed files with 48 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Android.bp
View File

@@ -78,6 +78,7 @@ bootstrap_go_package {
"android/env.go",
],
testSrcs: [
"android/android_test.go",
"android/arch_test.go",
"android/config_test.go",
"android/expand_test.go",

46
android/android_test.go Normal file
View File

@@ -0,0 +1,46 @@
// Copyright 2019 Google Inc. All rights reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package android
import (
"io/ioutil"
"os"
"testing"
)
var buildDir string
func setUp() {
var err error
buildDir, err = ioutil.TempDir("", "soong_android_test")
if err != nil {
panic(err)
}
}
func tearDown() {
os.RemoveAll(buildDir)
}
func TestMain(m *testing.M) {
run := func() int {
setUp()
defer tearDown()
return m.Run()
}
os.Exit(run())
}

8
android/namespace_test.go
View File

@@ -16,8 +16,6 @@ package android
import (
"errors"
"io/ioutil"
"os"
"path/filepath"
"reflect"
"testing"
@@ -613,12 +611,6 @@ func mockFiles(bps map[string]string) (files map[string][]byte) {
}
func setupTestFromFiles(bps map[string][]byte) (ctx *TestContext, errs []error) {
buildDir, err := ioutil.TempDir("", "soong_namespace_test")
if err != nil {
return nil, []error{err}
}
defer os.RemoveAll(buildDir)
config := TestConfig(buildDir, nil)
ctx = NewTestContext()

8
android/neverallow_test.go
View File

@@ -15,8 +15,6 @@
package android
import (
"io/ioutil"
"os"
"testing"
)
@@ -151,12 +149,6 @@ var neverallowTests = []struct {
}
func TestNeverallow(t *testing.T) {
buildDir, err := ioutil.TempDir("", "soong_neverallow_test")
if err != nil {
t.Fatal(err)
}
defer os.RemoveAll(buildDir)
config := TestConfig(buildDir, nil)
for _, test := range neverallowTests {

20
android/paths_test.go
View File

@@ -17,8 +17,6 @@ package android
import (
"errors"
"fmt"
"io/ioutil"
"os"
"reflect"
"strings"
"testing"
@@ -880,12 +878,6 @@ func testPathForModuleSrc(t *testing.T, buildDir string, tests []pathForModuleSr
}
func TestPathsForModuleSrc(t *testing.T) {
buildDir, err := ioutil.TempDir("", "soong_paths_for_module_src_test")
if err != nil {
t.Fatal(err)
}
defer os.RemoveAll(buildDir)
tests := []pathForModuleSrcTestCase{
{
name: "path",
@@ -966,12 +958,6 @@ func TestPathsForModuleSrc(t *testing.T) {
}
func TestPathForModuleSrc(t *testing.T) {
buildDir, err := ioutil.TempDir("", "soong_path_for_module_src_test")
if err != nil {
t.Fatal(err)
}
defer os.RemoveAll(buildDir)
tests := []pathForModuleSrcTestCase{
{
name: "path",
@@ -1039,12 +1025,6 @@ func TestPathForModuleSrc(t *testing.T) {
}
func TestPathsForModuleSrc_AllowMissingDependencies(t *testing.T) {
buildDir, err := ioutil.TempDir("", "soong_paths_for_module_src_allow_missing_dependencies_test")
if err != nil {
t.Fatal(err)
}
defer os.RemoveAll(buildDir)
config := TestConfig(buildDir, nil)
config.TestProductVariables.Allow_missing_dependencies = proptools.BoolPtr(true)

19
android/prebuilt_etc_test.go
View File

@@ -15,16 +15,13 @@
package android
import (
"io/ioutil"
"os"
"path/filepath"
"reflect"
"testing"
)
func testPrebuiltEtc(t *testing.T, bp string) (*TestContext, Config) {
config, buildDir := setUp(t)
defer tearDown(buildDir)
config := TestArchConfig(buildDir, nil)
ctx := NewTestArchContext()
ctx.RegisterModuleType("prebuilt_etc", ModuleFactoryAdaptor(PrebuiltEtcFactory))
ctx.RegisterModuleType("prebuilt_etc_host", ModuleFactoryAdaptor(PrebuiltEtcHostFactory))
@@ -51,20 +48,6 @@ func testPrebuiltEtc(t *testing.T, bp string) (*TestContext, Config) {
return ctx, config
}
func setUp(t *testing.T) (config Config, buildDir string) {
buildDir, err := ioutil.TempDir("", "soong_prebuilt_etc_test")
if err != nil {
t.Fatal(err)
}
config = TestArchConfig(buildDir, nil)
return
}
func tearDown(buildDir string) {
os.RemoveAll(buildDir)
}
func TestPrebuiltEtcVariants(t *testing.T) {
ctx, _ := testPrebuiltEtc(t, `
prebuilt_etc {

8
android/prebuilt_test.go
View File

@@ -16,8 +16,6 @@ package android
import (
"fmt"
"io/ioutil"
"os"
"testing"
"github.com/google/blueprint"
@@ -127,12 +125,6 @@ var prebuiltsTests = []struct {
}
func TestPrebuilts(t *testing.T) {
buildDir, err := ioutil.TempDir("", "soong_prebuilt_test")
if err != nil {
t.Fatal(err)
}
defer os.RemoveAll(buildDir)
config := TestConfig(buildDir, nil)
for _, test := range prebuiltsTests {

8
android/rule_builder_test.go
View File

@@ -16,8 +16,6 @@ package android
import (
"fmt"
"io/ioutil"
"os"
"path/filepath"
"reflect"
"strings"
@@ -418,12 +416,6 @@ func testRuleBuilder_Build(ctx BuilderContext, in Path, out, outDep, outDir Writ
}
func TestRuleBuilder_Build(t *testing.T) {
buildDir, err := ioutil.TempDir("", "soong_test_rule_builder")
if err != nil {
t.Fatal(err)
}
defer os.RemoveAll(buildDir)
bp := `
rule_builder_test {
name: "foo",

8
android/sh_binary_test.go
View File

@@ -1,19 +1,11 @@
package android
import (
"io/ioutil"
"os"
"reflect"
"testing"
)
func testShBinary(t *testing.T, bp string) (*TestContext, Config) {
buildDir, err := ioutil.TempDir("", "soong_sh_binary_test")
if err != nil {
t.Fatal(err)
}
defer os.RemoveAll(buildDir)
config := TestArchConfig(buildDir, nil)
ctx := NewTestArchContext()

8
android/visibility_test.go
View File

@@ -1,8 +1,6 @@
package android
import (
"io/ioutil"
"os"
"testing"
"github.com/google/blueprint"
@@ -663,12 +661,6 @@ var visibilityTests = []struct {
}
func TestVisibility(t *testing.T) {
buildDir, err := ioutil.TempDir("", "soong_neverallow_test")
if err != nil {
t.Fatal(err)
}
defer os.RemoveAll(buildDir)
for _, test := range visibilityTests {
t.Run(test.name, func(t *testing.T) {
_, errs := testVisibility(buildDir, test.fs)

8
android/vts_config_test.go
View File

@@ -15,19 +15,11 @@
package android
import (
"io/ioutil"
"os"
"testing"
)
func testVtsConfig(test *testing.T, bpFileContents string) *TestContext {
buildDir, err := ioutil.TempDir("", "soong_vts_config_test")
if err != nil {
test.Fatal(err)
}
config := TestArchConfig(buildDir, nil)
defer func() { os.RemoveAll(buildDir) }()
ctx := NewTestArchContext()
ctx.RegisterModuleType("vts_config", ModuleFactoryAdaptor(VtsConfigFactory))