浏览代码

HDFS-9487. libhdfs++ Enable builds with no compiler optimizations. Contributed by Bob Hansen.

James 9 年之前
父节点
当前提交
5dc2da1e6f

+ 3 - 1
hadoop-hdfs-project/hadoop-hdfs-native-client/pom.xml

@@ -180,6 +180,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
                       <env key="PATH" value="${env.PATH};${hadoop.common.build.dir}/bin;${java.home}/jre/bin/server;${java.home}/bin/server"/>
                       <!-- 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"/>
+                      <arg line="${native_ctest_args}"/>
                     </exec>
                   </target>
                 </configuration>
@@ -239,7 +240,8 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
                       <arg line="${native_ctest_args}"/>
                       <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}/native/target/usr/local/lib:${hadoop.common.build.dir}/native/target/usr/local/lib"/>
+                      <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"/>
+                      <arg line="${native_ctest_args}"/>
                     </exec>
                   </target>
                 </configuration>

+ 3 - 0
hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/CMakeLists.txt

@@ -38,6 +38,9 @@ endif (REQUIRE_VALGRIND AND MEMORYCHECK_COMMAND MATCHES "MEMORYCHECK_COMMAND-NOT
 
 add_definitions(-DASIO_STANDALONE -DASIO_CPP11_DATE_TIME)
 
+# Disable optimizations if compiling debug
+set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0")
+set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0")
 
 if(UNIX)
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -std=c++11 -g -fPIC -fno-strict-aliasing")