MAPREDUCE-6006. native-task: add native tests to maven and fix bug in pom.xml. Contributed by Binglin Chang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-2841@1617877 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Todd Lipcon
parent
4d4fb1723f
commit
886338ff80
|
|
@ -11,4 +11,5 @@ MAPREDUCE-5995. native-task: Revert changes to Text internals (todd)
|
|||
MAPREDUCE-6005. native-task: Fix some valgrind errors (Binglin Chang)
|
||||
MAPREDUCE-5984. native-task: Reuse lz4 sources in hadoop-common (Binglin Chang)
|
||||
MAPREDUCE-5976. native-task: should not fail to build if snappy is missing (Manu Zhang)
|
||||
MAPREDUCE-5978. native-task: remove test case for not supported codec Bzip2Codec and DefaultCodec (Manu Zhang)
|
||||
MAPREDUCE-5978. native-task: remove test case for not supported codec Bzip2Codec and DefaultCodec (Manu Zhang)
|
||||
MAPREDUCE-6006. native-task: add native tests to maven and fix bug in pom.xml (Binglin Chang via todd)
|
||||
|
|
|
|||
|
|
@ -84,17 +84,6 @@
|
|||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-jar-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>test-jar</goal>
|
||||
</goals>
|
||||
<phase>test-compile</phase>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -66,7 +66,6 @@
|
|||
<dependency>
|
||||
<groupId>org.apache.hadoop</groupId>
|
||||
<artifactId>hadoop-mapreduce-client-common</artifactId>
|
||||
<type>test-jar</type>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
|
@ -173,7 +172,6 @@
|
|||
overwrite="true">
|
||||
<fileset dir="${basedir}/src/main/native/testData" />
|
||||
</copy>
|
||||
<copy file="${basedir}/src/main/native/test.sh" todir="${project.build.directory}/native/test" />
|
||||
<exec executable="cmake" dir="${project.build.directory}/native"
|
||||
failonerror="true">
|
||||
<arg line="${basedir}/src/ -DGENERATED_JAVAH=${project.build.directory}/native/javah -DJVM_ARCH_DATA_MODEL=${sun.arch.data.model} -DREQUIRE_SNAPPY=${require.snappy} -DCUSTOM_SNAPPY_PREFIX=${snappy.prefix} -DCUSTOM_SNAPPY_LIB=${snappy.lib} -DCUSTOM_SNAPPY_INCLUDE=${snappy.include}" />
|
||||
|
|
@ -187,6 +185,20 @@
|
|||
</target>
|
||||
</configuration>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>native_tests</id>
|
||||
<phase>test</phase>
|
||||
<goals><goal>run</goal></goals>
|
||||
<configuration>
|
||||
<target>
|
||||
<exec executable="sh" failonerror="true" dir="${project.build.directory}/native/test">
|
||||
<arg value="-c"/>
|
||||
<arg value="[ x$SKIPTESTS = xtrue ] || sh test.sh"/>
|
||||
<env key="SKIPTESTS" value="${skipTests}"/>
|
||||
</exec>
|
||||
</target>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
|
|
|
|||
|
|
@ -167,10 +167,14 @@ SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
|
|||
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
||||
# macosx does not have -lrt
|
||||
set(NT_DEPEND_LIBRARY dl pthread z ${SNAPPY_LIBRARY} ${JAVA_JVM_LIBRARY})
|
||||
set(SYSTEM_MAC TRUE)
|
||||
else (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
||||
set(NT_DEPEND_LIBRARY dl rt pthread z ${SNAPPY_LIBRARY} ${JAVA_JVM_LIBRARY})
|
||||
set(SYSTEM_MAC FALSE)
|
||||
endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
||||
|
||||
configure_file(main/native/test.sh test/test.sh)
|
||||
|
||||
add_dual_library(nativetask
|
||||
${CMAKE_BINARY_DIR}/lz4.c
|
||||
${D}/cityhash/city.cc
|
||||
|
|
|
|||
|
|
@ -1,18 +1,25 @@
|
|||
#!/bin/bash
|
||||
#!/bin/sh
|
||||
|
||||
# only do normal tests by default
|
||||
FILTER="--gtest_filter=-Perf.*"
|
||||
|
||||
# do all tests
|
||||
if [ "$1" == "all" ]; then
|
||||
shift
|
||||
./nttest $@
|
||||
exit $?
|
||||
if [ "$1" = "all" ]; then
|
||||
shift
|
||||
FILTER=""
|
||||
fi
|
||||
|
||||
# do performance tests only
|
||||
if [ "$1" == "perf" ]; then
|
||||
shift
|
||||
./nttest --gtest_filter=Perf.* $@
|
||||
exit $?
|
||||
if [ "$1" = "perf" ]; then
|
||||
shift
|
||||
FILTER="--gtest_filter=Perf.*"
|
||||
fi
|
||||
|
||||
if [ "${SYSTEM_MAC}" = "TRUE" ]; then
|
||||
# MACOSX already setup RPATH, no extra help required
|
||||
./nttest $FILTER $@
|
||||
else
|
||||
JAVA_JVM_LIBRARY_DIR=`dirname ${JAVA_JVM_LIBRARY}`
|
||||
LD_LIBRARY_PATH=$JAVA_JVM_LIBRARY_DIR:$LD_LIBRARY_PATH ./nttest $FILTER $@
|
||||
fi
|
||||
|
||||
# do not do performance test by default
|
||||
./nttest --gtest_filter=-Perf.* $@
|
||||
|
|
|
|||
|
|
@ -134,12 +134,6 @@
|
|||
<artifactId>hadoop-mapreduce-client-common</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.hadoop</groupId>
|
||||
<artifactId>hadoop-mapreduce-client-common</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<type>test-jar</type>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.hadoop</groupId>
|
||||
<artifactId>hadoop-yarn-api</artifactId>
|
||||
|
|
|
|||
Loading…
Reference in New Issue