HADOOP-9290. Some tests cannot load native library on windows. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1476586 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
b7afde6d52
commit
fe3853484e
|
@ -382,7 +382,7 @@ Trunk (Unreleased)
|
||||||
|
|
||||||
HADOOP-9190. packaging docs is broken. (Andy Isaacson via atm)
|
HADOOP-9190. packaging docs is broken. (Andy Isaacson via atm)
|
||||||
|
|
||||||
BREAKDOWN OF HADOOP-8562 SUBTASKS
|
BREAKDOWN OF HADOOP-8562 SUBTASKS AND RELATED JIRAS
|
||||||
|
|
||||||
HADOOP-8924. Hadoop Common creating package-info.java must not depend on
|
HADOOP-8924. Hadoop Common creating package-info.java must not depend on
|
||||||
sh. (Chris Nauroth via suresh)
|
sh. (Chris Nauroth via suresh)
|
||||||
|
@ -520,6 +520,9 @@ Trunk (Unreleased)
|
||||||
HADOOP-9443. Port winutils static code analysis change to trunk.
|
HADOOP-9443. Port winutils static code analysis change to trunk.
|
||||||
(Chuan Liu via suresh)
|
(Chuan Liu via suresh)
|
||||||
|
|
||||||
|
HADOOP-9290. Some tests cannot load native library on windows.
|
||||||
|
(Chris Nauroth via suresh)
|
||||||
|
|
||||||
Release 2.0.5-beta - UNRELEASED
|
Release 2.0.5-beta - UNRELEASED
|
||||||
|
|
||||||
INCOMPATIBLE CHANGES
|
INCOMPATIBLE CHANGES
|
||||||
|
|
|
@ -33,6 +33,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<hadoop.component>hdfs</hadoop.component>
|
<hadoop.component>hdfs</hadoop.component>
|
||||||
|
<hadoop.common.build.dir>${basedir}/../../../../../hadoop-common-project/hadoop-common/target</hadoop.common.build.dir>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Needed for generating FindBugs warnings using parent pom -->
|
<hadoop.common.build.dir>${basedir}/../../../hadoop-common-project/hadoop-common/target</hadoop.common.build.dir>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
@ -176,10 +176,6 @@
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-surefire-plugin</artifactId>
|
<artifactId>maven-surefire-plugin</artifactId>
|
||||||
<configuration>
|
<configuration>
|
||||||
<environmentVariables>
|
|
||||||
<!-- HADOOP_HOME required for tests on Windows to find winutils -->
|
|
||||||
<HADOOP_HOME>${basedir}/../../../hadoop-common-project/hadoop-common/target</HADOOP_HOME>
|
|
||||||
</environmentVariables>
|
|
||||||
<properties>
|
<properties>
|
||||||
<property>
|
<property>
|
||||||
<name>listener</name>
|
<name>listener</name>
|
||||||
|
|
|
@ -50,6 +50,10 @@
|
||||||
|
|
||||||
<test.build.dir>${project.build.directory}/test-dir</test.build.dir>
|
<test.build.dir>${project.build.directory}/test-dir</test.build.dir>
|
||||||
<test.build.data>${test.build.dir}</test.build.data>
|
<test.build.data>${test.build.dir}</test.build.data>
|
||||||
|
|
||||||
|
<!-- Used for building path to native library loaded by tests. Projects -->
|
||||||
|
<!-- at different nesting levels in the source tree may need to override. -->
|
||||||
|
<hadoop.common.build.dir>${basedir}/../../hadoop-common-project/hadoop-common/target</hadoop.common.build.dir>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencyManagement>
|
<dependencyManagement>
|
||||||
|
@ -811,8 +815,8 @@
|
||||||
<argLine>-Xmx1024m -XX:+HeapDumpOnOutOfMemoryError</argLine>
|
<argLine>-Xmx1024m -XX:+HeapDumpOnOutOfMemoryError</argLine>
|
||||||
<environmentVariables>
|
<environmentVariables>
|
||||||
<!-- HADOOP_HOME required for tests on Windows to find winutils -->
|
<!-- HADOOP_HOME required for tests on Windows to find winutils -->
|
||||||
<HADOOP_HOME>${basedir}/../../hadoop-common-project/hadoop-common/target</HADOOP_HOME>
|
<HADOOP_HOME>${hadoop.common.build.dir}</HADOOP_HOME>
|
||||||
<LD_LIBRARY_PATH>${env.LD_LIBRARY_PATH}:${project.build.directory}/native/target/usr/local/lib:${basedir}/../../hadoop-common-project/hadoop-common/target/native/target/usr/local/lib/</LD_LIBRARY_PATH>
|
<LD_LIBRARY_PATH>${env.LD_LIBRARY_PATH}:${project.build.directory}/native/target/usr/local/lib:${hadoop.common.build.dir}/native/target/usr/local/lib</LD_LIBRARY_PATH>
|
||||||
<MALLOC_ARENA_MAX>4</MALLOC_ARENA_MAX>
|
<MALLOC_ARENA_MAX>4</MALLOC_ARENA_MAX>
|
||||||
</environmentVariables>
|
</environmentVariables>
|
||||||
<systemPropertyVariables>
|
<systemPropertyVariables>
|
||||||
|
@ -891,7 +895,7 @@
|
||||||
<configuration>
|
<configuration>
|
||||||
<environmentVariables>
|
<environmentVariables>
|
||||||
<!-- Specify where to look for the native DLL on Windows -->
|
<!-- Specify where to look for the native DLL on Windows -->
|
||||||
<PATH>${env.PATH};${basedir}/../../hadoop-common-project/hadoop-common/target/bin</PATH>
|
<PATH>${env.PATH};${hadoop.common.build.dir}/bin</PATH>
|
||||||
</environmentVariables>
|
</environmentVariables>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
|
@ -28,32 +28,15 @@
|
||||||
<name>hadoop-yarn-applications</name>
|
<name>hadoop-yarn-applications</name>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
|
<properties>
|
||||||
|
<hadoop.common.build.dir>${basedir}/../../../../hadoop-common-project/hadoop-common/target</hadoop.common.build.dir>
|
||||||
|
</properties>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
<module>hadoop-yarn-applications-distributedshell</module>
|
<module>hadoop-yarn-applications-distributedshell</module>
|
||||||
<module>hadoop-yarn-applications-unmanaged-am-launcher</module>
|
<module>hadoop-yarn-applications-unmanaged-am-launcher</module>
|
||||||
</modules>
|
</modules>
|
||||||
|
|
||||||
<build>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-surefire-plugin</artifactId>
|
|
||||||
<configuration>
|
|
||||||
<environmentVariables>
|
|
||||||
<!-- HADOOP_HOME required for tests on Windows to find winutils -->
|
|
||||||
<HADOOP_HOME>${basedir}/../../../../hadoop-common-project/hadoop-common/target</HADOOP_HOME>
|
|
||||||
</environmentVariables>
|
|
||||||
<properties>
|
|
||||||
<property>
|
|
||||||
<name>listener</name>
|
|
||||||
<value>org.apache.hadoop.test.TimedOutTestsListener</value>
|
|
||||||
</property>
|
|
||||||
</properties>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
|
|
||||||
<profiles>
|
<profiles>
|
||||||
<profile>
|
<profile>
|
||||||
<id>clover</id>
|
<id>clover</id>
|
||||||
|
|
|
@ -28,26 +28,9 @@
|
||||||
<name>hadoop-yarn-server</name>
|
<name>hadoop-yarn-server</name>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
<build>
|
<properties>
|
||||||
<plugins>
|
<hadoop.common.build.dir>${basedir}/../../../../hadoop-common-project/hadoop-common/target</hadoop.common.build.dir>
|
||||||
<plugin>
|
</properties>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-surefire-plugin</artifactId>
|
|
||||||
<configuration>
|
|
||||||
<environmentVariables>
|
|
||||||
<!-- HADOOP_HOME required for tests on Windows to find winutils -->
|
|
||||||
<HADOOP_HOME>${basedir}/../../../../hadoop-common-project/hadoop-common/target</HADOOP_HOME>
|
|
||||||
</environmentVariables>
|
|
||||||
<properties>
|
|
||||||
<property>
|
|
||||||
<name>listener</name>
|
|
||||||
<value>org.apache.hadoop.test.TimedOutTestsListener</value>
|
|
||||||
</property>
|
|
||||||
</properties>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
|
@ -30,6 +30,7 @@
|
||||||
<test.logs>true</test.logs>
|
<test.logs>true</test.logs>
|
||||||
<test.timeout>600000</test.timeout>
|
<test.timeout>600000</test.timeout>
|
||||||
<yarn.basedir>${basedir}</yarn.basedir>
|
<yarn.basedir>${basedir}</yarn.basedir>
|
||||||
|
<hadoop.common.build.dir>${basedir}/../../../hadoop-common-project/hadoop-common/target</hadoop.common.build.dir>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
@ -159,10 +160,6 @@
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-surefire-plugin</artifactId>
|
<artifactId>maven-surefire-plugin</artifactId>
|
||||||
<configuration>
|
<configuration>
|
||||||
<environmentVariables>
|
|
||||||
<!-- HADOOP_HOME required for tests on Windows to find winutils -->
|
|
||||||
<HADOOP_HOME>${basedir}/../../../hadoop-common-project/hadoop-common/target</HADOOP_HOME>
|
|
||||||
</environmentVariables>
|
|
||||||
<properties>
|
<properties>
|
||||||
<property>
|
<property>
|
||||||
<name>listener</name>
|
<name>listener</name>
|
||||||
|
|
Loading…
Reference in New Issue