tests: speed up and simplify

6 files changed, 12 insertions, 8 deletions

diff --git a/spec/unit/dir_spec.lua b/spec/unit/dir_spec.lua
index da5d6389..55dd6e0e 100644
--- a/spec/unit/dir_spec.lua
+++ b/spec/unit/dir_spec.lua
@@ -8,7 +8,7 @@ local dir = require("luarocks.dir")
 describe("luarocks.dir #unit", function()
    local runner
 
-   setup(function()
+   lazy_setup(function()
       runner = require("luacov.runner")
       runner.init(testing_paths.testrun_dir .. "/luacov.config")
    end)
diff --git a/spec/unit/fetch_spec.lua b/spec/unit/fetch_spec.lua
index 4fc01d80..bea50d78 100644
--- a/spec/unit/fetch_spec.lua
+++ b/spec/unit/fetch_spec.lua
@@ -20,7 +20,7 @@ describe("luarocks fetch #unit", function()
 
    local runner
 
-   setup(function()
+   lazy_setup(function()
       cfg.init()
       fs.init()
 
diff --git a/spec/unit/fun_spec.lua b/spec/unit/fun_spec.lua
index d7db1362..bffb60d7 100644
--- a/spec/unit/fun_spec.lua
+++ b/spec/unit/fun_spec.lua
@@ -6,7 +6,7 @@ local fun = require("luarocks.fun")
 describe("luarocks.fun #unit", function()
    local runner
 
-   setup(function()
+   lazy_setup(function()
       runner = require("luacov.runner")
       runner.init(testing_paths.testrun_dir .. "/luacov.config")
    end)
diff --git a/spec/unit/rockspecs_spec.lua b/spec/unit/rockspecs_spec.lua
index 5b0573fe..7eb033c8 100644
--- a/spec/unit/rockspecs_spec.lua
+++ b/spec/unit/rockspecs_spec.lua
@@ -6,7 +6,7 @@ local lfs = require("lfs")
 
 describe("luarocks.rockspecs #unit", function()
 
-   setup(function()
+   lazy_setup(function()
       cfg.init()
    end)
 
diff --git a/spec/unit/sysdetect_spec.lua b/spec/unit/sysdetect_spec.lua
index 6ec6f6b6..d3b16955 100644
--- a/spec/unit/sysdetect_spec.lua
+++ b/spec/unit/sysdetect_spec.lua
@@ -4,9 +4,13 @@ local lfs = require("lfs")
 
 describe("luarocks.core.sysdetect #unix #unit", function()
 
-   setup(function()
-      os.execute("[ -e binary-samples ] || git clone --depth=1 https://github.com/hishamhm/binary-samples")
-      os.execute("cd binary-samples && git pull")
+   lazy_setup(function()
+      os.execute([=[
+         [ -e binary-samples ] || {
+            git clone --depth=1 https://github.com/hishamhm/binary-samples
+            ( cd binary-samples && git pull )
+         }
+      ]=])
    end)
 
    local files = {
diff --git a/spec/unit/util_spec.lua b/spec/unit/util_spec.lua
index bb427b3e..8b234b2e 100644
--- a/spec/unit/util_spec.lua
+++ b/spec/unit/util_spec.lua
@@ -8,7 +8,7 @@ local core_util = require("luarocks.core.util")
 describe("luarocks.util #unit", function()
    local runner
 
-   setup(function()
+   lazy_setup(function()
       runner = require("luacov.runner")
       runner.init(testing_paths.testrun_dir .. "/luacov.config")
    end)