From ec177a4227d14ad28556baa5132376337feea7fb Mon Sep 17 00:00:00 2001 From: Hisham Date: Mon, 22 Aug 2016 17:24:22 -0300 Subject: Build Lua using the same compiler as the one we're testing --- appveyor.yml | 20 ++++++++++---------- test/test_environment.lua | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 0220514f..94fd6289 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,23 +7,23 @@ 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" + COMPILER: "vs" - LUA: "lua 5.1" COMPILER: "mingw" + - LUA: "lua 5.2" + COMPILER: "vs" - LUA: "lua 5.2" COMPILER: "mingw" + - LUA: "lua 5.3" + COMPILER: "vs" - LUA: "lua 5.3" COMPILER: "mingw" + - LUA: "luajit 2.0" + COMPILER: "vs" - LUA: "luajit 2.0" COMPILER: "mingw" + - LUA: "luajit 2.1" + COMPILER: "vs" - LUA: "luajit 2.1" COMPILER: "mingw" @@ -36,7 +36,7 @@ init: before_build: - set PATH=C:\Python27\Scripts;%PATH% # Add directory containing 'pip' to PATH - pip install hererocks - - hererocks env --%LUA% -rlatest + - hererocks env --%LUA% -rlatest --target=%COMPILER% - call env\bin\activate build_script: diff --git a/test/test_environment.lua b/test/test_environment.lua index f7cdcaa1..764cd65f 100644 --- a/test/test_environment.lua +++ b/test/test_environment.lua @@ -173,7 +173,7 @@ function test_env.set_args() test_env.TEST_TARGET_OS = argument:match("^os=(.*)$") elseif argument == "mingw" then test_env.MINGW = true - elseif argument == "msvc" then + elseif argument == "vs" then test_env.MINGW = false else help() -- cgit v1.2.3-55-g6feb