diff --git a/.gitignore b/.gitignore index 1000315b..ddeef2ef 100644 --- a/.gitignore +++ b/.gitignore @@ -11,4 +11,3 @@ redis.pid *.log coverage/ .DS_Store -libredis_cell.so diff --git a/run_tests.sh b/run_tests.sh index 8412a851..f26cad6d 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -50,17 +50,6 @@ die() { exit 1 } -get_redis_cell() { - if test x"$OPT_REDIS_CELL" = xyes; then - echo "Downloading redis-cell" - curl -L https://github.com/brandur/redis-cell/releases/download/v0.2.2/redis-cell-v0.2.2-x86_64-unknown-linux-gnu.tar.gz --output redis-cell.tar.gz > /dev/null 2>&1 - tar xvzf redis-cell.tar.gz > /dev/null 2>&1 - mv libredis_cell.so ${BASEDIR}/test/support/libredis_cell.so - rm redis-cell.tar.gz - rm libredis_cell.d - fi -} - trap 'cleanup_and_exit' 1 2 3 5 9 13 while [ -n "$1" ]; do @@ -122,9 +111,13 @@ fi TESTS=$@ if test x"$OPT_CREATE_REDIS" = xyes; then - get_redis_cell echo "Starting redis on port ${REDIS_PORT}" - echo "port ${REDIS_PORT}" | redis-server - --loadmodule ${BASEDIR}/test/support/libredis_cell.so > ${BASEDIR}/test.log & + REDIS_CELL_PATH="${BASEDIR}/test/support/libredis_cell.so" + if [[ "$OSTYPE" == "darwin"* ]]; then + REDIS_CELL_PATH="${BASEDIR}/test/support/libredis_cell.dylib" + fi + + echo "port ${REDIS_PORT}" | redis-server - --loadmodule ${REDIS_CELL_PATH} > ${BASEDIR}/test.log & PID_REDIS=$! echo ${PID_REDIS} > ${BASEDIR}/redis.pid fi diff --git a/test/support/libredis_cell.dylib b/test/support/libredis_cell.dylib new file mode 100755 index 00000000..7c7d6c88 Binary files /dev/null and b/test/support/libredis_cell.dylib differ diff --git a/test/support/libredis_cell.so b/test/support/libredis_cell.so new file mode 100755 index 00000000..1da8aa66 Binary files /dev/null and b/test/support/libredis_cell.so differ