Adjust the test suite.

7 files changed, 19 insertions, 10 deletions

diff --git a/crawl-ref/source/test/bstair-gen.lua b/crawl-ref/source/test/bstair-gen.lua
index 35d4e79900..484fbb45c7 100644
--- a/crawl-ref/source/test/bstair-gen.lua
+++ b/crawl-ref/source/test/bstair-gen.lua
@@ -18,6 +18,6 @@ local function test_branch_stair_places(nlevels, level_stairs)
 end
 
 test_branch_stair_places(niters,
-                 { { "D:$", "enter_zot" },
-                   { "D:24", "enter_pandemonium" },
-                   { "D:21", "enter_hell" } })
+                 { { "Depths:$", "enter_zot" },
+                   { "Depths:3", "enter_pandemonium" },
+                   { "Depths:2", "enter_hell" } })
diff --git a/crawl-ref/source/test/corpse.lua b/crawl-ref/source/test/corpse.lua
index 6260333130..90854369e4 100644
--- a/crawl-ref/source/test/corpse.lua
+++ b/crawl-ref/source/test/corpse.lua
@@ -4,7 +4,7 @@
 
 local p = dgn.point(20, 20)
 
-debug.goto_place("D:20")
+debug.goto_place("Depths:2")
 
 local function ok(corpse, pattern)
   dgn.reset_level()
diff --git a/crawl-ref/source/test/findray.lua b/crawl-ref/source/test/findray.lua
index 328c2393be..0a2a54715f 100644
--- a/crawl-ref/source/test/findray.lua
+++ b/crawl-ref/source/test/findray.lua
@@ -74,6 +74,6 @@ local function run_findray_tests(depth, nlevels, tests_per_level)
   end
 end
 
-for depth = 1, 27 do
+for depth = 1, 16 do
   run_findray_tests(depth, 1, 10)
 end
diff --git a/crawl-ref/source/test/los_csc.lua b/crawl-ref/source/test/los_csc.lua
index 02a8c2a108..c6c43e2675 100644
--- a/crawl-ref/source/test/los_csc.lua
+++ b/crawl-ref/source/test/los_csc.lua
@@ -52,6 +52,6 @@ local function run_los_tests(depth, nlevels, tests_per_level)
   end
 end
 
-for depth = 1, 27 do
+for depth = 1, 16 do
   run_los_tests(depth, 1, 1)
 end
diff --git a/crawl-ref/source/test/los_symm.lua b/crawl-ref/source/test/los_symm.lua
index 340d3eb63a..5ce891999b 100644
--- a/crawl-ref/source/test/los_symm.lua
+++ b/crawl-ref/source/test/los_symm.lua
@@ -58,6 +58,6 @@ local function run_los_tests(depth, nlevels, tests_per_level)
   end
 end
 
-for depth = 1, 27 do
+for depth = 1, 16 do
   run_los_tests(depth, 1, 3)
 end
diff --git a/crawl-ref/source/test/unique.lua b/crawl-ref/source/test/unique.lua
index c04b4a0dab..482c876fc5 100644
--- a/crawl-ref/source/test/unique.lua
+++ b/crawl-ref/source/test/unique.lua
@@ -39,13 +39,18 @@ local function test_uniques_random(branch, depth, nlevels)
 end
 
 local function run_unique_tests()
-  test_uniques_branch("D", 27)
+  test_uniques_branch("D", 16)
+  test_uniques_branch("Depths", 6)
   test_uniques_branch("Dis", 7)
 
-  for depth = 1, 27 do
+  for depth = 1, 16 do
     test_uniques_blank("D", depth, 3)
     test_uniques_random("D", depth, 3)
   end
+  for depth = 1, 6 do
+    test_uniques_blank("Depths", depth, 3)
+    test_uniques_random("Depths", depth, 3)
+  end
 
   for depth = 1, 7 do
     test_uniques_blank("Dis", depth, 3)
diff --git a/crawl-ref/source/test/uniquegen.lua b/crawl-ref/source/test/uniquegen.lua
index 4c4a4e046f..9addafd2f9 100644
--- a/crawl-ref/source/test/uniquegen.lua
+++ b/crawl-ref/source/test/uniquegen.lua
@@ -27,10 +27,14 @@ local function test_random_unique(branch, depth)
 end
 
 local function run_random_unique_tests()
-  for depth = 1, 27 do
+  for depth = 1, 16 do
     test_random_unique("D", depth, 3)
   end
 
+  for depth = 1, 6 do
+    test_random_unique("Depths", depth, 3)
+  end
+
   for depth = 1, 7 do
     test_random_unique("Dis", depth, 3)
   end