gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

32bit CI needs to build modules correctly

Browse Source
This commit is contained in:
Oran Agra 2020-05-27 18:09:09 +03:00
parent 94c026cd19
commit 15bcb813d4
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/daily.yml vendored
View File

@ -47,7 +47,9 @@ jobs:
sudo apt-get install tcl8.5 sudo apt-get install tcl8.5
./runtest --accurate --verbose ./runtest --accurate --verbose
- name: module api test - name: module api test
run: ./runtest-moduleapi --verbose run: |
make -C tests/modules 32bit # the script below doesn't have an argument, we must build manually ahead of time
./runtest-moduleapi --verbose
test-tls: test-tls:
runs-on: ubuntu-latest runs-on: ubuntu-latest

5
tests/modules/Makefile
View File

@ -28,11 +28,14 @@ TEST_MODULES = \
all: $(TEST_MODULES) all: $(TEST_MODULES)
32bit:
$(MAKE) CFLAGS="-m32" LDFLAGS="-melf_i386"
%.xo: %.c ../../src/redismodule.h %.xo: %.c ../../src/redismodule.h
$(CC) -I../../src $(CFLAGS) $(SHOBJ_CFLAGS) -fPIC -c $< -o $@ $(CC) -I../../src $(CFLAGS) $(SHOBJ_CFLAGS) -fPIC -c $< -o $@
%.so: %.xo %.so: %.xo
$(LD) -o $@ $< $(SHOBJ_LDFLAGS) $(LIBS) -lc $(LD) -o $@ $< $(SHOBJ_LDFLAGS) $(LDFLAGS) $(LIBS) -lc
.PHONY: clean .PHONY: clean