Remove Redis version from Linux scripts (#56)

* Remove Redis version from Linux scripts

* Add documentation.
This commit is contained in:
mehrdadn
2016-11-21 15:02:40 -08:00
committed by Robert Nishihara
parent 4b00c029ac
commit 3714984094
9 changed files with 17 additions and 12 deletions
+1 -1
View File
@@ -40,7 +40,7 @@ hiredis:
test: CFLAGS += -DRAY_COMMON_LOG_LEVEL=4
test: hiredis redis $(BUILD)/common_tests $(BUILD)/task_table_tests $(BUILD)/object_table_tests $(BUILD)/db_tests $(BUILD)/io_tests $(BUILD)/task_tests $(BUILD)/redis_tests FORCE
./thirdparty/redis-3.2.3/src/redis-server &
./thirdparty/redis/src/redis-server &
sleep 1s
./build/common_tests
./build/db_tests
+9 -4
View File
@@ -3,9 +3,14 @@
# Cause the script to exit if a single command fails.
set -e
if [ ! -f redis-3.2.3/src/redis-server ]; then
wget http://download.redis.io/releases/redis-3.2.3.tar.gz
tar xvfz redis-3.2.3.tar.gz
cd redis-3.2.3
if [ ! -f redis/src/redis-server ]; then
redis_vname="redis-3.2.3"
# This check is to make sure the tarball has been fully extracted. The only
# relevant bit about redis/utils/whatisdoing.sh is that it is one of the last
# files in the tarball.
if [ ! -f redis/utils/whatisdoing.sh ]; then
mkdir -p "./redis" && wget -O- "http://download.redis.io/releases/$redis_vname.tar.gz" | tar xvz --strip-components=1 -C "./redis"
fi
cd redis
make
fi
+1 -1
View File
@@ -41,7 +41,7 @@ class TestGlobalScheduler(unittest.TestCase):
def setUp(self):
# Start a Redis server.
redis_path = os.path.join(os.path.abspath(os.path.dirname(__file__)), "../../common/thirdparty/redis-3.2.3/src/redis-server")
redis_path = os.path.join(os.path.abspath(os.path.dirname(__file__)), "../../common/thirdparty/redis/src/redis-server")
node_ip_address = "127.0.0.1"
redis_port = new_port()
redis_address = "{}:{}".format(node_ip_address, redis_port)
+2 -2
View File
@@ -56,7 +56,7 @@ def assert_get_object_equal(unit_test, client1, client2, object_id, memory_buffe
client2.get_metadata(object_id)[:])
# Check if the redis-server binary is present.
redis_path = os.path.join(os.path.abspath(os.path.dirname(__file__)), "../../common/thirdparty/redis-3.2.3/src/redis-server")
redis_path = os.path.join(os.path.abspath(os.path.dirname(__file__)), "../../common/thirdparty/redis/src/redis-server")
if not os.path.exists(redis_path):
raise Exception("You do not have the redis-server binary. Run `make test` in the plasma directory to get it.")
@@ -254,7 +254,7 @@ class TestPlasmaManager(unittest.TestCase):
store_name1, self.p2 = plasma.start_plasma_store(use_valgrind=USE_VALGRIND)
store_name2, self.p3 = plasma.start_plasma_store(use_valgrind=USE_VALGRIND)
# Start a Redis server.
redis_path = os.path.join(os.path.abspath(os.path.dirname(__file__)), "../../common/thirdparty/redis-3.2.3/src/redis-server")
redis_path = os.path.join(os.path.abspath(os.path.dirname(__file__)), "../../common/thirdparty/redis/src/redis-server")
redis_port = 6379
with open(os.devnull, "w") as FNULL:
self.redis_process = subprocess.Popen([redis_path,