From 5a022db0dbd4f0f4f4053d69610158273bef04ff Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Wed, 10 Dec 2025 20:27:03 +0100 Subject: [PATCH] Use dynamic distro selection for UNIT and INTEGRATION tests - Pass `distro=arch` from Makefile into test scripts - Replace hardcoded "arch" references with "${distro}" - Update test-unit.sh and test-integration.sh to use dynamic image names - Improve log output to reflect selected distro https://chatgpt.com/share/6939c98a-d428-800f-8bb8-cf72e80ba80c --- Makefile | 4 ++-- scripts/test/test-integration.sh | 4 ++-- scripts/test/test-unit.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 06edc1e..09b0637 100644 --- a/Makefile +++ b/Makefile @@ -45,10 +45,10 @@ build: # ------------------------------------------------------------ test-unit: build-missing - @bash scripts/test/test-unit.sh + @distro=arch scripts/test/test-unit.sh test-integration: build-missing - @bash scripts/test/test-integration.sh + @distro=arch 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 639758e..701e15f 100755 --- a/scripts/test/test-integration.sh +++ b/scripts/test/test-integration.sh @@ -2,7 +2,7 @@ set -euo pipefail echo "============================================================" -echo ">>> Running INTEGRATION tests in Arch container" +echo ">>> Running INTEGRATION tests in ${distro} container" echo "============================================================" docker run --rm \ @@ -13,7 +13,7 @@ docker run --rm \ -e PKGMGR_DEV=1 \ -e TEST_PATTERN="${TEST_PATTERN}" \ --entrypoint bash \ - "package-manager-test-arch" \ + "package-manager-test-${distro}" \ -c ' set -e; git config --global --add safe.directory /src || true; diff --git a/scripts/test/test-unit.sh b/scripts/test/test-unit.sh index 98af826..2ab30ef 100755 --- a/scripts/test/test-unit.sh +++ b/scripts/test/test-unit.sh @@ -2,7 +2,7 @@ set -euo pipefail echo "============================================================" -echo ">>> Running UNIT tests in Arch container" +echo ">>> Running UNIT tests in ${distro} container" echo "============================================================" docker run --rm \ @@ -13,7 +13,7 @@ docker run --rm \ -e PKGMGR_DEV=1 \ -e TEST_PATTERN="${TEST_PATTERN}" \ --entrypoint bash \ - "package-manager-test-arch" \ + "package-manager-test-${distro}" \ -c ' set -e; git config --global --add safe.directory /src || true;