zix99 · zix99 · Jun 15, 2025 · Jun 15, 2025 · Jun 15, 2025 · Jun 15, 2025
diff --git a/acceptance.tests b/acceptance.tests
@@ -293,8 +293,17 @@ RUN -v
 END
 
 NAME walk
+GOOS linux
 RUN walk -R --include *.sh docs/
     docs/install.sh
 STDERR
     Found 1 path(s), 30 excluded
 END
+
+NAME walk windows
+GOOS windows
+RUN walk -R --include *.sh docs/
+    docs\install.sh
+STDERR
+    Found 1 path(s), 30 excluded
+END
diff --git a/cmd/filter_test.go b/cmd/filter_test.go
@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"os"
+	"path/filepath"
 	"testing"
 
 	"github.com/zix99/rare/cmd/helpers"
@@ -28,7 +29,7 @@ func TestSarch(t *testing.T) {
 func TestSearchOutput(t *testing.T) {
 	out, eout, err := testCommandCapture(searchCommand(), `last testdata/*.txt`)
 	assert.NoError(t, err)
-	assert.Equal(t, "testdata/log.txt 3: 5 is the last\n", out)
+	assert.Equal(t, filepath.Join("testdata", "log.txt")+" 3: 5 is the last\n", out)
 	assert.Equal(t, "Read   : 5 file(s) (9.41 KB)\nMatched: 1 / 76\n", eout)
 }
 

diff --git a/cmd/testdata/.gitattributes b/cmd/testdata/.gitattributes
@@ -0,0 +1 @@
+*.txt text eol=lf
diff --git a/cmd/walk_test.go b/cmd/walk_test.go
@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"path/filepath"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -16,13 +17,13 @@ func TestEmptyWalkCommand(t *testing.T) {
 func TestWalkTestDataGlob(t *testing.T) {
 	o, e, err := testCommandCapture(walkCommand(), "testdata/*.gz")
 	assert.NoError(t, err)
-	assert.Equal(t, "testdata/log.txt.gz\n", o)
+	assert.Equal(t, filepath.Join("testdata", "log.txt.gz")+"\n", o)
 	assert.Equal(t, "Found 1 path(s)\n", e)
 }
 
 func TestWalkTestDataRecursive(t *testing.T) {
 	o, e, err := testCommandCapture(walkCommand(), "-R testdata/")
 	assert.NoError(t, err)
 	assert.Contains(t, o, "log.txt")
-	assert.Equal(t, "Found 6 path(s)\n", e)
+	assert.Equal(t, "Found 7 path(s)\n", e)
 }
diff --git a/pkg/extractor/batchers/tailBatcher_test.go b/pkg/extractor/batchers/tailBatcher_test.go
@@ -6,6 +6,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/zix99/rare/pkg/testutil"
 )
 
 func TestBatchFollowFile(t *testing.T) {
@@ -21,6 +22,8 @@ func TestBatchFollowFile(t *testing.T) {
 }
 
 func TestBatchFollowTailFile(t *testing.T) {
+	testutil.SkipWindows(t) // Not working right now
+
 	tmp, err := os.CreateTemp("", "followtest-")
 	if err != nil {
 		panic(err)

diff --git a/pkg/extractor/dirwalk/globExpand_test.go b/pkg/extractor/dirwalk/globExpand_test.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/zix99/rare/pkg/extractor/dirwalk/pathmatch"
+	"github.com/zix99/rare/pkg/testutil"
 )
 
 /*
@@ -165,6 +166,8 @@ func TestRecurseExcludeDir(t *testing.T) {
 }
 
 func TestRecurseWithSymFile(t *testing.T) {
+	testutil.SkipWindows(t) // git symlinks don't work quite right on windows
+
 	walk := Walker{
 		Recursive:    true,
 		ListSymLinks: true,
@@ -191,6 +194,8 @@ func TestRecursiveWithSymFileIgnore(t *testing.T) {
 }
 
 func TestRecurseWithSymDir(t *testing.T) {
+	testutil.SkipWindows(t) // git symlinks don't work quite right on windows
+
 	p := setupTestDir(t)
 
 	walk := Walker{
@@ -220,6 +225,8 @@ func TestRecurseDoesntIdentifyDirAsFile(t *testing.T) {
 }
 
 func TestNoInfiniteRecursion(t *testing.T) {
+	testutil.SkipWindows(t)
+
 	p := setupTestDir(t)
 	os.Symlink("./", p+"/recursive")
 	os.Symlink(p, p+"/recursive2")
@@ -257,6 +264,8 @@ func TestNoMountTraverseWithSymlink(t *testing.T) {
 }
 
 func TestExcludeSymDir(t *testing.T) {
+	testutil.SkipWindows(t)
+
 	p := setupTestDir(t)
 
 	hadError := false
@@ -274,6 +283,8 @@ func TestExcludeSymDir(t *testing.T) {
 }
 
 func TestNoDoubleTraverseSymlink(t *testing.T) {
+	testutil.SkipWindows(t)
+
 	p := setupTestDir(t)
 	op := t.TempDir()
 	os.WriteFile(op+"/opfile", []byte("hello"), 0644)

diff --git a/pkg/followreader/followreader_test.go b/pkg/followreader/followreader_test.go
@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/zix99/rare/pkg/testutil"
 )
 
 // reads data and asserts all reads successful
@@ -87,21 +88,27 @@ func (s *testAppendingFile) Stop() {
 	}
 }
 
-// Close and stop writing to the file
-func (s *testAppendingFile) Close() {
+// Stop writing and close f
+func (s *testAppendingFile) CloseFile() {
 	s.Stop()
-	err := s.f.Close()
-	if err != nil {
+	if err := s.f.Close(); err != nil {
 		panic(err)
 	}
+}
 
-	err = os.Remove(s.f.Name())
+// Close and stop writing to the file and cleanup
+func (s *testAppendingFile) Close() {
+	s.CloseFile()
+
+	err := os.Remove(s.f.Name())
 	if err != nil {
 		panic(err)
 	}
 }
 
 func TestFollowReaderNew(t *testing.T) {
+	testutil.SkipWindows(t)
+
 	af := CreateAppendingTempFile()
 	defer af.Close()
 

diff --git a/pkg/followreader/notify_test.go b/pkg/followreader/notify_test.go
@@ -9,9 +9,12 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/zix99/rare/pkg/testutil"
 )
 
 func TestSimpleFileNotifyTail(t *testing.T) {
+	testutil.SkipWindows(t) // fsnotify not working, separate issue
+
 	af := CreateAppendingTempFile()
 	defer af.Close()
 
@@ -25,6 +28,8 @@ func TestSimpleFileNotifyTail(t *testing.T) {
 }
 
 func TestTailNotifyFileAppendingExisting(t *testing.T) {
+	testutil.SkipWindows(t) // fsnotify not working, separate issue
+
 	af := CreateAppendingTempFile()
 
 	tail, err := NewNotify(af.Name(), false)
@@ -44,6 +49,8 @@ func TestTailNotifyFileAppendingExisting(t *testing.T) {
 }
 
 func TestTailNotifyFileRecreatedReopen(t *testing.T) {
+	testutil.SkipWindows(t) // fsnotify not working, separate issue
+
 	af := CreateAppendingTempFile()
 
 	tail, err := NewNotify(af.Name(), true)
@@ -66,6 +73,8 @@ func TestTailNotifyFileRecreatedReopen(t *testing.T) {
 }
 
 func TestTailNotifyFileDeletedCloses(t *testing.T) {
+	testutil.SkipWindows(t) // fsnotify not working, separate issue
+
 	af := CreateAppendingTempFile()
 
 	tail, err := NewNotify(af.Name(), false)
@@ -96,6 +105,8 @@ func TestTailNotifyFileDeletedCloses(t *testing.T) {
 }
 
 func TestWatchingNonExistantFile(t *testing.T) {
+	testutil.SkipWindows(t) // fsnotify not working, separate issue
+
 	tp := path.Join(os.TempDir(), fmt.Sprintf("go-test-%d", rand.Int()))
 
 	tail, err := NewNotify(tp, true)
@@ -110,6 +121,8 @@ func TestWatchingNonExistantFile(t *testing.T) {
 }
 
 func TestWatchingNonExistingFileFails(t *testing.T) {
+	testutil.SkipWindows(t) // fsnotify not working, separate issue
+
 	tp := path.Join(os.TempDir(), fmt.Sprintf("go-test-%d", rand.Int()))
 	tail, err := NewNotify(tp, false)
 
@@ -127,6 +140,8 @@ func TestNonBlockingSignal(t *testing.T) {
 }
 
 func TestNotifyClosedReaderReturnsEOF(t *testing.T) {
+	testutil.SkipWindows(t) // fsnotify not working, separate issue
+
 	af := CreateAppendingTempFile()
 	defer af.Close()
 

diff --git a/pkg/followreader/poller_test.go b/pkg/followreader/poller_test.go
@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/zix99/rare/pkg/testutil"
 )
 
 func TestSimpleFilePollingTail(t *testing.T) {
@@ -35,16 +36,17 @@ func TestTailFileAppendingExisting(t *testing.T) {
 	assertSequentialReads(t, tail, 10)
 
 	// Re-open process
-	af.Stop()
+	af.CloseFile()
 	af = CreateAppendingFromFile(af.Name())
 
 	assertSequentialReads(t, tail, 10)
 
-	af.Close()
 	assert.NoError(t, tail.Close())
+	af.Close()
 }
 
 func TestTailFileRecreatedReopen(t *testing.T) {
+	testutil.SkipWindows(t) // Not able to delete-while-open, so not a use-case
 	if testing.Short() {
 		t.SkipNow()
 	}
@@ -71,6 +73,7 @@ func TestTailFileRecreatedReopen(t *testing.T) {
 }
 
 func TestTailFileDeletedCloses(t *testing.T) {
+	testutil.SkipWindows(t) // Not able to delete-while-open, so not a use-case
 	if testing.Short() {
 		t.SkipNow()
 	}

diff --git a/pkg/testutil/acceptance/parser.go b/pkg/testutil/acceptance/parser.go
@@ -22,6 +22,7 @@ var stringMatchers = map[string]stringComparer{
 type testConfig struct {
 	name        string
 	cmd         string
+	goos        string
 	stdout      strings.Builder
 	stderr      strings.Builder
 	stdin       strings.Builder
@@ -68,6 +69,8 @@ func iterateTestDefinitions(t *testing.T, r io.Reader) func(func(yield testConfi
 				cfg.errComp = matcher
 				cfg.linenum = linenum
 				writeTarget = &cfg.stdout
+			case strings.HasPrefix(line, "GOOS "):
+				cfg.goos = line[5:]
 			case strings.HasPrefix(line, "STDOUT"):
 				writeTarget = &cfg.stdout
 				cfg.outComp = matcher

diff --git a/pkg/testutil/acceptance/runner.go b/pkg/testutil/acceptance/runner.go
@@ -4,6 +4,7 @@ import (
 	"errors"
 	"io"
 	"os"
+	"runtime"
 	"strings"
 	"testing"
 
@@ -31,6 +32,11 @@ func RunTestSuiteFile(t *testing.T, filename string, runner Runner) {
 }
 
 func runTestConfig(t *testing.T, cfg *testConfig, runner Runner) {
+	if cfg.goos != "" && cfg.goos != runtime.GOOS {
+		t.Logf("SKIP (line %d): %s", cfg.linenum, cfg.name)
+		t.Skipf("goos %s != %s", cfg.goos, runtime.GOOS)
+	}
+
 	t.Logf("RUN (line %d): %s", cfg.linenum, cfg.cmd)
 
 	args := append([]string{"app"}, testutil.SplitQuotedString(cfg.cmd)...)

diff --git a/pkg/testutil/os.go b/pkg/testutil/os.go
@@ -0,0 +1,16 @@
+package testutil
+
+import (
+	"runtime"
+	"testing"
+)
+
+func IsWindows() bool {
+	return runtime.GOOS == "windows"
+}
+
+func SkipWindows(t *testing.T) {
+	if IsWindows() {
+		t.Skip("skip windows")
+	}
+}
diff --git a/pkg/testutil/os_test.go b/pkg/testutil/os_test.go
@@ -0,0 +1,12 @@
+package testutil
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestIsWindows(t *testing.T) {
+	SkipWindows(t)
+	assert.False(t, IsWindows())
+}