GitHubMirror/sys
1
0
Fork 0
mirror of https://github.com/rwinkhart/sys.git synced 2026-09-05 08:37:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

unix: fix TestStatFieldNames on aix and TestUtimesNanoAt on darwin

Browse Source 
Following CL 175157 which renames Stat_t time fields to [AMCB]tim.

Updates golang/go#31735

Change-Id: I0791c59bab307d237b315c1b919265902f7d9917
Reviewed-on: https://go-review.googlesource.com/c/sys/+/177437
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
Yuval Pavel Zholkover
2019-05-16 01:48:33 +00:00
committed by Brad Fitzpatrick
parent 87c872767d
commit cab07311ab
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
unix/syscall_darwin_test.go
+4 -4
View File
@@ -50,15 +50,15 @@ func TestUtimesNanoAt(t *testing.T) {
t.Fatalf("Lstat: %v", err) t.Fatalf("Lstat: %v", err)
} }
// Only check Mtimespec, Atimespec might not be supported by the underlying filesystem // Only check Mtim, Atim might not be supported by the underlying filesystem
expected := ts[1] expected := ts[1]
if st.Mtimespec.Nsec == 0 { if st.Mtim.Nsec == 0 {
// Some filesystems only support 1-second time stamp resolution // Some filesystems only support 1-second time stamp resolution
// and will always set Nsec to 0. // and will always set Nsec to 0.
expected.Nsec = 0 expected.Nsec = 0
} }
if st.Mtimespec != expected { if st.Mtim != expected {
t.Errorf("UtimesNanoAt: wrong mtime: got %v, expected %v", st.Mtimespec, expected) t.Errorf("UtimesNanoAt: wrong mtime: got %v, expected %v", st.Mtim, expected)
} }
} }
unix/syscall_test.go
+5 -1
View File
@@ -62,9 +62,13 @@ func TestUname(t *testing.T) {
// Test that this compiles. (Issue #31735) // Test that this compiles. (Issue #31735)
func TestStatFieldNames(t *testing.T) { func TestStatFieldNames(t *testing.T) {
var st unix.Stat_t var st unix.Stat_t
var ts *unix.Timespec var ts interface{} // either *unix.Timespec or *unix.StTimespec on GOOS==aix
ts = &st.Atim ts = &st.Atim
ts = &st.Mtim ts = &st.Mtim
ts = &st.Ctim ts = &st.Ctim
_ = ts _ = ts
secs := int64(st.Mtim.Sec)
nsecs := int64(st.Mtim.Nsec)
_ = secs
_ = nsecs
} }