Tweak tests for luarocks-3 branch.

4 files changed, 7 insertions, 5 deletions

diff --git a/.travis.yml b/.travis.yml
index 02bdb6c9..86f7bbad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,7 +42,7 @@ matrix:
 before_install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew install python; fi
   - pip install hererocks
-  - hererocks lua_install -r^ --$LUA
+  - hererocks lua_install --luarocks @luarocks-3 --$LUA
   - export PATH=$PATH:$PWD/lua_install/bin # Add directory with all installed binaries to PATH
 
 install:
diff --git a/src/bin/luarocks b/src/bin/luarocks
index 21f17da9..633f9f43 100755
--- a/src/bin/luarocks
+++ b/src/bin/luarocks
@@ -1,4 +1,5 @@
-#!/usr/bin/env lua
+#!/Programs/Lua/5.3.0/bin/lua
+package.path = [[/Users/hisham/luarocks/src/?.lua;]]..package.path
 
 -- this should be loaded first.
 local cfg = require("luarocks.core.cfg")
diff --git a/src/bin/luarocks-admin b/src/bin/luarocks-admin
index 660c0a70..587afcab 100755
--- a/src/bin/luarocks-admin
+++ b/src/bin/luarocks-admin
@@ -1,4 +1,5 @@
-#!/usr/bin/env lua
+#!/Programs/Lua/5.3.0/bin/lua
+package.path = [[/Users/hisham/luarocks/src/?.lua;]]..package.path
 
 -- this should be loaded first.
 local cfg = require("luarocks.core.cfg")
diff --git a/test/test_environment.lua b/test/test_environment.lua
index 13e548f9..c26c1e87 100644
--- a/test/test_environment.lua
+++ b/test/test_environment.lua
@@ -361,7 +361,7 @@ local function reset_environment(testing_paths, md5sums)
 end
 
 local function create_paths(luaversion_full)
-   local cfg = require("luarocks.cfg")
+   local cfg = require("luarocks.core.cfg")
 
    local testing_paths = {}
    testing_paths.luadir = cfg.variables.LUA_BINDIR:gsub("/bin/?$", "")
@@ -409,7 +409,7 @@ function test_env.setup_specs(extra_rocks)
       test_env.main()
       package.path = test_env.env_variables.LUA_PATH
 
-      test_env.platform = execute_output(test_env.testing_paths.lua .. " -e 'print(require(\"luarocks.cfg\").arch)'", false, test_env.env_variables)
+      test_env.platform = execute_output(test_env.testing_paths.lua .. " -e 'print(require(\"luarocks.core.cfg\").arch)'", false, test_env.env_variables)
       test_env.md5sums = create_md5sums(test_env.testing_paths)
       test_env.setup_done = true
       title("RUNNING TESTS")