Author: cos
Date: Mon Nov 2 22:29:50 2009
New Revision: 832162
URL: http://svn.apache.org/viewvc?rev=832162&view=rev
Log:
HADOOP-6347. svn merge -c 832157 from trunk to branch 0.21
Modified:
hadoop/common/branches/branch-0.21/ (props changed)
hadoop/common/branches/branch-0.21/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-0.21/build.xml
hadoop/common/branches/branch-0.21/src/contrib/ec2/ (props changed)
hadoop/common/branches/branch-0.21/src/docs/ (props changed)
hadoop/common/branches/branch-0.21/src/java/ (props changed)
hadoop/common/branches/branch-0.21/src/test/aop/build/aop.xml
hadoop/common/branches/branch-0.21/src/test/core/ (props changed)
Propchange: hadoop/common/branches/branch-0.21/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 2 22:29:50 2009
@@ -1,2 +1,2 @@
-/hadoop/common/trunk:818543,819670,824900-824942,831032,831070
+/hadoop/common/trunk:818543,819670,824900-824942,831032,831070,832157
/hadoop/core/branches/branch-0.19/core:713112
Modified: hadoop/common/branches/branch-0.21/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.21/CHANGES.txt?rev=832162&r1=832161&r2=832162&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.21/CHANGES.txt Mon Nov 2 22:29:50 2009
@@ -1106,6 +1106,9 @@
HADOOP-6344. Fix rm and rmr immediately delete files rather than sending
to trash, if a user is over-quota. (Jakob Homan via suresh)
+ HADOOP-6347. run-test-core-fault-inject runs a test case twice if
+ -Dtestcase is set (cos)
+
Release 0.20.2 - Unreleased
NEW FEATURES
Propchange: hadoop/common/branches/branch-0.21/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 2 22:29:50 2009
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/CHANGES.txt:818543,819670,823756,824900-824942,831032,831070
+/hadoop/common/trunk/CHANGES.txt:818543,819670,823756,824900-824942,831032,831070,832157
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
/hadoop/core/branches/branch-0.19/CHANGES.txt:713112
/hadoop/core/trunk/CHANGES.txt:776175-785643,785929-786278
Modified: hadoop/common/branches/branch-0.21/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.21/build.xml?rev=832162&r1=832161&r2=832162&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.21/build.xml (original)
+++ hadoop/common/branches/branch-0.21/build.xml Mon Nov 2 22:29:50 2009
@@ -443,7 +443,8 @@
<!-- Compile test code -->
<!-- ================================================================== -->
<!-- This is a wrapper for fault-injection needs-->
- <target name="compile-tests" depends="compile-core-test"/>
+ <target name="-classes-compilation"
+ depends="compile-core-classes, compile-core-test"/>
<target name="compile-core-test" depends="compile-core-classes,
ivy-retrieve-test, generate-test-records, generate-avro-records">
<mkdir dir="${test.core.build.classes}"/>
@@ -573,10 +574,14 @@
<isset property="testcase" />
</and>
</condition>
+ <condition property="tests.testcaseonly">
+ <istrue value="${special.fi.testcasesonly}" />
+ </condition>
<condition property="tests.testcase.fi">
<and>
<istrue value="${test.fault.inject}" />
<isset property="testcase" />
+ <isfalse value="${special.fi.testcasesonly}" />
</and>
</condition>
@@ -643,8 +648,7 @@
</batchtest>
<!--The following batch is for very special occasions only when
a non-FI tests are needed to be executed against FI-environment -->
- <batchtest todir="${test.build.dir}" if="special.fi.testcasesonly">
- <fileset dir="${test.src.dir}/aop" includes="**/${testcase}.java"/>
+ <batchtest todir="${test.build.dir}" if="tests.testcaseonly">
<fileset dir="${test.src.dir}/core" includes="**/${testcase}.java"/>
</batchtest>
</junit>
Propchange: hadoop/common/branches/branch-0.21/src/contrib/ec2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 2 22:29:50 2009
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/contrib/ec2:818543,819670,831032,831070
+/hadoop/common/trunk/src/contrib/ec2:818543,819670,831032,831070,832157
/hadoop/core/branches/branch-0.19/core/src/contrib/ec2:713112
/hadoop/core/trunk/src/contrib/ec2:776175-784663
Propchange: hadoop/common/branches/branch-0.21/src/docs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 2 22:29:50 2009
@@ -1,2 +1,2 @@
-/hadoop/common/trunk/src/docs:818543,819670,831032,831070
+/hadoop/common/trunk/src/docs:818543,819670,831032,831070,832157
/hadoop/core/branches/branch-0.19/src/docs:713112
Propchange: hadoop/common/branches/branch-0.21/src/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 2 22:29:50 2009
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/java:818543,819670,831032,831070
+/hadoop/common/trunk/src/java:818543,819670,831032,831070,832157
/hadoop/core/branches/branch-0.19/core/src/java:713112
/hadoop/core/trunk/src/core:776175-785643,785929-786278
Modified: hadoop/common/branches/branch-0.21/src/test/aop/build/aop.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.21/src/test/aop/build/aop.xml?rev=832162&r1=832161&r2=832162&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.21/src/test/aop/build/aop.xml (original)
+++ hadoop/common/branches/branch-0.21/src/test/aop/build/aop.xml Mon Nov 2
22:29:50 2009
@@ -31,8 +31,10 @@
Later on one can run 'ant jar-fault-inject' to create
Hadoop jar file with instrumented classes
-->
- <target name="compile-fault-inject"
- depends="compile-core-classes, compile-tests">
+ <!-- Target -classes-compilation has to be defined in build.xml and
+ needs to depend on classes compilation and test classes compilation
+ targets. This is a poor man parametrization for targets -->
+ <target name="compile-fault-inject" depends="-classes-compilation" >
<!-- AspectJ task definition -->
<taskdef
resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties">
Propchange: hadoop/common/branches/branch-0.21/src/test/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 2 22:29:50 2009
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/test/core:818543,819670,831032,831070
+/hadoop/common/trunk/src/test/core:818543,819670,831032,831070,832157
/hadoop/core/branches/branch-0.19/core/src/test/core:713112
/hadoop/core/trunk/src/test/core:776175-785643,785929-786278
