Repository: hadoop Updated Branches: refs/heads/trunk cb8d679c9 -> 4e3df75eb
HDFS-14049. TestHttpFSServerWebServer fails on Windows because of missing winutils.exe. Contributed by Inigo Goiri. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4e3df75e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4e3df75e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4e3df75e Branch: refs/heads/trunk Commit: 4e3df75eb72adbab18a1d6476f228a0b504238fa Parents: cb8d679 Author: Yiqun Lin <yq...@apache.org> Authored: Sun Nov 4 09:15:53 2018 +0800 Committer: Yiqun Lin <yq...@apache.org> Committed: Sun Nov 4 09:15:53 2018 +0800 ---------------------------------------------------------------------- .../hadoop/fs/http/server/TestHttpFSServerWebServer.java | 11 +++++++++++ 1 file changed, 11 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/4e3df75e/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/server/TestHttpFSServerWebServer.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/server/TestHttpFSServerWebServer.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/server/TestHttpFSServerWebServer.java index 5250543..97d41d3 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/server/TestHttpFSServerWebServer.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/server/TestHttpFSServerWebServer.java @@ -30,6 +30,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.security.authentication.server.AuthenticationFilter; import org.apache.hadoop.test.GenericTestUtils; import org.apache.hadoop.test.HadoopUsersConfTestHelper; +import org.apache.hadoop.util.Shell; import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; @@ -55,6 +56,16 @@ public class TestHttpFSServerWebServer { confDir.mkdirs(); logsDir.mkdirs(); tempDir.mkdirs(); + + if (Shell.WINDOWS) { + File binDir = new File(homeDir, "bin"); + binDir.mkdirs(); + File winutils = Shell.getWinUtilsFile(); + if (winutils.exists()) { + FileUtils.copyFileToDirectory(winutils, binDir); + } + } + System.setProperty("hadoop.home.dir", homeDir.getAbsolutePath()); System.setProperty("hadoop.log.dir", logsDir.getAbsolutePath()); System.setProperty("httpfs.home.dir", homeDir.getAbsolutePath()); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
