Merge pull request #583 from mpeterv/adjust-new-tests

Minor changes and fixes for new test suite

1 files changed, 299 insertions, 325 deletions

diff --git a/test/test_environment.lua b/test/test_environment.lua
index 6de501fb..6de7a4e2 100644
--- a/test/test_environment.lua
+++ b/test/test_environment.lua
@@ -1,26 +1,38 @@
 local lfs = require("lfs")
 local test_env = {}
-local arg = arg or { ... }
+
+local help_message = [[
+LuaRocks test-suite
+
+INFORMATION
+   New test-suite for LuaRocks project, using unit testing framework Busted.
+REQUIREMENTS
+   Be sure sshd is running on your system, or use '--exclude-tags=ssh',
+   to not execute tests which require sshd.
+USAGE
+   busted [-Xhelper <arguments>]
+ARGUMENTS
+   env=<type>     Set type of environment to use ("minimal" or "full",
+                  default: "minimal").
+   clean          Remove existing testing environment.
+   travis         Add if running on TravisCI.
+   os=<type>      Set OS ("linux", "osx", or "windows").
+]]
 
 local function help()
-   print("LuaRocks test-suite\n\n"..
-         [[
-   INFORMATION
-      New test-suite for LuaRocks project, using unit testing framework Busted.
-   REQUIREMENTS
-      Tests require to have Lua installed and added to PATH. Be sure sshd is runnig on your system, or
-      use '--exclude-tags=ssh', to not execute tests which require sshd.
-   USAGE -Xhelper <arguments>
-      lua=<version> (mandatory) type your full version of Lua (e.g. --lua 5.2.4)
-      OR
-      luajit=<version> (mandatory) type your full version of LuaJIT (e.g. --luajit 2.0.3)
-
-      env=<type>   (default:"minimal") type what kind of environment to use ["minimal", "full"]
-      clean  remove existing testing environment
-      travis  add just if running on TravisCI
-      os=<version>    type your OS ["linux", "osx", "windows"]
-         ]]);
-      os.exit(1)
+   print(help_message)
+   os.exit(1)
+end
+
+local function title(str)
+   print()
+   print(("-"):rep(#str))
+   print(str)
+   print(("-"):rep(#str))
+end
+
+local function exists(path)
+   return lfs.attributes(path, "mode") ~= nil
 end
 
 --- Helper function for execute_bool and execute_output
@@ -70,54 +82,38 @@ local function execute_output(command, print_command, env_variables)
    return output:gsub("\n","") -- output adding new line, need to be removed
 end
 
---- Set all arguments from input into global variables
-function test_env.set_args()
-   if arg[1] == nil then
-      help()
-   end
-   
-   local args_position
-   
-   for i=1, #arg do
-      if arg[i]:find("-Xhelper") and arg[i+1]:find("lua=") and not arg[i+1]:find("luajit=") then
-         args_position = i+1
-         test_env.LUA_V = arg[args_position]:gsub("(.*)lua=([^%,]+)(.*)","%2")
-         break  
-      elseif arg[i]:find("-Xhelper") and not arg[i+1]:find("lua=") and arg[i+1]:find("luajit=") then
-         args_position = i+1
-         test_env.LUAJIT_V = arg[args_position]:gsub("(.*)luajit=([^%,]+)(.*)","%2")
-         break  
-      elseif arg[i]:find("-Xhelper") and arg[i+1]:find("lua=") and arg[i+1]:find("luajit=") then
-         print("Please specify just Lua or LuaJIT version for testing in format 'lua=X.X.X' or 'luajit=X.X.X', for -Xhelper flag")
-         os.exit(1)
-      elseif arg[i]:find("-Xhelper") and not arg[i+1]:find("lua=") and not arg[i+1]:find("luajit=") then
-         print("Please add mandatory argument - version of Lua or LuaJIT in format 'lua=X.X.X' or 'luajit=X.X.X', for -Xhelper flag")
-         os.exit(1)
-      end
-   end
-
-   if not args_position then
-      help()
+--- Set test_env.LUA_V or test_env.LUAJIT_V based
+-- on version of Lua used to run this script.
+function test_env.set_lua_version()
+   if _G.jit then
+      test_env.LUAJIT_V = _G.jit.version:match("(2%.%d)%.%d")
+   else
+      test_env.LUA_V = _VERSION:match("5%.%d")
    end
+end
 
+--- Set all arguments from input into global variables
+function test_env.set_args()
    -- if at least Lua/LuaJIT version argument was found on input start to parse other arguments to env. variables
    test_env.TYPE_TEST_ENV = "minimal"
 
-   if arg[args_position]:find("env=") then
-      test_env.TYPE_TEST_ENV = arg[args_position]:gsub("(.*)env=([^%,]+)(.*)","%2")
-   end
-   if arg[args_position]:find("clean") then
-      test_env.TEST_ENV_CLEAN = true
-   end
-   if arg[args_position]:find("travis") then
-      test_env.TRAVIS = true
-   end
-   if arg[args_position]:find("os=") then
-      test_env.TEST_TARGET_OS = arg[args_position]:gsub("(.*)os=([^%,]+)(.*)","%2")
+   for _, argument in ipairs(arg) do
+      if argument:find("^env=") then
+         test_env.TYPE_TEST_ENV = argument:match("^env=(.*)$")
+      elseif argument == "clean" then
+         test_env.TEST_ENV_CLEAN = true
+      elseif argument == "travis" then
+         test_env.TRAVIS = true
+      elseif argument:find("^os=") then
+         test_env.TEST_TARGET_OS = argument:match("^os=(.*)$")
+      else
+         help()
+      end
    end
 
    if not test_env.TEST_TARGET_OS then
-      print("[OS CHECK]")
+      title("OS CHECK")
+
       if execute_bool("sw_vers") then 
          test_env.TEST_TARGET_OS = "osx"
       elseif execute_bool("uname -s") then
@@ -125,7 +121,6 @@ function test_env.set_args()
       else
          test_env.TEST_TARGET_OS = "windows"
       end
-      print("--------------")
    end
    return true
 end
@@ -133,15 +128,13 @@ end
 --- Remove directory recursively
 -- @param path string: directory path to delete
 function test_env.remove_dir(path)
-   if lfs.attributes(path) then
+   if exists(path) then
       for file in lfs.dir(path) do
          if file ~= "." and file ~= ".." then
             local full_path = path..'/'..file
-            local attr = lfs.attributes(full_path)
 
-            if attr.mode == "directory" then
+            if lfs.attributes(full_path, "mode") == "directory" then
                test_env.remove_dir(full_path)
-               os.remove(full_path)
             else
                os.remove(full_path)
             end
@@ -151,32 +144,30 @@ function test_env.remove_dir(path)
    os.remove(path)
 end
 
---- Remove directory recursively
--- @param path string: directory path to delete
--- @param pattern string: pattern in directories
-function test_env.remove_dir_pattern(path, pattern)
-   if lfs.attributes(path) then
+--- Remove subdirectories of a directory that match a pattern
+-- @param path string: path to directory
+-- @param pattern string: pattern matching basenames of subdirectories to be removed
+function test_env.remove_subdirs(path, pattern)
+   if exists(path) then
       for file in lfs.dir(path) do
          if file ~= "." and file ~= ".." then
             local full_path = path..'/'..file
-            local attr = lfs.attributes(full_path)
 
-            if attr.mode == "directory" and file:find(pattern) then
+            if lfs.attributes(full_path, "mode") == "directory" and file:find(pattern) then
                test_env.remove_dir(full_path)
-               os.remove(full_path)
             end
          end
       end
    end
 end
 
---- Remove files based on filename
+--- Remove files matching a pattern
 -- @param path string: directory where to delete files
--- @param pattern string: pattern in filenames
+-- @param pattern string: pattern matching basenames of files to be deleted
 -- @return result_check boolean: true if one or more files deleted
 function test_env.remove_files(path, pattern)
    local result_check = false
-   if lfs.attributes(path) then
+   if exists(path) then
       for file in lfs.dir(path) do
          if file ~= "." and file ~= ".." then
             if file:find(pattern) then
@@ -192,51 +183,44 @@ end
 
 
 --- Function for downloading rocks and rockspecs
--- @param rocks table: table with full name of rocks/rockspecs to download
+-- @param urls table: array of full names of rocks/rockspecs to download
 -- @param save_path string: path to directory, where to download rocks/rockspecs
 -- @return make_manifest boolean: true if new rocks downloaded
-local function download_rocks(rocks, save_path)
+local function download_rocks(urls, save_path)
    local luarocks_repo = "https://luarocks.org"   
    local make_manifest = false
 
-   for _,rock in ipairs(rocks) do  
+   for _, url in ipairs(urls) do
       -- check if already downloaded
-      if not os.rename( save_path .. rock, save_path .. rock) then
-         execute_bool("wget -cP " .. save_path .. " " .. luarocks_repo .. rock)
+      if not exists(save_path .. url) then
+         execute_bool("wget -cP " .. save_path .. " " .. luarocks_repo .. url)
          make_manifest = true 
       end
    end
    return make_manifest
 end
 
---- Create config files for testing
--- @param config_path string: path where to save config file
--- @param config_content string: content of this config file
-local function create_config(config_path, config_content)
-   local file, err = io.open(config_path, "w+")
-   if not file then return nil, err end
-   file:write(config_content)
+--- Create a file containing a string.
+-- @param path string: path to file.
+-- @param str string: content of the file.
+local function write_file(path, str)
+   local file = assert(io.open(path, "w"))
+   file:write(str)
    file:close()
 end
 
 --- Create md5sum of directory structure recursively, based on filename and size
 -- @param path string: path to directory for generate md5sum
--- @param testing_os string(optional): version of PC OS
 -- @return md5sum string: md5sum of directory
-local function hash_environment(path, testing_os)
-   local md5sum = ""
-   testing_os = testing_os or test_env.TEST_TARGET_OS
-
-   if testing_os == "linux" then
-      md5sum = execute_output("find " .. path .. " -printf \"%s %p\n\" | md5sum")
-   end
-   if testing_os == "osx" then
-      md5sum = execute_output("find " .. path .. " -type f -exec stat -f \"%z %N\" {} \\; | md5")
+local function hash_environment(path)
+   if test_env.TEST_TARGET_OS == "linux" then
+      return execute_output("find " .. path .. " -printf \"%s %p\n\" | md5sum")
+   elseif test_env.TEST_TARGET_OS == "osx" then
+      return execute_output("find " .. path .. " -type f -exec stat -f \"%z %N\" {} \\; | md5")
+   else
+      -- TODO: Windows
+      return ""
    end
-   --TODO if testing_os == "windows" then
-   --    md5sum = execute_output("find . -printf \"%s %p\n\" | md5sum")
-   -- end
-   return md5sum
 end
 
 --- Create environment variables needed for tests
@@ -275,51 +259,48 @@ local function create_md5sums(testing_paths)
    return md5sums
 end
 
-local function run_luarocks(testing_paths, env_variables)
-   
-   local function make_command_function(exec_function, lua_cmd, do_print)
-      return function(cmd, new_vars)
-         local temp_vars = {}
-         for k, v in pairs(env_variables) do
+local function make_run_function(cmd_name, exec_function, with_coverage, do_print)
+   local cmd_prefix = test_env.testing_paths.lua .. " "
+
+   if with_coverage then
+      cmd_prefix = cmd_prefix .. "-e \"require('luacov.runner')('" .. test_env.testing_paths.testing_dir .. "/luacov.config')\" "
+   end
+
+   cmd_prefix = cmd_prefix .. test_env.testing_paths.src_dir .. "/bin/" .. cmd_name .. " "
+
+   return function(cmd, new_vars)
+      local temp_vars = {}
+      for k, v in pairs(test_env.env_variables) do
+         temp_vars[k] = v
+      end
+      if new_vars then
+         for k, v in pairs(new_vars) do
             temp_vars[k] = v
          end
-         if new_vars then
-            for k, v in pairs(new_vars) do
-               temp_vars[k] = v
-            end
-         end
-         return exec_function(lua_cmd .. cmd, do_print, temp_vars)
       end
+      return exec_function(cmd_prefix .. cmd, do_print, temp_vars)
    end
+end
 
-   local run = {}
-
-   local cov_str = testing_paths.lua .. " -e\"require('luacov.runner')('" .. testing_paths.testing_dir .. "/luacov.config')\" "
-
-   local luarocks_cmd = cov_str .. testing_paths.src_dir .. "/bin/luarocks "
-   run.luarocks = make_command_function(execute_output, luarocks_cmd, true)
-   run.luarocks_bool = make_command_function(execute_bool, luarocks_cmd, true)
-   run.luarocks_noprint = make_command_function(execute_bool, luarocks_cmd, false)
-
-   local luarocks_nocov_cmd = testing_paths.lua .. " " .. testing_paths.src_dir .. "/bin/luarocks "
-   run.luarocks_nocov = make_command_function(execute_bool, luarocks_nocov_cmd, true)
-   run.luarocks_noprint_nocov = make_command_function(execute_bool, luarocks_nocov_cmd, false)
-   
-   local luarocks_admin_cmd = cov_str .. testing_paths.src_dir .. "/bin/luarocks-admin "
-   run.luarocks_admin = make_command_function(execute_output, luarocks_admin_cmd, true)
-   run.luarocks_admin_bool = make_command_function(execute_bool, luarocks_admin_cmd, true)
-
-   local luarocks_admin_nocov_cmd = testing_paths.lua .. " " .. testing_paths.src_dir .. "/bin/luarocks-admin "
-   run.luarocks_admin_nocov = make_command_function(execute_bool, luarocks_admin_nocov_cmd, false)
-
-   return run
+local function make_run_functions()
+   return {
+      luarocks = make_run_function("luarocks", execute_output, true, true),
+      luarocks_bool = make_run_function("luarocks", execute_bool, true, true),
+      luarocks_noprint = make_run_function("luarocks", execute_bool, true, false),
+      luarocks_nocov = make_run_function("luarocks", execute_bool, false, true),
+      luarocks_noprint_nocov = make_run_function("luarocks", execute_bool, false, false),
+      luarocks_admin = make_run_function("luarocks-admin", execute_output, true, true),
+      luarocks_admin_bool = make_run_function("luarocks-admin", execute_bool, true, true),
+      luarocks_admin_nocov = make_run_function("luarocks-admin", execute_bool, false, false)
+   }
 end
 
---- Build environment for testing
-local function build_environment(env_rocks, testing_paths, env_variables)
-   print("\n--------------------")
-   print("BUILDING ENVIRONMENT")
-   print("--------------------")
+--- Rebuild environment.
+-- Remove old installed rocks and install new ones,
+-- updating manifests and tree copies.
+local function build_environment(rocks, env_variables)
+   title("BUILDING ENVIRONMENT")
+   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)
@@ -328,14 +309,14 @@ local function build_environment(env_rocks, testing_paths, env_variables)
    lfs.mkdir(testing_paths.testing_tree)
    lfs.mkdir(testing_paths.testing_sys_tree)
 
-   local run = run_luarocks(testing_paths, env_variables)
-   run.luarocks_admin_nocov("make_manifest " .. testing_paths.testing_server)
-   run.luarocks_admin_nocov("make_manifest " .. testing_paths.testing_cache)
+   test_env.run.luarocks_admin_nocov("make_manifest " .. testing_paths.testing_server)
+   test_env.run.luarocks_admin_nocov("make_manifest " .. testing_paths.testing_cache)
 
-   for _,package in ipairs(env_rocks) do
-      if not run.luarocks_nocov("install --only-server=" .. testing_paths.testing_cache .. " --tree=" .. testing_paths.testing_sys_tree .. " " .. package, env_variables) then
-         run.luarocks_nocov("build --tree=" .. testing_paths.testing_sys_tree .. " " .. package, env_variables)
-         run.luarocks_nocov("pack --tree=" .. testing_paths.testing_sys_tree .. " " .. package .. "; mv " .. package .. "-*.rock " .. testing_paths.testing_cache, env_variables)
+   for _, rock in ipairs(rocks) do
+      if not test_env.run.luarocks_nocov("install --only-server=" .. testing_paths.testing_cache .. " --tree=" .. testing_paths.testing_sys_tree .. " " .. rock, env_variables) then
+         test_env.run.luarocks_nocov("build --tree=" .. testing_paths.testing_sys_tree .. " " .. rock, env_variables)
+         test_env.run.luarocks_nocov("pack --tree=" .. testing_paths.testing_sys_tree .. " " .. rock, env_variables)
+         execute_bool("mv " .. rock .. "-*.rock " .. testing_paths.testing_cache)
       end
    end
 
@@ -361,32 +342,11 @@ local function reset_environment(testing_paths, md5sums)
 end
 
 local function create_paths(luaversion_full)
-   local testing_paths = {}
-
-   testing_paths.luadir = ""
-
-   if test_env.TRAVIS then
-      testing_paths.luadir = lfs.currentdir() .. "/lua_install"
-      testing_paths.lua = testing_paths.luadir .. "/bin/lua"
-   end
+   local cfg = require("luarocks.cfg")
 
-   if test_env.LUA_V and not test_env.TRAVIS then
-      if lfs.attributes("/usr/bin/lua") then
-         testing_paths.luadir = "/usr"
-         testing_paths.lua = testing_paths.luadir .. "/bin/lua"
-      elseif lfs.attributes("/usr/local/bin/lua") then
-         testing_paths.luadir = "/usr/local"
-         testing_paths.lua = testing_paths.luadir .. "/bin/lua"
-      end
-   elseif test_env.LUAJIT_V and not test_env.TRAVIS then
-      if lfs.attributes("/usr/bin/luajit") then
-         testing_paths.luadir = "/usr"
-         testing_paths.lua = testing_paths.luadir .. "/bin/luajit"
-      elseif lfs.attributes("/usr/local/bin/luajit") then
-         testing_paths.luadir = "/usr/local"
-         testing_paths.lua = testing_paths.luadir .. "/bin/luajit"
-      end
-   end
+   local testing_paths = {}
+   testing_paths.luadir = cfg.variables.LUA_BINDIR:gsub("/bin/?$", "")
+   testing_paths.lua = cfg.variables.LUA_BINDIR .. "/" .. cfg.lua_interpreter
 
    testing_paths.luarocks_tmp = "/tmp/luarocks_testing" --windows?
 
@@ -415,13 +375,11 @@ function test_env.unload_luarocks()
 end
 
 --- Function for initially setup of environment, variables, md5sums for spec files
-function test_env.setup_specs(extra_rocks, luaversion_full)
+function test_env.setup_specs(extra_rocks)
    -- if global variable about successful creation of testing environment doesn't exists, build environment
    if not test_env.setup_done then
-      test_env.set_args()
-
       if test_env.TRAVIS then
-         if not os.rename(os.getenv("HOME") .. "/.ssh/id_rsa.pub", os.getenv("HOME") .. "/.ssh/id_rsa.pub") then
+         if not exists(os.getenv("HOME") .. "/.ssh/id_rsa.pub") then
             execute_bool("ssh-keygen -t rsa -P \"\" -f ~/.ssh/id_rsa")
             execute_bool("cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys")
             execute_bool("chmod og-wx ~/.ssh/authorized_keys")
@@ -429,197 +387,213 @@ function test_env.setup_specs(extra_rocks, luaversion_full)
          end
       end
 
-      luaversion_full = luaversion_full or test_env.LUA_V or test_env.LUAJIT_V
-
       test_env.main()
-
-      -- Set paths, env_vars and functions for specs
-      test_env.testing_paths = create_paths(luaversion_full)
-      test_env.env_variables = create_env(test_env.testing_paths)
       package.path = test_env.env_variables.LUA_PATH
 
-      test_env.run = run_luarocks(test_env.testing_paths, test_env.env_variables)
       test_env.platform = execute_output(test_env.testing_paths.lua .. " -e 'print(require(\"luarocks.cfg\").arch)'", false, test_env.env_variables)
       test_env.md5sums = create_md5sums(test_env.testing_paths)
       test_env.setup_done = true
+      title("RUNNING TESTS")
    end
    
    if extra_rocks then 
       local make_manifest = download_rocks(extra_rocks, test_env.testing_paths.testing_server)
       if make_manifest then
-         local run = run_luarocks(test_env.testing_paths, test_env.env_variables)
-         run.luarocks_admin_nocov("make_manifest " .. test_env.testing_paths.testing_server)
+         test_env.run.luarocks_admin_nocov("make_manifest " .. test_env.testing_paths.testing_server)
       end
    end
 
    reset_environment(test_env.testing_paths, test_env.md5sums, test_env.env_variables)
-
-   return true
 end
 
 --- Helper function for tests which needs luasocket installed
-function test_env.need_luasocket(luarocks_nocov, testing_cache, platform)
-   luarocks_nocov = luarocks_nocov or test_env.run.luarocks_nocov
-   testing_cache = testing_cache or test_env.testing_paths.testing_cache
-   platform = platform or test_env.platform
-
-   if luarocks_nocov("show luasocket") then
+function test_env.need_luasocket()
+   if test_env.run.luarocks_nocov("show luasocket") then
       return true
    else
-      testing_cache = testing_cache .. "/"
-      local luasocket_rock = "luasocket-3.0rc1-1." .. platform .. ".rock"
-      if not os.rename( testing_cache .. luasocket_rock, testing_cache .. luasocket_rock) then
-         luarocks_nocov("build --pack-binary-rock luasocket 3.0rc1-1")
+      local testing_cache = test_env.testing_paths.testing_cache .. "/"
+      local luasocket_rock = "luasocket-3.0rc1-1." .. test_env.platform .. ".rock"
+      if not exists(testing_cache .. luasocket_rock) then
+         test_env.run.luarocks_nocov("build --pack-binary-rock luasocket 3.0rc1-1")
          os.rename(luasocket_rock, testing_cache .. luasocket_rock)
       end
-      luarocks_nocov("install " .. testing_cache .. luasocket_rock)
+      return test_env.run.luarocks_nocov("install " .. testing_cache .. luasocket_rock)
    end
-   return true
+end
+
+--- For each key-value pair in replacements table
+-- replace %{key} in given string with value.
+local function substitute(str, replacements)
+   return (str:gsub("%%%b{}", function(marker)
+      return replacements[marker:sub(3, -2)]
+   end))
+end
+
+
+--- Create configs for luacov and several versions of Luarocks
+-- configs needed for some tests.
+local function create_configs()
+   -- testing_config.lua and testing_config_show_downloads.lua
+   local config_content = substitute([[
+      rocks_trees = {
+         "%{testing_tree}",
+         { name = "system", root = "%{testing_sys_tree}" },
+      }
+      rocks_servers = {
+         "%{testing_server}"
+      }
+      local_cache = "%{testing_cache}"
+      upload_server = "testing"
+      upload_user = "%{user}"
+      upload_servers = {
+         testing = {
+            rsync = "localhost/tmp/luarocks_testing",
+         },
+      }
+      external_deps_dirs = {
+         "/usr/local",
+         "/usr",
+         -- These are used for a test that fails, so it
+         -- can point to invalid paths:
+         {
+            prefix = "/opt",
+            bin = "bin",
+            include = "include",
+            lib = { "lib", "lib64" },
+         }
+      }
+   ]], {
+      user = os.getenv("USER"),
+      testing_sys_tree = test_env.testing_paths.testing_sys_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
+   })
+
+   write_file(test_env.testing_paths.testing_dir .. "/testing_config.lua", config_content .. " \nweb_browser = \"true\"")
+   write_file(test_env.testing_paths.testing_dir .. "/testing_config_show_downloads.lua", config_content
+                  .. "show_downloads = true \n rocks_servers={\"http://luarocks.org/repositories/rocks\"}")
+
+   -- testing_config_sftp.lua
+   config_content = substitute([[
+      rocks_trees = {
+         "%{testing_tree}",
+         "%{testing_sys_tree}",
+      }
+      local_cache = "%{testing_cache}"
+      upload_server = "testing"
+      upload_user = "%{user}"
+      upload_servers = {
+         testing = {
+            sftp = "localhost/tmp/luarocks_testing",
+         },
+      }
+   ]], {
+      user = os.getenv("USER"),
+      testing_sys_tree = test_env.testing_paths.testing_sys_tree,
+      testing_tree = test_env.testing_paths.testing_tree,
+      testing_cache = test_env.testing_paths.testing_cache
+   })
+
+   write_file(test_env.testing_paths.testing_dir .. "/testing_config_sftp.lua", config_content)
+
+   -- luacov.config
+   config_content = substitute([[
+      return {
+         statsfile = "%{testing_dir}/luacov.stats.out",
+         reportfile = "%{testing_dir}/luacov.report.out",
+         modules = {
+            ["luarocks"] = "src/bin/luarocks",
+            ["luarocks-admin"] = "src/bin/luarocks-admin",
+            ["luarocks.*"] = "src",
+            ["luarocks.*.*"] = "src",
+            ["luarocks.*.*.*"] = "src"
+         }
+      }
+   ]], {
+      testing_dir = test_env.testing_paths.testing_dir
+   })
+
+   write_file(test_env.testing_paths.testing_dir .. "/luacov.config", config_content)
+end
+
+--- Remove testing directories.
+local function clean()
+   print("Cleaning testing directory...")
+   test_env.remove_dir(test_env.testing_paths.luarocks_tmp)
+   test_env.remove_subdirs(test_env.testing_paths.testing_dir, "testing[_%-]")
+   test_env.remove_files(test_env.testing_paths.testing_dir, "testing_")
+   test_env.remove_files(test_env.testing_paths.testing_dir, "luacov")
+   print("Cleaning done!")
+end
+
+--- Install luarocks into testing prefix.
+local function install_luarocks(install_env_vars)
+   -- Configure LuaRocks testing environment
+   local configure_cmd = "./configure --with-lua=" .. test_env.testing_paths.luadir ..
+      " --prefix=" .. test_env.testing_paths.testing_lrprefix ..
+      " && make clean"
+
+   assert(execute_bool(configure_cmd, false, install_env_vars))
+   assert(execute_bool("make src/luarocks/site_config.lua && make dev", false, install_env_vars))
 end
 
 ---
 -- Main function to create config files and testing environment 
-function test_env.main(luaversion_full, env_type, env_clean)
-   luaversion_full = luaversion_full or test_env.LUA_V or test_env.LUAJIT_V
-   local testing_paths = create_paths(luaversion_full)
-
-   env_clean = env_clean or test_env.TEST_ENV_CLEAN
-   if env_clean then
-      print("Cleaning testing directory...")
-      test_env.remove_dir(testing_paths.luarocks_tmp)
-      test_env.remove_dir_pattern(testing_paths.testing_dir, "testing_")
-      test_env.remove_dir_pattern(testing_paths.testing_dir, "testing-")
-      test_env.remove_files(testing_paths.testing_dir, "testing_")
-      test_env.remove_files(testing_paths.testing_dir, "luacov")
-      print("Cleaning done!")
+function test_env.main()
+   local testing_paths = test_env.testing_paths
+
+   if test_env.TEST_ENV_CLEAN then
+      clean()
    end
 
    lfs.mkdir(testing_paths.testing_cache)
    lfs.mkdir(testing_paths.luarocks_tmp)
 
---- CONFIG FILES
--- testing_config.lua and testing_config_show_downloads.lua
-   local config_content = ([[rocks_trees = {
-   "%{testing_tree}",
-   { name = "system", root = "%{testing_sys_tree}" },
-}
-rocks_servers = {
-   "%{testing_server}"
-}
-local_cache = "%{testing_cache}"
-upload_server = "testing"
-upload_user = "%{user}"
-upload_servers = {
-   testing = {
-      rsync = "localhost/tmp/luarocks_testing",
-   },
-}
-external_deps_dirs = {
-   "/usr/local",
-   "/usr",
-   -- These are used for a test that fails, so it
-   -- can point to invalid paths:
-   {
-      prefix = "/opt",
-      bin = "bin",
-      include = "include",
-      lib = { "lib", "lib64" },
-   }
-}]]):gsub("%%%b{}", {
-    ["%{user}"] = os.getenv("USER"),
-    ["%{testing_sys_tree}"] = testing_paths.testing_sys_tree,
-    ["%{testing_tree}"] = testing_paths.testing_tree,
-    ["%{testing_server}"] = testing_paths.testing_server,
-    ["%{testing_cache}"] = testing_paths.testing_cache})
-
-   create_config(testing_paths.testing_dir .. "/testing_config.lua", config_content .. " \nweb_browser = \"true\"")
-   create_config(testing_paths.testing_dir .. "/testing_config_show_downloads.lua", config_content
-                  .. "show_downloads = true \n rocks_servers={\"http://luarocks.org/repositories/rocks\"}")
+   create_configs()
 
--- testing_config_sftp.lua
-   config_content=([[rocks_trees = {
-   "%{testing_tree}",
-   "%{testing_sys_tree}",
-}
-local_cache = "%{testing_cache}"
-upload_server = "testing"
-upload_user = "%{user}"
-upload_servers = {
-   testing = {
-      sftp = "localhost/tmp/luarocks_testing",
-   },
-}]]):gsub("%%%b{}", {
-    ["%{user}"] = os.getenv("USER"),
-    ["%{testing_sys_tree}"] = testing_paths.testing_sys_tree,
-    ["%{testing_tree}"] = testing_paths.testing_tree,
-    ["%{testing_cache}"] = testing_paths.testing_cache})
-
-   create_config(testing_paths.testing_dir .. "/testing_config_sftp.lua", config_content)
-
--- luacov.config
-   config_content=([[return {
-   statsfile = "%{testing_dir}/luacov.stats.out",
-   reportfile = "%{testing_dir}/luacov.report.out",
-   modules = {
-      ["luarocks"] = "src/bin/luarocks",
-      ["luarocks-admin"] = "src/bin/luarocks-admin",
-      ["luarocks.*"] = "src",
-      ["luarocks.*.*"] = "src",
-      ["luarocks.*.*.*"] = "src"
+   local install_env_vars = {
+      LUAROCKS_CONFIG = test_env.testing_paths.testing_dir .. "/testing_config.lua",
+      LUA_PATH = "",
+      LUA_CPATH = ""
    }
-}]]):gsub("%%%b{}", {
-    ["%{testing_dir}"] = testing_paths.testing_dir})
-
-   create_config(testing_paths.testing_dir .. "/luacov.config", config_content)
 
-   -- Create environment variables for configuration
-   local temp_env_variables = {LUAROCKS_CONFIG = testing_paths.testing_dir .. "/testing_config.lua",LUA_PATH="",LUA_CPATH=""}
-
-   -- Configure LuaRocks testing environment
-   local configure_cmd = "./configure --with-lua=" .. testing_paths.luadir .. " --prefix=" .. testing_paths.testing_lrprefix 
-   configure_cmd = configure_cmd .. " && make clean"
-   
-   if not execute_bool(configure_cmd, false, temp_env_variables) then
-      os.exit(1)
-   end
-   if not execute_bool("make src/luarocks/site_config.lua && make dev", false, temp_env_variables) then 
-      os.exit(1)
-   end
+   install_luarocks(install_env_vars)
 
    -- Preparation of rocks for building environment
-   env_type = env_type or test_env.TYPE_TEST_ENV
-   
-   local env_rocks = {} -- short names of rocks, required for building environment
-   local rocks = {}  -- full names of rocks required for download
-   rocks[#rocks+1] = "/luacov-0.11.0-1.rockspec"
-   rocks[#rocks+1] = "/luacov-0.11.0-1.src.rock"
-
-   if env_type == "full" then 
-      rocks[#rocks+1] = "/luafilesystem-1.6.3-1.src.rock"
-      rocks[#rocks+1] = "/luasocket-3.0rc1-1.src.rock"
-      rocks[#rocks+1] = "/luasocket-3.0rc1-1.rockspec"
-      rocks[#rocks+1] = "/luaposix-33.2.1-1.src.rock"
-      rocks[#rocks+1] = "/md5-1.2-1.src.rock"
-      rocks[#rocks+1] = "/lzlib-0.4.1.53-1.src.rock"
-      env_rocks = {"luafilesystem", "luasocket", "luaposix", "md5", "lzlib"}
-   end
-   if env_type == "full" and luaversion_full ~= "5.1.5" then
-      rocks[#rocks+1] = "/luabitop-1.0.2-1.rockspec"
-      rocks[#rocks+1] = "/luabitop-1.0.2-1.src.rock"
-      table.insert(env_rocks, "luabitop")
+   local rocks = {} -- names of rocks, required for building environment
+   local urls = {}  -- names of rock and rockspec files to be downloaded
+   table.insert(urls, "/luacov-0.11.0-1.rockspec")
+   table.insert(urls, "/luacov-0.11.0-1.src.rock")
+
+   if test_env.TYPE_TEST_ENV == "full" then
+      table.insert(urls, "/luafilesystem-1.6.3-1.src.rock")
+      table.insert(urls, "/luasocket-3.0rc1-1.src.rock")
+      table.insert(urls, "/luasocket-3.0rc1-1.rockspec")
+      table.insert(urls, "/luaposix-33.2.1-1.src.rock")
+      table.insert(urls, "/md5-1.2-1.src.rock")
+      table.insert(urls, "/lzlib-0.4.1.53-1.src.rock")
+      rocks = {"luafilesystem", "luasocket", "luaposix", "md5", "lzlib"}
+
+      if test_env.LUA_V ~= "5.1" then
+         table.insert(urls, "/luabitop-1.0.2-1.rockspec")
+         table.insert(urls, "/luabitop-1.0.2-1.src.rock")
+         table.insert(rocks, "luabitop")
+      end
    end
 
-   table.insert(env_rocks, "luacov")   -- luacov is needed for minimal or full environment
-   
+   table.insert(rocks, "luacov")   -- luacov is needed for minimal or full environment
+
    -- Download rocks needed for LuaRocks testing environment
    lfs.mkdir(testing_paths.testing_server)
-   download_rocks(rocks, testing_paths.testing_server)
-   
-   build_environment(env_rocks, testing_paths, temp_env_variables)
-
-   print("----------------")
-   print(" RUNNING  TESTS")
-   print("----------------")
+   download_rocks(urls, testing_paths.testing_server)
+   build_environment(rocks, install_env_vars)
 end
 
+test_env.set_lua_version()
+test_env.set_args()
+test_env.testing_paths = create_paths(test_env.LUA_V or test_env.LUAJIT_V)
+test_env.env_variables = create_env(test_env.testing_paths)
+test_env.run = make_run_functions()
+
 return test_env