You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by xy...@apache.org on 2015/05/06 19:26:37 UTC
hadoop git commit: HDFS-8310. Fix TestCLI.testAll 'help: help for
find' on Windows. (Kiran Kumar M R via Xiaoyu Yao)
Repository: hadoop
Updated Branches:
refs/heads/trunk a583a4069 -> 7a26d174a
HDFS-8310. Fix TestCLI.testAll 'help: help for find' on Windows. (Kiran Kumar M R via Xiaoyu Yao)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7a26d174
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7a26d174
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7a26d174
Branch: refs/heads/trunk
Commit: 7a26d174aff9535f7a60711bee586e225891b383
Parents: a583a40
Author: Xiaoyu Yao <xy...@apache.org>
Authored: Wed May 6 10:24:46 2015 -0700
Committer: Xiaoyu Yao <xy...@apache.org>
Committed: Wed May 6 10:24:46 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/7a26d174/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/7a26d174/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 92a82c8..a878374 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -632,6 +632,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