Repository: hadoop Updated Branches: refs/heads/branch-2 a0445eae5 -> bd8821539
HDFS-8310. Fix TestCLI.testAll 'help: help for find' on Windows. (Kiran Kumar M R via Xiaoyu Yao) (cherry picked from commit 7a26d174aff9535f7a60711bee586e225891b383) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/bd882153 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/bd882153 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/bd882153 Branch: refs/heads/branch-2 Commit: bd8821539318c6996c319914f399a76ec7bd7409 Parents: a0445ea Author: Xiaoyu Yao <[email protected]> Authored: Wed May 6 10:24:46 2015 -0700 Committer: Xiaoyu Yao <[email protected]> Committed: Wed May 6 10:27:07 2015 -0700 ---------------------------------------------------------------------- .../apache/hadoop/cli/util/RegexpAcrossOutputComparator.java | 5 +++++ hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ 2 files changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/bd882153/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/cli/util/RegexpAcrossOutputComparator.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/cli/util/RegexpAcrossOutputComparator.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/cli/util/RegexpAcrossOutputComparator.java index 9285bde..6dbaa29 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/cli/util/RegexpAcrossOutputComparator.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/cli/util/RegexpAcrossOutputComparator.java @@ -18,6 +18,7 @@ package org.apache.hadoop.cli.util; +import org.apache.hadoop.util.Shell; import java.util.regex.Pattern; /** @@ -33,6 +34,10 @@ public class RegexpAcrossOutputComparator extends ComparatorBase { @Override public boolean compare(String actual, String expected) { + if (Shell.WINDOWS) { + actual = actual.replaceAll("\\r", ""); + expected = expected.replaceAll("\\r", ""); + } return Pattern.compile(expected).matcher(actual).find(); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/bd882153/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index f253383..7dcb58e 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -305,6 +305,9 @@ Release 2.8.0 - UNRELEASED HDFS-8219. setStoragePolicy with folder behavior is different after cluster restart. (surendra singh lilhore via Xiaoyu Yao) + HDFS-8310. Fix TestCLI.testAll "help: help for find" on Windows. + (Kiran Kumar M R via Xiaoyu Yao) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES
