X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/524d515f0c02e62c67f6293a6b59448479f5f5e9..c984d42fb14c72aa8a97e971f0f3d3df189f82d0:/tests/test_helper.tcl

diff --git a/tests/test_helper.tcl b/tests/test_helper.tcl
index 8611326a..559d0264 100644
--- a/tests/test_helper.tcl
+++ b/tests/test_helper.tcl
@@ -31,6 +31,7 @@ set ::all_tests {
     integration/aof
     unit/pubsub
     unit/slowlog
+    unit/scripting
 }
 # Index to the next test to run in the ::all_tests list.
 set ::next_test 0
@@ -46,6 +47,7 @@ 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
 set ::curfile ""; # Hold the filename of the current suite
 set ::accurate 0; # If true runs fuzz tests with more iterations
+set ::force_failure 0
 
 # Set to 1 when we are running in client mode. The Redis test uses a
 # server-client model to run tests simultaneously. The server instance
@@ -139,7 +141,7 @@ proc s {args} {
 }
 
 proc cleanup {} {
-    puts -nonewline "Cleanup: warning may take some time... "
+    puts -nonewline "Cleanup: may take some time... "
     flush stdout
     catch {exec rm -rf {*}[glob tests/tmp/redis.conf.*]}
     catch {exec rm -rf {*}[glob tests/tmp/server.*]}
@@ -183,6 +185,7 @@ proc test_server_main {} {
     set ::active_clients {}
     array set ::clients_start_time {}
     set ::clients_time_history {}
+    set ::failed_tests {}
 
     # Enter the event loop to handle clients I/O
     after 100 test_server_cron
@@ -228,7 +231,9 @@ proc read_from_test_client fd {
     } elseif {$status eq {ok}} {
         puts "\[[colorstr green $status]\]: $data"
     } elseif {$status eq {err}} {
-        puts "\[[colorstr red $status]\]: $data"
+        set err "\[[colorstr red $status]\]: $data"
+        puts $err
+        lappend ::failed_tests $err
     } elseif {$status eq {exception}} {
         puts "\[[colorstr red $status]\]: $data"
         foreach p $::clients_pids {
@@ -267,12 +272,23 @@ proc signal_idle_client fd {
 # executed, so the test finished.
 proc the_end {} {
     # TODO: print the status, exit with the rigth exit code.
-    puts "The End\n"
+    puts "\n                   The End\n"
     puts "Execution time of different units:"
     foreach {time name} $::clients_time_history {
         puts "  $time seconds - $name"
     }
-    exit 1
+    if {[llength $::failed_tests]} {
+        puts "\n[colorstr bold-red {!!! WARNING}] The following tests failed:\n"
+        foreach failed $::failed_tests {
+            puts "*** $failed"
+        }
+        cleanup
+        exit 1
+    } else {
+        puts "\n[colorstr bold-white {\o/}] [colorstr bold-green {All tests passed without errors!}]\n"
+        cleanup
+        exit 0
+    }
 }
 
 # The client is not even driven (the test server is instead) as we just need
@@ -299,6 +315,17 @@ proc send_data_packet {fd status data} {
     flush $fd
 }
 
+proc print_help_screen {} {
+    puts [join {
+        "--valgrind         Run the test over valgrind."
+        "--accurate         Run slow randomized tests for more iterations."
+        "--single <unit>    Just execute the specified unit (see next option)."
+        "--list-tests       List all the available test units."
+        "--force-failure    Force the execution of a test that always fails."
+        "--help             Print this help screen."
+    } "\n"]
+}
+
 # parse arguments
 for {set j 0} {$j < [llength $argv]} {incr j} {
     set opt [lindex $argv $j]
@@ -314,9 +341,6 @@ for {set j 0} {$j < [llength $argv]} {incr j} {
         incr j
     } elseif {$opt eq {--valgrind}} {
         set ::valgrind 1
-    } elseif {$opt eq {--file}} {
-        set ::file $arg
-        incr j
     } elseif {$opt eq {--host}} {
         set ::external 1
         set ::host $arg
@@ -324,10 +348,10 @@ for {set j 0} {$j < [llength $argv]} {incr j} {
     } elseif {$opt eq {--port}} {
         set ::port $arg
         incr j
-    } elseif {$opt eq {--verbose}} {
-        set ::verbose 1
     } elseif {$opt eq {--accurate}} {
         set ::accurate 1
+    } elseif {$opt eq {--force-failure}} {
+        set ::force_failure 1
     } elseif {$opt eq {--single}} {
         set ::all_tests $arg
         incr j
@@ -341,7 +365,7 @@ for {set j 0} {$j < [llength $argv]} {incr j} {
         set ::test_server_port $arg
         incr j
     } elseif {$opt eq {--help}} {
-        puts "TODO print an help screen"
+        print_help_screen
         exit 0
     } else {
         puts "Wrong argument: $opt"