From: Bastian Dehn <hhaalo@arcor.de>
Date: Fri, 24 Apr 2026 11:15:41 +0000 (+0200)
Subject: run fail fast
X-Git-Tag: 1.3.20^2~5
X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=cbb8809eb6d51aa7b064c0d11957296fb5edf567;p=feierabend.git

run fail fast
---

diff --git a/builder/run b/builder/run
index e5161cc..98ab134 100644
--- 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 c3a24a7..e5a2acd 100644
--- 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