diff --git a/driver/driver_test.go b/driver/driver_test.go index 1b92f74..b839316 100644 --- a/driver/driver_test.go +++ b/driver/driver_test.go @@ -14,6 +14,7 @@ import ( "github.com/ncruces/go-sqlite3" _ "github.com/ncruces/go-sqlite3/embed" "github.com/ncruces/go-sqlite3/internal/util" + _ "github.com/ncruces/go-sqlite3/tests/testcfg" ) func Test_Open_dir(t *testing.T) { diff --git a/driver/savepoint_test.go b/driver/savepoint_test.go index a95cb35..54219a4 100644 --- a/driver/savepoint_test.go +++ b/driver/savepoint_test.go @@ -6,6 +6,7 @@ import ( "github.com/ncruces/go-sqlite3/driver" _ "github.com/ncruces/go-sqlite3/embed" + _ "github.com/ncruces/go-sqlite3/tests/testcfg" _ "github.com/ncruces/go-sqlite3/vfs/memdb" ) diff --git a/ext/fileio/fileio_test.go b/ext/fileio/fileio_test.go index 2b777a5..6c240a5 100644 --- a/ext/fileio/fileio_test.go +++ b/ext/fileio/fileio_test.go @@ -11,6 +11,7 @@ import ( "github.com/ncruces/go-sqlite3/driver" _ "github.com/ncruces/go-sqlite3/embed" "github.com/ncruces/go-sqlite3/ext/fileio" + _ "github.com/ncruces/go-sqlite3/tests/testcfg" ) func Test_lsmode(t *testing.T) { diff --git a/ext/fileio/fsdir_test.go b/ext/fileio/fsdir_test.go index e199a34..53df2b9 100644 --- a/ext/fileio/fsdir_test.go +++ b/ext/fileio/fsdir_test.go @@ -12,6 +12,7 @@ import ( "github.com/ncruces/go-sqlite3/driver" _ "github.com/ncruces/go-sqlite3/embed" "github.com/ncruces/go-sqlite3/ext/fileio" + _ "github.com/ncruces/go-sqlite3/tests/testcfg" ) func Test_fsdir(t *testing.T) { diff --git a/ext/fileio/write_test.go b/ext/fileio/write_test.go index 09769f3..847c7d0 100644 --- a/ext/fileio/write_test.go +++ b/ext/fileio/write_test.go @@ -10,6 +10,7 @@ import ( "github.com/ncruces/go-sqlite3" "github.com/ncruces/go-sqlite3/driver" _ "github.com/ncruces/go-sqlite3/embed" + _ "github.com/ncruces/go-sqlite3/tests/testcfg" ) func Test_writefile(t *testing.T) { diff --git a/ext/hash/hash_test.go b/ext/hash/hash_test.go index 5388410..f1adc00 100644 --- a/ext/hash/hash_test.go +++ b/ext/hash/hash_test.go @@ -10,6 +10,7 @@ import ( "github.com/ncruces/go-sqlite3" "github.com/ncruces/go-sqlite3/driver" _ "github.com/ncruces/go-sqlite3/embed" + _ "github.com/ncruces/go-sqlite3/tests/testcfg" _ "golang.org/x/crypto/blake2b" _ "golang.org/x/crypto/blake2s" _ "golang.org/x/crypto/md4" diff --git a/ext/stats/stats_test.go b/ext/stats/stats_test.go index 54b183e..f2b4280 100644 --- a/ext/stats/stats_test.go +++ b/ext/stats/stats_test.go @@ -7,6 +7,7 @@ import ( "github.com/ncruces/go-sqlite3" _ "github.com/ncruces/go-sqlite3/embed" "github.com/ncruces/go-sqlite3/ext/stats" + _ "github.com/ncruces/go-sqlite3/tests/testcfg" ) func TestRegister_variance(t *testing.T) { diff --git a/ext/unicode/unicode_test.go b/ext/unicode/unicode_test.go index fa41cd6..5c4dcc4 100644 --- a/ext/unicode/unicode_test.go +++ b/ext/unicode/unicode_test.go @@ -7,6 +7,7 @@ import ( "github.com/ncruces/go-sqlite3" _ "github.com/ncruces/go-sqlite3/embed" + _ "github.com/ncruces/go-sqlite3/tests/testcfg" ) func TestRegister(t *testing.T) { diff --git a/ext/zorder/zorder_test.go b/ext/zorder/zorder_test.go index a2699ce..8033e9f 100644 --- a/ext/zorder/zorder_test.go +++ b/ext/zorder/zorder_test.go @@ -7,6 +7,7 @@ import ( "github.com/ncruces/go-sqlite3/driver" _ "github.com/ncruces/go-sqlite3/embed" "github.com/ncruces/go-sqlite3/ext/zorder" + _ "github.com/ncruces/go-sqlite3/tests/testcfg" ) func TestRegister_zorder(t *testing.T) { diff --git a/gormlite/sqlite_test.go b/gormlite/sqlite_test.go index 7a0b97a..c09d611 100644 --- a/gormlite/sqlite_test.go +++ b/gormlite/sqlite_test.go @@ -9,6 +9,7 @@ import ( "github.com/ncruces/go-sqlite3" "github.com/ncruces/go-sqlite3/driver" _ "github.com/ncruces/go-sqlite3/embed" + _ "github.com/ncruces/go-sqlite3/tests/testcfg" ) func TestDialector(t *testing.T) { diff --git a/tests/backup_test.go b/tests/backup_test.go index 121a8a9..cb9ab8b 100644 --- a/tests/backup_test.go +++ b/tests/backup_test.go @@ -6,6 +6,7 @@ import ( "github.com/ncruces/go-sqlite3" _ "github.com/ncruces/go-sqlite3/embed" + _ "github.com/ncruces/go-sqlite3/tests/testcfg" ) func TestBackup(t *testing.T) { diff --git a/tests/blob_test.go b/tests/blob_test.go index 4b181f8..413ab05 100644 --- a/tests/blob_test.go +++ b/tests/blob_test.go @@ -11,6 +11,7 @@ import ( "github.com/ncruces/go-sqlite3" _ "github.com/ncruces/go-sqlite3/embed" + _ "github.com/ncruces/go-sqlite3/tests/testcfg" ) func TestBlob(t *testing.T) { diff --git a/tests/bradfitz/sql_test.go b/tests/bradfitz/sql_test.go index d76083c..8c10a8b 100644 --- a/tests/bradfitz/sql_test.go +++ b/tests/bradfitz/sql_test.go @@ -12,6 +12,7 @@ import ( _ "github.com/ncruces/go-sqlite3/driver" _ "github.com/ncruces/go-sqlite3/embed" + _ "github.com/ncruces/go-sqlite3/tests/testcfg" ) type Tester interface { diff --git a/tests/conn_test.go b/tests/conn_test.go index 0fd5978..b768adb 100644 --- a/tests/conn_test.go +++ b/tests/conn_test.go @@ -11,6 +11,7 @@ import ( "github.com/ncruces/go-sqlite3" _ "github.com/ncruces/go-sqlite3/embed" + _ "github.com/ncruces/go-sqlite3/tests/testcfg" _ "github.com/ncruces/go-sqlite3/vfs/memdb" ) diff --git a/tests/db_test.go b/tests/db_test.go index 168cae5..2322e7b 100644 --- a/tests/db_test.go +++ b/tests/db_test.go @@ -9,6 +9,7 @@ import ( "github.com/ncruces/go-sqlite3" _ "github.com/ncruces/go-sqlite3/embed" + _ "github.com/ncruces/go-sqlite3/tests/testcfg" _ "github.com/ncruces/go-sqlite3/vfs/memdb" ) diff --git a/tests/driver_test.go b/tests/driver_test.go index e474d09..5dc0239 100644 --- a/tests/driver_test.go +++ b/tests/driver_test.go @@ -6,6 +6,7 @@ import ( "github.com/ncruces/go-sqlite3/driver" _ "github.com/ncruces/go-sqlite3/embed" + _ "github.com/ncruces/go-sqlite3/tests/testcfg" ) func TestDriver(t *testing.T) { diff --git a/tests/ext_test.go b/tests/ext_test.go index b594b00..d5bcd07 100644 --- a/tests/ext_test.go +++ b/tests/ext_test.go @@ -5,6 +5,7 @@ import ( "github.com/ncruces/go-sqlite3" _ "github.com/ncruces/go-sqlite3/embed" + _ "github.com/ncruces/go-sqlite3/tests/testcfg" ) func Test_base64(t *testing.T) { diff --git a/tests/func_test.go b/tests/func_test.go index a727e6c..16beb3b 100644 --- a/tests/func_test.go +++ b/tests/func_test.go @@ -6,6 +6,7 @@ import ( "github.com/ncruces/go-sqlite3" _ "github.com/ncruces/go-sqlite3/embed" + _ "github.com/ncruces/go-sqlite3/tests/testcfg" ) func TestCreateFunction(t *testing.T) { diff --git a/tests/json_test.go b/tests/json_test.go index 70a4b07..3796cf3 100644 --- a/tests/json_test.go +++ b/tests/json_test.go @@ -10,6 +10,7 @@ import ( "github.com/ncruces/go-sqlite3" "github.com/ncruces/go-sqlite3/driver" _ "github.com/ncruces/go-sqlite3/embed" + _ "github.com/ncruces/go-sqlite3/tests/testcfg" "github.com/ncruces/julianday" ) diff --git a/tests/parallel/parallel_test.go b/tests/parallel/parallel_test.go index b5bdb26..97806a1 100644 --- a/tests/parallel/parallel_test.go +++ b/tests/parallel/parallel_test.go @@ -12,16 +12,11 @@ import ( "github.com/ncruces/go-sqlite3" _ "github.com/ncruces/go-sqlite3/embed" + _ "github.com/ncruces/go-sqlite3/tests/testcfg" "github.com/ncruces/go-sqlite3/vfs" "github.com/ncruces/go-sqlite3/vfs/memdb" - "github.com/tetratelabs/wazero" ) -func TestMain(m *testing.M) { - sqlite3.RuntimeConfig = wazero.NewRuntimeConfig().WithMemoryLimitPages(1024) - os.Exit(m.Run()) -} - func TestParallel(t *testing.T) { var iter int if testing.Short() { diff --git a/tests/stmt_test.go b/tests/stmt_test.go index 5284ead..42a3d59 100644 --- a/tests/stmt_test.go +++ b/tests/stmt_test.go @@ -8,6 +8,7 @@ import ( "github.com/ncruces/go-sqlite3" _ "github.com/ncruces/go-sqlite3/embed" + _ "github.com/ncruces/go-sqlite3/tests/testcfg" ) func TestStmt(t *testing.T) { diff --git a/tests/testcfg/testcfg.go b/tests/testcfg/testcfg.go new file mode 100644 index 0000000..5c646ba --- /dev/null +++ b/tests/testcfg/testcfg.go @@ -0,0 +1,10 @@ +package testcfg + +import ( + "github.com/ncruces/go-sqlite3" + "github.com/tetratelabs/wazero" +) + +func init() { + sqlite3.RuntimeConfig = wazero.NewRuntimeConfig().WithMemoryLimitPages(1024) +} diff --git a/tests/time_test.go b/tests/time_test.go index 23b5be2..283e8ac 100644 --- a/tests/time_test.go +++ b/tests/time_test.go @@ -10,6 +10,7 @@ import ( "github.com/ncruces/go-sqlite3" "github.com/ncruces/go-sqlite3/driver" _ "github.com/ncruces/go-sqlite3/embed" + _ "github.com/ncruces/go-sqlite3/tests/testcfg" ) func TestTimeFormat_Encode(t *testing.T) { diff --git a/tests/txn_test.go b/tests/txn_test.go index 2a77efb..415fcca 100644 --- a/tests/txn_test.go +++ b/tests/txn_test.go @@ -7,6 +7,7 @@ import ( "github.com/ncruces/go-sqlite3" _ "github.com/ncruces/go-sqlite3/embed" + _ "github.com/ncruces/go-sqlite3/tests/testcfg" ) func TestConn_Transaction_exec(t *testing.T) { diff --git a/tests/vfs_test.go b/tests/vfs_test.go index cc1a22a..7a6f7ce 100644 --- a/tests/vfs_test.go +++ b/tests/vfs_test.go @@ -6,6 +6,7 @@ import ( "github.com/ncruces/go-sqlite3" _ "github.com/ncruces/go-sqlite3/embed" + _ "github.com/ncruces/go-sqlite3/tests/testcfg" "github.com/ncruces/go-sqlite3/vfs/memdb" "github.com/ncruces/go-sqlite3/vfs/readervfs" ) diff --git a/tests/wal_test.go b/tests/wal_test.go index 2f525b2..8f1fcdf 100644 --- a/tests/wal_test.go +++ b/tests/wal_test.go @@ -6,6 +6,8 @@ import ( "testing" "github.com/ncruces/go-sqlite3" + _ "github.com/ncruces/go-sqlite3/embed" + _ "github.com/ncruces/go-sqlite3/tests/testcfg" "github.com/ncruces/go-sqlite3/vfs" ) diff --git a/vfs/README.md b/vfs/README.md index 58b3e9f..a8fe2d4 100644 --- a/vfs/README.md +++ b/vfs/README.md @@ -51,7 +51,7 @@ like SQLite. To allow `mmap` to work, each connection needs to reserve up to 4GB of address space.\ To limit the amount of address space each connection needs, -use [`WithMemoryLimitPages`](../tests/parallel/parallel_test.go#L21). +use [`WithMemoryLimitPages`](../tests/testcfg/testcfg.go). On all other platforms, [WAL](https://sqlite.org/wal.html) support is [limited](https://sqlite.org/wal.html#noshm). diff --git a/vfs/tests/mptest/mptest_test.go b/vfs/tests/mptest/mptest_test.go index 3b7e789..8f78b45 100644 --- a/vfs/tests/mptest/mptest_test.go +++ b/vfs/tests/mptest/mptest_test.go @@ -39,7 +39,8 @@ var ( func TestMain(m *testing.M) { ctx := context.Background() - rt = wazero.NewRuntime(ctx) + cfg := wazero.NewRuntimeConfig().WithMemoryLimitPages(1024) + rt = wazero.NewRuntimeWithConfig(ctx, cfg) wasi_snapshot_preview1.MustInstantiate(ctx, rt) env := vfs.ExportHostFunctions(rt.NewHostModuleBuilder("env")) diff --git a/vfs/tests/speedtest1/speedtest1_test.go b/vfs/tests/speedtest1/speedtest1_test.go index e050e5d..30fca3b 100644 --- a/vfs/tests/speedtest1/speedtest1_test.go +++ b/vfs/tests/speedtest1/speedtest1_test.go @@ -38,7 +38,8 @@ func TestMain(m *testing.M) { initFlags() ctx := context.Background() - rt = wazero.NewRuntime(ctx) + cfg := wazero.NewRuntimeConfig().WithMemoryLimitPages(1024) + rt = wazero.NewRuntimeWithConfig(ctx, cfg) wasi_snapshot_preview1.MustInstantiate(ctx, rt) env := vfs.ExportHostFunctions(rt.NewHostModuleBuilder("env")) _, err := env.Instantiate(ctx)