diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-04-07 15:30:15 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-05-18 12:02:48 -0700 |
commit | 1cdc182224ea1e3e5bb0e4a18f08cb722456324b (patch) | |
tree | 9c808ffa2d5d0fddf0efd96ab65acb85048ed6ab | |
parent | 2a58ea22c54be1909d40163a9793edba559a8063 (diff) | |
download | scala-1cdc182224ea1e3e5bb0e4a18f08cb722456324b.tar.gz scala-1cdc182224ea1e3e5bb0e4a18f08cb722456324b.tar.bz2 scala-1cdc182224ea1e3e5bb0e4a18f08cb722456324b.zip |
Compile & run partest-extras using quick library
Suppress (transitive) dependency on external scala-library
(through scala-partest). This caused trouble when binary compatibility
was not preserved for scala-library, as in #4297.
We already were doing this for `partest.compilation.path.noncore`,
but we seem to have missed `quick.partest-extras.build.path`.
-rwxr-xr-x | build.xml | 12 |
1 files changed, 11 insertions, 1 deletions
@@ -773,7 +773,13 @@ TODO: <path id="quick.partest-extras.build.path"> <path refid="asm.classpath"/> - <path refid="partest.classpath"/> + <restrict> + <path refid="partest.classpath"/> + <rsel:not><rsel:or> + <rsel:name name="scala-library*.jar"/> + </rsel:or></rsel:not> + </restrict> + <path refid="quick.compiler.build.path"/> <pathelement location="${build-quick.dir}/classes/repl"/> <!-- for the java dependency: Profiler.java --> @@ -1454,6 +1460,10 @@ TODO: <mkdir dir="${test.junit.classes}"/> <echo message="Note: details of failed tests will be output to ${build-junit.dir}"/> + <propertyfile file = "${test.junit.classes}/classpath.properties"> + <entry key = "test.junit.compiler.build.path" value="${toString:test.junit.compiler.build.path}"/> + </propertyfile> + <if><isset property="test.method" /><then><property name="test.methods" value="${test.method}" /></then></if> <junit fork="yes" haltonfailure="yes" printsummary="on"> <classpath refid="test.junit.compiler.build.path"/> |