Merge branch 'unstable'

[redis.git] / tests / test_helper.tcl

diff --git a/tests/test_helper.tcl b/tests/test_helper.tcl
index 2b7a8957772dbd1e57b4f73bfa362fe8392f1205..6dc85eff37c4a137fad0c382d76af675335f0d52 100644 (file)
--- a/tests/test_helper.tcl
+++ b/tests/test_helper.tcl
@@ -19,6 +19,7 @@ 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
 set ::curfile ""; # Hold the filename of the current suite
+set ::diskstore 0; # Don't touch this by hand. The test itself will toggle it.
 
 proc execute_tests name {
     set path "tests/$name.tcl"
@@ -103,11 +104,13 @@ proc s {args} {
 }
 
 proc cleanup {} {
+    puts "Cleanup: warning may take some time..."
     catch {exec rm -rf {*}[glob tests/tmp/redis.conf.*]}
     catch {exec rm -rf {*}[glob tests/tmp/server.*]}
 }
 
 proc execute_everything {} {
+    execute_tests "unit/printver"
     execute_tests "unit/auth"
     execute_tests "unit/protocol"
     execute_tests "unit/basic"
@@ -125,8 +128,12 @@ proc execute_everything {} {
 #    execute_tests "integration/redis-cli"
     execute_tests "unit/pubsub"
 
-    # run tests with VM enabled
-    set ::global_overrides {vm-enabled yes}
+    return; # No diskstore tests for now...
+    # run tests with diskstore enabled
+    puts "\nRunning diskstore tests... this is slow, press Ctrl+C if not interested.."
+    set ::diskstore 1
+    lappend ::denytags nodiskstore
+    set ::global_overrides {diskstore-enabled yes}
     execute_tests "unit/protocol"
     execute_tests "unit/basic"
     execute_tests "unit/type/list"