openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Fix hole in python testing code that ignored a broken test" am: 0a00e2680d am: 21a1d22ec3 

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

Change-Id: I4afed13f2f1ac1d5916f6a79e505172bd3135581
This commit is contained in:
Paul Duffin 2021-03-18 08:54:41 +00:00 committed by Automerger Merge Worker
parent 8255a16c37 21a1d22ec3
commit f3c3e60623
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
python/python_test.go
View File

@ -207,14 +207,26 @@ var (
"lib1", "lib1",
], ],
} }
python_binary_host {
name: "bin",
pkg_path: "e/",
srcs: [
"bin.py",
],
libs: [
"lib2",
],
}
`, `,
), ),
"dir/c/file1.py": nil, "dir/c/file1.py": nil,
"dir/file1.py": nil, "dir/file1.py": nil,
"dir/bin.py": nil,
}, },
errors: []string{ errors: []string{
fmt.Sprintf(dupRunfileErrTemplate, "dir/Android.bp:9:6", fmt.Sprintf(dupRunfileErrTemplate, "dir/Android.bp:20:6",
"lib2", "PY3", "a/b/c/file1.py", "lib2", "dir/file1.py", "bin", "PY3", "a/b/c/file1.py", "bin", "dir/file1.py",
"lib1", "dir/c/file1.py"), "lib1", "dir/c/file1.py"),
}, },
}, },
@ -339,7 +351,7 @@ func TestPythonModule(t *testing.T) {
_, testErrs := ctx.ParseBlueprintsFiles(bpFile) _, testErrs := ctx.ParseBlueprintsFiles(bpFile)
android.FailIfErrored(t, testErrs) android.FailIfErrored(t, testErrs)
_, actErrs := ctx.PrepareBuildActions(config) _, actErrs := ctx.PrepareBuildActions(config)
if len(actErrs) > 0 { if len(actErrs) > 0 || len(d.errors) > 0 {
testErrs = append(testErrs, expectErrors(t, actErrs, d.errors)...) testErrs = append(testErrs, expectErrors(t, actErrs, d.errors)...)
} else { } else {
for _, e := range d.expectedBinaries { for _, e := range d.expectedBinaries {