Fix Shoal:$ generation bugs: stairs could be surrounded by deep water, hut entrances could be blocked by rock.

shoal-hut.lua test generates 1k Shoal:$ levels and verifies that the levels pass sanity tests.

1 files changed, 8 insertions, 0 deletions

diff --git a/crawl-ref/source/ctest.cc b/crawl-ref/source/ctest.cc
index f8a3f74001..cfff5edecb 100644
--- a/crawl-ref/source/ctest.cc
+++ b/crawl-ref/source/ctest.cc
@@ -75,6 +75,7 @@ namespace crawl_tests
     {
         lua_stack_cleaner clean(dlua);
         luaL_openlib(dlua, "crawl", crawl_test_lib, 0);
+        dlua.execfile("clua/test.lua", true, true);
     }
 
     bool is_test_selected(const std::string &testname)
@@ -119,6 +120,13 @@ namespace crawl_tests
 
         init_test_bindings();
 
+        if (crawl_state.tests_selected.empty()
+            || (crawl_state.tests_selected[0].find("makeitem") !=
+                std::string::npos))
+        {
+            makeitem_tests();
+        }
+
         // Get a list of Lua files in test. Order of execution of
         // tests should be irrelevant.
         const std::vector<std::string> tests(