diff --git a/ArchLinux-CXX14/Dockerfile b/ArchLinux-CXX14/Dockerfile index 9ef6d54..e5b17d0 100644 --- a/ArchLinux-CXX14/Dockerfile +++ b/ArchLinux-CXX14/Dockerfile @@ -3,6 +3,7 @@ ARG dockerfile_url ENV DOCKERFILE_URL=$dockerfile_url ENV CGAL_TEST_PLATFORM="ArchLinux-CXX14" +ENV CGAL_SUMMARY_NAME="ArchLinux-basedevel-CXX14" ENV CGAL_CMAKE_FLAGS="(\"-DCGAL_HEADER_ONLY=OFF\" \"-DCGAL_CXX_FLAGS=-Wall -std=gnu++14\")" ENV INIT_FILE=/tmp/init.cmake COPY init.cmake /tmp/init.cmake diff --git a/ArchLinux-CXX17-Release/Dockerfile b/ArchLinux-CXX17-Release/Dockerfile index 14fc756..2e35946 100644 --- a/ArchLinux-CXX17-Release/Dockerfile +++ b/ArchLinux-CXX17-Release/Dockerfile @@ -3,6 +3,7 @@ ARG dockerfile_url ENV DOCKERFILE_URL=$dockerfile_url ENV CGAL_TEST_PLATFORM="ArchLinux-CXX17-Release" +ENV CGAL_SUMMARY_NAME="ArchLinux-basedevel-CXX17" ENV CGAL_CMAKE_FLAGS="(\"-DCMAKE_CXX_FLAGS=-Wall -O3 -msse4.1 -std=gnu++17\")" ENV INIT_FILE=/tmp/init.cmake COPY init.cmake /tmp/init.cmake diff --git a/ArchLinux-clang-CXX14/Dockerfile b/ArchLinux-clang-CXX14/Dockerfile index bf820bf..a4cecbd 100644 --- a/ArchLinux-clang-CXX14/Dockerfile +++ b/ArchLinux-clang-CXX14/Dockerfile @@ -3,6 +3,7 @@ ARG dockerfile_url ENV DOCKERFILE_URL=$dockerfile_url ENV CGAL_TEST_PLATFORM="ArchLinux-clang-CXX14" +ENV CGAL_SUMMARY_NAME="ArchLinux-basedevel-clang-CXX14" ENV CGAL_CMAKE_FLAGS="(\"-DCMAKE_CXX_FLAGS_DEBUG="" \" \"-DCMAKE_C_COMPILER:FILEPATH=/bin/clang\" \"-DCMAKE_CXX_COMPILER:FILEPATH=/bin/clang++\" \"-DCGAL_CXX_FLAGS=-Wall -std=c++14\")" CXX=/bin/clang++ CC=/bin/clang ENV INIT_FILE=/tmp/init.cmake COPY init.cmake /tmp/init.cmake diff --git a/ArchLinux-clang-CXX17-Release/Dockerfile b/ArchLinux-clang-CXX17-Release/Dockerfile index ed3988e..d4698e7 100644 --- a/ArchLinux-clang-CXX17-Release/Dockerfile +++ b/ArchLinux-clang-CXX17-Release/Dockerfile @@ -3,6 +3,7 @@ ARG dockerfile_url ENV DOCKERFILE_URL=$dockerfile_url ENV CGAL_TEST_PLATFORM="ArchLinux-clang-CXX17-Release" +ENV CGAL_SUMMARY_NAME="ArchLinux-basedevel-clang-CXX17" ENV CGAL_CMAKE_FLAGS="(\"-DCMAKE_CXX_FLAGS_DEBUG="" \" \"-DCMAKE_C_COMPILER:FILEPATH=/bin/clang\" \"-DCMAKE_CXX_COMPILER:FILEPATH=/bin/clang++\" \"-DCMAKE_CXX_FLAGS=-Wall -O3 -std=c++17\")" CXX=/bin/clang++ CC=/bin/clang ENV INIT_FILE=/tmp/init.cmake COPY init.cmake /tmp/init.cmake diff --git a/ArchLinux-clang-CXX20-Release/Dockerfile b/ArchLinux-clang-CXX20-Release/Dockerfile index cae8b03..306ff1d 100644 --- a/ArchLinux-clang-CXX20-Release/Dockerfile +++ b/ArchLinux-clang-CXX20-Release/Dockerfile @@ -3,6 +3,7 @@ ARG dockerfile_url ENV DOCKERFILE_URL=$dockerfile_url ENV CGAL_TEST_PLATFORM="ArchLinux-clang-CXX20-Release" +ENV CGAL_SUMMARY_NAME="ArchLinux-basedevel-clang-CXX20" ENV CGAL_CMAKE_FLAGS="(\"-DCMAKE_CXX_FLAGS_DEBUG="" \" \"-DCMAKE_C_COMPILER:FILEPATH=/bin/clang\" \"-DCMAKE_CXX_COMPILER:FILEPATH=/bin/clang++\" \"-DCMAKE_CXX_FLAGS=-Wall -O3 -std=c++20\" \"-DCMAKE_PREFIX_PATH=/usr/local/boost\")" CXX=/bin/clang++ CC=/bin/clang ENV INIT_FILE=/tmp/init.cmake COPY init.cmake /tmp/init.cmake diff --git a/ArchLinux-clang-Release/Dockerfile b/ArchLinux-clang-Release/Dockerfile index ad6352c..b56642e 100644 --- a/ArchLinux-clang-Release/Dockerfile +++ b/ArchLinux-clang-Release/Dockerfile @@ -3,6 +3,7 @@ ARG dockerfile_url ENV DOCKERFILE_URL=$dockerfile_url ENV CGAL_TEST_PLATFORM="ArchLinux-clang-Release" +ENV CGAL_SUMMARY_NAME="ArchLinux-basedevel-clang-Release" ENV CGAL_CMAKE_FLAGS="('-DCMAKE_BUILD_TYPE=Release' '-DCMAKE_CXX_FLAGS_RELEASE=-O3 -DCGAL_NDEBUG' '-DCMAKE_C_COMPILER:FILEPATH=/bin/clang' '-DCMAKE_CXX_COMPILER:FILEPATH=/bin/clang++' '-DCGAL_CXX_FLAGS=-Wall -march=native' '-DWITH_GMPXX:BOOL=ON')" CXX=/bin/clang++ CC=/bin/clang ENV INIT_FILE=/tmp/init.cmake COPY init.cmake /tmp/init.cmake diff --git a/ArchLinux-clang/Dockerfile b/ArchLinux-clang/Dockerfile index 2a13f83..e6f01b7 100644 --- a/ArchLinux-clang/Dockerfile +++ b/ArchLinux-clang/Dockerfile @@ -5,6 +5,7 @@ ENV DOCKERFILE_URL=$dockerfile_url RUN pacman -Syyu --noconfirm && pacman -S --noconfirm clang && pacman -Scc --noconfirm ENV CGAL_TEST_PLATFORM="ArchLinux-clang" +ENV CGAL_SUMMARY_NAME="ArchLinux-basedevel-clang-Debug" ENV CGAL_CMAKE_FLAGS="(\"-DCMAKE_CXX_FLAGS_DEBUG="" \" \"-DCMAKE_C_COMPILER:FILEPATH=/bin/clang\" \"-DCMAKE_CXX_COMPILER:FILEPATH=/bin/clang++\" \"-DCGAL_CXX_FLAGS=-Wall\")" CXX=/bin/clang++ CC=/bin/clang ENV INIT_FILE=/tmp/init.cmake COPY init.cmake /tmp/init.cmake diff --git a/ArchLinux/Dockerfile b/ArchLinux/Dockerfile index 1c234a7..80fdab9 100644 --- a/ArchLinux/Dockerfile +++ b/ArchLinux/Dockerfile @@ -95,6 +95,6 @@ ENV CGAL_TEST_PLATFORM="ArchLinux" \ # # Prerequisite '/include/c++/13.2.1/algorithm' of target 'test/AABB_tree_Demo/CMakeFiles/CGAL_Qt6_moc_and_resources.dir/CGAL_Qt6_moc_and_resources_autogen/mocs_compilation.cpp.o' does not exist. RUN ln -s /usr/include /include - +ENV CGAL_SUMMARY_NAME="ArchLinux-basedevel-Debug" ENV INIT_FILE=/tmp/init.cmake COPY init.cmake /tmp/init.cmake diff --git a/Debian-stable-Release/Dockerfile b/Debian-stable-Release/Dockerfile index 73c175c..aacdfcb 100644 --- a/Debian-stable-Release/Dockerfile +++ b/Debian-stable-Release/Dockerfile @@ -3,6 +3,7 @@ ARG dockerfile_url ENV DOCKERFILE_URL=$dockerfile_url ENV CGAL_TEST_PLATFORM="Debian-stable-Release" +ENV CGAL_SUMMARY_NAME="Debian-stable-Release" ENV CGAL_CMAKE_FLAGS="('-DCMAKE_BUILD_TYPE=Release' '-DCMAKE_CXX_FLAGS_RELEASE=-O3 -DCGAL_NDEBUG')" ENV INIT_FILE=/tmp/init.cmake COPY init.cmake /tmp/init.cmake diff --git a/Debian-stable/Dockerfile b/Debian-stable/Dockerfile index dc01d52..0bd5f0d 100644 --- a/Debian-stable/Dockerfile +++ b/Debian-stable/Dockerfile @@ -35,6 +35,7 @@ RUN apt-get update && apt-get install -y \ ENV CGAL_TEST_PLATFORM="Debian-Stable" +ENV CGAL_SUMMARY_NAME="Debian-stable-Debug" ENV CGAL_CMAKE_FLAGS="(\"-DWITH_CGAL_Qt5=OFF \")" ENV INIT_FILE=/tmp/init.cmake COPY init.cmake /tmp/init.cmake diff --git a/Debian-testing-clang-main/Dockerfile b/Debian-testing-clang-main/Dockerfile index bf40c08..612a060 100644 --- a/Debian-testing-clang-main/Dockerfile +++ b/Debian-testing-clang-main/Dockerfile @@ -12,3 +12,4 @@ RUN apt-get update -y && apt-get install -y wget \ ENV CXX=/usr/bin/clang++ ENV CC=/usr/bin/clang ENV CGAL_TEST_PLATFORM="Debian-testing-clang-main" +ENV CGAL_SUMMARY_NAME="Debian-testing-clang-main" diff --git a/Debian-testing/Dockerfile b/Debian-testing/Dockerfile index a435812..1fdd49a 100644 --- a/Debian-testing/Dockerfile +++ b/Debian-testing/Dockerfile @@ -55,5 +55,6 @@ ENV OpenMesh_DIR=/OpenMesh-11.0.0/build ENV CGAL_TEST_PLATFORM="Debian-Testing" +ENV CGAL_SUMMARY_NAME="Debian-testing-Debug" ENV INIT_FILE=/tmp/init.cmake COPY init.cmake /tmp/init.cmake diff --git a/Fedora-32-Release/Dockerfile b/Fedora-32-Release/Dockerfile index 299f529..60ea0c0 100644 --- a/Fedora-32-Release/Dockerfile +++ b/Fedora-32-Release/Dockerfile @@ -3,6 +3,7 @@ ARG dockerfile_url ENV DOCKERFILE_URL=$dockerfile_url ENV CGAL_TEST_PLATFORM="Fedora-32-Release" +ENV CGAL_SUMMARY_NAME="Fedora-latest-32-Release" ENV CGAL_CMAKE_FLAGS="('-DCMAKE_BUILD_TYPE=Release' '-DCMAKE_CXX_FLAGS_RELEASE=-O3 -DCGAL_NDEBUG')" ENV INIT_FILE=/tmp/init.cmake COPY init.cmake /tmp/init.cmake diff --git a/Fedora-32/Dockerfile b/Fedora-32/Dockerfile index 506312c..18d8d24 100644 --- a/Fedora-32/Dockerfile +++ b/Fedora-32/Dockerfile @@ -30,6 +30,7 @@ RUN dnf -y install \ ENV CC="gcc -m32" CXX="g++ -m32" ENV CGAL_TEST_PLATFORM="Fedora-32" +ENV CGAL_SUMMARY_NAME="Fedora-latest-32-Debug" ENV CGAL_CMAKE_FLAGS="('-DCGAL_HEADER_ONLY:BOOL=TRUE')" ENV INIT_FILE=/tmp/init.cmake COPY init.cmake /tmp/init.cmake diff --git a/Fedora-Release/Dockerfile b/Fedora-Release/Dockerfile index 20df639..7c062b1 100644 --- a/Fedora-Release/Dockerfile +++ b/Fedora-Release/Dockerfile @@ -5,6 +5,7 @@ ENV DOCKERFILE_URL=$dockerfile_url RUN dnf -y install libasan && dnf clean all ENV CGAL_TEST_PLATFORM="Fedora-Release" +ENV CGAL_SUMMARY_NAME="Fedora-latest-Release-ASAN" ENV CGAL_CMAKE_FLAGS="('-DCMAKE_BUILD_TYPE=Release' '-DCMAKE_CXX_FLAGS_RELEASE=-msse3 -O3 -DCGAL_NDEBUG -fsanitize=address' '-DWITH_GMPXX=ON')" ENV CGAL_USE_ASAN=1 ENV INIT_FILE=/tmp/init.cmake diff --git a/Fedora-rawhide-Release/Dockerfile b/Fedora-rawhide-Release/Dockerfile index 677bae0..a7bc35b 100644 --- a/Fedora-rawhide-Release/Dockerfile +++ b/Fedora-rawhide-Release/Dockerfile @@ -3,6 +3,7 @@ ARG dockerfile_url ENV DOCKERFILE_URL=$dockerfile_url ENV CGAL_TEST_PLATFORM="Fedora-rawhide-Release" +ENV CGAL_SUMMARY_NAME="Fedora-testing-Release" ENV CGAL_CMAKE_FLAGS="('-DCMAKE_BUILD_TYPE=Release' '-DCMAKE_CXX_FLAGS_RELEASE=-O3 -DCGAL_NDEBUG')" ENV INIT_FILE=/tmp/init.cmake COPY init.cmake /tmp/init.cmake diff --git a/Fedora-rawhide/Dockerfile b/Fedora-rawhide/Dockerfile index 8383e67..21a1bc9 100644 --- a/Fedora-rawhide/Dockerfile +++ b/Fedora-rawhide/Dockerfile @@ -39,6 +39,7 @@ RUN dnf -y upgrade && \ cd .. && rm -rf v2021.8.0.tar.gz oneTBB-2021.8.0 build ENV CGAL_TEST_PLATFORM="Fedora-rawhide" +ENV CGAL_SUMMARY_NAME="Fedora-testing-Debug" ENV CGAL_CMAKE_FLAGS="('-DCGAL_HEADER_ONLY:BOOL=TRUE')" ENV INIT_FILE=/tmp/init.cmake COPY init.cmake /tmp/init.cmake diff --git a/Fedora-with-LEDA/Dockerfile b/Fedora-with-LEDA/Dockerfile index 5b5a894..5809abe 100644 --- a/Fedora-with-LEDA/Dockerfile +++ b/Fedora-with-LEDA/Dockerfile @@ -3,6 +3,7 @@ ARG dockerfile_url ENV DOCKERFILE_URL=$dockerfile_url ENV CGAL_TEST_PLATFORM="Fedora-with-LEDA" +ENV CGAL_SUMMARY_NAME="Fedora-latest-With-LEDA" ENV LEDA_DIR="/mnt/testresults/leda-numbers/" LD_LIBRARY_PATH=/mnt/testresults/leda-numbers/ ENV INIT_FILE=/tmp/init.cmake ENV CGAL_DISABLE_GMP=ON diff --git a/Fedora/Dockerfile b/Fedora/Dockerfile index 90709a3..9c62b4f 100644 --- a/Fedora/Dockerfile +++ b/Fedora/Dockerfile @@ -51,6 +51,7 @@ RUN wget https://github.com/sloriot/LAStools/archive/refs/heads/fix_make_install ENV CGAL_TEST_PLATFORM="Fedora" +ENV CGAL_SUMMARY_NAME="Fedora-latest-Debug" ENV CGAL_CMAKE_FLAGS="" ENV INIT_FILE=/tmp/init.cmake COPY init.cmake /tmp/init.cmake diff --git a/Ubuntu-GCC6-CXX1Z/Dockerfile b/Ubuntu-GCC6-CXX1Z/Dockerfile index a862b05..6ca60f8 100644 --- a/Ubuntu-GCC6-CXX1Z/Dockerfile +++ b/Ubuntu-GCC6-CXX1Z/Dockerfile @@ -3,6 +3,7 @@ ARG dockerfile_url ENV DOCKERFILE_URL=$dockerfile_url ENV CGAL_TEST_PLATFORM="Ubuntu-latest-GCC6-CXX1z" +ENV CGAL_SUMMARY_NAME="Ubuntu-latest-GCC_master-CXX1z" ENV CGAL_CMAKE_FLAGS="(\"-DCGAL_CXX_FLAGS=-DDONT_USE_BOOST_PROGRAM_OPTIONS -Wall -Wextra -std=c++1z\")" ENV INIT_FILE=/tmp/init.cmake COPY init.cmake /tmp/init.cmake diff --git a/Ubuntu-GCC6-Release/Dockerfile b/Ubuntu-GCC6-Release/Dockerfile index ff31d94..17503f0 100644 --- a/Ubuntu-GCC6-Release/Dockerfile +++ b/Ubuntu-GCC6-Release/Dockerfile @@ -3,6 +3,7 @@ ARG dockerfile_url ENV DOCKERFILE_URL=$dockerfile_url ENV CGAL_TEST_PLATFORM="Ubuntu-latest-GCC6-Release" +ENV CGAL_SUMMARY_NAME="Ubuntu-latest-GCC_master-Release" ENV CGAL_CMAKE_FLAGS="(\"-DCGAL_CXX_FLAGS=-DDONT_USE_BOOST_PROGRAM_OPTIONS -Wall -Wextra -O3 -DCGAL_NDEBUG\")" ENV INIT_FILE=/tmp/init.cmake COPY init.cmake /tmp/init.cmake diff --git a/Ubuntu-GCC6/Dockerfile b/Ubuntu-GCC6/Dockerfile index 2d76832..5860ab0 100644 --- a/Ubuntu-GCC6/Dockerfile +++ b/Ubuntu-GCC6/Dockerfile @@ -38,6 +38,7 @@ RUN git clone --depth=1 --shallow-submodules https://gitlab.com/libeigen/eigen. cmake .. && make install && cd .. && rm -rf eigen ENV CGAL_TEST_PLATFORM="Ubuntu-latest-GCC6" +ENV CGAL_SUMMARY_NAME="Ubuntu-latest-GCC_master-Debug" ENV CGAL_CMAKE_FLAGS="(\"-DCGAL_CXX_FLAGS=-DDONT_USE_BOOST_PROGRAM_OPTIONS -Wall -Wno-expansion-to-defined\")" ENV INIT_FILE=/tmp/init.cmake diff --git a/Ubuntu-GCC_master_cpp20-Release/Dockerfile b/Ubuntu-GCC_master_cpp20-Release/Dockerfile index d98e328..432f274 100644 --- a/Ubuntu-GCC_master_cpp20-Release/Dockerfile +++ b/Ubuntu-GCC_master_cpp20-Release/Dockerfile @@ -3,6 +3,7 @@ ARG dockerfile_url ENV DOCKERFILE_URL=$dockerfile_url ENV CGAL_TEST_PLATFORM="Ubuntu-GCC_master_CXX20-Release" +ENV CGAL_SUMMARY_NAME="Ubuntu-latest-GCC_master-CXX2a" ENV CGAL_CMAKE_FLAGS="(\"-DCGAL_CXX_FLAGS=-DDONT_USE_BOOST_PROGRAM_OPTIONS -Wall -Wextra -std=c++2a -O3 -DCGAL_NDEBUG\" \"-DCMAKE_PREFIX_PATH=/usr/local/boost\")" ENV INIT_FILE=/tmp/init.cmake COPY init.cmake /tmp/init.cmake diff --git a/Ubuntu-NO_DEPRECATED_CODE/Dockerfile b/Ubuntu-NO_DEPRECATED_CODE/Dockerfile index 1b1ecab..6fb9453 100644 --- a/Ubuntu-NO_DEPRECATED_CODE/Dockerfile +++ b/Ubuntu-NO_DEPRECATED_CODE/Dockerfile @@ -12,6 +12,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ libqt6websockets6-dev ENV CGAL_TEST_PLATFORM="Ubuntu-Latest-NO_DEPRECATED_CODE" +ENV CGAL_SUMMARY_NAME="Ubuntu-latest-NO_DEPRECATED_CODE" ENV CGAL_CMAKE_FLAGS="(\"-DCGAL_CXX_FLAGS=-DCGAL_NO_DEPRECATED_CODE\")" ENV INIT_FILE=/tmp/init.cmake COPY init.cmake /tmp/init.cmake diff --git a/Ubuntu-no-gmp-no-leda/Dockerfile b/Ubuntu-no-gmp-no-leda/Dockerfile index b339ad7..84c5670 100644 --- a/Ubuntu-no-gmp-no-leda/Dockerfile +++ b/Ubuntu-no-gmp-no-leda/Dockerfile @@ -4,6 +4,7 @@ ARG dockerfile_url ENV DOCKERFILE_URL=$dockerfile_url ENV CGAL_TEST_PLATFORM="Ubuntu-no-gmp-no-leda" +ENV CGAL_SUMMARY_NAME="Ubuntu-latest-no-gmp-no-leda" ENV INIT_FILE=/init.cmake COPY ./init.cmake . diff --git a/Ubuntu/Dockerfile b/Ubuntu/Dockerfile index 35be2d4..c2676cf 100644 --- a/Ubuntu/Dockerfile +++ b/Ubuntu/Dockerfile @@ -126,6 +126,7 @@ RUN git clone https://ceres-solver.googlesource.com/ceres-solver \ && rm -rf ceres-solver ENV CGAL_TEST_PLATFORM="Ubuntu-Latest" +ENV CGAL_SUMMARY_NAME="Ubuntu-latest-Debug" ENV CGAL_CMAKE_FLAGS="(\"-DWITH_CGAL_Qt5:BOOL=OFF\")" ENV INIT_FILE=/tmp/init.cmake COPY init.cmake /tmp/init.cmake diff --git a/run-testsuite.sh b/run-testsuite.sh index 42626b1..79a47e2 100755 --- a/run-testsuite.sh +++ b/run-testsuite.sh @@ -160,6 +160,7 @@ touch "$RESULT_FILE" sed -n '/The CXX compiler/s/-- The CXX compiler identification is/COMPILER_VERSION =/p' < "${CMAKE_LOG_FILE}" |sed -E "s/ = (.*)/\ = '\1\'/">> "$RESULT_FILE" sed -n '/CGAL_VERSION /s/#define //p' < "${CGAL_VERSION_DIR}/include/CGAL/version.h" >> "$RESULT_FILE" +echo "CGAL_SUMMARY_NAME ${CGAL_SUMMARY_NAME:-$CGAL_TEST_PLATFORM}" >> "$RESULT_FILE" echo "TESTER ${CGAL_TESTER}" >> "$RESULT_FILE" echo "TESTER_NAME ${CGAL_TESTER_NAME}" >> "$RESULT_FILE" echo "TESTER_ADDRESS ${CGAL_TESTER_ADDRESS}" >> "$RESULT_FILE"