summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile4
-rw-r--r--test-redis.tcl13
2 files changed, 10 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 995bd8bc7..aea43f1da 100644
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,8 @@ else
endif
CCOPT= $(CFLAGS) $(CCLINK) $(ARCH) $(PROF)
DEBUG?= -g -rdynamic -ggdb
+HOST?= 127.0.0.1
+PORT?= 6379
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
BENCHOBJ = ae.o anet.o redis-benchmark.o sds.o adlist.o zmalloc.o
@@ -79,7 +81,7 @@ staticsymbols:
tclsh utils/build-static-symbols.tcl > staticsymbols.h
test:
- tclsh test-redis.tcl
+ tclsh test-redis.tcl -p $(PORT) -h $(HOST)
bench:
./redis-benchmark
diff --git a/test-redis.tcl b/test-redis.tcl
index f321258a5..944e631de 100644
--- a/test-redis.tcl
+++ b/test-redis.tcl
@@ -226,8 +226,8 @@ proc datasetDigest r {
return $digest
}
-proc main {server port} {
- set r [redis $server $port]
+proc main {} {
+ set r [redis $::host $::port]
$r select 9
set err ""
set res ""
@@ -2008,7 +2008,7 @@ proc main {server port} {
} {1 1}
test {PIPELINING stresser (also a regression for the old epoll bug)} {
- set fd2 [socket 127.0.0.1 6379]
+ set fd2 [socket $::host $::port]
fconfigure $fd2 -encoding binary -translation binary
puts -nonewline $fd2 "SELECT 9\r\n"
flush $fd2
@@ -2113,7 +2113,7 @@ proc main {server port} {
}
proc stress {} {
- set r [redis]
+ set r [redis $::host $::port]
$r select 9
$r flushdb
while 1 {
@@ -2182,7 +2182,7 @@ for {set j 0} {$j < [llength $argv]} {incr j} {
}
# Before to run the test check if DB 9 and DB 10 are empty
-set r [redis]
+set r [redis $::host $::port]
if {$::flush} {
$r flushall
@@ -2201,8 +2201,9 @@ unset r
unset db9size
unset db10size
+puts "Testing Redis, host $::host, port $::port"
if {$::stress} {
stress
} else {
- main $::host $::port
+ main
}