aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.build.yml14
1 files changed, 7 insertions, 7 deletions
diff --git a/.build.yml b/.build.yml
index 261f72e..16d1816 100644
--- a/.build.yml
+++ b/.build.yml
@@ -104,15 +104,15 @@ build_scripts:
- cppcheck --enable=warning,style,performance,portability,information,missingInclude .
- fi
-
- - if [ -e ./autogen.sh ]; then
- - NOCONFIGURE=1 ./autogen.sh
- - scan-build $CHECKERS ./configure --prefix=/usr --enable-gtk-doc --enable-compile-warnings=maximum
- - elif [ -e ./CMakeLists.txt ]; then
+ - if [ -e ./CMakeLists.txt ]; then
- if [ ${DISTRO_NAME} == "debian" ];then
- scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_TESTS=ON
- else
- scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON
- fi
+ - elif [ -e ./autogen.sh ]; then
+ - NOCONFIGURE=1 ./autogen.sh
+ - scan-build $CHECKERS ./configure --prefix=/usr --enable-gtk-doc --enable-compile-warnings=maximum
- else
- exit 1
- fi
@@ -135,11 +135,11 @@ after_scripts:
- if [ ${BUILD_TYPE} == "scripts" ];then
- XVFB_RUN="$(which xvfb-run || true)"
- if [ ${DISTRO_NAME} == "debian" ];then
- - if [ -e ./autogen.sh ]; then
+ - if [ -e ./CMakeLists.txt ]; then
+ - ${XVFB_RUN} env CTEST_OUTPUT_ON_FAILURE=1 make test
+ - elif [ -e ./autogen.sh ]; then
- ${XVFB_RUN} make check
- cat tests/test-suite.log
- - elif [ -e ./CMakeLists.txt ]; then
- - ${XVFB_RUN} env CTEST_OUTPUT_ON_FAILURE=1 make test
- fi
- fi
- fi