Author: cos Date: Sat Oct 24 00:41:37 2009 New Revision: 829294 URL: http://svn.apache.org/viewvc?rev=829294&view=rev Log: HADOOP-6326. svn merge -c 829269 from trunk to branch
Modified: hadoop/common/branches/branch-0.21/CHANGES.txt hadoop/common/branches/branch-0.21/src/test/aop/build/aop.xml Modified: hadoop/common/branches/branch-0.21/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.21/CHANGES.txt?rev=829294&r1=829293&r2=829294&view=diff ============================================================================== --- hadoop/common/branches/branch-0.21/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.21/CHANGES.txt Sat Oct 24 00:41:37 2009 @@ -595,6 +595,9 @@ HADOOP-6309. Change build.xml to run tests with java asserts. (Eli Collins via szetszwo) + HADOOP-6326. Hundson runs should check for AspectJ warnings and report + failure if any is present (cos) + HADOOP-6329. Add build-fi directory to the ignore lists. (szetszwo) OPTIMIZATIONS 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=829294&r1=829293&r2=829294&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 Sat Oct 24 00:41:37 2009 @@ -17,6 +17,7 @@ <project name="aspects"> <property name="build-fi.dir" value="${basedir}/build-fi"/> <property name="hadoop-fi.jar" location="${build.dir}/${final.name}-fi.jar" /> + <property name="compile-inject.output" value="${build-fi.dir}/compile-fi.log"/> <property name="aspectversion" value="1.6.4"/> <property file="${basedir}/build.properties"/> @@ -53,12 +54,26 @@ deprecation="${javac.deprecation}"> <classpath refid="test.classpath"/> </iajc> + <loadfile property="injection.failure" srcfile="${compile-inject.output}"> + <filterchain> + <linecontainsregexp> + <regexp pattern='iajc.*warning'/> + </linecontainsregexp> + </filterchain> + </loadfile> + <fail if="injection.failure"> + Broken binding of advises: ${line.separator}${injection.failure} + </fail> <echo message="Weaving of aspects is finished"/> </target> <target name="injectfaults" description="Instrument classes with faults and other AOP advices"> - <subant buildpath="${basedir}" target="compile-fault-inject"> + <!--mkdir to prevent <subant> failure in case the folder has been removed--> + <mkdir dir="${build-fi.dir}"/> + <delete file="${compile-inject.output}"/> + <subant buildpath="${basedir}" target="compile-fault-inject" + output="${compile-inject.output}"> <property name="build.dir" value="${build-fi.dir}"/> </subant> </target>