tests: speed up and simplify

2 files changed, 71 insertions, 62 deletions

diff --git a/spec/util/quick.lua b/spec/util/quick.lua
index c313f575..5c49fff9 100644
--- a/spec/util/quick.lua
+++ b/spec/util/quick.lua
@@ -159,6 +159,16 @@ local function parse(filename)
             cur_block = cur_op
             cur_block_name = "FILE"
             table.insert(stack, "block start")
+         elseif cmd == "FILE_CONTENTS" then
+            cur_op = {
+               op = "FILE_CONTENTS",
+               name = arg,
+               data = {},
+            }
+            table.insert(cur_test.ops, cur_op)
+            cur_block = cur_op
+            cur_block_name = "FILE_CONTENTS"
+            table.insert(stack, "block start")
          elseif cmd == "RUN" then
             local program, args = arg:match("([^ ]+)%s*(.*)$")
             if not program then
@@ -195,6 +205,20 @@ local function parse(filename)
                line = cur_line,
             }
             table.insert(cur_test.ops, cur_op)
+         elseif cmd == "RMDIR" then
+            cur_op = {
+               op = "RMDIR",
+               file = dir.normalize(arg),
+               line = cur_line,
+            }
+            table.insert(cur_test.ops, cur_op)
+         elseif cmd == "RM" then
+            cur_op = {
+               op = "RM",
+               file = dir.normalize(arg),
+               line = cur_line,
+            }
+            table.insert(cur_test.ops, cur_op)
          elseif cmd == "EXIT" then
             if not cur_op or cur_op.op ~= "RUN" then
                fail("EXIT must be given in the context of a RUN")
@@ -346,6 +370,28 @@ function quick.compile(filename, env)
             op.file = native_slash(op.file)
             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 == "RMDIR" then
+            op.file = native_slash(op.file)
+            write(([=[ ok, err = test_env.remove_dir(%q) ]=]):format(op.file))
+            write(([=[ assert.falsy((lfs.attributes(%q) or {}).mode == "directory", error_message(%d, "MKDIR failed: " .. %q .. " - " .. (err or "") )) ]=]):format(op.file, op.line, op.file))
+         elseif op.op == "RM" then
+            op.file = native_slash(op.file)
+            write(([=[ ok, err = os.remove(%q) ]=]):format(op.file))
+            write(([=[ assert.falsy((lfs.attributes(%q) or {}).mode == "file", error_message(%d, "RM failed: " .. %q .. " - " .. (err or "") )) ]=]):format(op.file, op.line, op.file))
+         elseif op.op == "FILE_CONTENTS" then
+            write(([=[ do ]=]))
+            write(([=[ local fd_file = assert(io.open(%q, "rb")) ]=]):format(op.name))
+            write(([=[ local file_data = fd_file:read("*a") ]=]))
+            write(([=[ fd_file:close() ]=]))
+            write([=[ local block_at = 1 ]=])
+            write([=[ local s, e, line ]=])
+            for i, line in ipairs(op.data) do
+               write(([=[ line = %q ]=]):format(line))
+               write(([=[ s, e = string.find(file_data, line, 1, true) ]=]))
+               write(([=[ assert(s, error_message(%d, "FILE_CONTENTS %s did not match: " .. line, file_data)) ]=]):format(op.start + i, op.name))
+               write(([=[ block_at = e + 1 ]=]):format(i))
+            end
+            write([=[ end ]=])
          elseif op.op == "RUN" then
             local cmd_helper = cmd_helpers[op.program] or ("%q"):format(op.program)
             local redirs = " 1>stdout.txt 2>stderr.txt "
diff --git a/spec/util/test_env.lua b/spec/util/test_env.lua
index 8ccb494b..be75b4ec 100644
--- a/spec/util/test_env.lua
+++ b/spec/util/test_env.lua
@@ -527,21 +527,6 @@ function test_env.write_file(pathname, str, finally)
    end
 end
 
---- Create md5sum of directory structure recursively, based on filename and size
--- @param path string: path to directory for generate md5sum
--- @return md5sum string: md5sum of directory
-local function hash_environment(path)
-   if test_env.TEST_TARGET_OS == "linux" then
-      return execute_output(C("cd", path, "&& find . -printf \"%s %p\n\" | md5sum"))
-   elseif test_env.TEST_TARGET_OS == "osx" then
-      return execute_output(C("find", path, "-type f -exec stat -f \"%z %N\" {} \\; | md5"))
-   elseif test_env.TEST_TARGET_OS == "windows" then
-      return execute_output(
-         "\"" .. C(tool("find"), Q(path), "-printf", "\"%s %p\"") .. "\"" ..
-         " > temp_sum.txt && certUtil -hashfile temp_sum.txt && del temp_sum.txt")
-   end
-end
-
 --- Create environment variables needed for tests
 -- @param testing_paths table: table with paths to testing directory
 -- @return env_variables table: table with created environment variables
@@ -551,6 +536,7 @@ local function create_env(testing_paths)
    local lrprefix = testing_paths.testing_lrprefix
    local tree = testing_paths.testing_tree
    local sys_tree = testing_paths.testing_sys_tree
+   local deps_tree = testing_paths.testing_deps_tree
 
    if test_env.LUAJIT_V then
       lua_v="5.1"
@@ -567,38 +553,31 @@ local function create_env(testing_paths)
    else
       table.insert(lua_path, dir_path(lrprefix, "share", "lua", lua_v, "?.lua"))
    end
-   table.insert(lua_path, dir_path(tree,     "share", "lua", lua_v, "?.lua"))
-   table.insert(lua_path, dir_path(tree,     "share", "lua", lua_v, "?", "init.lua"))
-   table.insert(lua_path, dir_path(sys_tree, "share", "lua", lua_v, "?.lua"))
-   table.insert(lua_path, dir_path(sys_tree, "share", "lua", lua_v, "?", "init.lua"))
+   table.insert(lua_path, dir_path(tree,      "share", "lua", lua_v, "?.lua"))
+   table.insert(lua_path, dir_path(tree,      "share", "lua", lua_v, "?", "init.lua"))
+   table.insert(lua_path, dir_path(sys_tree,  "share", "lua", lua_v, "?.lua"))
+   table.insert(lua_path, dir_path(sys_tree,  "share", "lua", lua_v, "?", "init.lua"))
+   table.insert(lua_path, dir_path(deps_tree, "share", "lua", lua_v, "?.lua"))
+   table.insert(lua_path, dir_path(deps_tree, "share", "lua", lua_v, "?", "init.lua"))
    table.insert(lua_path, dir_path(testing_paths.src_dir, "?.lua"))
    env_variables.LUA_PATH = table.concat(lua_path, ";") .. ";"
 
    local lua_cpath = {}
    local lib_pattern = "?." .. test_env.lib_extension
-   table.insert(lua_cpath, dir_path(tree,     "lib", "lua", lua_v, lib_pattern))
-   table.insert(lua_cpath, dir_path(sys_tree, "lib", "lua", lua_v, lib_pattern))
+   table.insert(lua_cpath, dir_path(tree,      "lib", "lua", lua_v, lib_pattern))
+   table.insert(lua_cpath, dir_path(sys_tree,  "lib", "lua", lua_v, lib_pattern))
+   table.insert(lua_cpath, dir_path(deps_tree, "lib", "lua", lua_v, lib_pattern))
    env_variables.LUA_CPATH = table.concat(lua_cpath, ";") .. ";"
 
    local path = { os.getenv("PATH") }
    table.insert(path, dir_path(tree, "bin"))
    table.insert(path, dir_path(sys_tree, "bin"))
+   table.insert(path, dir_path(deps_tree, "bin"))
    env_variables.PATH = table.concat(path, test_env.TARGET_OS == "windows" and ";" or ":")
 
    return env_variables
 end
 
---- Create md5sums of origin system and system-copy testing directory
--- @param testing_paths table: table with paths to testing directory
--- @return md5sums table: table of md5sums of system and system-copy testing directory
-local function create_md5sums(testing_paths)
-   local md5sums = {}
-   md5sums.testing_tree_copy_md5 = hash_environment(testing_paths.testing_tree_copy)
-   md5sums.testing_sys_tree_copy_md5 = hash_environment(testing_paths.testing_sys_tree_copy)
-
-   return md5sums
-end
-
 local function make_run_function(cmd_name, exec_function, with_coverage, do_print)
    local cmd_prefix = Q(test_env.testing_paths.lua)
    local testrun_dir = test_env.testing_paths.testrun_dir
@@ -663,43 +642,23 @@ local function build_environment(rocks, env_variables)
    local testing_paths = test_env.testing_paths
    test_env.remove_dir(testing_paths.testing_tree)
    test_env.remove_dir(testing_paths.testing_sys_tree)
-   test_env.remove_dir(testing_paths.testing_tree_copy)
-   test_env.remove_dir(testing_paths.testing_sys_tree_copy)
 
    lfs.mkdir(testing_paths.testing_tree)
    lfs.mkdir(testing_paths.testing_sys_tree)
+   lfs.mkdir(testing_paths.testing_deps_tree)
 
    test_env.run.luarocks_admin_nocov(C("make_manifest", Q(testing_paths.testing_server)))
    test_env.run.luarocks_admin_nocov(C("make_manifest", Q(testing_paths.testing_cache)))
 
    for _, rock in ipairs(rocks) do
       local only_server = "--only-server=" .. testing_paths.testing_cache
-      local tree = "--tree=" .. testing_paths.testing_sys_tree
+      local tree = "--tree=" .. testing_paths.testing_deps_tree
       if not test_env.run.luarocks_nocov(test_env.quiet(C("install", only_server, tree, Q(rock)), env_variables)) then
          assert(test_env.run.luarocks_nocov(C("build", tree, Q(rock)), env_variables))
          assert(test_env.run.luarocks_nocov(C("pack", tree, Q(rock)), env_variables))
          move_file(rock .. "-*.rock", testing_paths.testing_cache)
       end
    end
-
-   test_env.copy_dir(testing_paths.testing_tree, testing_paths.testing_tree_copy)
-   test_env.copy_dir(testing_paths.testing_sys_tree, testing_paths.testing_sys_tree_copy)
-end
-
---- Reset testing environment
-local function reset_environment(testing_paths, md5sums)
-   local testing_tree_md5 = hash_environment(testing_paths.testing_tree)
-   local testing_sys_tree_md5 = hash_environment(testing_paths.testing_sys_tree)
-
-   if testing_tree_md5 ~= md5sums.testing_tree_copy_md5 then
-      test_env.remove_dir(testing_paths.testing_tree)
-      test_env.copy_dir(testing_paths.testing_tree_copy, testing_paths.testing_tree)
-   end
-
-   if testing_sys_tree_md5 ~= md5sums.testing_sys_tree_copy_md5 then
-      test_env.remove_dir(testing_paths.testing_sys_tree)
-      test_env.copy_dir(testing_paths.testing_sys_tree_copy, testing_paths.testing_sys_tree)
-   end
 end
 
 local function find_lua()
@@ -765,15 +724,15 @@ local function create_testing_paths(suffix)
    paths.testrun_dir           = testrun_dir
    paths.testing_lrprefix      = dir_path(testrun_dir, "testing_lrprefix-" .. suffix)
    paths.testing_tree          = dir_path(testrun_dir, "testing-" .. suffix)
-   paths.testing_tree_copy     = dir_path(testrun_dir, "testing_copy-" .. suffix)
    paths.testing_sys_tree      = dir_path(testrun_dir, "testing_sys-" .. suffix)
-   paths.testing_sys_tree_copy = dir_path(testrun_dir, "testing_sys_copy-" .. suffix)
+   paths.testing_deps_tree     = dir_path(testrun_dir, "testing_deps-" .. suffix)
    paths.testing_cache         = dir_path(testrun_dir, "testing_cache-" .. suffix)
    paths.testing_server        = dir_path(testrun_dir, "testing_server-" .. suffix)
 
    local rocks_v = "rocks-" .. test_env.lua_version
-   paths.testing_rocks     = dir_path(paths.testing_tree,     "lib", "luarocks", rocks_v)
-   paths.testing_sys_rocks = dir_path(paths.testing_sys_tree, "lib", "luarocks", rocks_v)
+   paths.testing_rocks      = dir_path(paths.testing_tree,      "lib", "luarocks", rocks_v)
+   paths.testing_sys_rocks  = dir_path(paths.testing_sys_tree,  "lib", "luarocks", rocks_v)
+   paths.testing_deps_rocks = dir_path(paths.testing_deps_tree, "lib", "luarocks", rocks_v)
 
    if test_env.TEST_TARGET_OS == "windows" then
       paths.luarocks_tmp = os.getenv("TEMP")
@@ -853,7 +812,8 @@ local function create_configs()
    -- testing_config_no_downloader.lua
    local config_content = substitute([[
       rocks_trees = {
-         "%{testing_tree}",
+         { name = "user", root = "%{testing_tree}" },
+         { name = "deps", root = "%{testing_deps_tree}" },
          { name = "system", root = "%{testing_sys_tree}" },
       }
       rocks_servers = {
@@ -870,6 +830,7 @@ local function create_configs()
    ]], {
       user = "testuser",
       testing_sys_tree = test_env.testing_paths.testing_sys_tree,
+      testing_deps_tree = test_env.testing_paths.testing_deps_tree,
       testing_tree = test_env.testing_paths.testing_tree,
       testing_server = test_env.testing_paths.testing_server,
       testing_cache = test_env.testing_paths.testing_cache
@@ -885,6 +846,7 @@ local function create_configs()
    config_content = substitute([[
       rocks_trees = {
          "%{testing_tree}",
+         "%{testing_deps_tree}",
          "%{testing_sys_tree}",
       }
       local_cache = "%{testing_cache}"
@@ -898,6 +860,7 @@ local function create_configs()
    ]], {
       user = "testuser",
       testing_sys_tree = test_env.testing_paths.testing_sys_tree,
+      testing_deps_tree = test_env.testing_paths.testing_deps_tree,
       testing_tree = test_env.testing_paths.testing_tree,
       testing_cache = test_env.testing_paths.testing_cache
    })
@@ -1140,7 +1103,7 @@ function test_env.main()
    build_environment(rocks, env_vars)
 end
 
---- Function for initial setup of environment, variables, md5sums for spec files
+--- Function for initial setup of environment and variables
 function test_env.setup_specs(extra_rocks, use_mock)
    test_env.unload_luarocks()
 
@@ -1169,7 +1132,6 @@ function test_env.setup_specs(extra_rocks, use_mock)
 
       test_env.platform = get_luarocks_platform(test_env.env_variables)
       test_env.wrapper_extension = test_env.TEST_TARGET_OS == "windows" and ".bat" or ""
-      test_env.md5sums = create_md5sums(test_env.testing_paths)
       test_env.setup_done = true
       title("RUNNING TESTS")
    end
@@ -1186,7 +1148,8 @@ function test_env.setup_specs(extra_rocks, use_mock)
    end
 
    if test_env.RESET_ENV then
-      reset_environment(test_env.testing_paths, test_env.md5sums, variables)
+      test_env.remove_dir(test_env.testing_paths.testing_tree)
+      test_env.remove_dir(test_env.testing_paths.testing_sys_tree)
    end
 
    lfs.chdir(testrun_dir)