From: ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 7 Feb 2019 05:02:26 +0000 (+0000)
Subject:     os, syscall: Hurd fixes for a couple of tests
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7490764f0a1e49b5a6d26015808cd1e3a3a45556;p=thirdparty%2Fgcc.git

os, syscall: Hurd fixes for a couple of tests

    Based on patch by Svante Signell.

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


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@268605 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index b7efb211ca50..398a8512bdc0 100644
--- 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 98eba89331a5..cf68cae6cec3 100644
--- 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 085afb294112..034194861948 100644
--- 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 (