From ed28e29e8c19c2b0d988334f2a59b209a4c03e62 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Mon, 8 Sep 2008 08:59:30 +0000 Subject: [PATCH] Previous commit was incomplete ("New attempt to catch runtime warnings. One need to grep in ProgramOutput.*.* instead of ErrorOutput_*.") Fix the regular expression. I hope all platforms will have a grep knowing that syntax. --- Testsuite/test/collect_cgal_testresults | 2 +- Testsuite/test/collect_cgal_testresults_from_cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Testsuite/test/collect_cgal_testresults b/Testsuite/test/collect_cgal_testresults index bcdb1211a23..72ed5fec5d2 100755 --- a/Testsuite/test/collect_cgal_testresults +++ b/Testsuite/test/collect_cgal_testresults @@ -56,7 +56,7 @@ print_testresult() # string "warning" preceded with a letter that is not a letter or '_' or ',' # That avoids some false positives such as # '-read_only_relocs,warning' or '-D_CRT_SECURE_NO_WARNINGS' - if $GREP -i -E '[^a-zA-Z_,]warning' "CompilerOutput_$1" ProgramOutput.*.$1 > /dev/null ; then + if $GREP -i -E '(^|[^a-zA-Z_,])warning' "CompilerOutput_$1" ProgramOutput.*.$1 > /dev/null ; then RESULT="w" else RESULT="y" diff --git a/Testsuite/test/collect_cgal_testresults_from_cmake b/Testsuite/test/collect_cgal_testresults_from_cmake index a273e2424af..98feb1d1e49 100755 --- a/Testsuite/test/collect_cgal_testresults_from_cmake +++ b/Testsuite/test/collect_cgal_testresults_from_cmake @@ -44,7 +44,7 @@ print_testresult() # string "warning" preceded with a letter that is not a letter or '_' or ',' # That avoids some false positives such as # '-read_only_relocs,warning' or '-D_CRT_SECURE_NO_WARNINGS' - if grep -i -E -q '[^a-zA-Z_,]warning' CompilerOutput_$1 ProgramOutput.*.$1 + if grep -i -E -q '(^|[^a-zA-Z_,])warning' CompilerOutput_$1 ProgramOutput.*.$1 then RESULT="w" else