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 wh...@apache.org on 2015/11/25 19:32:19 UTC
hadoop git commit: HDFS-9459. hadoop-hdfs-native-client fails test
build on Windows after transition to ctest. Contributed by Chris Nauroth.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 628c78287 -> 15caaa7d0
HDFS-9459. hadoop-hdfs-native-client fails test build on Windows after transition to ctest. Contributed by Chris Nauroth.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/15caaa7d
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/15caaa7d
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/15caaa7d
Branch: refs/heads/branch-2
Commit: 15caaa7d0a13044f29085888894ace9196e00c9b
Parents: 628c782
Author: Haohui Mai <wh...@apache.org>
Authored: Wed Nov 25 10:31:39 2015 -0800
Committer: Haohui Mai <wh...@apache.org>
Committed: Wed Nov 25 10:32:13 2015 -0800
----------------------------------------------------------------------
.../hadoop-hdfs-native-client/pom.xml | 16 +++++++---------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
2 files changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/15caaa7d/hadoop-hdfs-project/hadoop-hdfs-native-client/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-native-client/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-native-client/pom.xml
index cc59a28..85c0fe4 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-native-client/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-native-client/pom.xml
@@ -162,15 +162,13 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
<target>
<property name="compile_classpath" refid="maven.compile.classpath"/>
<property name="test_classpath" refid="maven.test.classpath"/>
- <target>
- <property name="compile_classpath" refid="maven.compile.classpath"/>
- <property name="test_classpath" refid="maven.test.classpath"/>
- <exec executable="ctest" failonerror="true" dir="${project.build.directory}/">
- <env key="CLASSPATH" value="${test_classpath}:${compile_classpath}"/>
- <!-- Make sure libhadoop.so is on LD_LIBRARY_PATH. -->
- <env key="LD_LIBRARY_PATH" value="${env.LD_LIBRARY_PATH}:${project.build.directory}/target/usr/local/lib:${hadoop.common.build.dir}/native/target/usr/local/lib"/>
- </exec>
- </target>
+ <exec executable="ctest" failonerror="true" dir="${project.build.directory}/native">
+ <env key="CLASSPATH" value="${test_classpath}:${compile_classpath}"/>
+ <!-- HADOOP_HOME required to find winutils. -->
+ <env key="HADOOP_HOME" value="${hadoop.common.build.dir}"/>
+ <!-- Make sure hadoop.dll and jvm.dll are on PATH. -->
+ <env key="PATH" value="${env.PATH};${hadoop.common.build.dir}/bin;${java.home}/jre/bin/server;${java.home}/bin/server"/>
+ </exec>
</target>
</configuration>
</execution>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/15caaa7d/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 8387571..7564a38 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1529,6 +1529,9 @@ Release 2.8.0 - UNRELEASED
intermittently with various symptoms - debugging patch. (Yongjun Zhang via
Arpit Agarwal)
+ HDFS-9459. hadoop-hdfs-native-client fails test build on Windows after
+ transition to ctest. (Chris Nauroth via wheat9)
+
Release 2.7.3 - UNRELEASED
INCOMPATIBLE CHANGES