diff options
Diffstat (limited to 'android/module_test.go')
| -rw-r--r-- | android/module_test.go | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/android/module_test.go b/android/module_test.go index 99bf30afc..9ac929179 100644 --- a/android/module_test.go +++ b/android/module_test.go @@ -179,11 +179,9 @@ func TestErrorDependsOnDisabledModule(t *testing.T) { } ` - emptyTestFixtureFactory. + prepareForModuleTests. ExtendWithErrorHandler(FixtureExpectsAtLeastOneErrorMatchingPattern(`module "foo": depends on disabled module "bar"`)). - RunTest(t, - prepareForModuleTests, - FixtureWithRootAndroidBp(bp)) + RunTestWithBp(t, bp) } func TestValidateCorrectBuildParams(t *testing.T) { @@ -268,9 +266,7 @@ func TestDistErrorChecking(t *testing.T) { "\\QAndroid.bp:18:17: module \"foo\": dists[1].suffix: Suffix may not contain a '/' character.\\E", } - emptyTestFixtureFactory. + prepareForModuleTests. ExtendWithErrorHandler(FixtureExpectsAllErrorsToMatchAPattern(expectedErrs)). - RunTest(t, - prepareForModuleTests, - FixtureWithRootAndroidBp(bp)) + RunTestWithBp(t, bp) } |