From f87ab7e01b0631d2664dc58467562c154f68302f Mon Sep 17 00:00:00 2001
From: Michal Kravcenko <michal.kravcenko@vsb.cz>
Date: Thu, 6 Sep 2018 09:35:02 +0200
Subject: [PATCH] FIX: 'ubuntu_boost_system' was incorrectly compiling a local
copy of boost which made this continuous integration test pointless
---
.gitlab-ci.yml | 8 ++------
build.sh | 8 +-------
ci_run_tests.sh | 9 +++++++++
3 files changed, 12 insertions(+), 13 deletions(-)
create mode 100755 ci_run_tests.sh
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 46b6bf4b..71c75e05 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,14 +30,10 @@ ubuntu_boost_system:
- git clone https://github.com/ArashPartow/exprtk.git
- cp exprtk/exprtk.hpp /usr/include
- export TERM=xterm
- - cd build_scripts/linux
- - ./linux_gcc_build_x64_debug.sh
- - cd ../..
+ - ./build.sh
script:
- - cd build_scripts/linux
- - './linux_run_tests.sh'
- - cd ../..
+ - './ci_run_tests.sh'
# Latest Ubuntu with Boost and Exprtk
# compiled locally as submodules
diff --git a/build.sh b/build.sh
index 10e2c8f2..61a54f34 100755
--- a/build.sh
+++ b/build.sh
@@ -25,11 +25,5 @@ fi
$(pwd)/clean.sh
-#
-# For ExprTk download
-#
-git submodule init
-git submodule update --remote
-
cmake -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_CXX_COMPILER=${CXX_COMPILER} -DCMAKE_C_COMPILER=${C_COMPILER} -DBUILD_TESTS=${BUILD_TESTS} -DBUILD_EXAMPLES=${BUILD_EXAMPLES} -DBUILD_LIB=${BUILD_LIB} -DLIB4NEURO_DIR=$(pwd)/build/lib .
-cmake --build . --config ${BUILD_TYPE} -- -j${N_CORES} && (tput setaf 2; echo "Build complete."; echo "For examples have a look at the folder build/bin/examples."; tput sgr 0; ) || (tput setaf 1; echo "Build finished with errors!"; tput sgr 0; exit 1;)
+cmake --build . --config ${BUILD_TYPE} -- -j${N_CORES} && (tput setaf 2; echo "Build complete."; echo "For examples have a look at the folder build/examples/bin."; tput sgr 0; ) || (tput setaf 1; echo "Build finished with errors!"; tput sgr 0; exit 1;)
diff --git a/ci_run_tests.sh b/ci_run_tests.sh
new file mode 100755
index 00000000..dfc20279
--- /dev/null
+++ b/ci_run_tests.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+##############
+# UNIT TESTS #
+##############
+for f in build/unit-tests/bin/*_test; do
+ ${f} || exit -1
+done
+
--
GitLab