Fixed SPR-5918.
Had to override the test.do definition in build.xml. Need to consult the spring-build team to add the change to spring-build itself. Since classes in test sources from another project cannot be shared, had to duplicate those classes.
This commit is contained in:
@@ -3,4 +3,35 @@
|
||||
<property file="${basedir}/../build.properties"/>
|
||||
<import file="${basedir}/../build-spring-framework/package-bundle.xml"/>
|
||||
<import file="${basedir}/../spring-build/aspect/default.xml"/>
|
||||
|
||||
<target name="test.do" depends="ivy.init, resolve.test, resolve.aspects, compile.init, test.init" if="test.exists">
|
||||
<path id="test.compile.classpath">
|
||||
<pathelement location="${jar.output.file}"/>
|
||||
<path refid="compile.classpath"/>
|
||||
<path refid="test.classpath"/>
|
||||
</path>
|
||||
<!--
|
||||
<test-compile classpath.id="test.compile.classpath" input.dir="${test.java.dir}" output.dir="${test.output.dir}"
|
||||
resources.dir="${test.resources.dir}"/>
|
||||
-->
|
||||
<iajc sourceroots="${test.java.dir}" aspectPath="${jar.output.file}" classpathRef="test.compile.classpath"
|
||||
destDir="${test.output.dir}" source="${source.version}" checkRuntimeVersion="false"/>
|
||||
<copy todir="${test.output.dir}">
|
||||
<fileset dir="${test.java.dir}">
|
||||
<exclude name="**/*.aj"/>
|
||||
<exclude name="**/*.java"/>
|
||||
<exclude name="*.aj"/>
|
||||
<exclude name="*.java"/>
|
||||
</fileset>
|
||||
</copy>
|
||||
<path id="test.run.classpath">
|
||||
<pathelement location="${jar.output.file}"/>
|
||||
<pathelement location="${test.output.dir}"/>
|
||||
<path refid="compile.classpath"/>
|
||||
<path refid="test.classpath"/>
|
||||
<path refid="runtime.classpath"/>
|
||||
</path>
|
||||
<test-run classpath.id="test.run.classpath"/>
|
||||
</target>
|
||||
|
||||
</project>
|
||||
|
||||
Reference in New Issue
Block a user