From 6addecb2f2b6152fcf4bc939fbc9f86c524a353a Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 1 Oct 2021 15:19:50 +0200 Subject: [PATCH] Fix the regular expression to match "CGAL warning" and detect a `w` --- Testsuite/test/collect_cgal_testresults_from_cmake | 2 +- Testsuite/test/parse-ctest-dashboard-xml.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Testsuite/test/collect_cgal_testresults_from_cmake b/Testsuite/test/collect_cgal_testresults_from_cmake index 23a0741df38..099e511d63f 100755 --- a/Testsuite/test/collect_cgal_testresults_from_cmake +++ b/Testsuite/test/collect_cgal_testresults_from_cmake @@ -50,7 +50,7 @@ print_testresult() # 'QMessageBox::warning'. if grep -v -F 'CMake Warning at /usr/share/cmake/Modules/FindBoost' CompilerOutput_$1 ProgramOutput.*.$1 | grep -i -E -q '(^|[^a-zA-Z_,:-])warning' then - if grep -v -F 'CMake Warning at /usr/share/cmake/Modules/FindBoost' CompilerOutput_$1 ProgramOutput.*.$1 | grep -i -E '(^|[^a-zA-Z_,:-])warning' | grep -i -q "include[/\]CGAL\|cmake" + if grep -v -F 'CMake Warning at /usr/share/cmake/Modules/FindBoost' CompilerOutput_$1 ProgramOutput.*.$1 | grep -i -E '(^|[^a-zA-Z_,:-])warning' | grep -i -q "include[/\]CGAL\|cmake|CGAL warning" then RESULT="w" else diff --git a/Testsuite/test/parse-ctest-dashboard-xml.py b/Testsuite/test/parse-ctest-dashboard-xml.py index 757212833fa..d816ac1e89b 100644 --- a/Testsuite/test/parse-ctest-dashboard-xml.py +++ b/Testsuite/test/parse-ctest-dashboard-xml.py @@ -76,7 +76,7 @@ for t_id in range(0, len(tests)): labels.add(label) tests_per_label[label].append(t) -warning_pattern=re.compile(r'(.*([^a-zA-Z_,:-])([^\d]\s)warning).*?(\[|\n)', flags=re.IGNORECASE) +warning_pattern=re.compile(r'(.*([^a-zA-Z_,:-])warning)', flags=re.IGNORECASE) w_det=re.compile("warning"); filter_pattern=re.compile(r'cmake|cgal', flags=re.IGNORECASE); with open_file_create_dir(result_file_name.format(dir=os.getcwd(),