os, syscall: Hurd fixes for a couple of tests

    Based on patch by Svante Signell.

    Reviewed-on: https://go-review.googlesource.com/c/161520

From-SVN: r268605

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index b7efb211ca505b2f82cc42c4e334b0a658582b67..398a8512bdc0f5a2fcc763db207df1626981fa68 100644 (file)
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-28b65174d9c9163f4ab2cfaf70dca646f1a7611f
+9b66264ed6adcf3fd215dbfd125c12b022b7280e
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.

diff --git a/libgo/go/os/os_test.go b/libgo/go/os/os_test.go
index 98eba89331a5631df03923e552296765759c8b4d..cf68cae6cec3398a684fca82e56ff6a993bcd84b 100644 (file)
--- a/libgo/go/os/os_test.go
+++ b/libgo/go/os/os_test.go
@@ -1336,6 +1336,10 @@ func TestSeek(t *testing.T) {
                        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 085afb29411218d1586ec94b5d1081b83383dfca..0341948619486819779abd26b84b1e421ade1f54 100644 (file)
--- a/libgo/go/syscall/syscall_unix_test.go
+++ b/libgo/go/syscall/syscall_unix_test.go
@@ -46,11 +46,13 @@ func _() {
        // 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 (