svn commit: r1368257 - /hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml

2012-08-01 Thread eli 
Author: eli
Date: Wed Aug  1 21:28:49 2012
New Revision: 1368257

URL: http://svn.apache.org/viewvc?rev=1368257view=rev
Log:
HADOOP-8480. The native build should honor -DskipTests. Contributed by Colin 
Patrick McCabe

Modified:

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml

Modified: 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml?rev=1368257r1=1368256r2=1368257view=diff
==
--- 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
 (original)
+++ 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
 Wed Aug  1 21:28:49 2012
@@ -49,6 +49,9 @@
   plugin
 groupIdorg.apache.maven.plugins/groupId
 artifactIdmaven-antrun-plugin/artifactId
+configuration
+  skipTestsfalse/skipTests
+/configuration
 executions
   execution
 idmake/id
@@ -72,7 +75,10 @@
 phasetest/phase
 configuration
   target
-exec executable=test-container-executor 
dir=${project.build.directory}/native failonerror=true
+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

svn commit: r1368259 - /hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml

2012-08-01 Thread eli 
Author: eli
Date: Wed Aug  1 21:30:06 2012
New Revision: 1368259

URL: http://svn.apache.org/viewvc?rev=1368259view=rev
Log:
HADOOP-8480. The native build should honor -DskipTests. Contributed by Colin 
Patrick McCabe

Modified:

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml

Modified: 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml?rev=1368259r1=1368258r2=1368259view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
 Wed Aug  1 21:30:06 2012
@@ -49,6 +49,9 @@
   plugin
 groupIdorg.apache.maven.plugins/groupId
 artifactIdmaven-antrun-plugin/artifactId
+configuration
+  skipTestsfalse/skipTests
+/configuration
 executions
   execution
 idmake/id
@@ -72,7 +75,10 @@
 phasetest/phase
 configuration
   target
-exec executable=test-container-executor 
dir=${project.build.directory}/native failonerror=true
+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

svn commit: r1368294 - in /hadoop/common/trunk/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/ src/test/mapred/org/apache

2012-08-01 Thread tgraves 
Author: tgraves
Date: Wed Aug  1 22:14:13 2012
New Revision: 1368294

URL: http://svn.apache.org/viewvc?rev=1368294view=rev
Log:
MAPREDUCE-4504. SortValidator writes to wrong directory (Robert Evans via 
tgraves)

Modified:
hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/SortValidator.java

hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/SortValidator.java

Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1368294r1=1368293r2=1368294view=diff
==
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Wed Aug  1 
22:14:13 2012
@@ -789,6 +789,9 @@ Release 0.23.3 - UNRELEASED
 parallel use (due to a /tmp file with static name) (Robert Evans via
 jeagles)
 
+MAPREDUCE-4504. SortValidator writes to wrong directory (Robert Evans 
+via tgraves)
+
 Release 0.23.2 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/SortValidator.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/SortValidator.java?rev=1368294r1=1368293r2=1368294view=diff
==
--- 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/SortValidator.java
 (original)
+++ 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/SortValidator.java
 Wed Aug  1 22:14:13 2012
@@ -344,7 +344,7 @@ public class SortValidator extends Confi
 
   FileInputFormat.setInputPaths(jobConf, sortInput);
   FileInputFormat.addInputPath(jobConf, sortOutput);
-  Path outputPath = new Path(new Path(jobConf.get(hadoop.tmp.dir, 
/tmp),
+  Path outputPath = new Path(new Path(/tmp,
sortvalidate), UUID.randomUUID().toString());
   if (defaultfs.exists(outputPath)) {
 defaultfs.delete(outputPath, true);

Modified: 
hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/SortValidator.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/SortValidator.java?rev=1368294r1=1368293r2=1368294view=diff
==
--- 
hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/SortValidator.java
 (original)
+++ 
hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/SortValidator.java
 Wed Aug  1 22:14:13 2012
@@ -344,7 +344,7 @@ public class SortValidator extends Confi
 
   FileInputFormat.setInputPaths(jobConf, sortInput);
   FileInputFormat.addInputPath(jobConf, sortOutput);
-  Path outputPath = new Path(new Path(jobConf.get(hadoop.tmp.dir, 
/tmp),
+  Path outputPath = new Path(new Path(/tmp,
sortvalidate), UUID.randomUUID().toString());
   if (defaultfs.exists(outputPath)) {
 defaultfs.delete(outputPath, true);

svn commit: r1368296 - in /hadoop/common/branches/branch-2/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/ src/test/mapre

2012-08-01 Thread tgraves 
Author: tgraves
Date: Wed Aug  1 22:20:59 2012
New Revision: 1368296

URL: http://svn.apache.org/viewvc?rev=1368296view=rev
Log:
merge -r  1368293:1368294 from trunk. FIXES: MAPREDUCE-4504

Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/SortValidator.java

hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/SortValidator.java

Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1368296r1=1368295r2=1368296view=diff
==
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Wed 
Aug  1 22:20:59 2012
@@ -665,6 +665,9 @@ Release 0.23.3 - UNRELEASED
 parallel use (due to a /tmp file with static name) (Robert Evans via
 jeagles)
 
+MAPREDUCE-4504. SortValidator writes to wrong directory (Robert Evans 
+via tgraves)
+
 Release 0.23.2 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/SortValidator.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/SortValidator.java?rev=1368296r1=1368295r2=1368296view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/SortValidator.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/SortValidator.java
 Wed Aug  1 22:20:59 2012
@@ -344,7 +344,7 @@ public class SortValidator extends Confi
 
   FileInputFormat.setInputPaths(jobConf, sortInput);
   FileInputFormat.addInputPath(jobConf, sortOutput);
-  Path outputPath = new Path(new Path(jobConf.get(hadoop.tmp.dir, 
/tmp),
+  Path outputPath = new Path(new Path(/tmp,
sortvalidate), UUID.randomUUID().toString());
   if (defaultfs.exists(outputPath)) {
 defaultfs.delete(outputPath, true);

Modified: 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/SortValidator.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/SortValidator.java?rev=1368296r1=1368295r2=1368296view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/SortValidator.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/SortValidator.java
 Wed Aug  1 22:20:59 2012
@@ -344,7 +344,7 @@ public class SortValidator extends Confi
 
   FileInputFormat.setInputPaths(jobConf, sortInput);
   FileInputFormat.addInputPath(jobConf, sortOutput);
-  Path outputPath = new Path(new Path(jobConf.get(hadoop.tmp.dir, 
/tmp),
+  Path outputPath = new Path(new Path(/tmp,
sortvalidate), UUID.randomUUID().toString());
   if (defaultfs.exists(outputPath)) {
 defaultfs.delete(outputPath, true);

svn commit: r1368298 - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/ src/test/ma

2012-08-01 Thread tgraves 
Author: tgraves
Date: Wed Aug  1 22:22:23 2012
New Revision: 1368298

URL: http://svn.apache.org/viewvc?rev=1368298view=rev
Log:
merge -r 1368295:1368296 from branch-2. FIXES: MAPREDUCE-4504

Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/SortValidator.java

hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/SortValidator.java

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1368298r1=1368297r2=1368298view=diff
==
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Wed 
Aug  1 22:22:23 2012
@@ -379,6 +379,9 @@ Release 0.23.3 - UNRELEASED
 parallel use (due to a /tmp file with static name) (Robert Evans via
 jeagles)
 
+MAPREDUCE-4504. SortValidator writes to wrong directory (Robert Evans 
+via tgraves)
+
 Release 0.23.2 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/SortValidator.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/SortValidator.java?rev=1368298r1=1368297r2=1368298view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/SortValidator.java
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/SortValidator.java
 Wed Aug  1 22:22:23 2012
@@ -344,7 +344,7 @@ public class SortValidator extends Confi
 
   FileInputFormat.setInputPaths(jobConf, sortInput);
   FileInputFormat.addInputPath(jobConf, sortOutput);
-  Path outputPath = new Path(new Path(jobConf.get(hadoop.tmp.dir, 
/tmp),
+  Path outputPath = new Path(new Path(/tmp,
sortvalidate), UUID.randomUUID().toString());
   if (defaultfs.exists(outputPath)) {
 defaultfs.delete(outputPath, true);

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/SortValidator.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/SortValidator.java?rev=1368298r1=1368297r2=1368298view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/SortValidator.java
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/SortValidator.java
 Wed Aug  1 22:22:23 2012
@@ -344,7 +344,7 @@ public class SortValidator extends Confi
 
   FileInputFormat.setInputPaths(jobConf, sortInput);
   FileInputFormat.addInputPath(jobConf, sortOutput);
-  Path outputPath = new Path(new Path(jobConf.get(hadoop.tmp.dir, 
/tmp),
+  Path outputPath = new Path(new Path(/tmp,
sortvalidate), UUID.randomUUID().toString());
   if (defaultfs.exists(outputPath)) {
 defaultfs.delete(outputPath, true);