summaryrefslogtreecommitdiff
path: root/sysprop/sysprop_test.go
diff options
context:
space:
mode:
author Paul Duffin <paulduffin@google.com> 2021-03-20 00:36:55 +0000
committer Paul Duffin <paulduffin@google.com> 2021-03-22 18:31:53 +0000
commit89648f98faf46f4c9ae2b084167a79f7da2df567 (patch)
tree38c2561883b220b1ee671748d17c1657c42a77c9 /sysprop/sysprop_test.go
parent30ac3e7ca75106d7f883558c46501296d4bffcfc (diff)
Remove usages of FixtureFactory from misc packages
These packages have already been migrated to use per test build directory so have no need for a FixtureFactory. Bug: 183235980 Test: m nothing Change-Id: I667d1d992caaf0f615de91f89efdae11c44986c2
Diffstat (limited to 'sysprop/sysprop_test.go')
-rw-r--r--sysprop/sysprop_test.go6
1 files changed, 2 insertions, 4 deletions
diff --git a/sysprop/sysprop_test.go b/sysprop/sysprop_test.go
index cb1e36230..e9d905186 100644
--- a/sysprop/sysprop_test.go
+++ b/sysprop/sysprop_test.go
@@ -30,8 +30,6 @@ func TestMain(m *testing.M) {
os.Exit(m.Run())
}
-var emptyFixtureFactory = android.NewFixtureFactory(nil)
-
func test(t *testing.T, bp string) *android.TestResult {
t.Helper()
@@ -124,7 +122,7 @@ func test(t *testing.T, bp string) *android.TestResult {
"com/android2/OdmProperties.sysprop": nil,
}
- result := emptyFixtureFactory.RunTest(t,
+ result := android.GroupFixturePreparers(
cc.PrepareForTestWithCcDefaultModules,
java.PrepareForTestWithJavaDefaultModules,
PrepareForTestWithSyspropBuildComponents,
@@ -135,7 +133,7 @@ func test(t *testing.T, bp string) *android.TestResult {
}),
mockFS.AddToFixture(),
android.FixtureWithRootAndroidBp(bp),
- )
+ ).RunTest(t)
return result
}