Merge pull request #192 from pietern/makefile

[redis.git] / tests / test_helper.tcl

diff --git a/tests/test_helper.tcl b/tests/test_helper.tcl
index fbd9d3b312d7682b7754653f31f9dd224fdd7b9e..dd91d2cbb08b9a2cbff1db5c0d1e4d86e8396d01 100644 (file)
--- a/tests/test_helper.tcl
+++ b/tests/test_helper.tcl
@@ -31,12 +31,14 @@ set ::all_tests {
     integration/aof
     unit/pubsub
     unit/slowlog
+    unit/scripting
+    unit/maxmemory
 }
 # Index to the next test to run in the ::all_tests list.
 set ::next_test 0
 
 set ::host 127.0.0.1
-set ::port 16379
+set ::port 21111
 set ::traceleaks 0
 set ::valgrind 0
 set ::verbose 0
@@ -147,36 +149,38 @@ proc cleanup {} {
     puts "OK"
 }
 
+proc find_available_port start {
+    for {set j $start} {$j < $start+1024} {incr j} {
+        if {[catch {
+            set fd [socket 127.0.0.1 $start]
+        }]} {
+            return $start
+        } else {
+            close $fd
+        }
+    }
+    if {$j == $start+1024} {
+        error "Can't find a non busy port in the $start-[expr {$start+1023}] range."
+    }
+}
+
 proc test_server_main {} {
     cleanup
     # Open a listening socket, trying different ports in order to find a
     # non busy one.
-    set port 11111
-    while 1 {
-        puts "Starting test server at port $port"
-        if {[catch {socket -server accept_test_clients $port} e]} {
-            if {[string match {*address already in use*} $e]} {
-                if {$port == 20000} {
-                    puts "Can't find an available TCP port for test server."
-                    exit 1
-                } else {
-                    incr port
-                }
-            } else {
-                puts "Fatal error starting test server: $e"
-                exit 1
-            }
-        } else {
-            break
-        }
-    }
+    set port [find_available_port 11111]
+    puts "Starting test server at port $port"
+    socket -server accept_test_clients $port
 
     # Start the client instances
     set ::clients_pids {}
+    set start_port [expr {$::port+100}]
     for {set j 0} {$j < $::numclients} {incr j} {
+        set start_port [find_available_port $start_port]
         set p [exec tclsh8.5 [info script] {*}$::argv \
-            --client $port --port [expr {$::port+($j*10)}] &]
+            --client $port --port $start_port &]
         lappend ::clients_pids $p
+        incr start_port 10
     }
 
     # Setup global state for the test server