This is an automated email from the ASF dual-hosted git repository. elek pushed a commit to branch checks2 in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit 06d125c9abf5c0e1ba91347b500f5a9273b0112c Author: Márton Elek <[email protected]> AuthorDate: Wed Jul 3 20:10:55 2019 +0200 fix print0 consequences --- hadoop-ozone/dev-support/checks/checkstyle.sh | 2 +- hadoop-ozone/dev-support/checks/findbugs.sh | 4 ++-- hadoop-ozone/dev-support/checks/integration.sh | 2 +- .../checks/{integration.sh => shellcheck.sh} | 18 +++++++++--------- hadoop-ozone/dev-support/checks/unit.sh | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/hadoop-ozone/dev-support/checks/checkstyle.sh b/hadoop-ozone/dev-support/checks/checkstyle.sh index 19d6a89..c4de528 100755 --- a/hadoop-ozone/dev-support/checks/checkstyle.sh +++ b/hadoop-ozone/dev-support/checks/checkstyle.sh @@ -19,7 +19,7 @@ cd "$DIR/../../.." || exit 1 mvn -B -fn checkstyle:check -f pom.ozone.xml #Print out the exact violations with parsing XML results with sed -find "." -name checkstyle-errors.xml -print0 | xargs sed '$!N; /<file.*\n<\/file/d;P;D' | sed '/<\/.*/d;/<checkstyle.*/d;s/<error.*line="\([[:digit:]]*\)".*message="\([^"]\+\).*/ \1: \2/;s/<file name="\([^"]*\)".*/\1/;/<\?xml.*>/d' +find "." -name checkstyle-errors.xml -print0 | xargs -0 sed '$!N; /<file.*\n<\/file/d;P;D' | sed '/<\/.*/d;/<checkstyle.*/d;s/<error.*line="\([[:digit:]]*\)".*message="\([^"]\+\).*/ \1: \2/;s/<file name="\([^"]*\)".*/\1/;/<\?xml.*>/d' violations=$(grep -r error --include checkstyle-errors.xml .| wc -l) if [[ $violations -gt 0 ]]; then diff --git a/hadoop-ozone/dev-support/checks/findbugs.sh b/hadoop-ozone/dev-support/checks/findbugs.sh index 5dcb650..545ad9f 100755 --- a/hadoop-ozone/dev-support/checks/findbugs.sh +++ b/hadoop-ozone/dev-support/checks/findbugs.sh @@ -24,8 +24,8 @@ touch "$FINDBUGS_ALL_FILE" mvn -B compile -fn findbugs:check -Dfindbugs.failOnError=false -f pom.ozone.xml -find hadoop-ozone -name findbugsXml.xml -print0 | xargs -n1 convertXmlToText | tee -a "${FINDBUGS_ALL_FILE}" -find hadoop-hdds -name findbugsXml.xml -print0 | xargs -n1 convertXmlToText | tee -a "${FINDBUGS_ALL_FILE}" +find hadoop-ozone -name findbugsXml.xml -print0 | xargs -0 -n1 convertXmlToText | tee -a "${FINDBUGS_ALL_FILE}" +find hadoop-hdds -name findbugsXml.xml -print0 | xargs -0 -n1 convertXmlToText | tee -a "${FINDBUGS_ALL_FILE}" bugs=$(wc -l < "$FINDBUGS_ALL_FILE") diff --git a/hadoop-ozone/dev-support/checks/integration.sh b/hadoop-ozone/dev-support/checks/integration.sh index 9dac627..1aea3d1 100755 --- a/hadoop-ozone/dev-support/checks/integration.sh +++ b/hadoop-ozone/dev-support/checks/integration.sh @@ -20,7 +20,7 @@ export MAVEN_OPTS="-Xmx4096m" mvn -B install -f pom.ozone.xml -DskipTests mvn -B -fn test -f pom.ozone.xml -pl :hadoop-ozone-integration-test,:hadoop-ozone-filesystem module_failed_tests=$(find "." -name 'TEST*.xml' -print0 \ - | xargs "grep" -l -E "<failure|<error"\ + | xargs -0 -n1 "grep" -l -E "<failure|<error"\ | awk -F/ '{sub("'"TEST-JUNIT_TEST_OUTPUT_DIR"'",""); sub(".xml",""); print $NF}') if [[ -n "${module_failed_tests}" ]] ; then exit 1 diff --git a/hadoop-ozone/dev-support/checks/integration.sh b/hadoop-ozone/dev-support/checks/shellcheck.sh similarity index 67% copy from hadoop-ozone/dev-support/checks/integration.sh copy to hadoop-ozone/dev-support/checks/shellcheck.sh index 9dac627..1284acd 100755 --- a/hadoop-ozone/dev-support/checks/integration.sh +++ b/hadoop-ozone/dev-support/checks/shellcheck.sh @@ -16,13 +16,13 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" cd "$DIR/../../.." || exit 1 -export MAVEN_OPTS="-Xmx4096m" -mvn -B install -f pom.ozone.xml -DskipTests -mvn -B -fn test -f pom.ozone.xml -pl :hadoop-ozone-integration-test,:hadoop-ozone-filesystem -module_failed_tests=$(find "." -name 'TEST*.xml' -print0 \ - | xargs "grep" -l -E "<failure|<error"\ - | awk -F/ '{sub("'"TEST-JUNIT_TEST_OUTPUT_DIR"'",""); sub(".xml",""); print $NF}') -if [[ -n "${module_failed_tests}" ]] ; then - exit 1 +OUTPUT_FILE="$DIR/../../../target/shell-problems.txt" +mkdir -p "$(dirname "$OUTPUT_FILE")" +echo "" > "$OUTPUT_FILE" +find "./hadoop-hdds" -type f -executable | grep -v target | grep -v node_modules | grep -v py | xargs -n1 shellcheck | tee "$OUTPUT_FILE" +find "./hadoop-ozone" -type f -executable | grep -v target | grep -v node_modules | grep -v py | xargs -n1 shellcheck | tee "$OUTPUT_FILE" + + +if [ "$(cat "$OUTPUT_FILE")" ]; then + exit 1 fi -exit 0 diff --git a/hadoop-ozone/dev-support/checks/unit.sh b/hadoop-ozone/dev-support/checks/unit.sh index e9e09dd..35e5d9f 100755 --- a/hadoop-ozone/dev-support/checks/unit.sh +++ b/hadoop-ozone/dev-support/checks/unit.sh @@ -14,9 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. export MAVEN_OPTS="-Xmx4096m" -mvn -fn test -f pom.ozone.xml -pl \!:hadoop-ozone-integration-test,\!:hadoop-ozone-filesystem +#mvn -fn test -f pom.ozone.xml -pl \!:hadoop-ozone-integration-test,\!:hadoop-ozone-filesystem module_failed_tests=$(find "." -name 'TEST*.xml' -print0 \ - | xargs "grep" -l -E "<failure|<error"\ + | xargs -n1 -0 "grep" -l -E "<failure|<error"\ | awk -F/ '{sub("'"TEST-JUNIT_TEST_OUTPUT_DIR"'",""); sub(".xml",""); print $NF}') if [[ -n "${module_failed_tests}" ]] ; then exit 1 --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
