Skip to content

Commit 1cb0fa6

Browse files
author
dlsmith
committed
Updated build script to point to plt-ant.jar
git-svn-id: file:///tmp/test-svn/trunk@4130 fe72c1cf-3628-48e9-8b72-1c46755d3cff
1 parent 7c06ee5 commit 1cb0fa6

File tree

2 files changed

+11
-42
lines changed

2 files changed

+11
-42
lines changed

‎drjava/build.xml‎

Lines changed: 11 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -327,41 +327,6 @@
327327
Testing Targets
328328
*************** -->
329329

330-
<!-- The following targets test if the "quiet" and "oneline" formatters
331-
are available, and if so, selects one of them. Otherwise, the "brief"
332-
formatter is used. -->
333-
<target name="init-test-check-quiet-formatter">
334-
<available property="quiet.present" classname="org.apache.tools.ant.taskdefs.optional.junit.QuietJUnitResultFormatter" />
335-
</target>
336-
<target name="init-test-check-oneline-formatter">
337-
<available property="oneline.present" classname="org.apache.tools.ant.taskdefs.optional.junit.OneLineJUnitResultFormatter" />
338-
</target>
339-
340-
<target name="init-test-set-quiet"
341-
depends="init-test-check-quiet-formatter"
342-
if="quiet.present">
343-
<property name="junit-formatter" value="quiet" />
344-
<property name="junit-haltonfailure" value="no" />
345-
</target>
346-
347-
<target name="init-test-set-oneline"
348-
depends="init-test-check-oneline-formatter"
349-
if="oneline.present">
350-
<property name="junit-formatter" value="oneline" />
351-
<property name="junit-haltonfailure" value="no" />
352-
</target>
353-
354-
<target name="init-test-set-brief"
355-
depends="init-test-check-oneline-formatter"
356-
unless="oneline.present">
357-
<property name="junit-formatter" value="brief" />
358-
<property name="junit-haltonfailure" value="yes" />
359-
</target>
360-
361-
<target name="init-test"
362-
depends="init-test-set-oneline, init-test-set-brief">
363-
</target>
364-
365330
<target name="test" depends="test-15" description="Shortcut for 'test-15'">
366331
</target>
367332

@@ -417,23 +382,25 @@
417382
</and>
418383
</selector>
419384

420-
<target name="do-test-15" depends="assert-15, resolve-java15-tools, init-test">
385+
<target name="do-test-15" depends="assert-15, resolve-java15-tools">
421386
<echo message="Running all 5.0 tests matching '${test-filter-string}' under Java 5.0" />
422387
<junit haltonfailure="${junit-haltonfailure}"
423388
failureproperty="do-test-15-failed"
424389
fork="yes"
425390
forkmode="perTest"
426391
maxmemory="256M"
427-
dir="${basedir}">
392+
includeAntRuntime="yes"
393+
dir="${basedir}">
428394
<classpath>
429395
<pathelement location="${java15-tools}" />
430396
<pathelement location="lib/buildlib/junit.jar" />
397+
<pathelement location="lib/buildlib/plt-ant.jar" /> <!-- required for custom formatter -->
431398
<pathelement location="${clover-jar}" />
432399
<pathelement location="classes/test" />
433400
<pathelement location="classes/base" />
434401
<pathelement location="classes/lib" />
435402
</classpath>
436-
<formatter type="${junit-formatter}" usefile="false" />
403+
<formatter classname="edu.rice.cs.plt.ant.OneLineJUnitResultFormatter" usefile="false" />
437404
<batchtest>
438405
<fileset dir="classes/test">
439406
<selector refid="tests-to-run" />
@@ -444,7 +411,7 @@
444411
<fail if="do-test-15-failed" message="One or more unit tests failed."/>
445412
</target>
446413

447-
<target name="do-test-14" depends="resolve-java14-exec, resolve-java14-tools, init-test">
414+
<target name="do-test-14" depends="resolve-java14-exec, resolve-java14-tools">
448415
<echo message="Running all 1.4 tests matching '${test-spec}' under Java 1.4" />
449416
<echo message="WARNING: 1.4-compatible test classes are (intentionally) not checked for Java 5 API references." />
450417
<echo message="If such references exist, these tests will probably fail." />
@@ -458,12 +425,13 @@
458425
<classpath>
459426
<pathelement location="${java14-tools}" />
460427
<pathelement location="lib/buildlib/junit.jar" />
428+
<pathelement location="lib/buildlib/plt-ant.jar" /> <!-- required for custom formatter -->
461429
<pathelement location="${clover-jar}" />
462430
<pathelement location="classes/test-14" />
463431
<pathelement location="classes/base-14" />
464432
<pathelement location="classes/lib-14" />
465433
</classpath>
466-
<formatter type="${junit-formatter}" usefile="false" />
434+
<formatter classname="edu.rice.cs.plt.ant.OneLineJUnitResultFormatter" usefile="false" />
467435
<batchtest>
468436
<fileset dir="classes/test-14">
469437
<selector refid="tests-to-run" />
@@ -474,7 +442,7 @@
474442
<fail if="do-test-14-failed" message="One or more unit tests failed."/>
475443
</target>
476444

477-
<target name="do-test-14-in-15" depends="assert-15, resolve-java15-tools, init-test">
445+
<target name="do-test-14-in-15" depends="assert-15, resolve-java15-tools">
478446
<echo message="Running all 1.4 tests matching '${test-spec}' under Java 5.0" />
479447
<junit haltonfailure="${junit-haltonfailure}"
480448
failureproperty="do-test-14-in-15-failed"
@@ -485,12 +453,13 @@
485453
<classpath>
486454
<pathelement location="${java15-tools}" />
487455
<pathelement location="lib/buildlib/junit.jar" />
456+
<pathelement location="lib/buildlib/plt-ant.jar" /> <!-- required for custom formatter -->
488457
<pathelement location="${clover-jar}" />
489458
<pathelement location="classes/test-14" />
490459
<pathelement location="classes/base-14" />
491460
<pathelement location="classes/lib-14" />
492461
</classpath>
493-
<formatter type="${junit-formatter}" usefile="false" />
462+
<formatter classname="edu.rice.cs.plt.ant.OneLineJUnitResultFormatter" usefile="false" />
494463
<batchtest>
495464
<fileset dir="classes/test-14">
496465
<selector refid="tests-to-run" />

‎drjava/lib/buildlib/plt-ant.jar‎

5.54 KB
Binary file not shown.

0 commit comments

Comments
 (0)