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

diff --git a/src/lib/os/Makefile b/src/lib/os/Makefile
index 5272e88ad48369fe0ae78a6409614329093699f9..4a53a26f9be5764ff6a0f9ad800f73db575fa79b 100644 (file)
--- a/src/lib/os/Makefile
+++ b/src/lib/os/Makefile
@@ -3,7 +3,7 @@
 # license that can be found in the LICENSE file.
 
 # 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=
 
@@ -45,7 +45,7 @@ O1=\
 
 O2=\
        proc.$O\
-       stat_$(GOARCH)_$(GOOS).$O\
+       stat_$(GOOS)_$(GOARCH).$O\
        time.$O\
 
 O3=\
@@ -53,7 +53,7 @@ O3=\
        file.$O\
 
 O4=\
-       dir_$(GOARCH)_$(GOOS).$O\
+       dir_$(GOOS)_$(GOARCH).$O\
        exec.$O\
        getwd.$O\
        path.$O\
@@ -67,7 +67,7 @@ a1: $(O1)
        rm -f $(O1)
 
 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)
 
 a3: $(O3)
@@ -75,7 +75,7 @@ a3: $(O3)
        rm -f $(O3)
 
 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)
 
 

diff --git a/src/lib/os/dir_amd64_darwin.go b/src/lib/os/dir_darwin_amd64.go
similarity index 100%
rename from src/lib/os/dir_amd64_darwin.go
rename to src/lib/os/dir_darwin_amd64.go

diff --git a/src/lib/os/dir_amd64_linux.go b/src/lib/os/dir_linux_amd64.go
similarity index 100%
rename from src/lib/os/dir_amd64_linux.go
rename to src/lib/os/dir_linux_amd64.go

diff --git a/src/lib/os/os_test.go b/src/lib/os/os_test.go
index e4d115d81f6d6ee15ac4980cc1088cc0025f584b..84469b68a7730528a0cc36ca67f1b9ec69139b4e 100644 (file)
--- a/src/lib/os/os_test.go
+++ b/src/lib/os/os_test.go
@@ -12,16 +12,16 @@ import (
 )
 
 var dot = []string{
-       "dir_amd64_darwin.go",
-       "dir_amd64_linux.go",
+       "dir_darwin_amd64.go",
+       "dir_linux_amd64.go",
        "env.go",
        "error.go",
        "file.go",
        "os_test.go",
        "time.go",
        "types.go",
-       "stat_amd64_darwin.go",
-       "stat_amd64_linux.go"
+       "stat_darwin_amd64.go",
+       "stat_linux_amd64.go"
 }
 
 var etc = []string{
@@ -468,7 +468,7 @@ func TestChdirAndGetwd(t *testing.T) {
                        if mode == 0 {
                                err = Chdir(d);
                        } else {
-                               fd1, err := os.Open(d, os.O_RDONLY, 0);
+                               fd1, err := Open(d, O_RDONLY, 0);
                                if err != nil {
                                        t.Errorf("Open %s: %s", d, err);
                                        continue;
@@ -501,3 +501,17 @@ func TestChdirAndGetwd(t *testing.T) {
        }
        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);
+       }
+}
+

diff --git a/src/lib/os/stat_amd64_darwin.go b/src/lib/os/stat_darwin_amd64.go
similarity index 100%
rename from src/lib/os/stat_amd64_darwin.go
rename to src/lib/os/stat_darwin_amd64.go

diff --git a/src/lib/os/stat_amd64_linux.go b/src/lib/os/stat_linux_amd64.go
similarity index 100%
rename from src/lib/os/stat_amd64_linux.go
rename to src/lib/os/stat_linux_amd64.go