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

Fix OutDir vs SoongOutDir in tests

Browse Source 
Tests were using the same value for OutDir and SoongOutDir, separate
them to allow a test that needs to distinguish between them.

Test: all soong tests
Change-Id: Ibd78758c133a7f07bead3f51b699052676f92fbd
This commit is contained in:
Colin Cross
2021-11-09 12:34:39 -08:00
parent 85b7eb90d9
commit 7b6a55f5a2
4 changed files with 42 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android/paths_test.go
View File

@@ -993,7 +993,7 @@ func TestPathForSource(t *testing.T) {
{
name: "in out dir",
buildDir: "out",
src: "out/a/b/c",
src: "out/soong/a/b/c",
err: "is in output",
},
}
@@ -1525,7 +1525,7 @@ func ExampleOutputPath_ReplaceExtension() {
fmt.Println(p.Rel(), p2.Rel())
// Output:
// out/system/framework/boot.art out/system/framework/boot.oat
// out/soong/system/framework/boot.art out/soong/system/framework/boot.oat
// boot.art boot.oat
}
@@ -1539,7 +1539,7 @@ func ExampleOutputPath_InSameDir() {
fmt.Println(p.Rel(), p2.Rel())
// Output:
// out/system/framework/boot.art out/system/framework/oat/arm/boot.vdex
// out/soong/system/framework/boot.art out/soong/system/framework/oat/arm/boot.vdex
// boot.art oat/arm/boot.vdex
}