Made error-filter expression in build-check script slightly more

forgiving; added Makefile.tests to list of files to exclude from
packaging.

diff --git a/releasetools/Variables.mk b/releasetools/Variables.mk
index ce37d875c021bc1aea3428b894a82f21a4aa059f..e9ce1ce89bec7c1043f1ab52fc571552b5331e7c 100644 (file)
--- a/releasetools/Variables.mk
+++ b/releasetools/Variables.mk
@@ -168,6 +168,7 @@ ZIP_EXCLUDES = \
  Makefile$$ \
  Makefile.common \
  Makefile.incl \
+ Makefile.tests \
  Makefile.param \
  ChangeLog\.xml \
  README\.SVN \

diff --git a/releasetools/build-check b/releasetools/build-check
index bf6fa07d8d5260ca98e8d591ec8d2bae9e3b8377..1e328f1d3f8be46d2d6c2c0b3eb3473073f70d7a 100755 (executable)
--- a/releasetools/build-check
+++ b/releasetools/build-check
@@ -4,7 +4,7 @@ grep=egrep
 LOGFILENAME=$1
 # FIXME: This regexp may not catch all error messages emitted;
 # probably should be refined with a more complete regexp.
-errorRegexp="error|fail|\*[^.]"
+errorRegexp="error|fail|\*\*[^.]"
 if [ -f $LOGFILENAME ]
 then
   errors=$($grep -i $errorRegexp $LOGFILENAME)
@@ -15,7 +15,7 @@ then
     echo
     echo "Possible build errors found:"
     echo
-    $grep -i "error|fail|\*[^.]" $LOGFILENAME
+    $grep -i "$errorRegexp" $LOGFILENAME
     echo
     echo "Stopping."
     echo