Refactor test/run

sschmid · Nov 5, 2024 · a483799 · a483799
1 parent 1974de7
commit a483799
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 31 deletions.
diff --git a/.github/workflows/alpine.yml b/.github/workflows/alpine.yml
@@ -16,4 +16,4 @@ jobs:
           submodules: recursive
 
       - name: "Run tests"
-        run: test/run --alpine
+        run: test/run -p alpine
diff --git a/.github/workflows/archlinux.yml b/.github/workflows/archlinux.yml
@@ -16,4 +16,4 @@ jobs:
           submodules: recursive
 
       - name: "Run tests"
-        run: test/run --archlinux
+        run: test/run -p archlinux
diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml
@@ -16,4 +16,4 @@ jobs:
           submodules: recursive
 
       - name: "Run tests"
-        run: test/run --debian
+        run: test/run -p debian
diff --git a/.github/workflows/fedora.yml b/.github/workflows/fedora.yml
@@ -16,4 +16,4 @@ jobs:
           submodules: recursive
 
       - name: "Run tests"
-        run: test/run --fedora
+        run: test/run -p fedora
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -16,4 +16,4 @@ jobs:
           submodules: recursive
 
       - name: "Run tests"
-        run: test/run --ubuntu
+        run: test/run -p ubuntu
diff --git a/test/run b/test/run
@@ -4,29 +4,30 @@ set -e
 
 declare -rx TEST_BASH_VERSION="${TEST_BASH_VERSION:-"5.2"}"
 
-case "${1:-}" in
-  --alpine)
-    DOCKER_BUILDKIT=1 docker build --build-arg BASH_VERSION="${TEST_BASH_VERSION}" --progress=plain \
-      --target test -t sschmid/pw/test/alpine -f docker/alpine/Dockerfile .
-    ;;
-  --archlinux)
-    DOCKER_BUILDKIT=1 docker build --progress=plain \
-      --target test -t sschmid/pw/test/archlinux -f docker/archlinux/Dockerfile .
-    ;;
-  --debian)
-    DOCKER_BUILDKIT=1 docker build --progress=plain \
-      --target test -t sschmid/pw/test/debian -f docker/debian/Dockerfile .
-    ;;
-  --fedora)
-    DOCKER_BUILDKIT=1 docker build --progress=plain \
-      --target test -t sschmid/pw/test/fedora -f docker/fedora/Dockerfile .
-    ;;
-  --ubuntu)
-    DOCKER_BUILDKIT=1 docker build --progress=plain \
-      --target test -t sschmid/pw/test/ubuntu -f docker/ubuntu/Dockerfile .
-    ;;
-  *)
-    test/bats/bin/bats "${@:-test}"
-    test/shellcheck
-    ;;
-esac
+run_tests() {
+  DOCKER_BUILDKIT=1 docker build --target test -t "sschmid/pw/test/$1" -f "docker/$1/Dockerfile" .
+}
+
+while getopts ":ap:" options; do
+  case "${options}" in
+    a)
+      run_tests alpine
+      run_tests archlinux
+      run_tests debian
+      run_tests fedora
+      run_tests ubuntu
+      ;;
+    p)
+      run_tests "${OPTARG}"
+      exit
+      ;;
+    *)
+      echo "Invalid option: -${OPTARG}" >&2
+      exit 1
+      ;;
+  esac
+done
+shift $(( OPTIND - 1 ))
+
+test/bats/bin/bats "${@:-test}"
+test/shellcheck