You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yarn-commits@hadoop.apache.org by tu...@apache.org on 2012/10/19 07:38:27 UTC
svn commit: r1399972 - in
/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager:
pom.xml src/main/native/container-executor/test/test-container-executor.c
Author: tucu
Date: Fri Oct 19 05:38:26 2012
New Revision: 1399972
URL: http://svn.apache.org/viewvc?rev=1399972&view=rev
Log:
reverting commit 1399898 (HADOOP-8887)
Modified:
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/test/test-container-executor.c
Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml?rev=1399972&r1=1399971&r2=1399972&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml (original)
+++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml Fri Oct 19 05:38:26 2012
@@ -47,31 +47,40 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.hadoop.cmake.maven.ng</groupId>
- <artifactId>cmake-ng</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <configuration>
+ <skipTests>false</skipTests>
+ </configuration>
<executions>
<execution>
- <id>cmake-compile</id>
- <goals><goal>compile</goal></goals>
+ <id>make</id>
+ <phase>compile</phase>
+ <goals><goal>run</goal></goals>
<configuration>
- <target>all</target>
- <source>${basedir}/src</source>
- <vars>
- <HADOOP_CONF_DIR>${container-executor.conf.dir}</HADOOP_CONF_DIR>
- <JVM_ARCH_DATA_MODEL>${sun.arch.data.model}</JVM_ARCH_DATA_MODEL>
- </vars>
- <env>
- <CFLAGS>${container-executor.additional_cflags}</CFLAGS>
- </env>
+ <target>
+ <mkdir dir="${project.build.directory}/native/target"/>
+ <exec executable="cmake" dir="${project.build.directory}/native" failonerror="true">
+ <arg line="${basedir}/src/ -DHADOOP_CONF_DIR=${container-executor.conf.dir} -DJVM_ARCH_DATA_MODEL=${sun.arch.data.model}"/>
+ <env key="CFLAGS" value="${container-executor.additional_cflags}"/>
+ </exec>
+ <exec executable="make" dir="${project.build.directory}/native" failonerror="true">
+ <arg line="VERBOSE=1"/>
+ </exec>
+ </target>
</configuration>
</execution>
<execution>
- <id>test-container-executor</id>
- <goals><goal>test</goal></goals>
+ <id>native_tests</id>
+ <phase>test</phase>
<configuration>
- <binary>${project.build.directory}/native/target/usr/local/bin/test-container-executor</binary>
- <timeout>300</timeout>
- <results>${project.build.directory}/results</results>
+ <target>
+ <exec executable="sh" failonerror="true" dir="${project.build.directory}/native">
+ <arg value="-c"/>
+ <arg value="[ x$SKIPTESTS = xtrue ] || test-container-executor"/>
+ <env key="SKIPTESTS" value="${skipTests}"/>
+ </exec>
+ </target>
</configuration>
</execution>
</executions>
Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/test/test-container-executor.c
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/test/test-container-executor.c?rev=1399972&r1=1399971&r2=1399972&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/test/test-container-executor.c (original)
+++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/test/test-container-executor.c Fri Oct 19 05:38:26 2012
@@ -400,13 +400,6 @@ void run_test_in_child(const char* test_
}
void test_signal_container() {
- sigset_t set;
-
- // unblock SIGQUIT
- sigemptyset(&set);
- sigaddset(&set, SIGQUIT);
- sigprocmask(SIG_UNBLOCK, &set, NULL);
-
printf("\nTesting signal_container\n");
fflush(stdout);
fflush(stderr);