Add support for testing using MinGW

2 files changed, 23 insertions, 6 deletions

diff --git a/appveyor.yml b/appveyor.yml
index 66a12896..0220514f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,10 +7,25 @@ environment:
 
   matrix:
   - LUA: "lua 5.1"
+    COMPILER: "msvc"
   - LUA: "lua 5.2"
+    COMPILER: "msvc"
   - LUA: "lua 5.3"
+    COMPILER: "msvc"
   - LUA: "luajit 2.0"
+    COMPILER: "msvc"
   - LUA: "luajit 2.1"
+    COMPILER: "msvc"
+  - LUA: "lua 5.1"
+    COMPILER: "mingw"
+  - LUA: "lua 5.2"
+    COMPILER: "mingw"
+  - LUA: "lua 5.3"
+    COMPILER: "mingw"
+  - LUA: "luajit 2.0"
+    COMPILER: "mingw"
+  - LUA: "luajit 2.1"
+    COMPILER: "mingw"
 
 
 init:
@@ -28,7 +43,8 @@ build_script:
   - luarocks install busted 1> NUL 2> NUL
 
 test_script:
-  - busted --lpath=.//?.lua --exclude-tags=ssh,unix,mock -Xhelper appveyor
+  - set PATH=C:\MinGW\bin;%PATH% # Add MinGW compiler to the path
+  - busted --lpath=.//?.lua --exclude-tags=ssh,unix,mock -Xhelper appveyor,%COMPILER%
 
 after_test:
   - if "%LUA%"=="lua 5.1" (luarocks show bit32 || luarocks install bit32)
diff --git a/test/test_environment.lua b/test/test_environment.lua
index 37bd38f1..f7cdcaa1 100644
--- a/test/test_environment.lua
+++ b/test/test_environment.lua
@@ -171,6 +171,10 @@ function test_env.set_args()
          test_env.APPVEYOR_OPENSSL = "OPENSSL_LIBDIR=C:\\OpenSSL-Win32\\lib OPENSSL_INCDIR=C:\\OpenSSL-Win32\\include"
       elseif argument:find("^os=") then
          test_env.TEST_TARGET_OS = argument:match("^os=(.*)$")
+      elseif argument == "mingw" then
+         test_env.MINGW = true
+      elseif argument == "msvc" then
+         test_env.MINGW = false
       else
          help()
       end
@@ -629,11 +633,8 @@ local function install_luarocks(install_env_vars)
    local testing_paths = test_env.testing_paths
    title("Installing LuaRocks")
    if test_env.TEST_TARGET_OS == "windows" then
-      if test_env.LUA_V then 
-         assert(execute_bool("install.bat /LUA " .. testing_paths.luadir .. " /LV " .. test_env.LUA_V .. " /P " .. testing_paths.testing_lrprefix .. " /NOREG /NOADMIN /F /Q /CONFIG " .. testing_paths.testing_lrprefix .. "/etc/luarocks", false, install_env_vars))
-      else
-         assert(execute_bool("install.bat /LUA " .. testing_paths.luadir .. " /P " .. testing_paths.testing_lrprefix .. " /NOREG /NOADMIN /F /Q /CONFIG " .. testing_paths.testing_lrprefix .. "/etc/luarocks", false, install_env_vars))
-      end
+      local compiler_flag = test_env.MINGW and "/MW" or ""
+      assert(execute_bool("install.bat /LUA " .. testing_paths.luadir .. " " .. compiler_flag .. " /P " .. testing_paths.testing_lrprefix .. " /NOREG /NOADMIN /F /Q /CONFIG " .. testing_paths.testing_lrprefix .. "/etc/luarocks", false, install_env_vars))
       assert(execute_bool(testing_paths.win_tools .. "/cp " .. testing_paths.testing_lrprefix .. "/lua/luarocks/site_config* " .. testing_paths.src_dir .. "/luarocks/site_config.lua"))
    else
       local configure_cmd = "./configure --with-lua=" .. testing_paths.luadir .. " --prefix=" .. testing_paths.testing_lrprefix