run fail fast

diff --git a/builder/run b/builder/run
index e5161cc4aeb827bf07e609a15067353953ffcd75..98ab134c32d3fe3eece65457b957c668d197fb7a 100644 (file)
--- a/builder/run
+++ b/builder/run
@@ -3,8 +3,8 @@
 run_tests()
 {
        mkdir -p /app/tests && cd /app/tests
-       cmake -DCMAKE_BUILD_TYPE=Debug /src
-       make -j$(nproc)
+       cmake -DCMAKE_BUILD_TYPE=Debug /src || return $?
+       make -j$(nproc) || return $?
 }
 
 build()
@@ -16,22 +16,21 @@ build()
        cmake -DCMAKE_BUILD_TYPE=Release \
                -DEXTRA_VERSION="-$ID-$VERSION_CODENAME" \
                -DSOLL_HOUR="$soll_hour" \
-               -DSOLL_MINUTES="$soll_minutes" /src
-       make -j$(nproc) package
+               -DSOLL_MINUTES="$soll_minutes" /src || return $?
+       make -j$(nproc) package || return $?
 }
 
 copy_package()
 {
-       cp /app/build/*.deb /src/build/
+       cp /app/build/*.deb /src/build/ || return $?
 }
 
 main()
 {
        source /etc/os-release
-       run_tests
-       build
-       rename_package
-       copy_package
+       run_tests || return $?
+       build || return $?
+       copy_package || return $?
 }
 
 main

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index c3a24a7124d6e68487a32bcddc2a8e314a1691d3..e5a2acd3e88880309f79197b38e01ffb4dbdc0c0 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -3,6 +3,9 @@ cmake_minimum_required(VERSION 3.16.3)
 find_library(CMOCKA cmocka REQUIRED)
 find_program(CPPCHECK cppcheck REQUIRED)
 
+execute_process(COMMAND bash -c "${CPPCHECK} --version | sed 's/Cppcheck //'"
+       OUTPUT_VARIABLE CPPCHECK_VERSION)
+
 include_directories(${CMAKE_BINARY_DIR}/src)
 
 add_executable(break_tests
@@ -40,10 +43,23 @@ add_custom_target(run_tests
        time_format_tests
        validate_tests)
 
-add_custom_command(TARGET run_tests
-       POST_BUILD
-       COMMAND ${CPPCHECK}
-               --check-level=exhaustive
-               --enable=warning,style
-               ${CMAKE_SOURCE_DIR}/src
-               ${CMAKE_SOURCE_DIR}/tests)
\ No newline at end of file
+if(CPPCHECK_VERSION VERSION_GREATER 2.10)
+       add_custom_command(TARGET run_tests
+               POST_BUILD
+               COMMAND ${CPPCHECK}
+                       --check-level=exhaustive
+                       --enable=warning,style
+                       --inline-suppr
+                       --error-exitcode=1
+                       ${CMAKE_SOURCE_DIR}/src
+                       ${CMAKE_SOURCE_DIR}/tests)
+else()
+       add_custom_command(TARGET run_tests
+               POST_BUILD
+               COMMAND ${CPPCHECK}
+                       --enable=warning,style
+                       --inline-suppr
+                       --error-exitcode=1
+                       ${CMAKE_SOURCE_DIR}/src
+                       ${CMAKE_SOURCE_DIR}/tests)
+endif()
\ No newline at end of file