os/inotify: use _test for test files, not _obj

R=golang-dev, r, iant2
CC=golang-dev
https://golang.org/cl/4408043

diff --git a/src/pkg/os/inotify/inotify_linux.go b/src/pkg/os/inotify/inotify_linux.go
index 96c229e7b744a1cfcc5e13d928e026775c771e93..8b5c30e0dc8432c05361f47d82312a7d309749ac 100644 (file)
--- a/src/pkg/os/inotify/inotify_linux.go
+++ b/src/pkg/os/inotify/inotify_linux.go
@@ -109,7 +109,7 @@ func (w *Watcher) AddWatch(path string, flags uint32) os.Error {
        }
        wd, errno := syscall.InotifyAddWatch(w.fd, path, flags)
        if wd == -1 {
-               return os.NewSyscallError("inotify_add_watch", errno)
+               return &os.PathError{"inotify_add_watch", path, os.Errno(errno)}
        }
 
        if !found {

diff --git a/src/pkg/os/inotify/inotify_linux_test.go b/src/pkg/os/inotify/inotify_linux_test.go
index f5d1f8384df5533fdff33c18803658b20f80ef07..e29a46d6c2d123724a3fdabaa66f83d2ebfd8cf1 100644 (file)
--- a/src/pkg/os/inotify/inotify_linux_test.go
+++ b/src/pkg/os/inotify/inotify_linux_test.go
@@ -17,8 +17,8 @@ func TestInotifyEvents(t *testing.T) {
                t.Fatalf("NewWatcher() failed: %s", err)
        }
 
-       // Add a watch for "_obj"
-       err = watcher.Watch("_obj")
+       // Add a watch for "_test"
+       err = watcher.Watch("_test")
        if err != nil {
                t.Fatalf("Watcher.Watch() failed: %s", err)
        }
@@ -30,7 +30,7 @@ func TestInotifyEvents(t *testing.T) {
                }
        }()
 
-       const testFile string = "_obj/TestInotifyEvents.testfile"
+       const testFile string = "_test/TestInotifyEvents.testfile"
 
        // Receive events on the event channel on a separate goroutine
        eventstream := watcher.Event
@@ -90,7 +90,7 @@ func TestInotifyClose(t *testing.T) {
                t.Fatal("double Close() test failed: second Close() call didn't return")
        }
 
-       err := watcher.Watch("_obj")
+       err := watcher.Watch("_test")
        if err == nil {
                t.Fatal("expected error on Watch() after Close(), got nil")
        }