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

Merge "Fix TestDroiddoc's reliance on absolute paths" am: 6c968b1f0f

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

Change-Id: I48cd4a6a6d2a50a1b756c59bbdcf4ead8bc2dccf
This commit is contained in:
Paul Duffin
2021-03-25 18:20:46 +00:00
committed by Automerger Merge Worker
parent f1cf5308f9 6c968b1f0f
commit 166ae29441
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/java_test.go
View File

@@ -1429,7 +1429,7 @@ func TestDroiddoc(t *testing.T) {
barStubsOutput := barStubsOutputs[0] barStubsOutput := barStubsOutputs[0]
barDoc := ctx.ModuleForTests("bar-doc", "android_common") barDoc := ctx.ModuleForTests("bar-doc", "android_common")
javaDoc := barDoc.Rule("javadoc").RelativeToTop() javaDoc := barDoc.Rule("javadoc").RelativeToTop()
if g, w := javaDoc.Implicits.Strings(), barStubsOutput.String(); !inList(w, g) { if g, w := android.PathsRelativeToTop(javaDoc.Implicits), android.PathRelativeToTop(barStubsOutput); !inList(w, g) {
t.Errorf("implicits of bar-doc must contain %q, but was %q.", w, g) t.Errorf("implicits of bar-doc must contain %q, but was %q.", w, g)
} }
@@ -1439,7 +1439,7 @@ func TestDroiddoc(t *testing.T) {
} }
aidl := barDoc.Rule("aidl") aidl := barDoc.Rule("aidl")
if g, w := javaDoc.Implicits.Strings(), aidl.Output.String(); !inList(w, g) { if g, w := android.PathsRelativeToTop(javaDoc.Implicits), android.PathRelativeToTop(aidl.Output); !inList(w, g) {
t.Errorf("implicits of bar-doc must contain %q, but was %q.", w, g) t.Errorf("implicits of bar-doc must contain %q, but was %q.", w, g)
} }