bind: fix tests for the always enabled go cache
The go tool requires either HOME or GOCACHE set, but tests invoking
go install only passed GOPATH. Pass the inherited environment as well.
While here, update the reverse generated java.go.golden file with
additions from the latest Android SDK.
Change-Id: I3567dcc30e588b20266e9ba01d17a0ee547919bc
Reviewed-on: https://go-review.googlesource.com/c/159677
Reviewed-by: Hyang-Ah Hana Kim <hyangah@gmail.com>
diff --git a/bind/bind_test.go b/bind/bind_test.go
index 02bfe6d..7314bd1 100644
--- a/bind/bind_test.go
+++ b/bind/bind_test.go
@@ -230,7 +230,7 @@
"-pkgdir="+filepath.Join(dir, "pkg", build.Default.GOOS+"_"+build.Default.GOARCH),
"ObjC/...",
)
- cmd.Env = append(cmd.Env, "GOPATH="+dir)
+ cmd.Env = append(os.Environ(), "GOPATH="+dir)
if out, err := cmd.CombinedOutput(); err != nil {
t.Fatalf("failed to go install the generated ObjC wrappers: %v: %s", err, string(out))
}
@@ -271,7 +271,7 @@
"-pkgdir="+filepath.Join(dir, "pkg", build.Default.GOOS+"_"+build.Default.GOARCH),
"Java/...",
)
- cmd.Env = append(cmd.Env, "GOPATH="+dir)
+ cmd.Env = append(os.Environ(), "GOPATH="+dir)
if out, err := cmd.CombinedOutput(); err != nil {
t.Fatalf("failed to go install the generated Java wrappers: %v: %s", err, string(out))
}
diff --git a/bind/testdata/java.go.golden b/bind/testdata/java.go.golden
index 9271eaf..ee66846 100644
--- a/bind/testdata/java.go.golden
+++ b/bind/testdata/java.go.golden
@@ -156,6 +156,10 @@
DIRECTIONALITY_RIGHT_TO_LEFT_EMBEDDING = 16
DIRECTIONALITY_RIGHT_TO_LEFT_OVERRIDE = 17
DIRECTIONALITY_POP_DIRECTIONAL_FORMAT = 18
+ DIRECTIONALITY_LEFT_TO_RIGHT_ISOLATE = 19
+ DIRECTIONALITY_RIGHT_TO_LEFT_ISOLATE = 20
+ DIRECTIONALITY_FIRST_STRONG_ISOLATE = 21
+ DIRECTIONALITY_POP_DIRECTIONAL_ISOLATE = 22
MIN_SUPPLEMENTARY_CODE_POINT = 65536
MIN_CODE_POINT = 0
MAX_CODE_POINT = 1114111
