update docker images to use new targets and runner

felixschurk · May 7, 2024 · cb6c742 · cb6c742
1 parent 8f6a0d5
commit cb6c742
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 24 deletions.
diff --git a/test/docker/arch b/test/docker/arch
@@ -26,7 +26,11 @@ RUN cmake --install build
 RUN task --version
 
 # Setup tests
-WORKDIR /root/code/build/test/
-RUN make -j8
+WORKDIR /root/code/
+RUN cmake --build build --target build_tests
+
+## runs all tests in parallel
+RUN ctest --test-dir build/test -j 8
 
-CMD ["bash", "-c", "./run_all -v ; cat all.log | grep 'not ok' ; ./problems"]
+## if there are failed tests they now are run in serial with verbose output
+RUN ctest --test-dir build/test --rerun-failed --output-on-failure
diff --git a/test/docker/debianstable b/test/docker/debianstable
@@ -27,7 +27,11 @@ RUN cmake --install build
 RUN task --version
 
 # Setup tests
-WORKDIR /root/code/build/test
-RUN make -j8
+WORKDIR /root/code/
+RUN cmake --build build --target build_tests
+
+## runs all tests in parallel
+RUN ctest --test-dir build/test -j 8
 
-CMD ["bash", "-c", "./run_all -v ; cat all.log | grep 'not ok' ; ./problems"]
+## if there are failed tests they now are run in serial with verbose output
+RUN ctest --test-dir build/test --rerun-failed --output-on-failure
diff --git a/test/docker/debiantesting b/test/docker/debiantesting
@@ -27,7 +27,11 @@ RUN cmake --install build
 RUN task --version
 
 # Setup tests
-WORKDIR /root/code/build/test
-RUN make -j8
+WORKDIR /root/code/
+RUN cmake --build build --target build_tests
+
+## runs all tests in parallel
+RUN ctest --test-dir build/test -j 8
 
-CMD ["bash", "-c", "./run_all -v ; cat all.log | grep 'not ok' ; ./problems"]
+## if there are failed tests they now are run in serial with verbose output
+RUN ctest --test-dir build/test --rerun-failed --output-on-failure
diff --git a/test/docker/fedora39 b/test/docker/fedora39
@@ -26,7 +26,11 @@ RUN cmake --install build
 RUN task --version
 
 # Setup tests
-WORKDIR /root/code/build/test
-RUN make -j8
+WORKDIR /root/code/
+RUN cmake --build build --target build_tests
+
+## runs all tests in parallel
+RUN ctest --test-dir build/test -j 8
 
-CMD ["bash", "-c", "./run_all -v ; cat all.log | grep 'not ok' ; ./problems"]
+## if there are failed tests they now are run in serial with verbose output
+RUN ctest --test-dir build/test --rerun-failed --output-on-failure
diff --git a/test/docker/fedora40 b/test/docker/fedora40
@@ -26,7 +26,11 @@ RUN cmake --install build
 RUN task --version
 
 # Setup tests
-WORKDIR /root/code/build/test
-RUN make -j8
+WORKDIR /root/code/
+RUN cmake --build build --target build_tests
+
+## runs all tests in parallel
+RUN ctest --test-dir build/test -j 8
 
-CMD ["bash", "-c", "./run_all -v ; cat all.log | grep 'not ok' ; ./problems"]
+## if there are failed tests they now are run in serial with verbose output
+RUN ctest --test-dir build/test --rerun-failed --output-on-failure
diff --git a/test/docker/opensuse b/test/docker/opensuse
@@ -25,7 +25,11 @@ RUN cmake --install build
 RUN task --version
 
 # Setup tests
-WORKDIR /root/code/build/test
-RUN make -j8
+WORKDIR /root/code/
+RUN cmake --build build --target build_tests
+
+## runs all tests in parallel
+RUN ctest --test-dir build/test -j 8
 
-CMD ["bash", "-c", "./run_all -v ; cat all.log | grep 'not ok' ; ./problems"]
+## if there are failed tests they now are run in serial with verbose output
+RUN ctest --test-dir build/test --rerun-failed --output-on-failure
diff --git a/test/docker/ubuntu2004 b/test/docker/ubuntu2004
@@ -34,7 +34,11 @@ RUN cmake --install build
 RUN task --version
 
 # Setup tests
-WORKDIR /root/code/build/test
-RUN make -j8
+WORKDIR /root/code/
+RUN cmake --build build --target build_tests
+
+## runs all tests in parallel
+RUN ctest --test-dir build/test -j 8
 
-CMD ["bash", "-c", "./run_all -v ; cat all.log | grep 'not ok' ; ./problems"]
+## if there are failed tests they now are run in serial with verbose output
+RUN ctest --test-dir build/test --rerun-failed --output-on-failure
diff --git a/test/docker/ubuntu2204 b/test/docker/ubuntu2204
@@ -27,7 +27,11 @@ RUN cmake --install build
 RUN task --version
 
 # Setup tests
-WORKDIR /root/code/build/test
-RUN make -j8
+WORKDIR /root/code/
+RUN cmake --build build --target build_tests
+
+## runs all tests in parallel
+RUN ctest --test-dir build/test -j 8
 
-CMD ["bash", "-c", "./run_all -v ; cat all.log | grep 'not ok' ; ./problems"]
+## if there are failed tests they now are run in serial with verbose output
+RUN ctest --test-dir build/test --rerun-failed --output-on-failure