Skip to content

Commit 13c716e

Browse files
committed
Build partest-extras under pack.done
... rather than just in `test.suite.init`. Now: % ant pack.done | egrep -i 'compiling|jar' desired.jars.uptodate: [quick.partest-extras] Compiling 1 file to /Users/jason/code/scala/build/quick/classes/partest-extras [jar] Building jar: /Users/jason/code/scala/build/pack/lib/scala-partest-extras.jar Note: Because of the recent changes to the way that the classpath or partest is build up (it is done via `ant test.suite.init`), partest no longer works with quick/classes, the classpath is always taken as `pack`. So `ant quick.bin && ./test/partest` is insufficient; you need to run `ant pack.done`, or just `ant` if you prefer brevity.
1 parent aa4524a commit 13c716e

File tree

1 file changed

+16
-9
lines changed

1 file changed

+16
-9
lines changed

build.xml

+16-9
Original file line numberDiff line numberDiff line change
@@ -1281,6 +1281,14 @@ TODO:
12811281
<target name="quick.swing" depends="quick.actors, quick.lib" if="has.java6">
12821282
<staged-build with="locker" stage="quick" project="swing"/> </target>
12831283

1284+
<target name="quick.partest-extras"
1285+
depends="quick.comp">
1286+
<!-- compile compiler-specific parts of partest -->
1287+
<staged-build with="starr" stage="quick" project="partest-extras" />
1288+
<staged-build with="starr" stage="quick" project="partest-javaagent" />
1289+
</target>
1290+
1291+
12841292
<target name="quick.plugins" depends="quick.comp">
12851293
<staged-uptodate stage="quick" project="plugins">
12861294
<check><srcfiles dir="${src.dir}/continuations"/></check>
@@ -1308,7 +1316,7 @@ TODO:
13081316
</staged-uptodate>
13091317
</target>
13101318

1311-
<target name="quick.bin" depends="quick.lib, quick.reflect, quick.comp, quick.repl, quick.scalap, quick.interactive, quick.swing, quick.plugins, quick.scaladoc">
1319+
<target name="quick.bin" depends="quick.lib, quick.reflect, quick.comp, quick.repl, quick.scalap, quick.interactive, quick.swing, quick.plugins, quick.scaladoc, quick.partest-extras">
13121320
<staged-bin stage="quick" classpathref="quick.bin.tool.path"/>
13131321
</target>
13141322

@@ -1325,6 +1333,11 @@ TODO:
13251333
<target name="pack.actors" depends="quick.lib"> <staged-pack project="actors"/> </target>
13261334
<target name="pack.swing" if="has.java6" depends="quick.swing"> <staged-pack project="swing"/> </target>
13271335
<target name="pack.reflect" depends="quick.reflect"> <staged-pack project="reflect"/> </target>
1336+
<target name="pack.partest-extras" depends="quick.partest-extras">
1337+
<staged-pack project="partest-extras"/>
1338+
<staged-pack project="partest-javaagent"
1339+
manifest="${src.dir}/partest-javaagent/scala/tools/partest/javaagent/MANIFEST.MF"/>
1340+
</target>
13281341

13291342
<target name="pack.comp" depends="quick.comp, quick.scaladoc, quick.interactive, quick.repl, asm.done">
13301343
<staged-pack project="compiler" manifest="${build-pack.dir}/META-INF/MANIFEST.MF">
@@ -1357,7 +1370,7 @@ TODO:
13571370

13581371
<target name="pack.scalap" depends="quick.scalap"> <staged-pack project="scalap" targetjar="scalap.jar"/> </target>
13591372

1360-
<target name="pack.bin" depends="pack.comp, pack.lib, pack.actors, pack.plugins, pack.reflect, pack.scalap, pack.swing">
1373+
<target name="pack.bin" depends="pack.comp, pack.lib, pack.actors, pack.plugins, pack.reflect, pack.scalap, pack.swing, pack.partest-extras">
13611374
<copy todir="${build-pack.dir}/lib">
13621375
<path refid="external-modules-nocore" />
13631376
<mapper type="flatten" />
@@ -1606,18 +1619,12 @@ TODO:
16061619
</target>
16071620

16081621
<!-- See test/build-partest.xml for the macro(s) being used here. -->
1609-
<target name="partest.task" depends="init">
1622+
<target name="partest.task" depends="init,pack.done">
16101623
<!-- note the classpathref! this is the classpath used to run partest,
16111624
so it must have the new compiler.... -->
16121625
<taskdef
16131626
classpathref="partest.compilation.path"
16141627
resource="scala/tools/partest/antlib.xml"/>
1615-
1616-
<!-- compile compiler-specific parts of partest -->
1617-
<staged-build with="starr" stage="quick" project="partest-extras" />
1618-
<staged-build with="starr" stage="quick" project="partest-javaagent" />
1619-
<staged-pack project="partest-extras"/>
1620-
<staged-pack project="partest-javaagent" manifest="${src.dir}/partest-javaagent/scala/tools/partest/javaagent/MANIFEST.MF"/>
16211628
</target>
16221629

16231630
<target name="test.suite.init" depends="pack.done, partest.task">

0 commit comments

Comments
 (0)