Skip to content

Commit 1cdc182

Browse files
committed
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 scala#4297. We already were doing this for `partest.compilation.path.noncore`, but we seem to have missed `quick.partest-extras.build.path`.
1 parent 2a58ea2 commit 1cdc182

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

build.xml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -773,7 +773,13 @@ TODO:
773773

774774
<path id="quick.partest-extras.build.path">
775775
<path refid="asm.classpath"/>
776-
<path refid="partest.classpath"/>
776+
<restrict>
777+
<path refid="partest.classpath"/>
778+
<rsel:not><rsel:or>
779+
<rsel:name name="scala-library*.jar"/>
780+
</rsel:or></rsel:not>
781+
</restrict>
782+
777783
<path refid="quick.compiler.build.path"/>
778784
<pathelement location="${build-quick.dir}/classes/repl"/>
779785
<!-- for the java dependency: Profiler.java -->
@@ -1454,6 +1460,10 @@ TODO:
14541460
<mkdir dir="${test.junit.classes}"/>
14551461
<echo message="Note: details of failed tests will be output to ${build-junit.dir}"/>
14561462

1463+
<propertyfile file = "${test.junit.classes}/classpath.properties">
1464+
<entry key = "test.junit.compiler.build.path" value="${toString:test.junit.compiler.build.path}"/>
1465+
</propertyfile>
1466+
14571467
<if><isset property="test.method" /><then><property name="test.methods" value="${test.method}" /></then></if>
14581468
<junit fork="yes" haltonfailure="yes" printsummary="on">
14591469
<classpath refid="test.junit.compiler.build.path"/>

0 commit comments

Comments
 (0)