Skip to content

Commit

Permalink
Merge branch 'main' into configOptions
Browse files Browse the repository at this point in the history
  • Loading branch information
arp242 committed Jul 14, 2023
2 parents 7b68b8f + 9342b6d commit 2ca1f58
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Expand Up @@ -25,7 +25,7 @@ jobs:
sysctl fs.inotify.max_user_watches fs.inotify.max_user_instances
ulimit -a
go version
go test -race -parallel 1 ./...
go test -parallel 1 -race ./...
# iOS
ios:
Expand All @@ -50,7 +50,7 @@ jobs:
export PATH=$PATH:/usr/local/Cellar/go/*/bin
uname -a
go version
go test -race -parallel 1 ./...
go test -parallel 1 -race ./...
# This is just Linux x86_64; also need to get a Go with GOOS=android, but
# there aren't any pre-built versions of that on the Go site. Idk, disable for
Expand Down Expand Up @@ -78,5 +78,5 @@ jobs:
# uname -a
# export PATH=/usr/local/go/bin:$PATH
# go version
# go test -race -parallel 1 ./...
# go test -parallel 1 -race ./...
#
2 changes: 1 addition & 1 deletion .cirrus.yml
Expand Up @@ -9,4 +9,4 @@ freebsd_task:
# run tests as user "cirrus" instead of root
- pw useradd cirrus -m
- chown -R cirrus:cirrus .
- sudo -u cirrus go test -race -parallel 1 ./...
- sudo -u cirrus go test -parallel 1 -race ./...
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Expand Up @@ -29,7 +29,7 @@ jobs:

- name: test
run: |
go test -race -parallel 1 ./...
go test -parallel 1 -race ./...
# Test gccgo
testgcc:
Expand Down Expand Up @@ -70,7 +70,7 @@ jobs:

- name: test
run: |
go test -race -parallel 1 ./...
go test -parallel 1 -race ./...
# OpenBSD; no -race as the VM doesn't include the comp set.
#
Expand Down
2 changes: 1 addition & 1 deletion fsnotify_test.go
Expand Up @@ -35,7 +35,7 @@ func TestMain(m *testing.M) {
c1 := m.Run()
os.Setenv("FSNOTIFY_BUFFER", "1")
c2 := m.Run()
os.Setenv("FSNOTIFY_BUFFER", "1024")
os.Setenv("FSNOTIFY_BUFFER", "64")
c3 := m.Run()

if c1 != 0 {
Expand Down

0 comments on commit 2ca1f58

Please sign in to comment.