HDFS-6237. Merging change r1587146 from trunk to branch-2.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587147 13f79535-47bb-0310-9956-ffa450edef68

hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

@@ -88,6 +88,9 @@ Release 2.5.0 - UNRELEASED
     HDFS-5669. Storage#tryLock() should check for null before logging successfull message
     (Vinayakumar B via umamahesh)
 
+    HDFS-6237. TestDFSShell#testGet fails on Windows due to invalid file system
+    path. (cnauroth)
+
 Release 2.4.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSShell.java

@@ -1461,7 +1461,8 @@ public class TestDFSShell {
     	private final FsShell shell = new FsShell(conf);
 
     	public String run(int exitcode, String... options) throws IOException {
-    	  String dst = TEST_ROOT_DIR + "/" + fname+ ++count;
+    	  String dst = new File(TEST_ROOT_DIR, fname + ++count)
+            .getAbsolutePath();
     	  String[] args = new String[options.length + 3];
     	  args[0] = "-get"; 
     	  args[args.length - 2] = remotef.toString();