From 95d5227c75f430da7c77847f31734b34b36157d2 Mon Sep 17 00:00:00 2001
From: Haohui Mai <wheat9@apache.org>
Date: Wed, 25 Nov 2015 10:31:39 -0800
Subject: [PATCH] HDFS-9459. hadoop-hdfs-native-client fails test build on
 Windows after transition to ctest. Contributed by Chris Nauroth.

---
 .../hadoop-hdfs-native-client/pom.xml            | 16 +++++++---------
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt      |  3 +++
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/hadoop-hdfs-project/hadoop-hdfs-native-client/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-native-client/pom.xml
index a966a286b7..9fa5fbf315 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>
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 8100c4d50c..707684b50e 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