Visual Studio 2015 builds are a nightmare...

.travis.yml

@@ -156,12 +156,9 @@ matrix:
         - LUA_VERSION=lua-5.3.4
           LLVM_VERSION=5.0.1
       before_install:
-        - brew update > /dev/null
+        - chmod +x ./scripts/run.osx.sh
-        - brew install zsh || true
+        - chmod +x ./scripts/preparation.osx.sh
-        - brew install git || true
+        - ./scripts/preparation.osx.sh
-        - brew install cmake || true
-        - brew install python || true
-        - brew install ninja || true
       script:
         - ./scripts/run.osx.sh
 
@@ -171,12 +168,9 @@ matrix:
         - LUA_VERSION=lua-5.3.4
           LLVM_VERSION=5.0.1
       before_install:
-        - brew update > /dev/null
+        - chmod +x ./scripts/run.osx.sh
-        - brew install zsh || true
+        - chmod +x ./scripts/preparation.osx.sh
-        - brew install git || true
+        - ./scripts/preparation.osx.sh
-        - brew install cmake || true
-        - brew install python || true
-        - brew install ninja || true
       script:
         - ./scripts/run.osx.sh
 

scripts/preparation.osx.sh

@@ -24,95 +24,9 @@
 
 # This script installs and configures the dependencies for the project
 
-case `uname` in 
+brew update > /dev/null
-    Darwin)     export OS_NAME="osx"    ;;
+brew install zsh || brew upgrade zsh || true
-    Linux)      export OS_NAME="linux"  ;;
+brew install git || brew upgrade git || true
-esac
+brew install cmake || brew upgrade cmake || true
-
+brew install python || brew upgrade python || true
-echo "Building on: ${OS_NAME}"
+brew install ninja || brew upgrade ninja || true
-
-if env | grep -qE '^(?:TRAVIS|CI)='; then
-#    We're on Travis, intialize variables:
-    echo "Detected CI Build -> CI=${CI}"
-else
-#   We're building locally
-    export CI=false
-    echo "Detected Local Build -> CI=${CI}"
-fi
-
-export_compiler_vars() {
-    case ${COMPILER} in
-        appleclang*) 
-            export CC=clang
-            export CXX=clang++
-        ;;
-
-        clang*)
-            export CC=$(echo ${COMPILER} | sed 's/\+//g')
-            export CXX=${COMPILER}
-        ;;
-
-        g++-*)
-            export CC=$(echo ${COMPILER} | sed 's/\+/c/g')
-            export CXX=${COMPILER} 
-        ;;
-
-        *) echo "Invalid compiler version" ; exit 2 ;;
-    esac
-
-    echo "CC=${CC}"
-    $CC --version
-
-    echo "CXX=${CXX}"
-    $CXX --version
-}
-
-install_os_deps() {
-    # Install all of the OS specific OS dependencies
-    echo "Install: os-based dependencies"
-
-    local wd=`pwd`
-
-    case ${OS_NAME} in
-        osx)
-            export HOMEBREW_NO_EMOJI=1
-
-            echo "brew update ..."; brew update > /dev/null
-
-            case ${COMPILER} in
-                appleclang*) ;;
-
-                g++-5)
-                    brew install gcc5 
-                    brew link gcc5 --overwrite --force
-                ;;
-
-                g++-4.9) ;;
-
-                *) echo "Invalid compiler version" ; exit 2 ;;
-            esac
-
-            brew install ninja
-
-            local lua_pkg
-            case ${LUA_VERSION} in
-                lua53)      lua_pkg=lua53   ;;
-                lua52)      lua_pkg=lua     ;;
-                lua51)      lua_pkg=lua51   ;; 
-                luajit52)   lua_pkg=luajit  ;; 
-                luajit)     lua_pkg=luajit  ;;
-                *)  echo "Invalid Lua Version for OSX" 
-                    exit 2 
-                    ;;
-            esac
-
-            brew install ${lua_pkg}
-        ;;
-
-        linux) 
-            # no extras currently
-        ;;
-    esac
-
-    cd ${wd}
-}

tests/test_sol.hpp

@@ -21,8 +21,6 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#pragma once
-
 #ifndef SOL_TEST_SOL_HPP
 #define SOL_TEST_SOL_HPP
 
@@ -42,6 +40,8 @@
 #include <sol_forward.hpp>
 #endif // Single
 #include <sol.hpp>
+
+#define CATCH_CONFIG_ALL_PARTS 1
 #include <catch.hpp>
 
 #define CHECK_VALID ( x ) { auto r = x; REQUIRE(r.valid()); }