File tree Expand file tree Collapse file tree 3 files changed +5
-14
lines changed
Expand file tree Collapse file tree 3 files changed +5
-14
lines changed Original file line number Diff line number Diff line change @@ -218,7 +218,7 @@ jobs:
218218 parameters :
219219 test_args :
220220 type : string
221- default : " CLUSTER=0 AOF=0 "
221+ default : " CLUSTER=0"
222222 docker :
223223 - image : redisfab/rmbuilder:6.2.1-x64-buster
224224 steps :
@@ -538,12 +538,7 @@ workflows:
538538 << : *after-linter
539539 - valgrind :
540540 name : valgrind-cluster
541- test_args : GEN=0 AOF=0
542- << : *on-integ-branch
543- << : *after-linter
544- - valgrind :
545- name : valgrind-aof
546- test_args : GEN=0 CLUSTER=0
541+ test_args : GEN=0
547542 << : *on-integ-branch
548543 << : *after-linter
549544 - build-and-test-gpu :
Original file line number Diff line number Diff line change @@ -240,7 +240,6 @@ endif
240240
241241export GEN ?= 1
242242export SLAVES ?= 1
243- export AOF ?= 1
244243export CLUSTER ?= 1
245244
246245define UNIT_TESTS
@@ -256,7 +255,7 @@ $(SHOW)\
256255DEVICE=$(DEVICE ) \
257256MODULE=$(realpath $(INSTALLED_TARGET ) ) \
258257CLUSTER=$(CLUSTER ) \
259- GEN=$(GEN ) AOF= $( AOF ) SLAVES=$(SLAVES ) \
258+ GEN=$(GEN ) SLAVES=$(SLAVES ) \
260259VALGRIND=$(VALGRIND ) \
261260$(ROOT ) /tests/flow/tests_setup/tests.sh
262261endef
@@ -272,7 +271,7 @@ flow_tests: build
272271 DEVICE=$(DEVICE ) \
273272 MODULE=$(realpath $(INSTALLED_TARGET ) ) \
274273 CLUSTER=$(CLUSTER ) \
275- GEN=$(GEN ) AOF= $( AOF ) SLAVES=$(SLAVES ) \
274+ GEN=$(GEN ) SLAVES=$(SLAVES ) \
276275 VALGRIND=$(VALGRIND ) \
277276 REDIS=$(REDIS ) \
278277 $(ROOT ) /tests/flow/tests_setup/tests.sh
@@ -290,7 +289,7 @@ test: build
290289 MODULE=$(realpath $(INSTALLED_TARGET ) ) \
291290 TESTMOD=$(realpath $(BINDIR ) /tests/module/testmod.so) \
292291 CLUSTER=$(CLUSTER ) \
293- GEN=$(GEN ) AOF= $( AOF ) SLAVES=$(SLAVES ) \
292+ GEN=$(GEN ) SLAVES=$(SLAVES ) \
294293 VALGRIND=$(VALGRIND ) \
295294 REDIS=$(REDIS ) \
296295 $(ROOT ) /tests/flow/tests_setup/tests.sh
Original file line number Diff line number Diff line change @@ -34,7 +34,6 @@ help() {
3434
3535 DEVICE=cpu|gpu Device for testing
3636 GEN=0|1 General tests
37- AOF=0|1 Tests with --test-aof
3837 SLAVES=0|1 Tests with --test-slaves
3938
4039 TEST=test Run specific test (e.g. test.py:test_name)
@@ -109,7 +108,6 @@ DEVICE=${DEVICE:-cpu}
109108
110109GEN=${GEN:- 1}
111110SLAVES=${SLAVES:- 0}
112- AOF=${AOF:- 0}
113111
114112GDB=${GDB:- 0}
115113
@@ -146,6 +144,5 @@ check_redis_server
146144[[ $GEN == 1 ]] && run_tests
147145[[ $CLUSTER == 1 ]] && RLTEST_ARGS+=" --env oss-cluster --shards-count 1" run_tests " --env oss-cluster"
148146[[ $VALGRIND != 1 && $SLAVES == 1 ]] && RLTEST_ARGS+=" --use-slaves" run_tests " --use-slaves"
149- [[ $AOF == 1 ]] && RLTEST_ARGS+=" --use-aof" run_tests " --use-aof"
150147# [[ $VALGRIND == 1 ]] && valgrind_summary
151148exit 0
You can’t perform that action at this time.
0 commit comments