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

Migrate etc package to a per test build directory

Browse Source 
Bug: 182885307
Test: m nothing
Change-Id: I0f516efdf3344ba4c5d70c2fcc8d322f56e12a86
This commit is contained in:
Paul Duffin
2021-03-15 15:35:49 +00:00
parent e66946b43e
commit 5f9f771dab
1 changed files with 14 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
etc/prebuilt_etc_test.go
View File

@@ -15,7 +15,6 @@
package etc package etc
import ( import (
"io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
"testing" "testing"
@@ -23,33 +22,12 @@ import (
"android/soong/android" "android/soong/android"
) )
var buildDir string
func setUp() {
var err error
buildDir, err = ioutil.TempDir("", "soong_etc_test")
if err != nil {
panic(err)
}
}
func tearDown() {
os.RemoveAll(buildDir)
}
func TestMain(m *testing.M) { func TestMain(m *testing.M) {
run := func() int { os.Exit(m.Run())
setUp()
defer tearDown()
return m.Run()
}
os.Exit(run())
} }
var prebuiltEtcFixtureFactory = android.NewFixtureFactory( var prebuiltEtcFixtureFactory = android.NewFixtureFactory(
&buildDir, nil,
android.PrepareForTestWithArchMutator, android.PrepareForTestWithArchMutator,
PrepareForTestWithPrebuiltEtc, PrepareForTestWithPrebuiltEtc,
android.FixtureMergeMockFs(android.MockFS{ android.FixtureMergeMockFs(android.MockFS{
@@ -170,8 +148,8 @@ func TestPrebuiltEtcRelativeInstallPathInstallDirPath(t *testing.T) {
`) `)
p := result.Module("foo.conf", "android_arm64_armv8-a").(*PrebuiltEtc) p := result.Module("foo.conf", "android_arm64_armv8-a").(*PrebuiltEtc)
expected := buildDir + "/target/product/test_device/system/etc/bar" expected := "out/soong/target/product/test_device/system/etc/bar"
android.AssertStringEquals(t, "install dir", expected, p.installDirPath.String()) android.AssertPathRelativeToTopEquals(t, "install dir", expected, p.installDirPath)
} }
func TestPrebuiltEtcCannotSetRelativeInstallPathAndSubDir(t *testing.T) { func TestPrebuiltEtcCannotSetRelativeInstallPathAndSubDir(t *testing.T) {
@@ -212,8 +190,8 @@ func TestPrebuiltUserShareInstallDirPath(t *testing.T) {
`) `)
p := result.Module("foo.conf", "android_arm64_armv8-a").(*PrebuiltEtc) p := result.Module("foo.conf", "android_arm64_armv8-a").(*PrebuiltEtc)
expected := buildDir + "/target/product/test_device/system/usr/share/bar" expected := "out/soong/target/product/test_device/system/usr/share/bar"
android.AssertStringEquals(t, "install dir", expected, p.installDirPath.String()) android.AssertPathRelativeToTopEquals(t, "install dir", expected, p.installDirPath)
} }
func TestPrebuiltUserShareHostInstallDirPath(t *testing.T) { func TestPrebuiltUserShareHostInstallDirPath(t *testing.T) {
@@ -227,8 +205,8 @@ func TestPrebuiltUserShareHostInstallDirPath(t *testing.T) {
buildOS := android.BuildOs.String() buildOS := android.BuildOs.String()
p := result.Module("foo.conf", buildOS+"_common").(*PrebuiltEtc) p := result.Module("foo.conf", buildOS+"_common").(*PrebuiltEtc)
expected := filepath.Join(buildDir, "host", result.Config.PrebuiltOS(), "usr", "share", "bar") expected := filepath.Join("out/soong/host", result.Config.PrebuiltOS(), "usr", "share", "bar")
android.AssertStringEquals(t, "install dir", expected, p.installDirPath.String()) android.AssertPathRelativeToTopEquals(t, "install dir", expected, p.installDirPath)
} }
func TestPrebuiltFontInstallDirPath(t *testing.T) { func TestPrebuiltFontInstallDirPath(t *testing.T) {
@@ -240,12 +218,12 @@ func TestPrebuiltFontInstallDirPath(t *testing.T) {
`) `)
p := result.Module("foo.conf", "android_arm64_armv8-a").(*PrebuiltEtc) p := result.Module("foo.conf", "android_arm64_armv8-a").(*PrebuiltEtc)
expected := buildDir + "/target/product/test_device/system/fonts" expected := "out/soong/target/product/test_device/system/fonts"
android.AssertStringEquals(t, "install dir", expected, p.installDirPath.String()) android.AssertPathRelativeToTopEquals(t, "install dir", expected, p.installDirPath)
} }
func TestPrebuiltFirmwareDirPath(t *testing.T) { func TestPrebuiltFirmwareDirPath(t *testing.T) {
targetPath := buildDir + "/target/product/test_device" targetPath := "out/soong/target/product/test_device"
tests := []struct { tests := []struct {
description string description string
config string config string
@@ -273,13 +251,13 @@ func TestPrebuiltFirmwareDirPath(t *testing.T) {
t.Run(tt.description, func(t *testing.T) { t.Run(tt.description, func(t *testing.T) {
result := prebuiltEtcFixtureFactory.RunTestWithBp(t, tt.config) result := prebuiltEtcFixtureFactory.RunTestWithBp(t, tt.config)
p := result.Module("foo.conf", "android_arm64_armv8-a").(*PrebuiltEtc) p := result.Module("foo.conf", "android_arm64_armv8-a").(*PrebuiltEtc)
android.AssertStringEquals(t, "install dir", tt.expectedPath, p.installDirPath.String()) android.AssertPathRelativeToTopEquals(t, "install dir", tt.expectedPath, p.installDirPath)
}) })
} }
} }
func TestPrebuiltDSPDirPath(t *testing.T) { func TestPrebuiltDSPDirPath(t *testing.T) {
targetPath := filepath.Join(buildDir, "/target/product/test_device") targetPath := "out/soong/target/product/test_device"
tests := []struct { tests := []struct {
description string description string
config string config string
@@ -307,7 +285,7 @@ func TestPrebuiltDSPDirPath(t *testing.T) {
t.Run(tt.description, func(t *testing.T) { t.Run(tt.description, func(t *testing.T) {
result := prebuiltEtcFixtureFactory.RunTestWithBp(t, tt.config) result := prebuiltEtcFixtureFactory.RunTestWithBp(t, tt.config)
p := result.Module("foo.conf", "android_arm64_armv8-a").(*PrebuiltEtc) p := result.Module("foo.conf", "android_arm64_armv8-a").(*PrebuiltEtc)
android.AssertStringEquals(t, "install dir", tt.expectedPath, p.installDirPath.String()) android.AssertPathRelativeToTopEquals(t, "install dir", tt.expectedPath, p.installDirPath)
}) })
} }
} }