diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2014-09-17 11:44:20 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2014-09-17 11:44:20 +1000 |
| commit | 5c6e7b3d6587107bf6f9746c9be8643b53321614 (patch) | |
| tree | 319c7d297d26d577190c0a977bf03e0a5f3f2870 /build.xml | |
| parent | be825be0b0c5dcbd210c52295022ccee0a859262 (diff) | |
| parent | 223e207e5a4904bf9a6bd70972fa69452d228529 (diff) | |
| download | scala-5c6e7b3d6587107bf6f9746c9be8643b53321614.tar.gz scala-5c6e7b3d6587107bf6f9746c9be8643b53321614.tar.bz2 scala-5c6e7b3d6587107bf6f9746c9be8643b53321614.zip | |
Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-20140917
Conflicts:
build.xml
The merge conflict was centred around the introduction of
the build property `test.bc.skip`, and was straight forward
to resolve.
Diffstat (limited to 'build.xml')
| -rwxr-xr-x | build.xml | 16 |
1 files changed, 11 insertions, 5 deletions
@@ -970,6 +970,7 @@ TODO: <pathelement location="${test.junit.classes}"/> <path refid="quick.compiler.build.path"/> <path refid="quick.repl.build.path"/> + <path refid="quick.partest-extras.build.path"/> <path refid="junit.classpath"/> </path> @@ -1512,7 +1513,12 @@ TODO: <!-- =========================================================================== BINARY COMPATIBILITY TESTING ============================================================================ --> - <target name="bc.init" depends="init" unless="maven-deps-done-mima"> + <target name="bc.init" depends="init" if="test.bc.skip"> + <!-- if test.bc.skip is set, make sure that pc.prepare is not executed either --> + <property name="maven-deps-done-mima" value="true"/> + </target> + + <target name="bc.prepare" depends="bc.init" unless="maven-deps-done-mima"> <property name="bc-reference-version" value="2.11.0"/> <property name="bc-build.dir" value="${build.dir}/bc"/> @@ -1530,10 +1536,10 @@ TODO: </target> <target name="test.bc-opt" description="Optimized version of test.bc."> <optimized name="test.bc"/></target> - <target name="test.bc" depends="bc.init, pack.lib, pack.reflect"> - <echo message="binary compatibility testing disabled in the 2.12.x branch"/> - <!-- <bc.check project="library"/> --> - <!-- <bc.check project="reflect"/> --> + <target name="test.bc" depends="bc.prepare, pack.lib, pack.reflect" unless="test.bc.skip"> + <echo message="binary compatibility testing disabled in the 2.12.x branch"/> + <!-- <bc.check project="library"/> --> + <!-- <bc.check project="reflect"/> --> </target> <!-- =========================================================================== |