Extend error case tests

.github/workflows/linux.yml

@@ -14,6 +14,7 @@ on:
       - 'cmake/Modules/**'
       - 'po/**.po'
       - 'util/ci/**'
+      - 'util/helper_mod/**'
       - '.github/workflows/linux.yml'
   pull_request:
     paths:
@@ -27,6 +28,7 @@ on:
       - 'cmake/Modules/**'
       - 'po/**.po'
       - 'util/ci/**'
+      - 'util/helper_mod/**'
       - '.github/workflows/linux.yml'
 
 env:

util/helper_mod/init.lua

@@ -51,7 +51,7 @@ elseif mode == "mapgen" then
 elseif mode == "error" then
 
 	local n = tonumber(core.settings:get("error_type"))
-	local error_lua = core.get_modpath(core.get_current_modname()) .. "/error.lua"
+	local modpath = core.get_modpath(core.get_current_modname())
 	if n == 1 then
 		print("=> error during startup <=")
 		error("intentional")
@@ -60,10 +60,26 @@ elseif mode == "error" then
 		core.after(0, error, "intentional")
 	elseif n == 3 then
 		print("=> error in async script <=")
-		core.register_async_dofile(error_lua)
+		core.register_async_dofile(modpath .. "/error.lua")
 	elseif n == 4 then
 		print("=> error in mapgen script <=")
-		core.register_mapgen_script(error_lua)
+		core.register_mapgen_script(modpath .. "/error.lua")
+	elseif n == 5 then
+		print("=> error in mapgen env callback <=")
+		core.register_mapgen_script(modpath .. "/mapgen_error.lua")
+		core.after(0, function()
+			-- emerge something to trigger it
+			core.emerge_area(vector.new(0,0,0), vector.new(1,1,1), function(pos, action)
+				print("action=" .. action)
+			end)
+		end)
+	elseif n == 6 then
+		print("=> error in emerge_area callback <=")
+		core.after(0, function()
+			core.emerge_area(vector.new(0,0,0), vector.new(1,1,1), function()
+				error("intentional")
+			end)
+		end)
 	else
 		assert(false)
 	end

util/helper_mod/mapgen_error.lua

@@ -0,0 +1,3 @@
+core.register_on_generated(function()
+	error("intentional")
+end)

util/test_error_cases.sh

@@ -36,7 +36,7 @@ export ASAN_OPTIONS="exitcode=42"
 export MSAN_OPTIONS="exitcode=42"
 
 # see helper_mod/init.lua for the different types
-for n in $(seq 1 4); do
+for n in $(seq 1 6); do
 	write_config error_type=$n
 	run "$executable" "${args[@]}"
 	echo "---------------"