Merge remote branch 'origin/unstable' into unstable

diff --git a/src/Makefile b/src/Makefile
index f499a1940782961c716c514c921a1b8747cdf784..4a6f27ebad486232f543dd1c8947ae7b28f8b2a0 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -196,7 +196,7 @@ dep:
        $(CC) -MM *.c -I ../deps/hiredis -I ../deps/linenoise
 
 test: redis-server
-       (cd ..; tclsh8.5 tests/test_helper.tcl --tags "${TAGS}" --file "${FILE}")
+       @(cd ..; (which tclsh >/dev/null && tclsh tests/test_helper.tcl --tags "${TAGS}" --file "${FILE}") || echo "You need to install Tcl in order to run tests.")
 
 bench:
        ./redis-benchmark