1 files changed, 18 insertions, 9 deletions

diff --git a/spec/make_spec.lua b/spec/make_spec.lua
index 88b35b22..bb219b68 100644
--- a/spec/make_spec.lua
+++ b/spec/make_spec.lua
@@ -21,12 +21,23 @@ describe("LuaRocks make tests #blackbox #b_make", function()
    end)
 
    it("LuaRocks make with no flags/arguments", function()
-      lfs.chdir("test")
+      finally(function()
+         lfs.chdir(testing_paths.testrun_dir)
+         test_env.remove_dir("empty")
+      end)
+      assert(lfs.mkdir("empty"))
+      assert(lfs.chdir("empty"))
       assert.is_false(run.luarocks_bool("make"))
-      lfs.chdir(testing_paths.luarocks_dir)
    end)
 
    it("LuaRocks make with rockspec", function()
+      finally(function()
+         -- delete downloaded and unpacked files
+         lfs.chdir(testing_paths.testrun_dir)
+         test_env.remove_dir("luasocket-3.0rc1-2")
+         os.remove("luasocket-3.0rc1-2.src.rock")
+      end)
+   
       -- make luasocket
       assert.is_true(run.luarocks_bool("download --source luasocket 3.0rc1-2"))
       assert.is_true(run.luarocks_bool("unpack luasocket-3.0rc1-2.src.rock"))
@@ -36,11 +47,6 @@ describe("LuaRocks make tests #blackbox #b_make", function()
       -- test it
       assert.is_true(run.luarocks_bool("show luasocket"))
       assert.is.truthy(lfs.attributes(testing_paths.testing_sys_rocks .. "/luasocket/3.0rc1-2/luasocket-3.0rc1-2.rockspec"))
-
-      -- delete downloaded and unpacked files
-      lfs.chdir(testing_paths.luarocks_dir)
-      test_env.remove_dir("luasocket-3.0rc1-2")
-      assert.is_true(os.remove("luasocket-3.0rc1-2.src.rock"))
    end)
 
    describe("LuaRocks making rockspecs (using lxsh)", function()
@@ -53,7 +59,7 @@ describe("LuaRocks make tests #blackbox #b_make", function()
    
       -- delete downloaded and unpacked files
       after_each(function()
-         assert.is_true(lfs.chdir(testing_paths.luarocks_dir))
+         assert(lfs.chdir(testing_paths.testrun_dir))
          test_env.remove_dir("lxsh-0.8.6-2")
          assert.is_true(os.remove("lxsh-0.8.6-2.src.rock"))
       end)         
@@ -67,12 +73,15 @@ describe("LuaRocks make tests #blackbox #b_make", function()
       end)
 
       it("LuaRocks make unnamed rockspec", function()
+         finally(function()
+            os.remove("rockspec")
+         end)
+      
          test_env.copy("lxsh-0.8.6-2.rockspec", "rockspec")
          assert.is_true(run.luarocks_bool("make"))
 
          assert.is_true(run.luarocks_bool("show lxsh"))
          assert.is.truthy(lfs.attributes(testing_paths.testing_sys_rocks .. "/lxsh/0.8.6-2/lxsh-0.8.6-2.rockspec"))
-         os.remove("rockspec")
       end)
       
       it("LuaRocks make ambiguous rockspec", function()