Author: cos
Date: Thu Jul 22 05:48:10 2010
New Revision: 966508
URL: http://svn.apache.org/viewvc?rev=966508&view=rev
Log:
HADOOP-6790. Instrumented (Herriot) build uses too wide mask to include aspect
files. Contributed by Konstantin Boudnik.
Modified:
hadoop/common/trunk/CHANGES.txt
hadoop/common/trunk/src/test/aop/build/aop.xml
Modified: hadoop/common/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=966508&r1=966507&r2=966508&view=diff
==============================================================================
--- hadoop/common/trunk/CHANGES.txt (original)
+++ hadoop/common/trunk/CHANGES.txt Thu Jul 22 05:48:10 2010
@@ -1053,6 +1053,9 @@ Release 0.21.0 - Unreleased
BUG FIXES
+ HADOOP-6790. Instrumented (Herriot) build uses too wide mask to include
+ aspect files. (Konstantin Boudnik)
+
HADOOP-6860. 'compile-fault-inject' should never be called directly.
(Konstantin Boudnik)
Modified: hadoop/common/trunk/src/test/aop/build/aop.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/src/test/aop/build/aop.xml?rev=966508&r1=966507&r2=966508&view=diff
==============================================================================
--- hadoop/common/trunk/src/test/aop/build/aop.xml (original)
+++ hadoop/common/trunk/src/test/aop/build/aop.xml Thu Jul 22 05:48:10 2010
@@ -63,7 +63,7 @@
<iajc
encoding="${build.encoding}"
srcdir="${java.src.dir};${build.src};${src.dir.path}"
- includes="**/org/apache/hadoop/**/*.java, **/org/apache/hadoop/**/*.aj"
+ includes="org/apache/hadoop/**/*.java, org/apache/hadoop/**/*.aj"
excludes="org/apache/hadoop/classification/tools/**/*,
org/apache/hadoop/record/**/*"
destDir="${dest.dir}"
debug="${javac.debug}"
@@ -157,7 +157,7 @@
<mkdir dir="${build-fi.dir}"/>
<delete file="${compile-inject.output}"/>
<weave-injectfault-aspects dest.dir="${system-test-build-dir}/classes"
- src.dir="${test.src.dir}/system">
+
src.dir="${test.src.dir}/system/java;${test.src.dir}/system/aop">
</weave-injectfault-aspects>
</target>
