Merge "Fix TestDroiddoc's reliance on absolute paths"
This commit is contained in:
commit
6c968b1f0f
1 changed files with 2 additions and 2 deletions
|
@ -1429,7 +1429,7 @@ func TestDroiddoc(t *testing.T) {
|
|||
barStubsOutput := barStubsOutputs[0]
|
||||
barDoc := ctx.ModuleForTests("bar-doc", "android_common")
|
||||
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)
|
||||
}
|
||||
|
||||
|
@ -1439,7 +1439,7 @@ func TestDroiddoc(t *testing.T) {
|
|||
}
|
||||
|
||||
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)
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue