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

Merge "Convert testJavaError to test fixtures" am: 56372081ed am: c0acd402ef

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634622

Change-Id: I1fdaa8bb01ac6138c8c4f733424ad527499cbbd1
This commit is contained in:
Paul Duffin
2021-03-15 18:04:19 +00:00
committed by Automerger Merge Worker
parent 7c46058e77 c0acd402ef
commit ebde79862a
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/java_test.go
View File

@@ -147,7 +147,11 @@ func run(t *testing.T, ctx *android.TestContext, config android.Config) {
// deprecated // deprecated
func testJavaError(t *testing.T, pattern string, bp string) (*android.TestContext, android.Config) { func testJavaError(t *testing.T, pattern string, bp string) (*android.TestContext, android.Config) {
t.Helper() t.Helper()
return testJavaErrorWithConfig(t, pattern, testConfig(nil, bp, nil)) result := javaFixtureFactory.
Extend(dexpreopt.PrepareForTestWithDexpreopt).
ExtendWithErrorHandler(android.FixtureExpectsAtLeastOneErrorMatchingPattern(pattern)).
RunTestWithBp(t, bp)
return result.TestContext, result.Config
} }
// testJavaErrorWithConfig is a legacy way of running tests of java modules that expect errors. // testJavaErrorWithConfig is a legacy way of running tests of java modules that expect errors.