From 342b05b849e69b4db8e10acbeea4953d37f2d2bc Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Fri, 22 Nov 2013 12:21:31 -0800
Subject: Test in quick mode for ant build

Add a target `test.suite.quick`.

Let test.quick depend only on init and quick.done,
and load the task using the quick path (with non-core deps).
---
 build.xml              | 17 +++++++++++++++++
 test/build-partest.xml |  3 ++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 9e385ee802..648baf9bce 100755
--- a/build.xml
+++ b/build.xml
@@ -920,9 +920,15 @@ TODO:
         Why, the compiler we're testing, of course, and partest with all its dependencies.
     -->
     <path id="partest.compilation.path">
+      <path refid="partest.compilation.path.core"/>
+      <path refid="partest.compilation.path.noncore"/>
+    </path>
+    <path id="partest.compilation.path.core">
       <pathelement location="${library.jar}"/>
       <pathelement location="${reflect.jar}"/>
       <pathelement location="${compiler.jar}"/>
+    </path>
+    <path id="partest.compilation.path.noncore">
 
       <!-- TODO modularize compiler
       <pathelement location="${scaladoc.jar}"/>
@@ -1892,6 +1898,17 @@ TODO:
     <testSuite colors="8" kinds="pos neg run jvm res scalap scalacheck specialized instrumented"/>
   </target>
 
+  <target name="test.suite.quick" depends="init, quick.done">
+    <path id="test.suite.path">
+      <path refid="quick.bin.tool.path"/>
+      <path refid="quick.interactive.build.path"/>
+      <path refid="partest.compilation.path.noncore"/>
+    </path>
+    <property name="pcp" value="${toString:test.suite.path}"/>
+    <taskdef classpathref="test.suite.path" resource="scala/tools/partest/antlib.xml"/>
+    <testSuite colors="8" kinds="pos neg run jvm res scalap scalacheck specialized instrumented" pcp="${pcp}"/>
+  </target>
+
   <target name="test.run" depends="test.suite.init">
     <testSuite kinds="run jvm"/>
   </target>
diff --git a/test/build-partest.xml b/test/build-partest.xml
index 22ad85ac03..e909a09123 100755
--- a/test/build-partest.xml
+++ b/test/build-partest.xml
@@ -7,6 +7,7 @@
     <attribute name="srcdir" default="files"/> <!-- TODO: make targets for `pending` and other subdirs -->
     <attribute name="colors" default="${partest.colors}"/>
     <attribute name="scalacOpts" default="${scalac.args.optimise}"/>
+    <attribute name="pcp" default="${toString:partest.compilation.path}"/>
     <attribute name="kinds"/>
     <sequential>
       <property name="partest.dir" value="@{dir}" />
@@ -14,7 +15,7 @@
                    kinds="@{kinds}"
                   colors="@{colors}"
               scalacOpts="@{scalacOpts}"
-      compilationpathref="partest.compilation.path"/>
+         compilationpath="@{pcp}"/>
     </sequential>
   </macrodef>
 </project>
-- 
cgit v1.2.3