diff options
Diffstat (limited to 'scripts/travis.sh')
-rwxr-xr-x | scripts/travis.sh | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/scripts/travis.sh b/scripts/travis.sh index dadc478..98d14a7 100755 --- a/scripts/travis.sh +++ b/scripts/travis.sh @@ -1,15 +1,15 @@ -#!/bin/bash -e - -CMAKE_ARGS="-DCMAKE_BUILD_TYPE=Debug -DENTITYX_BUILD_TESTING=1" - -if [ "$USE_STD_SHARED_PTR" = "1" ]; then - CMAKE_ARGS="${CMAKE_ARGS} -DENTITYX_USE_STD_SHARED_PTR=1" - # This fails on OSX - if [ "$CXX" = "clang++" ]; then - CMAKE_ARGS="${CMAKE_ARGS} -DENTITYX_USE_CPP11_STDLIB=1" - fi -fi - -cmake ${CMAKE_ARGS} -make VERBOSE=1 -make test || cat Testing/Temporary/LastTest.log +#!/bin/bash -e
+
+CMAKE_ARGS="-DCMAKE_BUILD_TYPE=Debug -DENTITYX_BUILD_TESTING=1"
+
+if [ "$USE_STD_SHARED_PTR" = "1" ]; then
+ CMAKE_ARGS="${CMAKE_ARGS}"
+ # This fails on OSX
+ if [ "$CXX" = "clang++" ]; then
+ CMAKE_ARGS="${CMAKE_ARGS} -DENTITYX_USE_CPP11_STDLIB=1"
+ fi
+fi
+
+cmake ${CMAKE_ARGS}
+make VERBOSE=1
+make test || cat Testing/Temporary/LastTest.log
|