Skip to content

Commit 2e3ba39

Browse files
ncrucesncruces
committed
Remove sqlite3_nosys.
1 parent a446900 commit 2e3ba39

34 files changed

+29
-42
lines changed

‎.github/workflows/cross.sh

-4
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,8 @@ echo js ; GOOS=js GOARCH=wasm go build .
1818
echo wasip1 ; GOOS=wasip1 GOARCH=wasm go build .
1919
echo linux-flock ; GOOS=linux GOARCH=amd64 go build -tags sqlite3_flock .
2020
echo linux-dotlk ; GOOS=linux GOARCH=amd64 go build -tags sqlite3_dotlk .
21-
echo linux-nosys ; GOOS=linux GOARCH=amd64 go build -tags sqlite3_nosys .
2221
echo darwin-flock ; GOOS=darwin GOARCH=amd64 go build -tags sqlite3_flock .
2322
echo darwin-dotlk ; GOOS=darwin GOARCH=amd64 go build -tags sqlite3_dotlk .
24-
echo darwin-nosys ; GOOS=darwin GOARCH=amd64 go build -tags sqlite3_nosys .
2523
echo windows-dotlk ; GOOS=windows GOARCH=amd64 go build -tags sqlite3_dotlk .
26-
echo windows-nosys ; GOOS=windows GOARCH=amd64 go build -tags sqlite3_nosys .
2724
echo freebsd-dotlk ; GOOS=freebsd GOARCH=amd64 go build -tags sqlite3_dotlk .
28-
echo freebsd-nosys ; GOOS=freebsd GOARCH=amd64 go build -tags sqlite3_nosys .
2925
echo solaris-dotlk ; GOOS=solaris GOARCH=amd64 go build -tags sqlite3_dotlk .

‎.github/workflows/test.yml

-4
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,6 @@ jobs:
5454
- name: Test
5555
run: go test -v ./... -bench . -benchtime=1x
5656

57-
- name: Test no locks
58-
run: go test -v -tags sqlite3_nosys ./...
59-
if: matrix.os == 'ubuntu-latest'
60-
6157
- name: Test BSD locks
6258
run: go test -v -tags sqlite3_flock ./...
6359
if: matrix.os == 'macos-latest'

‎driver/example2_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//go:build (linux || darwin || windows || freebsd || openbsd || netbsd || dragonfly || illumos || sqlite3_flock) && !sqlite3_nosys
1+
//go:build linux || darwin || windows || freebsd || openbsd || netbsd || dragonfly || illumos || sqlite3_flock || sqlite3_dotlk
22

33
package driver_test
44

‎driver/example_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//go:build ((linux || darwin || windows || freebsd || openbsd || netbsd || dragonfly || illumos) && !sqlite3_nosys) || sqlite3_flock || sqlite3_dotlk
1+
//go:build linux || darwin || windows || freebsd || openbsd || netbsd || dragonfly || illumos || sqlite3_flock || sqlite3_dotlk
22

33
package driver_test
44

‎internal/alloc/alloc_other.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//go:build !(unix || windows) || sqlite3_nosys
1+
//go:build !unix && !windows
22

33
package alloc
44

‎internal/alloc/alloc_unix.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//go:build unix && !sqlite3_nosys
1+
//go:build unix
22

33
package alloc
44

‎internal/alloc/alloc_windows.go

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
//go:build !sqlite3_nosys
2-
31
package alloc
42

53
import (

‎internal/util/mmap_other.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//go:build !unix || sqlite3_nosys
1+
//go:build !unix
22

33
package util
44

‎internal/util/mmap.go ‎internal/util/mmap_unix.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//go:build unix && !sqlite3_nosys
1+
//go:build unix
22

33
package util
44

‎internal/util/mmap_windows.go

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
//go:build !sqlite3_nosys
2-
31
package util
42

53
import (

‎tests/bradfitz/sql_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//go:build ((linux || darwin || windows || freebsd || openbsd || netbsd || dragonfly || illumos) && !sqlite3_nosys) || sqlite3_flock || sqlite3_dotlk
1+
//go:build linux || darwin || windows || freebsd || openbsd || netbsd || dragonfly || illumos || sqlite3_flock || sqlite3_dotlk
22

33
package bradfitz
44

‎vfs/README.md

-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ The implementation is compatible with SQLite's
9191
The VFS can be customized with a few build tags:
9292
- `sqlite3_flock` forces the use of BSD locks.
9393
- `sqlite3_dotlk` forces the use of dot-file locks.
94-
- `sqlite3_nosys` prevents importing [`x/sys`](https://pkg.go.dev/golang.org/x/sys).
9594

9695
> [!IMPORTANT]
9796
> The default configuration of this package is compatible with the standard

‎vfs/adiantum/example_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//go:build ((linux || darwin || windows || freebsd || openbsd || netbsd || dragonfly || illumos) && !sqlite3_nosys) || sqlite3_flock || sqlite3_dotlk
1+
//go:build linux || darwin || windows || freebsd || openbsd || netbsd || dragonfly || illumos || sqlite3_flock || sqlite3_dotlk
22

33
package adiantum_test
44

‎vfs/lock.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//go:build ((linux || darwin || windows || freebsd || openbsd || netbsd || dragonfly || illumos) && !sqlite3_nosys) || sqlite3_flock || sqlite3_dotlk
1+
//go:build linux || darwin || windows || freebsd || openbsd || netbsd || dragonfly || illumos || sqlite3_flock || sqlite3_dotlk
22

33
package vfs
44

‎vfs/lock_other.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//go:build !(((linux || darwin || windows || freebsd || openbsd || netbsd || dragonfly || illumos) && !sqlite3_nosys) || sqlite3_flock || sqlite3_dotlk)
1+
//go:build !(linux || darwin || windows || freebsd || openbsd || netbsd || dragonfly || illumos || sqlite3_flock || sqlite3_dotlk)
22

33
package vfs
44

‎vfs/os_bsd.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//go:build ((freebsd || openbsd || netbsd || dragonfly || illumos) && !(sqlite3_dotlk || sqlite3_nosys)) || sqlite3_flock
1+
//go:build ((freebsd || openbsd || netbsd || dragonfly || illumos) && !sqlite3_dotlk) || sqlite3_flock
22

33
package vfs
44

‎vfs/os_darwin.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//go:build !(sqlite3_flock || sqlite3_nosys)
1+
//go:build !sqlite3_flock
22

33
package vfs
44

‎vfs/os_f2fs_linux.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//go:build (amd64 || arm64 || riscv64) && !sqlite3_nosys
1+
//go:build amd64 || arm64 || riscv64
22

33
package vfs
44

‎vfs/os_linux.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//go:build !(sqlite3_flock || sqlite3_nosys)
1+
//go:build !sqlite3_flock
22

33
package vfs
44

‎vfs/os_ofd.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//go:build (linux || darwin) && !(sqlite3_flock || sqlite3_dotlk || sqlite3_nosys)
1+
//go:build (linux || darwin) && !(sqlite3_flock || sqlite3_dotlk)
22

33
package vfs
44

‎vfs/os_std.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//go:build !unix || sqlite3_nosys
1+
//go:build !unix
22

33
package vfs
44

‎vfs/os_std_alloc.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//go:build !(linux || darwin) || sqlite3_flock || sqlite3_nosys
1+
//go:build !(linux || darwin) || sqlite3_flock
22

33
package vfs
44

‎vfs/os_std_atomic.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//go:build !linux || !(amd64 || arm64 || riscv64) || sqlite3_nosys
1+
//go:build !linux || !(amd64 || arm64 || riscv64)
22

33
package vfs
44

‎vfs/os_std_sync.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//go:build !(linux || darwin) || sqlite3_flock || sqlite3_nosys
1+
//go:build !(linux || darwin) || sqlite3_flock
22

33
package vfs
44

‎vfs/os_unix.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//go:build unix && !sqlite3_nosys
1+
//go:build unix
22

33
package vfs
44

‎vfs/os_unix_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//go:build unix && !(sqlite3_flock || sqlite3_nosys)
1+
//go:build unix && !sqlite3_flock
22

33
package vfs
44

‎vfs/os_windows.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//go:build !(sqlite3_dotlk || sqlite3_nosys)
1+
//go:build !sqlite3_dotlk
22

33
package vfs
44

‎vfs/shm.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//go:build ((linux || darwin || windows || freebsd || openbsd || netbsd || dragonfly || illumos) && (386 || arm || amd64 || arm64 || riscv64 || ppc64le) && !sqlite3_nosys) || sqlite3_flock || sqlite3_dotlk
1+
//go:build ((linux || darwin || windows || freebsd || openbsd || netbsd || dragonfly || illumos) && (386 || arm || amd64 || arm64 || riscv64 || ppc64le)) || sqlite3_flock || sqlite3_dotlk
22

33
package vfs
44

‎vfs/shm_bsd.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//go:build ((freebsd || openbsd || netbsd || dragonfly || illumos) && (386 || arm || amd64 || arm64 || riscv64 || ppc64le) && !(sqlite3_dotlk || sqlite3_nosys)) || sqlite3_flock
1+
//go:build ((freebsd || openbsd || netbsd || dragonfly || illumos) && (386 || arm || amd64 || arm64 || riscv64 || ppc64le) && !sqlite3_dotlk) || sqlite3_flock
22

33
package vfs
44

‎vfs/shm_copy.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//go:build (windows && (386 || arm || amd64 || arm64 || riscv64 || ppc64le) && !sqlite3_nosys) || sqlite3_dotlk
1+
//go:build (windows && (386 || arm || amd64 || arm64 || riscv64 || ppc64le)) || sqlite3_dotlk
22

33
package vfs
44

‎vfs/shm_memlk.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//go:build ((freebsd || openbsd || netbsd || dragonfly || illumos) && (386 || arm || amd64 || arm64 || riscv64 || ppc64le) && !sqlite3_nosys) || sqlite3_flock || sqlite3_dotlk
1+
//go:build ((freebsd || openbsd || netbsd || dragonfly || illumos) && (386 || arm || amd64 || arm64 || riscv64 || ppc64le)) || sqlite3_flock || sqlite3_dotlk
22

33
package vfs
44

‎vfs/shm_ofd.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//go:build (linux || darwin) && (386 || arm || amd64 || arm64 || riscv64 || ppc64le) && !(sqlite3_flock || sqlite3_dotlk || sqlite3_nosys)
1+
//go:build (linux || darwin) && (386 || arm || amd64 || arm64 || riscv64 || ppc64le) && !(sqlite3_flock || sqlite3_dotlk)
22

33
package vfs
44

‎vfs/shm_other.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//go:build !(((linux || darwin || windows || freebsd || openbsd || netbsd || dragonfly || illumos) && (386 || arm || amd64 || arm64 || riscv64 || ppc64le) && !sqlite3_nosys) || sqlite3_flock || sqlite3_dotlk)
1+
//go:build !(((linux || darwin || windows || freebsd || openbsd || netbsd || dragonfly || illumos) && (386 || arm || amd64 || arm64 || riscv64 || ppc64le)) || sqlite3_flock || sqlite3_dotlk)
22

33
package vfs
44

‎vfs/shm_windows.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//go:build (386 || arm || amd64 || arm64 || riscv64 || ppc64le) && !(sqlite3_dotlk || sqlite3_nosys)
1+
//go:build (386 || arm || amd64 || arm64 || riscv64 || ppc64le) && !sqlite3_dotlk
22

33
package vfs
44

0 commit comments

Comments
 (0)