diff options
author | Ian Lance Taylor <ian@gcc.gnu.org> | 2017-01-23 22:18:42 +0000 |
---|---|---|
committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2017-01-23 22:18:42 +0000 |
commit | c25edd44a04672573946138da9c8fdc8c0eef5fd (patch) | |
tree | 843ee0b88a49a9a81be51f8853f88eb3c11256b1 /libgo/go/os | |
parent | 28826a66fb457b6655d66a40638a759617aa8673 (diff) | |
download | gcc-c25edd44a04672573946138da9c8fdc8c0eef5fd.zip gcc-c25edd44a04672573946138da9c8fdc8c0eef5fd.tar.gz gcc-c25edd44a04672573946138da9c8fdc8c0eef5fd.tar.bz2 |
libgo: update to go1.8rc2
Fix a bug in the generation of the hash value in reflect.FuncOf.
The merge script missed a bunch of testdata files over the years.
Copy them over.
Reviewed-on: https://go-review.googlesource.com/35570
From-SVN: r244835
Diffstat (limited to 'libgo/go/os')
-rw-r--r-- | libgo/go/os/os_test.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libgo/go/os/os_test.go b/libgo/go/os/os_test.go index 10a74c2..dcc8d76 100644 --- a/libgo/go/os/os_test.go +++ b/libgo/go/os/os_test.go @@ -52,12 +52,15 @@ var sysdir = func() *sysDir { case "darwin": switch runtime.GOARCH { case "arm", "arm64": + /// At this point the test harness has not had a chance + // to move us into the ./src/os directory, so the + // current working directory is the root of the app. wd, err := syscall.Getwd() if err != nil { wd = err.Error() } return &sysDir{ - filepath.Join(wd, "..", ".."), + wd, []string{ "ResourceRules.plist", "Info.plist", |