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

Remove varargs from RunTest(t *testing.T)

Browse Source 
Use GroupFixturePreparers instead.

Bug: 182885307
Test: m nothing
Change-Id: Iaedb0ddc9d6a704f4d41363e705f3025a1291dc8
This commit is contained in:
Paul Duffin
2021-03-29 02:06:19 +01:00
parent 4f6d15465b
commit 55e740e9a6
4 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
java/system_modules_test.go
View File

@@ -50,7 +50,7 @@ var addSourceSystemModules = android.FixtureAddTextFile("source/Android.bp", `
`)
func TestJavaSystemModules(t *testing.T) {
result := prepareForJavaTest.RunTest(t, addSourceSystemModules)
result := android.GroupFixturePreparers(prepareForJavaTest, addSourceSystemModules).RunTest(t)
// check the existence of the source module
sourceSystemModules := result.ModuleForTests("system-modules", "android_common")
@@ -77,7 +77,7 @@ var addPrebuiltSystemModules = android.FixtureAddTextFile("prebuilts/Android.bp"
`)
func TestJavaSystemModulesImport(t *testing.T) {
result := prepareForJavaTest.RunTest(t, addPrebuiltSystemModules)
result := android.GroupFixturePreparers(prepareForJavaTest, addPrebuiltSystemModules).RunTest(t)
// check the existence of the renamed prebuilt module
prebuiltSystemModules := result.ModuleForTests("system-modules", "android_common")
@@ -89,10 +89,11 @@ func TestJavaSystemModulesImport(t *testing.T) {
}
func TestJavaSystemModulesMixSourceAndPrebuilt(t *testing.T) {
result := prepareForJavaTest.RunTest(t,
result := android.GroupFixturePreparers(
prepareForJavaTest,
addSourceSystemModules,
addPrebuiltSystemModules,
)
).RunTest(t)
// check the existence of the source module
sourceSystemModules := result.ModuleForTests("system-modules", "android_common")