From 6d7ee6fc0480816d961506a14bfb88533ebc9373 Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Wed, 10 Dec 2025 21:09:18 +0100 Subject: [PATCH] Fix test scripts: ensure default distro and always run via bash - Remove Makefile inline variable export (distro=arch) and invoke scripts via bash - Add robust default in test-unit.sh and test-integration.sh: : "${distro:=arch}" - Prevent "unbound variable" errors under `set -u` when no distro is provided --- Makefile | 4 ++-- scripts/test/test-integration.sh | 2 ++ scripts/test/test-unit.sh | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 09b0637..06edc1e 100644 --- a/Makefile +++ b/Makefile @@ -45,10 +45,10 @@ build: # ------------------------------------------------------------ test-unit: build-missing - @distro=arch scripts/test/test-unit.sh + @bash scripts/test/test-unit.sh test-integration: build-missing - @distro=arch scripts/test/test-integration.sh + @bash scripts/test/test-integration.sh test-e2e: build-missing @bash scripts/test/test-e2e.sh diff --git a/scripts/test/test-integration.sh b/scripts/test/test-integration.sh index 701e15f..c9a445d 100755 --- a/scripts/test/test-integration.sh +++ b/scripts/test/test-integration.sh @@ -1,6 +1,8 @@ #!/usr/bin/env bash set -euo pipefail +: "${distro:=arch}" + echo "============================================================" echo ">>> Running INTEGRATION tests in ${distro} container" echo "============================================================" diff --git a/scripts/test/test-unit.sh b/scripts/test/test-unit.sh index 2ab30ef..d470852 100755 --- a/scripts/test/test-unit.sh +++ b/scripts/test/test-unit.sh @@ -1,6 +1,8 @@ #!/usr/bin/env bash set -euo pipefail +: "${distro:=arch}" + echo "============================================================" echo ">>> Running UNIT tests in ${distro} container" echo "============================================================"