]> Cypherpunks repositories - gostls13.git/commitdiff
syscall: test Gettimeofday everywhere, not just on Darwin
authorBrad Fitzpatrick <bradfitz@golang.org>
Wed, 10 Aug 2016 19:46:48 +0000 (19:46 +0000)
committerBrad Fitzpatrick <bradfitz@golang.org>
Tue, 16 Aug 2016 00:17:21 +0000 (00:17 +0000)
The Darwin-only restriction was because we were late in the Go 1.7
cycle when the test was added.

In the process, I noticed Gettimeofday wasn't in the "unimplemented
midden heap" section of syscall_nacl.go, despite this line in the
original go1.txt:

pkg syscall, func Gettimeofday(*Timeval) error

So, add it, returning ENOSYS like the others.

Change-Id: Id7e02e857b753f8d079bee335c22368734e92254
Reviewed-on: https://go-review.googlesource.com/26772
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Quentin Smith <quentin@golang.org>
src/syscall/syscall_darwin_test.go [deleted file]
src/syscall/syscall_nacl.go
src/syscall/syscall_test.go

diff --git a/src/syscall/syscall_darwin_test.go b/src/syscall/syscall_darwin_test.go
deleted file mode 100644 (file)
index cea5636..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin
-// +build amd64 386 arm arm64
-
-package syscall_test
-
-import (
-       "syscall"
-       "testing"
-)
-
-func TestDarwinGettimeofday(t *testing.T) {
-       tv := &syscall.Timeval{}
-       if err := syscall.Gettimeofday(tv); err != nil {
-               t.Fatal(err)
-       }
-       if tv.Sec == 0 && tv.Usec == 0 {
-               t.Fatal("Sec and Usec both zero")
-       }
-}
index ba6eafed1c529faeed435eded562c2a77103fea2..d22d0c7536af5ed3ca5023e3409bf6582678635d 100644 (file)
@@ -295,6 +295,7 @@ func Getgroups() ([]int, error)         { return []int{1}, nil }
 func Getpagesize() int                  { return 65536 }
 func Getppid() int                      { return 2 }
 func Getpid() int                       { return 3 }
+func Gettimeofday(tv *Timeval) error    { return ENOSYS }
 func Getuid() int                       { return 1 }
 func Kill(pid int, signum Signal) error { return ENOSYS }
 func Sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
index 0a0b8b7a26da1be69c3e15a0a3aadbea22f7dd78..c3fffda2df59ab1f59d6b2b0ccbc772f8d6f568c 100644 (file)
@@ -8,6 +8,7 @@ import (
        "fmt"
        "internal/testenv"
        "os"
+       "runtime"
        "syscall"
        "testing"
 )
@@ -59,3 +60,16 @@ func TestExecErrPermutedFds(t *testing.T) {
                t.Fatalf("StartProcess of invalid program returned err = nil")
        }
 }
+
+func TestGettimeofday(t *testing.T) {
+       if runtime.GOOS == "nacl" {
+               t.Skip("not implemented on nacl")
+       }
+       tv := &syscall.Timeval{}
+       if err := syscall.Gettimeofday(tv); err != nil {
+               t.Fatal(err)
+       }
+       if tv.Sec == 0 && tv.Usec == 0 {
+               t.Fatal("Sec and Usec both zero")
+       }
+}