From 8b20a97764281d902fd43a309ff553d45d03df2e Mon Sep 17 00:00:00 2001 From: Nicolas Saillant Date: Thu, 11 Jul 2024 10:27:16 +0200 Subject: [PATCH 1/2] Add third-party library information to test results --- run-testsuite.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/run-testsuite.sh b/run-testsuite.sh index 7913185..4e03700 100755 --- a/run-testsuite.sh +++ b/run-testsuite.sh @@ -122,6 +122,13 @@ echo "TESTER_ADDRESS ${CGAL_TESTER_ADDRESS}" >> "$RESULT_FILE" echo "CGAL_TEST_PLATFORM ${PLATFORM}" >> "$RESULT_FILE" grep -e "^-- Operating system: " "${CGAL_TESTRESULTS}installation-${CGAL_TEST_PLATFORM}.log"|sort -u >> $RESULT_FILE grep -e "^-- USING " "${CGAL_TESTRESULTS}installation-${CGAL_TEST_PLATFORM}.log"|sort -u >> $RESULT_FILE +grep -e "^-- Third-party library TBB " "${CGAL_TESTRESULTS}installation-${CGAL_TEST_PLATFORM}.log"|sort -u >> $RESULT_FILE +grep -e "^-- Third-party library Eigen3 " "${CGAL_TESTRESULTS}installation-${CGAL_TEST_PLATFORM}.log"|sort -u >> $RESULT_FILE +grep -e "^-- Third-party library GMP " "${CGAL_TESTRESULTS}installation-${CGAL_TEST_PLATFORM}.log"|sort -u >> $RESULT_FILE +grep -e "^-- Third-party library MPFR " "${CGAL_TESTRESULTS}installation-${CGAL_TEST_PLATFORM}.log"|sort -u >> $RESULT_FILE +grep -e "^-- Third-party library OpenCV " "${CGAL_TESTRESULTS}installation-${CGAL_TEST_PLATFORM}.log"|sort -u >> $RESULT_FILE +grep -e "^-- Third-party library METIS " "${CGAL_TESTRESULTS}installation-${CGAL_TEST_PLATFORM}.log"|sort -u >> $RESULT_FILE +grep -e "^-- Third-party library zlib " "${CGAL_TESTRESULTS}installation-${CGAL_TEST_PLATFORM}.log"|sort -u >> $RESULT_FILE #Use sed to get the content of DEBUG or RELEASE CXX FLAGS so that Multiconfiguration platforms do provide their CXXXFLAGS to the testsuite page (that greps USING CXXFLAGS to get info) sed -i -E 's/(^-- USING )(DEBUG|RELEASE) (CXXFLAGS)/\1\3/' $RESULT_FILE echo "------------" >> "$RESULT_FILE" From 7f566bed5e2e16af17cb6dd9a2bd991a4736eb1a Mon Sep 17 00:00:00 2001 From: Nicolas Saillant Date: Thu, 11 Jul 2024 16:20:17 +0200 Subject: [PATCH 2/2] Refactor how third-party libraries are extracted --- run-testsuite.sh | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/run-testsuite.sh b/run-testsuite.sh index 4e03700..f8ea430 100755 --- a/run-testsuite.sh +++ b/run-testsuite.sh @@ -122,13 +122,7 @@ echo "TESTER_ADDRESS ${CGAL_TESTER_ADDRESS}" >> "$RESULT_FILE" echo "CGAL_TEST_PLATFORM ${PLATFORM}" >> "$RESULT_FILE" grep -e "^-- Operating system: " "${CGAL_TESTRESULTS}installation-${CGAL_TEST_PLATFORM}.log"|sort -u >> $RESULT_FILE grep -e "^-- USING " "${CGAL_TESTRESULTS}installation-${CGAL_TEST_PLATFORM}.log"|sort -u >> $RESULT_FILE -grep -e "^-- Third-party library TBB " "${CGAL_TESTRESULTS}installation-${CGAL_TEST_PLATFORM}.log"|sort -u >> $RESULT_FILE -grep -e "^-- Third-party library Eigen3 " "${CGAL_TESTRESULTS}installation-${CGAL_TEST_PLATFORM}.log"|sort -u >> $RESULT_FILE -grep -e "^-- Third-party library GMP " "${CGAL_TESTRESULTS}installation-${CGAL_TEST_PLATFORM}.log"|sort -u >> $RESULT_FILE -grep -e "^-- Third-party library MPFR " "${CGAL_TESTRESULTS}installation-${CGAL_TEST_PLATFORM}.log"|sort -u >> $RESULT_FILE -grep -e "^-- Third-party library OpenCV " "${CGAL_TESTRESULTS}installation-${CGAL_TEST_PLATFORM}.log"|sort -u >> $RESULT_FILE -grep -e "^-- Third-party library METIS " "${CGAL_TESTRESULTS}installation-${CGAL_TEST_PLATFORM}.log"|sort -u >> $RESULT_FILE -grep -e "^-- Third-party library zlib " "${CGAL_TESTRESULTS}installation-${CGAL_TEST_PLATFORM}.log"|sort -u >> $RESULT_FILE +sed -n '/^-- Third-party library /p' "${CGAL_TESTRESULTS}installation-${CGAL_TEST_PLATFORM}.log" >> $RESULT_FILE #Use sed to get the content of DEBUG or RELEASE CXX FLAGS so that Multiconfiguration platforms do provide their CXXXFLAGS to the testsuite page (that greps USING CXXFLAGS to get info) sed -i -E 's/(^-- USING )(DEBUG|RELEASE) (CXXFLAGS)/\1\3/' $RESULT_FILE echo "------------" >> "$RESULT_FILE"