diff options
| author | Colin Cross <ccross@android.com> | 2020-10-29 17:09:13 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2020-11-12 10:07:49 -0800 |
| commit | ae8600b507416192f5134dfc068cd0eea4c4dc9e (patch) | |
| tree | 3ab3ab614e28c71f461534f0969c39aa5c4edd8b /xml | |
| parent | 45e0c95f859d6ae3743a9971be8b43b91c3bd68f (diff) | |
Pass Config to NewTestContext instead of ctx.Register
Prepare for using Config when adding singletons by passing
Config to NewTestContext and NewContext instead of to ctx.Register.
This will enable a followup change to store SingletonMakeVarsProviders
registered on the Context in the Config, which is necessary to run
multiple tests in parallel without data races.
Test: all soong tests
Change-Id: Id229629a4e42ff4487d317241673837726c075fc
Diffstat (limited to 'xml')
| -rw-r--r-- | xml/xml_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xml/xml_test.go b/xml/xml_test.go index abcb1085f..138503c6d 100644 --- a/xml/xml_test.go +++ b/xml/xml_test.go @@ -57,10 +57,10 @@ func testXml(t *testing.T, bp string) *android.TestContext { "baz.xml": nil, } config := android.TestArchConfig(buildDir, nil, bp, fs) - ctx := android.NewTestArchContext() + ctx := android.NewTestArchContext(config) ctx.RegisterModuleType("prebuilt_etc", etc.PrebuiltEtcFactory) ctx.RegisterModuleType("prebuilt_etc_xml", PrebuiltEtcXmlFactory) - ctx.Register(config) + ctx.Register() _, errs := ctx.ParseFileList(".", []string{"Android.bp"}) android.FailIfErrored(t, errs) _, errs = ctx.PrepareBuildActions(config) |