diff options
| author | Hisham Muhammad <hisham@gobolinux.org> | 2016-10-20 01:59:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-20 01:59:08 -0400 |
| commit | 02dc970620ea88d63093a3f848eac69bb9e3e460 (patch) | |
| tree | 2f2e15f68cb797776430f493e0341fae8d1daa3f /test | |
| parent | 78e84d2c903e85ec620c08275519dac65e9cbf97 (diff) | |
| parent | c7b91ce031a3b7877f59951fc8570c97f598e771 (diff) | |
| download | luarocks-02dc970620ea88d63093a3f848eac69bb9e3e460.tar.gz luarocks-02dc970620ea88d63093a3f848eac69bb9e3e460.tar.bz2 luarocks-02dc970620ea88d63093a3f848eac69bb9e3e460.zip | |
Merge pull request #631 from mpeterv/fix-conflict-resolution
Fix conflict resolution
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_environment.lua | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test/test_environment.lua b/test/test_environment.lua index 1d0b0c32..196202df 100644 --- a/test/test_environment.lua +++ b/test/test_environment.lua | |||
| @@ -515,6 +515,7 @@ function test_env.setup_specs(extra_rocks) | |||
| 515 | 515 | ||
| 516 | test_env.platform = execute_output(test_env.testing_paths.lua .. " -e \"print(require('luarocks.cfg').arch)\"", false, test_env.env_variables) | 516 | test_env.platform = execute_output(test_env.testing_paths.lua .. " -e \"print(require('luarocks.cfg').arch)\"", false, test_env.env_variables) |
| 517 | test_env.lib_extension = execute_output(test_env.testing_paths.lua .. " -e \"print(require('luarocks.cfg').lib_extension)\"", false, test_env.env_variables) | 517 | test_env.lib_extension = execute_output(test_env.testing_paths.lua .. " -e \"print(require('luarocks.cfg').lib_extension)\"", false, test_env.env_variables) |
| 518 | test_env.wrapper_extension = test_env.TEST_TARGET_OS == "windows" and ".bat" or "" | ||
| 518 | test_env.md5sums = create_md5sums(test_env.testing_paths) | 519 | test_env.md5sums = create_md5sums(test_env.testing_paths) |
| 519 | test_env.setup_done = true | 520 | test_env.setup_done = true |
| 520 | title("RUNNING TESTS") | 521 | title("RUNNING TESTS") |