diff options
| -rw-r--r-- | .builds/alpine-edge-amd64.yml | 7 | ||||
| -rw-r--r-- | .builds/debian-stable-aarch64.yml | 8 | ||||
| -rw-r--r-- | .builds/debian-stable-amd64.yml | 7 | ||||
| -rw-r--r-- | .builds/freebsd-latest-amd64.yml | 7 | ||||
| -rw-r--r-- | .github/workflows/main.yml | 5 | ||||
| -rw-r--r-- | build.zig | 4 | ||||
| -rw-r--r-- | sqlite.zig | 4 |
7 files changed, 32 insertions, 10 deletions
diff --git a/.builds/alpine-edge-amd64.yml b/.builds/alpine-edge-amd64.yml index dc6f34f..6ff1f53 100644 --- a/.builds/alpine-edge-amd64.yml +++ b/.builds/alpine-edge-amd64.yml | |||
| @@ -17,9 +17,14 @@ tasks: | |||
| 17 | tar xJf ~/zig.tar.xz | 17 | tar xJf ~/zig.tar.xz |
| 18 | mv ~/zig-linux-* ~/zig-master | 18 | mv ~/zig-linux-* ~/zig-master |
| 19 | echo "export PATH=$PATH:~/zig-master" >> ~/.buildenv | 19 | echo "export PATH=$PATH:~/zig-master" >> ~/.buildenv |
| 20 | |||
| 20 | - test: | | 21 | - test: | |
| 21 | cd zig-sqlite | 22 | cd zig-sqlite |
| 22 | TERM=dumb zig build test -Dis_ci | 23 | TERM=dumb zig build test |
| 24 | |||
| 25 | - test_in_memory: | | ||
| 26 | cd zig-sqlite | ||
| 27 | TERM=dumb zig build test -Din_memory | ||
| 23 | 28 | ||
| 24 | triggers: | 29 | triggers: |
| 25 | - action: email | 30 | - action: email |
diff --git a/.builds/debian-stable-aarch64.yml b/.builds/debian-stable-aarch64.yml index 8c4464e..f3508b7 100644 --- a/.builds/debian-stable-aarch64.yml +++ b/.builds/debian-stable-aarch64.yml | |||
| @@ -17,9 +17,13 @@ tasks: | |||
| 17 | mv ~/zig-linux-* ~/zig-master | 17 | mv ~/zig-linux-* ~/zig-master |
| 18 | echo "export PATH=$PATH:~/zig-master" >> ~/.buildenv | 18 | echo "export PATH=$PATH:~/zig-master" >> ~/.buildenv |
| 19 | 19 | ||
| 20 | - test_with_system_library: | | 20 | - test: | |
| 21 | cd zig-sqlite | 21 | cd zig-sqlite |
| 22 | TERM=dumb zig build test -Dis_ci | 22 | TERM=dumb zig build test |
| 23 | |||
| 24 | - test_in_memory: | | ||
| 25 | cd zig-sqlite | ||
| 26 | TERM=dumb zig build test -Din_memory | ||
| 23 | 27 | ||
| 24 | triggers: | 28 | triggers: |
| 25 | - action: email | 29 | - action: email |
diff --git a/.builds/debian-stable-amd64.yml b/.builds/debian-stable-amd64.yml index eea85e4..856e61c 100644 --- a/.builds/debian-stable-amd64.yml +++ b/.builds/debian-stable-amd64.yml | |||
| @@ -16,9 +16,14 @@ tasks: | |||
| 16 | tar xJf ~/zig.tar.xz | 16 | tar xJf ~/zig.tar.xz |
| 17 | mv ~/zig-linux-* ~/zig-master | 17 | mv ~/zig-linux-* ~/zig-master |
| 18 | echo "export PATH=$PATH:~/zig-master" >> ~/.buildenv | 18 | echo "export PATH=$PATH:~/zig-master" >> ~/.buildenv |
| 19 | |||
| 19 | - test: | | 20 | - test: | |
| 20 | cd zig-sqlite | 21 | cd zig-sqlite |
| 21 | TERM=dumb zig build test -Dis_ci | 22 | TERM=dumb zig build test |
| 23 | |||
| 24 | - test_in_memory: | | ||
| 25 | cd zig-sqlite | ||
| 26 | TERM=dumb zig build test -Din_memory | ||
| 22 | 27 | ||
| 23 | triggers: | 28 | triggers: |
| 24 | - action: email | 29 | - action: email |
diff --git a/.builds/freebsd-latest-amd64.yml b/.builds/freebsd-latest-amd64.yml index 784ce6a..e6200bb 100644 --- a/.builds/freebsd-latest-amd64.yml +++ b/.builds/freebsd-latest-amd64.yml | |||
| @@ -16,9 +16,14 @@ tasks: | |||
| 16 | tar xJf ~/zig.tar.xz | 16 | tar xJf ~/zig.tar.xz |
| 17 | mv ~/zig-freebsd-* ~/zig-master | 17 | mv ~/zig-freebsd-* ~/zig-master |
| 18 | echo "export PATH=$PATH:~/zig-master" >> ~/.buildenv | 18 | echo "export PATH=$PATH:~/zig-master" >> ~/.buildenv |
| 19 | |||
| 19 | - test: | | 20 | - test: | |
| 20 | cd zig-sqlite | 21 | cd zig-sqlite |
| 21 | TERM=dumb zig build test -Dis_ci | 22 | TERM=dumb zig build test |
| 23 | |||
| 24 | - test_in_memory: | | ||
| 25 | cd zig-sqlite | ||
| 26 | TERM=dumb zig build test -Din_memory | ||
| 22 | 27 | ||
| 23 | triggers: | 28 | triggers: |
| 24 | - action: email | 29 | - action: email |
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0a6d92f..ead0083 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml | |||
| @@ -26,5 +26,8 @@ jobs: | |||
| 26 | - name: Build | 26 | - name: Build |
| 27 | run: zig build | 27 | run: zig build |
| 28 | 28 | ||
| 29 | - name: Run Tests | 29 | - name: Run Tests with filesystem |
| 30 | run: zig build test | ||
| 31 | |||
| 32 | - name: Run Tests in memory | ||
| 30 | run: zig build test | 33 | run: zig build test |
| @@ -14,11 +14,11 @@ pub fn build(b: *Builder) void { | |||
| 14 | linkAll(lib); | 14 | linkAll(lib); |
| 15 | lib.install(); | 15 | lib.install(); |
| 16 | 16 | ||
| 17 | const is_ci = b.option(bool, "is_ci", "Identifies if it runs in a CI environment") orelse false; | 17 | const in_memory = b.option(bool, "in_memory", "Should the tests run with sqlite in memory") orelse false; |
| 18 | 18 | ||
| 19 | var main_tests = b.addTest("sqlite.zig"); | 19 | var main_tests = b.addTest("sqlite.zig"); |
| 20 | main_tests.setBuildMode(mode); | 20 | main_tests.setBuildMode(mode); |
| 21 | main_tests.addBuildOption(bool, "is_ci", is_ci); | 21 | main_tests.addBuildOption(bool, "in_memory", in_memory); |
| 22 | linkAll(main_tests); | 22 | linkAll(main_tests); |
| 23 | 23 | ||
| 24 | const test_step = b.step("test", "Run library tests"); | 24 | const test_step = b.step("test", "Run library tests"); |
| @@ -790,7 +790,7 @@ test "sqlite: db pragma" { | |||
| 790 | testing.expect(foreign_keys != null); | 790 | testing.expect(foreign_keys != null); |
| 791 | testing.expectEqual(@as(usize, 0), foreign_keys.?); | 791 | testing.expectEqual(@as(usize, 0), foreign_keys.?); |
| 792 | 792 | ||
| 793 | if (build_options.is_ci) { | 793 | if (build_options.in_memory) { |
| 794 | const journal_mode = try db.pragma( | 794 | const journal_mode = try db.pragma( |
| 795 | []const u8, | 795 | []const u8, |
| 796 | "journal_mode", | 796 | "journal_mode", |
| @@ -1186,7 +1186,7 @@ test "sqlite: statement iterator" { | |||
| 1186 | } | 1186 | } |
| 1187 | 1187 | ||
| 1188 | fn dbMode() Db.Mode { | 1188 | fn dbMode() Db.Mode { |
| 1189 | return if (build_options.is_ci) blk: { | 1189 | return if (build_options.in_memory) blk: { |
| 1190 | break :blk .{ .Memory = {} }; | 1190 | break :blk .{ .Memory = {} }; |
| 1191 | } else blk: { | 1191 | } else blk: { |
| 1192 | const path = "/tmp/zig-sqlite.db"; | 1192 | const path = "/tmp/zig-sqlite.db"; |