feat: more informative reports no bad LUA_{INC,LIB}DIR configs

2 files changed, 11 insertions, 8 deletions

diff --git a/spec/util/quick.lua b/spec/util/quick.lua
index cb4bb4cf..c313f575 100644
--- a/spec/util/quick.lua
+++ b/spec/util/quick.lua
@@ -347,7 +347,7 @@ function quick.compile(filename, env)
             write(([=[ ok, err = make_dir(%q) ]=]):format(op.file))
             write(([=[ assert.truthy((lfs.attributes(%q) or {}).mode == "directory", error_message(%d, "MKDIR failed: " .. %q .. " - " .. (err or "") )) ]=]):format(op.file, op.line, op.file))
          elseif op.op == "RUN" then
-            local cmd_helper = cmd_helpers[op.program] or op.program
+            local cmd_helper = cmd_helpers[op.program] or ("%q"):format(op.program)
             local redirs = " 1>stdout.txt 2>stderr.txt "
             write(([=[ local ok, _, code = os.execute(%s .. " " .. %q .. %q) ]=]):format(cmd_helper, op.args, redirs))
             write([=[ if type(ok) == "number" then code = (ok >= 256 and ok / 256 or ok) end ]=])
diff --git a/spec/util/test_env.lua b/spec/util/test_env.lua
index 24a1de9e..8ccb494b 100644
--- a/spec/util/test_env.lua
+++ b/spec/util/test_env.lua
@@ -207,13 +207,16 @@ function test_env.run_in_tmp(f, finally)
    end
    fs.change_dir(tmpdir)
 
-   if finally then
-      finally(function()
-         lfs.chdir(olddir)
-         lfs.rmdir(tmpdir)
-         fs.change_dir(olddir)
-      end)
-   end
+   local lr_config = test_env.env_variables.LUAROCKS_CONFIG
+
+   test_env.copy(lr_config, lr_config .. ".bak")
+
+   finally(function()
+      test_env.copy(lr_config .. ".bak", lr_config)
+      lfs.chdir(olddir)
+      lfs.rmdir(tmpdir)
+      fs.change_dir(olddir)
+   end)
 
    f(tmpdir)
 end