os, syscall: Hurd fixes for a couple of tests
Based on patch by Svante Signell.
Change-Id: Id2bbb765f7b3bf1482af956804b5799901c24cc9
Reviewed-on: https://go-review.googlesource.com/c/161520
Reviewed-by: Ian Lance Taylor <iant@golang.org>
diff --git a/libgo/go/os/os_test.go b/libgo/go/os/os_test.go
index 98eba89..cf68cae 100644
--- a/libgo/go/os/os_test.go
+++ b/libgo/go/os/os_test.go
@@ -1336,6 +1336,10 @@
t.Logf("skipping test case #%d on nacl; https://golang.org/issue/21728", i)
continue
}
+ if runtime.GOOS == "hurd" && tt.out > 1<<32 {
+ t.Logf("skipping test case #%d on Hurd: file too large", i)
+ continue
+ }
off, err := f.Seek(tt.in, tt.whence)
if off != tt.out || err != nil {
if e, ok := err.(*PathError); ok && e.Err == syscall.EINVAL && tt.out > 1<<32 && runtime.GOOS == "linux" {
diff --git a/libgo/go/syscall/syscall_unix_test.go b/libgo/go/syscall/syscall_unix_test.go
index 085afb2..0341948 100644
--- a/libgo/go/syscall/syscall_unix_test.go
+++ b/libgo/go/syscall/syscall_unix_test.go
@@ -46,11 +46,13 @@
// fcntl file locking structure and constants
var (
_ = syscall.Flock_t{
- Type: int16(0),
- Whence: int16(0),
- Start: int64(0),
- Len: int64(0),
- Pid: int32(0),
+ // Comment out the Type and Whence tests because
+ // on the Hurd they are int32, not int16.
+ // Type: int16(0),
+ // Whence: int16(0),
+ Start: int64(0),
+ Len: int64(0),
+ Pid: int32(0),
}
)
const (