From 1032be508fdf7c2365608d0abde83cc24fe6b65d Mon Sep 17 00:00:00 2001
From: assiduous <assiduous@diligentgraphics.com>
Date: Sat, 28 Dec 2019 15:47:34 -0800
Subject: Enabled DiligentCoreTest for OSX build on travis

---
 BuildTools/Scripts/travis/build.sh         | 2 +-
 BuildTools/Scripts/travis/build_install.sh | 2 +-
 BuildTools/Scripts/travis/run_tests.sh     | 9 +++++++++
 3 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100755 BuildTools/Scripts/travis/run_tests.sh

(limited to 'BuildTools/Scripts')

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
-- 
cgit v1.2.3