From 80d388ebff19fd2ccfb20476bcfd60f839f4b179 Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Mon, 24 Mar 2025 19:48:32 +0100 Subject: [PATCH] Collect exit codes --- test/test-with-drm.sh | 14 +++++++++----- test/test-without-drm.sh | 14 +++++++++----- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/test/test-with-drm.sh b/test/test-with-drm.sh index 8225510..58fc1b7 100755 --- a/test/test-with-drm.sh +++ b/test/test-with-drm.sh @@ -4,8 +4,12 @@ root=$(dirname "${BASH_SOURCE[0]}") source "$root/helpers.sh" -run_script "$root/build-with-drm.sh" -run_script "$root/test-version-matches-meson-and-changelog.sh" -run_script "$root/test-uses-fb-backend-by-default.sh" -run_script "$root/test-uses-fb-backend-if-selected-via-config.sh" -run_script "$root/test-uses-drm-backend-if-selected-via-config-and-available.sh" +rc=0 + +run_script "$root/build-with-drm.sh" || rc=1 +run_script "$root/test-version-matches-meson-and-changelog.sh" || rc=1 +run_script "$root/test-uses-fb-backend-by-default.sh" || rc=1 +run_script "$root/test-uses-fb-backend-if-selected-via-config.sh" || rc=1 +run_script "$root/test-uses-drm-backend-if-selected-via-config-and-available.sh" || rc=1 + +exit $rc diff --git a/test/test-without-drm.sh b/test/test-without-drm.sh index a8e86c9..3483041 100755 --- a/test/test-without-drm.sh +++ b/test/test-without-drm.sh @@ -4,8 +4,12 @@ root=$(dirname "${BASH_SOURCE[0]}") source "$root/helpers.sh" -run_script "$root/build-without-drm.sh" -run_script "$root/test-version-matches-meson-and-changelog.sh" -run_script "$root/test-uses-fb-backend-by-default.sh" -run_script "$root/test-uses-fb-backend-if-selected-via-config.sh" -run_script "$root/test-uses-fb-backend-if-drm-selected-via-config-but-unavailable.sh" +rc=0 + +run_script "$root/build-without-drm.sh" || rc=1 +run_script "$root/test-version-matches-meson-and-changelog.sh" || rc=1 +run_script "$root/test-uses-fb-backend-by-default.sh" || rc=1 +run_script "$root/test-uses-fb-backend-if-selected-via-config.sh" || rc=1 +run_script "$root/test-uses-fb-backend-if-drm-selected-via-config-but-unavailable.sh" || rc=1 + +exit $rc