diff options
| -rw-r--r-- | .github/workflows/ci.yml | 11 | ||||
| -rw-r--r-- | .github/workflows/daily.yml | 15 | ||||
| -rw-r--r-- | tests/integration/corrupt-dump-fuzzer.tcl | 7 | ||||
| -rw-r--r-- | tests/modules/Makefile | 2 |
4 files changed, 16 insertions, 19 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2e1e7865c..2582c53a4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -58,14 +58,3 @@ jobs: run: | yum -y install gcc make make REDIS_CFLAGS='-Werror' - - build-freebsd: - runs-on: macos-latest - steps: - - uses: actions/checkout@v2 - - name: make - uses: vmactions/freebsd-vm@v0.1.0 - with: - usesh: true - prepare: pkg install -y gmake - run: gmake diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index 8fb23bac4..589694f38 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -210,13 +210,14 @@ jobs: steps: - uses: actions/checkout@v2 - name: test - uses: vmactions/freebsd-vm@v0.1.0 + uses: vmactions/freebsd-vm@v0.1.2 with: usesh: true - prepare: pkg install -y gmake lang/tcl85 - run: | - gmake - ./runtest --accurate --verbose --no-latency - MAKE=gmake ./runtest-moduleapi --verbose - ./runtest-sentinel + sync: rsync + prepare: pkg install -y bash gmake lang/tcl86 + run: > + gmake && + ./runtest --accurate --verbose --no-latency && + MAKE=gmake ./runtest-moduleapi --verbose && + ./runtest-sentinel && ./runtest-cluster diff --git a/tests/integration/corrupt-dump-fuzzer.tcl b/tests/integration/corrupt-dump-fuzzer.tcl index d41ed2941..2506205a5 100644 --- a/tests/integration/corrupt-dump-fuzzer.tcl +++ b/tests/integration/corrupt-dump-fuzzer.tcl @@ -71,6 +71,13 @@ foreach sanitize_dump {no yes} { set min_cycles 10 ; # run at least 10 cycles } + # Don't execute this on FreeBSD due to a yet-undiscovered memory issue + # which causes tclsh to bloat. + if {[exec uname] == "FreeBSD"} { + set min_cycles 1 + set min_duration 1 + } + test "Fuzzer corrupt restore payloads - sanitize_dump: $sanitize_dump" { if {$min_duration * 2 > $::timeout} { fail "insufficient timeout" diff --git a/tests/modules/Makefile b/tests/modules/Makefile index 93b4b022f..e1629a8ac 100644 --- a/tests/modules/Makefile +++ b/tests/modules/Makefile @@ -43,7 +43,7 @@ all: $(TEST_MODULES) $(CC) -I../../src $(CFLAGS) $(SHOBJ_CFLAGS) -fPIC -c $< -o $@ %.so: %.xo - $(LD) -o $@ $< $(SHOBJ_LDFLAGS) $(LDFLAGS) $(LIBS) -lc + $(LD) -o $@ $< $(SHOBJ_LDFLAGS) $(LDFLAGS) $(LIBS) .PHONY: clean |