Repository: hadoop Updated Branches: refs/heads/trunk 15d577bfb -> 95d5227c7
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/95d5227c Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/95d5227c Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/95d5227c Branch: refs/heads/trunk Commit: 95d5227c75f430da7c77847f31734b34b36157d2 Parents: 15d577b Author: Haohui Mai <whe...@apache.org> Authored: Wed Nov 25 10:31:39 2015 -0800 Committer: Haohui Mai <whe...@apache.org> Committed: Wed Nov 25 10:32:48 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/95d5227c/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 a966a28..9fa5fbf 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/95d5227c/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 8100c4d..707684b 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -2388,6 +2388,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
