Allow to specify which specific test files to run

diff --git a/src/Makefile b/src/Makefile
index e1e989c60d04ff868865f8a95c1effba033d9e74..3add292567c9a92576e364d70e01e52375633e91 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -126,7 +126,7 @@ dep:
        $(CC) -MM *.c
 
 test:
        $(CC) -MM *.c
 
 test:

-       (cd ..; tclsh8.5 tests/test_helper.tcl --tags "${TAGS}")
+       (cd ..; tclsh8.5 tests/test_helper.tcl --tags "${TAGS}" --file "${FILE}")

 
 bench:
        ./redis-benchmark
 
 bench:
        ./redis-benchmark

diff --git a/tests/test_helper.tcl b/tests/test_helper.tcl
index ee7fa3e19597205b0757e667fdb3cf74a401e3d3..f427fabce053c20b8bb6d69ed56642b4e37cdf27 100644 (file)
--- a/tests/test_helper.tcl
+++ b/tests/test_helper.tcl
@@ -16,6 +16,7 @@ set ::valgrind 0
 set ::denytags {}
 set ::allowtags {}
 set ::external 0; # If "1" this means, we are running against external instance
 set ::denytags {}
 set ::allowtags {}
 set ::external 0; # If "1" this means, we are running against external instance

+set ::file ""; # If set, runs only the tests in this comma separated list

 
 proc execute_tests name {
     source "tests/$name.tcl"
 
 proc execute_tests name {
     source "tests/$name.tcl"


@@ -80,8 +81,7 @@ proc cleanup {} {
     catch {exec rm -rf {*}[glob tests/tmp/server.*]}
 }
 
     catch {exec rm -rf {*}[glob tests/tmp/server.*]}
 }
 

-proc main {} {
-    cleanup
+proc execute_everything {} {

     execute_tests "unit/auth"
     execute_tests "unit/protocol"
     execute_tests "unit/basic"
     execute_tests "unit/auth"
     execute_tests "unit/protocol"
     execute_tests "unit/basic"


@@ -110,6 +110,18 @@ proc main {} {
     execute_tests "unit/expire"
     execute_tests "unit/other"
     execute_tests "unit/cas"
     execute_tests "unit/expire"
     execute_tests "unit/other"
     execute_tests "unit/cas"

+}
+
+proc main {} {
+    cleanup
+
+    if {[string length $::file] > 0} {
+        foreach {file} [split $::file ,] {
+            execute_tests $file
+        }
+    } else {
+        execute_everything
+    }

 
     cleanup
     puts "\n[expr $::passed+$::failed] tests, $::passed passed, $::failed failed"
 
     cleanup
     puts "\n[expr $::passed+$::failed] tests, $::passed passed, $::failed failed"


@@ -132,6 +144,9 @@ for {set j 0} {$j < [llength $argv]} {incr j} {
             }
         }
         incr j
             }
         }
         incr j

+    } elseif {$opt eq {--file}} {
+        set ::file $arg
+        incr j

     } elseif {$opt eq {--host}} {
         set ::external 1
         set ::host $arg
     } elseif {$opt eq {--host}} {
         set ::external 1
         set ::host $arg