From: antirez <antirez@gmail.com>
Date: Sat, 25 Jun 2011 10:22:59 +0000 (+0200)
Subject: Merge remote branch 'origin/unstable' into unstable
X-Git-Url: https://git.saurik.com/redis.git/commitdiff_plain/d5b36c5114659e979fc2e102954ded1e30aacacf?hp=-c

Merge remote branch 'origin/unstable' into unstable
---

d5b36c5114659e979fc2e102954ded1e30aacacf
diff --combined src/Makefile
index f499a194,9801dca6..4a6f27eb
--- a/src/Makefile
+++ b/src/Makefile
@@@ -61,7 -61,7 +61,7 @@@ QUIET_CC = @printf '    %b %b\n' $(CCCO
  QUIET_LINK = @printf '    %b %b\n' $(LINKCOLOR)LINK$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR);
  endif
  
 -OBJ = adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o dscache.o pubsub.o multi.o debug.o sort.o intset.o syncio.o diskstore.o cluster.o crc16.o endian.o
 +OBJ = adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endian.o
  BENCHOBJ = ae.o anet.o redis-benchmark.o sds.o adlist.o zmalloc.o
  CLIOBJ = anet.o sds.o adlist.o redis-cli.o zmalloc.o release.o
  CHECKDUMPOBJ = redis-check-dump.o lzf_c.o lzf_d.o
@@@ -196,7 -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