Run tests in parallel

sschmid · Nov 10, 2024 · 020c949 · 020c949
1 parent a4cc340
commit 020c949
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 10 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -12,7 +12,7 @@ jobs:
     steps:
       - name: "Install dependencies"
         run: |
-          brew install bash fzf kcov shellcheck
+          brew install bash fzf kcov parallel shellcheck
           brew install --cask keepassxc
 
       - name: "Checkout"
@@ -21,10 +21,10 @@ jobs:
           submodules: recursive
 
       - name: "Run tests"
-        run: test/run
+        run: test/run -j $(sysctl -n hw.logicalcpu)
 
       - name: "Test coverage"
-        run: test/coverage
+        run: test/coverage --jobs $(sysctl -n hw.logicalcpu) test
 
       - name: "Upload coverage report"
         uses: actions/upload-artifact@v4

diff --git a/docker/alpine/Dockerfile b/docker/alpine/Dockerfile
@@ -4,6 +4,7 @@ WORKDIR /usr/local/opt/pw
 COPY DEPENDENCIES.md .
 RUN apk add --no-cache \
     $(cat DEPENDENCIES.md) \
+    parallel \
     xclip \
     xvfb
 
@@ -20,4 +21,4 @@ ENTRYPOINT ["docker-entrypoint.sh"]
 FROM pw AS test
 WORKDIR /usr/local/opt/pw
 COPY test test
-RUN test/bats/bin/bats test
+RUN test/bats/bin/bats --jobs $(nproc) test
diff --git a/docker/archlinux/Dockerfile b/docker/archlinux/Dockerfile
@@ -4,6 +4,7 @@ WORKDIR /usr/local/opt/pw
 COPY DEPENDENCIES.md .
 RUN pacman -Syu --noconfirm && pacman -S --noconfirm --needed \
     $(cat DEPENDENCIES.md) \
+    parallel \
     xclip \
     xorg-server-xvfb \
     && pacman -Scc --noconfirm
@@ -21,4 +22,4 @@ ENTRYPOINT ["docker-entrypoint.sh"]
 FROM pw AS test
 WORKDIR /usr/local/opt/pw
 COPY test test
-RUN test/bats/bin/bats test
+RUN test/bats/bin/bats --jobs $(nproc) test
diff --git a/docker/debian/Dockerfile b/docker/debian/Dockerfile
@@ -4,6 +4,7 @@ COPY DEPENDENCIES.md .
 RUN apt-get update && apt-get install -y \
     $(cat DEPENDENCIES.md) \
     file \
+    parallel \
     xclip \
     xvfb \
     && rm -rf /var/lib/apt/lists/*
@@ -21,4 +22,4 @@ ENTRYPOINT ["docker-entrypoint.sh"]
 FROM pw AS test
 WORKDIR /usr/local/opt/pw
 COPY test test
-RUN test/bats/bin/bats test
+RUN test/bats/bin/bats --jobs $(nproc) test
diff --git a/docker/fedora/Dockerfile b/docker/fedora/Dockerfile
@@ -4,6 +4,7 @@ COPY DEPENDENCIES.md .
 RUN dnf install -y \
     $(cat DEPENDENCIES.md) \
     file \
+    parallel \
     procps-ng \
     xclip \
     xorg-x11-server-Xvfb \
@@ -23,4 +24,4 @@ ENTRYPOINT ["docker-entrypoint.sh"]
 FROM pw AS test
 WORKDIR /usr/local/opt/pw
 COPY test test
-RUN test/bats/bin/bats test
+RUN test/bats/bin/bats --jobs $(nproc) test
diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile
@@ -4,6 +4,7 @@ COPY DEPENDENCIES.md .
 RUN apt-get update && apt-get install -y \
     $(cat DEPENDENCIES.md) \
     file \
+    parallel \
     xclip \
     xvfb \
     && rm -rf /var/lib/apt/lists/*
@@ -21,4 +22,4 @@ ENTRYPOINT ["docker-entrypoint.sh"]
 FROM pw AS test
 WORKDIR /usr/local/opt/pw
 COPY test test
-RUN test/bats/bin/bats test
+RUN test/bats/bin/bats --jobs $(nproc) test
diff --git a/test/pw-clip.bats b/test/pw-clip.bats
@@ -2,6 +2,8 @@
 
 if [[ "$OSTYPE" == "darwin"* ]]; then
 
+export BATS_NO_PARALLELIZE_WITHIN_FILE=true
+
 setup() {
   load 'pw'
   _setup

diff --git a/test/run b/test/run
@@ -8,7 +8,7 @@ run_tests() {
   DOCKER_BUILDKIT=1 docker build --target test -t "sschmid/pw/test/$1" -f "docker/$1/Dockerfile" .
 }
 
-while getopts ":ap:" options; do
+while getopts ":aj:p:" options; do
   case "${options}" in
     a)
       run_tests alpine
@@ -17,6 +17,9 @@ while getopts ":ap:" options; do
       run_tests fedora
       run_tests ubuntu
       ;;
+    j)
+      jobs="${OPTARG}"
+      ;;
     p)
       run_tests "${OPTARG}"
       exit
@@ -29,5 +32,5 @@ while getopts ":ap:" options; do
 done
 shift $(( OPTIND - 1 ))
 
-test/bats/bin/bats "${@:-test}"
+test/bats/bin/bats --jobs "${jobs:-1}" "${@:-test}"
 test/shellcheck