339166 - "resourceContains" causes out of memory errors (fix to use grep instead).
diff --git a/releng.wtpbuilder/scripts/build/checkForFastFail.xml b/releng.wtpbuilder/scripts/build/checkForFastFail.xml index 2a93868..3f9ce37 100644 --- a/releng.wtpbuilder/scripts/build/checkForFastFail.xml +++ b/releng.wtpbuilder/scripts/build/checkForFastFail.xml
@@ -15,6 +15,7 @@ --> <echo message="log file to check for failures: ${resource}"/> + <!-- remember to quote any grep special characters, such as bracket ([) --> <antcall target="checkForString"> <param name="stringToCheck" @@ -24,6 +25,7 @@ value="Problem with CVS checkout. Check tag. Perhaps network. "/> </antcall> + <!-- note use of wild card (.) since can not embbed apostophe (') in so many other quotes and apostrophes --> <antcall target="checkForString"> <param name="stringToCheck" @@ -55,7 +57,7 @@ </exec> <!-- it appears the exec, at least for grep, returns an empty string if no match - so we follow that check to see if return result has length --> + so we follow that check to see if return result has length. TODO: could maybe use return code? --> <condition property="reasonFailedText" value="${reasonFailed}"> @@ -79,9 +81,9 @@ <!-- be sure to echo reason msg to log --> <!-- TODO: we could write this to a file, and make available from download page --> - - <echo message="FAST FAIL CHECK found reason to end build: ${shortDescription}" /> - + + <echo message="FAST FAIL CHECK found reason to end build: ${shortDescription}"/> + <echo message="${formatedReasonFailedText}"/> <!-- copy early, if we can ... else site won't be created, when we fail -->