Make test.sh use REDIS_SERVER everywhere

This commit is contained in:
Orion Poplawski 2024-08-24 19:15:22 -06:00 committed by Michael Grunder
parent 329346bb64
commit e0f48202aa

View File

@ -11,7 +11,7 @@ SKIPS_ARG=${SKIPS_ARG:-}
REDIS_DOCKER=${REDIS_DOCKER:-} REDIS_DOCKER=${REDIS_DOCKER:-}
# We need to enable the DEBUG command for redis-server >= 7.0.0 # We need to enable the DEBUG command for redis-server >= 7.0.0
REDIS_MAJOR_VERSION="$(redis-server --version|awk -F'[^0-9]+' '{ print $2 }')" REDIS_MAJOR_VERSION="$(${REDIS_SERVER} --version|awk -F'[^0-9]+' '{ print $2 }')"
if [ "$REDIS_MAJOR_VERSION" -gt "6" ]; then if [ "$REDIS_MAJOR_VERSION" -gt "6" ]; then
ENABLE_DEBUG_CMD="enable-debug-command local" ENABLE_DEBUG_CMD="enable-debug-command local"
fi fi
@ -98,7 +98,7 @@ if [ -n "${REDIS_DOCKER}" ] ; then
-p ${REDIS_SSL_PORT}:${REDIS_SSL_PORT} \ -p ${REDIS_SSL_PORT}:${REDIS_SSL_PORT} \
-v ${tmpdir}:${tmpdir} \ -v ${tmpdir}:${tmpdir} \
${REDIS_DOCKER} \ ${REDIS_DOCKER} \
redis-server ${tmpdir}/redis.conf ${REDIS_SERVER} ${tmpdir}/redis.conf
else else
${REDIS_SERVER} ${tmpdir}/redis.conf ${REDIS_SERVER} ${tmpdir}/redis.conf
fi fi