Commit 69623890 authored by Russ Cox's avatar Russ Cox

for consistency with syscall, rename files

from GOARCH_GOOS -> GOOS_GOARCH.

update os_test and add test of Time.

R=r
DELTA=490  (247 added, 233 deleted, 10 changed)
OCL=29730
CL=29805
parent aa3222d8
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# license that can be found in the LICENSE file. # license that can be found in the LICENSE file.
# DO NOT EDIT. Automatically generated by gobuild. # DO NOT EDIT. Automatically generated by gobuild.
# gobuild -m dir_${GOARCH}_${GOOS}.go env.go error.go file.go path.go stat_${GOARCH}_${GOOS}.go time.go types.go exec.go proc.go getwd.go >Makefile # gobuild -m dir_${GOOS}_${GOARCH}.go env.go error.go file.go path.go stat_${GOOS}_${GOARCH}.go time.go types.go exec.go proc.go getwd.go >Makefile
D= D=
...@@ -45,7 +45,7 @@ O1=\ ...@@ -45,7 +45,7 @@ O1=\
O2=\ O2=\
proc.$O\ proc.$O\
stat_$(GOARCH)_$(GOOS).$O\ stat_$(GOOS)_$(GOARCH).$O\
time.$O\ time.$O\
O3=\ O3=\
...@@ -53,7 +53,7 @@ O3=\ ...@@ -53,7 +53,7 @@ O3=\
file.$O\ file.$O\
O4=\ O4=\
dir_$(GOARCH)_$(GOOS).$O\ dir_$(GOOS)_$(GOARCH).$O\
exec.$O\ exec.$O\
getwd.$O\ getwd.$O\
path.$O\ path.$O\
...@@ -67,7 +67,7 @@ a1: $(O1) ...@@ -67,7 +67,7 @@ a1: $(O1)
rm -f $(O1) rm -f $(O1)
a2: $(O2) a2: $(O2)
$(AR) grc _obj$D/os.a proc.$O stat_$(GOARCH)_$(GOOS).$O time.$O $(AR) grc _obj$D/os.a proc.$O stat_$(GOOS)_$(GOARCH).$O time.$O
rm -f $(O2) rm -f $(O2)
a3: $(O3) a3: $(O3)
...@@ -75,7 +75,7 @@ a3: $(O3) ...@@ -75,7 +75,7 @@ a3: $(O3)
rm -f $(O3) rm -f $(O3)
a4: $(O4) a4: $(O4)
$(AR) grc _obj$D/os.a dir_$(GOARCH)_$(GOOS).$O exec.$O getwd.$O path.$O $(AR) grc _obj$D/os.a dir_$(GOOS)_$(GOARCH).$O exec.$O getwd.$O path.$O
rm -f $(O4) rm -f $(O4)
......
...@@ -12,16 +12,16 @@ import ( ...@@ -12,16 +12,16 @@ import (
) )
var dot = []string{ var dot = []string{
"dir_amd64_darwin.go", "dir_darwin_amd64.go",
"dir_amd64_linux.go", "dir_linux_amd64.go",
"env.go", "env.go",
"error.go", "error.go",
"file.go", "file.go",
"os_test.go", "os_test.go",
"time.go", "time.go",
"types.go", "types.go",
"stat_amd64_darwin.go", "stat_darwin_amd64.go",
"stat_amd64_linux.go" "stat_linux_amd64.go"
} }
var etc = []string{ var etc = []string{
...@@ -468,7 +468,7 @@ func TestChdirAndGetwd(t *testing.T) { ...@@ -468,7 +468,7 @@ func TestChdirAndGetwd(t *testing.T) {
if mode == 0 { if mode == 0 {
err = Chdir(d); err = Chdir(d);
} else { } else {
fd1, err := os.Open(d, os.O_RDONLY, 0); fd1, err := Open(d, O_RDONLY, 0);
if err != nil { if err != nil {
t.Errorf("Open %s: %s", d, err); t.Errorf("Open %s: %s", d, err);
continue; continue;
...@@ -501,3 +501,17 @@ func TestChdirAndGetwd(t *testing.T) { ...@@ -501,3 +501,17 @@ func TestChdirAndGetwd(t *testing.T) {
} }
fd.Close(); fd.Close();
} }
func TestTime(t *testing.T) {
// Just want to check that Time() is getting something.
// A common failure mode on Darwin is to get 0, 0,
// because it returns the time in registers instead of
// filling in the structure passed to the system call.
// TODO(rsc): Too bad the compiler doesn't know that
// 365.24*86400 is an integer.
sec, nsec, err := Time();
if sec < (2009-1970)*36524*864 {
t.Errorf("Time() = %d, %d, %s; not plausible", sec, nsec, err);
}
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment