From 86cc08e4d688ac2ea4937e94d3b7a21fd389ee2a Mon Sep 17 00:00:00 2001 From: Nuno Cruces Date: Tue, 12 Dec 2023 02:03:02 +0000 Subject: [PATCH] Fix BSD tests. --- .github/workflows/bsd.yml | 7 +++++-- tests/parallel/parallel_test.go | 6 ++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/bsd.yml b/.github/workflows/bsd.yml index be990f0..4fcb55a 100644 --- a/.github/workflows/bsd.yml +++ b/.github/workflows/bsd.yml @@ -18,7 +18,7 @@ jobs: go-version: stable - name: Build - run: GOOS=freebsd go test -c ./... + run: GOOS=freebsd go test -c . ./vfs/... ./tests/... - name: Test uses: cross-platform-actions/action@v0.21.1 @@ -26,4 +26,7 @@ jobs: operating_system: freebsd version: '13.2' sync_files: runner-to-vm - run: find . -name '*.test' -maxdepth 1 -exec {} -test.v \; + run: | + foreach test ( *.test ) + ./$test -test.v || exit $? + end \ No newline at end of file diff --git a/tests/parallel/parallel_test.go b/tests/parallel/parallel_test.go index f920235..7fc7f85 100644 --- a/tests/parallel/parallel_test.go +++ b/tests/parallel/parallel_test.go @@ -60,7 +60,7 @@ func TestMultiProcess(t *testing.T) { "&_pragma=journal_mode(truncate)" + "&_pragma=synchronous(off)" - cmd := exec.Command("go", "test", "-v", "-run", "TestChildProcess") + cmd := exec.Command(os.Args[0], append(os.Args[1:], "-test.v", "-test.run=TestChildProcess")...) out, err := cmd.StdoutPipe() if err != nil { t.Fatal(err) @@ -71,8 +71,10 @@ func TestMultiProcess(t *testing.T) { var buf [3]byte // Wait for child to start. - if _, err := io.ReadFull(out, buf[:]); err != nil || string(buf[:]) != "===" { + if _, err := io.ReadFull(out, buf[:]); err != nil { t.Fatal(err) + } else if str := string(buf[:]); str != "===" { + t.Fatal(str) } testParallel(t, name, 1000)