Skip to content

Commit

Permalink
Testsuite: Add OS extraction for Windows and macOS, fix TPL init (#8595)
Browse files Browse the repository at this point in the history
## Summary of Changes

- Adds OS extraction for Windows and macOS in test script.
- Fixes TPL initialization.
  • Loading branch information
lrineau authored Nov 8, 2024
2 parents 55362f0 + 8c6c08b commit 06cd13f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Maintenance/test_handling/to_zipped_format
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ sub reformat_results($)
$_ = $line;
open (PLATFORM_INFO,">${platform}.info") or return;
open (PLATFORM_NEW_RESULTS,">${platform}.new_results") or return;
my ($CGAL_VERSION,$LEDA_VERSION,$COMPILER,$OS,$TESTER_NAME,$TESTER_ADDRESS,$GMP,$MPFR,$ZLIB,$OPENGL,$BOOST,$QT,$CMAKE,$TPL) = ("-","-","-","-","-","-","-","-","-","-","-","no","TPL:");
my ($CGAL_VERSION,$LEDA_VERSION,$COMPILER,$OS,$TESTER_NAME,$TESTER_ADDRESS,$GMP,$MPFR,$ZLIB,$OPENGL,$BOOST,$QT,$CMAKE,$TPL) = ("-","-","-","-","-","-","-","-","-","-","-","-","no","TPL:");
my ($LDFLAGS,$CXXFLAGS) = ("", "");
while (! /^------/) {
if(/^\s*$/) {
Expand Down
1 change: 1 addition & 0 deletions Scripts/developer_scripts/run_testsuite_with_ctest
Original file line number Diff line number Diff line change
Expand Up @@ -369,6 +369,7 @@ run_test_on_platform()
echo "TESTER_NAME ${CGAL_TESTER}" >> "$RESULT_FILE"
echo "TESTER_ADDRESS ${TESTER_ADDRESS}" >> "$RESULT_FILE"
echo "CGAL_TEST_PLATFORM ${PLATFORM}" >> "$RESULT_FILE"
grep -e "^-- Operating system: " "${CGAL_BINARY_DIR}/installation.log" >> "$RESULT_FILE"
grep -e "^-- USING " "${CGAL_BINARY_DIR}/installation.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
Expand Down

0 comments on commit 06cd13f

Please sign in to comment.