diff options
| author | 2021-03-31 17:18:14 +0000 | |
|---|---|---|
| committer | 2021-03-31 17:18:14 +0000 | |
| commit | 508651252443fd949f6eb08b114d003a90dd44a8 (patch) | |
| tree | 810a58c2f688fa9b697cde0a0004d2916c39e1cf /java/system_modules_test.go | |
| parent | c68bc37e51976d695f88cbc9ae8badba367dc776 (diff) | |
| parent | 55e740e9a684619ec398b72036cf6739fa499940 (diff) | |
Merge "Remove varargs from RunTest(t *testing.T)"
Diffstat (limited to 'java/system_modules_test.go')
| -rw-r--r-- | java/system_modules_test.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/java/system_modules_test.go b/java/system_modules_test.go index 120bbf7f5..7b5a3867e 100644 --- a/java/system_modules_test.go +++ b/java/system_modules_test.go @@ -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") |