Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
28e574bc
Unverified
Commit
28e574bc
authored
May 28, 2020
by
Salvatore Sanfilippo
Committed by
GitHub
May 28, 2020
Browse files
Merge pull request #7336 from oranagra/modules_ci_32bit
32bit CI needs to build modules correctly
parents
a4efbd59
15bcb813
Changes
2
Hide whitespace changes
Inline
Side-by-side
.github/workflows/daily.yml
View file @
28e574bc
...
@@ -47,7 +47,9 @@ jobs:
...
@@ -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
...
...
tests/modules/Makefile
View file @
28e574bc
...
@@ -28,11 +28,14 @@ TEST_MODULES = \
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment