diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2019-12-28 23:47:34 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2019-12-28 23:47:34 +0000 |
| commit | 1032be508fdf7c2365608d0abde83cc24fe6b65d (patch) | |
| tree | 7e7090b2a5c75974ac83f0136a590beb06be8308 /BuildTools/Scripts | |
| parent | Updated travis build scripts to hopefully catch build failure (diff) | |
| download | DiligentCore-1032be508fdf7c2365608d0abde83cc24fe6b65d.tar.gz DiligentCore-1032be508fdf7c2365608d0abde83cc24fe6b65d.zip | |
Enabled DiligentCoreTest for OSX build on travis
Diffstat (limited to 'BuildTools/Scripts')
| -rwxr-xr-x | BuildTools/Scripts/travis/build.sh | 2 | ||||
| -rwxr-xr-x | BuildTools/Scripts/travis/build_install.sh | 2 | ||||
| -rwxr-xr-x | BuildTools/Scripts/travis/run_tests.sh | 9 |
3 files changed, 11 insertions, 2 deletions
diff --git a/BuildTools/Scripts/travis/build.sh b/BuildTools/Scripts/travis/build.sh index 8a4c2678..391100ac 100755 --- a/BuildTools/Scripts/travis/build.sh +++ b/BuildTools/Scripts/travis/build.sh @@ -3,7 +3,7 @@ cd build if [ "$TRAVIS_OS_NAME" = "linux" ]; then cmake .. -G "Unix Makefiles" $1 -DCMAKE_BUILD_TYPE=${CONFIG} - cmake --build . && return ${PIPESTATUS[0]} + cmake --build . fi if [ "$TRAVIS_OS_NAME" = "osx" ]; then diff --git a/BuildTools/Scripts/travis/build_install.sh b/BuildTools/Scripts/travis/build_install.sh index 5b2cecd2..b2105d25 100755 --- a/BuildTools/Scripts/travis/build_install.sh +++ b/BuildTools/Scripts/travis/build_install.sh @@ -3,7 +3,7 @@ cd build if [ "$TRAVIS_OS_NAME" = "linux" ]; then cmake .. -G "Unix Makefiles" $1 -DCMAKE_BUILD_TYPE=${CONFIG} -DCMAKE_INSTALL_PREFIX=install - cmake --build . --target install && return ${PIPESTATUS[0]} + cmake --build . --target install fi if [ "$TRAVIS_OS_NAME" = "osx" ]; then diff --git a/BuildTools/Scripts/travis/run_tests.sh b/BuildTools/Scripts/travis/run_tests.sh new file mode 100755 index 00000000..e0d469d3 --- /dev/null +++ b/BuildTools/Scripts/travis/run_tests.sh @@ -0,0 +1,9 @@ +if [ "$TRAVIS_OS_NAME" = "linux" ]; then + echo No tests for linux yet +fi + +if [ "$TRAVIS_OS_NAME" = "osx" ]; then + if [ "$IOS" = "false" ]; then + $1/Tests/DiligentCoreTest/$CONFIG/DiligentCoreTest + fi +fi |