openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge changes I9aad3e4e,I150889a0 am: b01125f92b am: c899e88474 am: 3c5a83b056 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1643949

Change-Id: Iaca3b530c46c00e911e43927c88eecfa1e48970b
This commit is contained in:
Paul Duffin 2021-03-18 16:13:06 +00:00 committed by Automerger Merge Worker
parent c76957fd75 3c5a83b056
commit 5e6c3685f9
4 changed files with 43 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
xml/Android.bp
View File

@ -13,6 +13,7 @@ bootstrap_go_package {
"soong-etc",
],
srcs: [
"testing.go",
"xml.go",
],
testSrcs: [

19
xml/testing.go Normal file
View File

@ -0,0 +1,19 @@
// Copyright 2018 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 xml
import "android/soong/android"
var PreparerForTestWithXmlBuildComponents = android.FixtureRegisterWithContext(registerXmlBuildComponents)

6
xml/xml.go
View File

@ -53,10 +53,14 @@ var (
)
func init() {
android.RegisterModuleType("prebuilt_etc_xml", PrebuiltEtcXmlFactory)
registerXmlBuildComponents(android.InitRegistrationContext)
pctx.HostBinToolVariable("XmlLintCmd", "xmllint")
}
func registerXmlBuildComponents(ctx android.RegistrationContext) {
ctx.RegisterModuleType("prebuilt_etc_xml", PrebuiltEtcXmlFactory)
}
type prebuiltEtcXmlProperties struct {
// Optional DTD that will be used to validate the xml file.
Schema *string `android:"path"`

66
xml/xml_test.go
View File

@ -15,7 +15,6 @@
package xml
import (
"io/ioutil"
"os"
"testing"
@ -23,62 +22,33 @@ import (
"android/soong/etc"
)
var buildDir string
func setUp() {
var err error
buildDir, err = ioutil.TempDir("", "soong_xml_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())
os.Exit(m.Run())
}
func testXml(t *testing.T, bp string) *android.TestContext {
fs := map[string][]byte{
var emptyFixtureFactory = android.NewFixtureFactory(nil)
func testXml(t *testing.T, bp string) *android.TestResult {
fs := android.MockFS{
"foo.xml": nil,
"foo.dtd": nil,
"bar.xml": nil,
"bar.xsd": nil,
"baz.xml": nil,
}
config := android.TestArchConfig(buildDir, nil, bp, fs)
ctx := android.NewTestArchContext(config)
ctx.RegisterModuleType("prebuilt_etc", etc.PrebuiltEtcFactory)
ctx.RegisterModuleType("prebuilt_etc_xml", PrebuiltEtcXmlFactory)
ctx.Register()
_, errs := ctx.ParseFileList(".", []string{"Android.bp"})
android.FailIfErrored(t, errs)
_, errs = ctx.PrepareBuildActions(config)
android.FailIfErrored(t, errs)
return ctx
}
func assertEqual(t *testing.T, name, expected, actual string) {
t.Helper()
if expected != actual {
t.Errorf(name+" expected %q != got %q", expected, actual)
}
return emptyFixtureFactory.RunTest(t,
android.PrepareForTestWithArchMutator,
etc.PrepareForTestWithPrebuiltEtc,
PreparerForTestWithXmlBuildComponents,
fs.AddToFixture(),
android.FixtureWithRootAndroidBp(bp),
)
}
// Minimal test
func TestPrebuiltEtcXml(t *testing.T) {
ctx := testXml(t, `
result := testXml(t, `
prebuilt_etc_xml {
name: "foo.xml",
src: "foo.xml",
@ -103,14 +73,14 @@ func TestPrebuiltEtcXml(t *testing.T) {
{rule: "xmllint-minimal", input: "baz.xml"},
} {
t.Run(tc.schemaType, func(t *testing.T) {
rule := ctx.ModuleForTests(tc.input, "android_arm64_armv8-a").Rule(tc.rule)
assertEqual(t, "input", tc.input, rule.Input.String())
rule := result.ModuleForTests(tc.input, "android_arm64_armv8-a").Rule(tc.rule)
android.AssertStringEquals(t, "input", tc.input, rule.Input.String())
if tc.schemaType != "" {
assertEqual(t, "schema", tc.schema, rule.Args[tc.schemaType])
android.AssertStringEquals(t, "schema", tc.schema, rule.Args[tc.schemaType])
}
})
}
m := ctx.ModuleForTests("foo.xml", "android_arm64_armv8-a").Module().(*prebuiltEtcXml)
assertEqual(t, "installDir", buildDir+"/target/product/test_device/system/etc", m.InstallDirPath().String())
m := result.ModuleForTests("foo.xml", "android_arm64_armv8-a").Module().(*prebuiltEtcXml)
android.AssertPathRelativeToTopEquals(t, "installDir", "out/soong/target/product/test_device/system/etc", m.InstallDirPath())
}