Merge "Fix jjb-verify job to ignore the docs directory"

diff --git a/.jjb-test/expected-xml/gerrit-ciman-jjb-verify b/.jjb-test/expected-xml/gerrit-ciman-jjb-verify
index b59d3c6..2a9896f 100644 (file)
--- a/.jjb-test/expected-xml/gerrit-ciman-jjb-verify
+++ b/.jjb-test/expected-xml/gerrit-ciman-jjb-verify
@@ -303,7 +303,7 @@ popd
 ##############################################################################
 echo "---> jjb-check-unicode.sh"
 
-if LC_ALL=C grep -r '[^[:print:][:space:]]' jjb/; then
+if LC_ALL=C grep --exclude=docs/ -r '[^[:print:][:space:]]' jjb/; then
     echo "Found files containing non-ascii characters."
     exit 1
 fi

diff --git a/.jjb-test/expected-xml/github-ciman-jjb-verify b/.jjb-test/expected-xml/github-ciman-jjb-verify
index 3a10bb8..5705ebc 100644 (file)
--- a/.jjb-test/expected-xml/github-ciman-jjb-verify
+++ b/.jjb-test/expected-xml/github-ciman-jjb-verify
@@ -251,7 +251,7 @@ popd
 ##############################################################################
 echo "---> jjb-check-unicode.sh"
 
-if LC_ALL=C grep -r '[^[:print:][:space:]]' jjb/; then
+if LC_ALL=C grep --exclude=docs/ -r '[^[:print:][:space:]]' jjb/; then
     echo "Found files containing non-ascii characters."
     exit 1
 fi

diff --git a/shell/jjb-check-unicode.sh b/shell/jjb-check-unicode.sh
index c1293ba..e1d28a0 100644 (file)
--- a/shell/jjb-check-unicode.sh
+++ b/shell/jjb-check-unicode.sh
@@ -10,7 +10,7 @@
 ##############################################################################
 echo "---> jjb-check-unicode.sh"
 
-if LC_ALL=C grep -r '[^[:print:][:space:]]' jjb/; then
+if LC_ALL=C grep --exclude=docs/ -r '[^[:print:][:space:]]' jjb/; then
     echo "Found files containing non-ascii characters."
     exit 1
 fi