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

Ensure subtest failures are reported on subtest am: 89886cbdb0

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2d6ad0fd97b196054bc873930cf91eca7319907c
This commit is contained in:
Paul Duffin
2021-02-07 22:03:46 +00:00
committed by Automerger Merge Worker
parent 3c4acc4279 89886cbdb0
commit 215001cb5a
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
apex/apex_test.go
View File

@@ -4362,7 +4362,7 @@ func TestPrebuiltExportDexImplementationJars(t *testing.T) {
// Empty transformation.
}
checkDexJarBuildPath := func(ctx *android.TestContext, name string) {
checkDexJarBuildPath := func(t *testing.T, ctx *android.TestContext, name string) {
// Make sure the import has been given the correct path to the dex jar.
p := ctx.ModuleForTests(name, "android_common_myapex").Module().(java.Dependency)
dexJarBuildPath := p.DexJarBuildPath()
@@ -4371,7 +4371,7 @@ func TestPrebuiltExportDexImplementationJars(t *testing.T) {
}
}
ensureNoSourceVariant := func(ctx *android.TestContext) {
ensureNoSourceVariant := func(t *testing.T, ctx *android.TestContext) {
// Make sure that an apex variant is not created for the source module.
if expected, actual := []string{"android_common"}, ctx.ModuleVariantsForTests("libfoo"); !reflect.DeepEqual(expected, actual) {
t.Errorf("invalid set of variants for %q: expected %q, found %q", "libfoo", expected, actual)
@@ -4402,7 +4402,7 @@ func TestPrebuiltExportDexImplementationJars(t *testing.T) {
// Make sure that dexpreopt can access dex implementation files from the prebuilt.
ctx := testDexpreoptWithApexes(t, bp, "", transform)
checkDexJarBuildPath(ctx, "libfoo")
checkDexJarBuildPath(t, ctx, "libfoo")
})
t.Run("prebuilt with source preferred", func(t *testing.T) {
@@ -4434,8 +4434,8 @@ func TestPrebuiltExportDexImplementationJars(t *testing.T) {
// Make sure that dexpreopt can access dex implementation files from the prebuilt.
ctx := testDexpreoptWithApexes(t, bp, "", transform)
checkDexJarBuildPath(ctx, "prebuilt_libfoo")
ensureNoSourceVariant(ctx)
checkDexJarBuildPath(t, ctx, "prebuilt_libfoo")
ensureNoSourceVariant(t, ctx)
})
t.Run("prebuilt preferred with source", func(t *testing.T) {
@@ -4467,8 +4467,8 @@ func TestPrebuiltExportDexImplementationJars(t *testing.T) {
// Make sure that dexpreopt can access dex implementation files from the prebuilt.
ctx := testDexpreoptWithApexes(t, bp, "", transform)
checkDexJarBuildPath(ctx, "prebuilt_libfoo")
ensureNoSourceVariant(ctx)
checkDexJarBuildPath(t, ctx, "prebuilt_libfoo")
ensureNoSourceVariant(t, ctx)
})
}
@@ -4477,7 +4477,7 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) {
config.BootJars = android.CreateTestConfiguredJarList([]string{"myapex:libfoo"})
}
checkBootDexJarPath := func(ctx *android.TestContext, bootDexJarPath string) {
checkBootDexJarPath := func(t *testing.T, ctx *android.TestContext, bootDexJarPath string) {
s := ctx.SingletonForTests("dex_bootjars")
foundLibfooJar := false
for _, output := range s.AllOutputs() {
@@ -4518,7 +4518,7 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) {
`
ctx := testDexpreoptWithApexes(t, bp, "", transform)
checkBootDexJarPath(ctx, ".intermediates/myapex.deapexer/android_common/deapexer/javalib/libfoo.jar")
checkBootDexJarPath(t, ctx, ".intermediates/myapex.deapexer/android_common/deapexer/javalib/libfoo.jar")
})
t.Run("prebuilt with source library preferred", func(t *testing.T) {
@@ -4587,7 +4587,7 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) {
`
ctx := testDexpreoptWithApexes(t, bp, "", transform)
checkBootDexJarPath(ctx, ".intermediates/myapex.deapexer/android_common/deapexer/javalib/libfoo.jar")
checkBootDexJarPath(t, ctx, ".intermediates/myapex.deapexer/android_common/deapexer/javalib/libfoo.jar")
})
t.Run("prebuilt with source apex preferred", func(t *testing.T) {
@@ -4631,7 +4631,7 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) {
`
ctx := testDexpreoptWithApexes(t, bp, "", transform)
checkBootDexJarPath(ctx, ".intermediates/libfoo/android_common_apex10000/aligned/libfoo.jar")
checkBootDexJarPath(t, ctx, ".intermediates/libfoo/android_common_apex10000/aligned/libfoo.jar")
})
t.Run("prebuilt preferred with source apex disabled", func(t *testing.T) {
@@ -4677,7 +4677,7 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) {
`
ctx := testDexpreoptWithApexes(t, bp, "", transform)
checkBootDexJarPath(ctx, ".intermediates/myapex.deapexer/android_common/deapexer/javalib/libfoo.jar")
checkBootDexJarPath(t, ctx, ".intermediates/myapex.deapexer/android_common/deapexer/javalib/libfoo.jar")
})
}