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`.

1 files changed, 11 insertions, 1 deletions

diff --git a/build.xml b/build.xml
index 31ed78d6dc..bd9de04790 100755
--- a/build.xml
+++ b/build.xml
@@ -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"/>