ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/build.xml
(Generate patch)

Comparing jsr166/build.xml (file contents):
Revision 1.139 by jsr166, Thu May 2 21:38:03 2013 UTC vs.
Revision 1.143 by dl, Wed Jul 10 17:09:45 2013 UTC

# Line 45 | Line 45 | As of 2013-02, the very latest lambda 8
45    <property name="build.javadoc.access" value="protected"/>
46  
47    <!-- Tck options; see JSR166TestCase.java -->
48 <  <!-- Use via, e.g. ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->
48 >  <!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->
49    <property name="jsr166.profileTests"     value="false"/>
50    <property name="jsr166.profileThreshold" value="100"/>
51    <property name="jsr166.runsPerTest"      value="1"/>
52 +  <!-- Allow running an individual tck test class -->
53 +  <!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck -->
54 +  <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
55  
56    <!-- Build locations -->
57    <property name="build.dir"                   location="build"/>
# Line 208 | Line 211 | As of 2013-02, the very latest lambda 8
211  
212      </javac>
213  
214 <    <java classname="JSR166TestCase"
214 >    <java classname="${jsr166.tckTestClass}"
215            failonerror="true"
216            jvm="${java@{target}}"
217            fork="true">
# Line 306 | Line 309 | As of 2013-02, the very latest lambda 8
309    </target>
310  
311  
309  <target name="test"
310          depends="configure-tests, report-tests"
311          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
312
313
312    <target name="docs"
313            description="Builds javadocs for src/main to dist dir">
314  
# Line 334 | Line 332 | As of 2013-02, the very latest lambda 8
332        <arg value="-XDignore.symbol.file=true"/>
333        <arg value="-tag"/>
334        <arg value="${javadoc.jls.option}"/>
335 +      <arg value="-tag"/>
336 +      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
337 +      <arg value="-tag"/>
338 +      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
339 +      <arg value="-tag"/>
340 +      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
341      </javadoc>
342    </target>
343  
# Line 377 | Line 381 | As of 2013-02, the very latest lambda 8
381    </target>
382  
383  
380  <!-- Internal targets -->
381
382
384    <target name="dist-jar"
385            depends="clean, jar">
386      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 391 | Line 392 | As of 2013-02, the very latest lambda 8
392    </target>
393  
394  
394  <target name="compile-tests"
395          depends="jar">
396
397    <mkdir dir="${build.testcases.dir}"/>
398
399    <javac srcdir="${tck.src.dir}"
400           destdir="${build.testcases.dir}"
401           debug="${build.debug}"
402           debuglevel="${build.debuglevel}"
403           deprecation="${build.deprecation}"
404           source="6"
405           classpath="${junit.jar}"
406           bootclasspath="@{product.jar}:${bootclasspath6}"
407           includeAntRuntime="false"
408           includeJavaRuntime="false"
409           executable="${javac8}"
410           fork="true">
411
412      <include name="**/*.java"/>
413      <compilerarg value="-XDignore.symbol.file=true"/>
414      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
415      <compilerarg line="${build.args}"/>
416
417    </javac>
418
419    <javac srcdir="${test.src.dir}"
420           destdir="${build.testcases.dir}"
421           debug="${build.debug}"
422           debuglevel="${build.debuglevel}"
423           deprecation="${build.deprecation}"
424           source="6"
425           classpath=""
426           bootclasspath="@{product.jar}:${bootclasspath6}"
427           includeAntRuntime="false"
428           includeJavaRuntime="false"
429           executable="${javac8}"
430           fork="true">
431
432      <include name="jsr166/test/**/*.java"/>
433      <compilerarg value="-XDignore.symbol.file=true"/>
434      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
435      <compilerarg line="${build.args}"/>
436
437    </javac>
438
439 <!--
440    <javac srcdir="${jtreg.src.dir}"
441          destdir="${build.testcases.dir}"
442            debug="${build.debug}"
443       debuglevel="${build.debuglevel}"
444      deprecation="${build.deprecation}"
445           source="${build.sourcelevel}"
446             fork="true">
447
448      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
449      <compilerarg value="-XDignore.symbol.file=true"/>
450      <compilerarg line="${build.args}"/>
451
452    </javac>
453 -->
454
455  </target>
456
395    <target name="test-tck"
396            depends="jar"
397            description="Runs tck tests for main directly">
# Line 473 | Line 411 | As of 2013-02, the very latest lambda 8
411         classes="${product.jar}"/>
412    </target>
413  
414 <  <target name="test-ng"
414 >  <target name="test"
415            depends="test-tck, test-jtreg"
416            description="Runs tck and jtreg tests for main">
417    </target>
418  
481  <target name="run-tests"
482          depends="compile-tests">
483
484    <!-- May be overridden by user.properties -->
485    <property name="testcase" value="*"/>
486
487    <mkdir dir="${build.reports.dir}"/>
488
489    <junit printsummary="true"
490             showoutput="true"
491          errorProperty="junit.failed"
492        failureProperty="junit.failed"
493                    dir="${build.reports.dir}"
494                    jvm="${java8}"
495                   fork="true">
496
497      <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
498      <jvmarg value="-server"/>
499      <jvmarg value="-showversion"/>
500
501      <classpath refid="test.classpath"/>
502
503      <formatter type="xml"/>
504
505      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
506        <fileset dir="${tck.src.dir}">
507          <include name="**/${testcase}Test.java"/>
508        </fileset>
509      </batchtest>
510
511      <batchtest todir="${build.reports.dir}" if="do.test.old">
512        <fileset dir="${test.src.dir}">
513          <include name="jsr166/test/**/${testcase}Test.java"/>
514        </fileset>
515      </batchtest>
516
517 <!--
518      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
519        <fileset dir="${jtreg.src.dir}">
520          <include name="**/${testcase}Test.java"/>
521        </fileset>
522      </batchtest>
523 -->
524
525    </junit>
526
527  </target>
528
529
530  <target name="report-tests"
531          depends="run-tests">
532
533    <!-- Sets junit.report.format to frames if redirection is present,
534         otherwise sets it to noframes. -->
535    <available property="junit.report.format"
536                  value="frames"
537              classname="org.apache.xalan.lib.Redirect"
538    />
539    <property name="junit.report.format" value="noframes"/>
540
541    <junitreport todir="${build.reports.dir}">
542      <fileset dir="${build.reports.dir}">
543        <include name="TEST-*.xml"/>
544      </fileset>
545      <report format="${junit.report.format}" todir="${build.reports.dir}"
546      />
547    </junitreport>
548
549    <fail message="Test Cases Failed" if="junit.failed"/>
550
551  </target>
419  
420  
421    <target name="configure-compiler">
# Line 568 | Line 435 | As of 2013-02, the very latest lambda 8
435    </target>
436  
437  
571  <target name="configure-tests"
572       depends="configure-compiler">
573
574    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
575    <available property="junit.available"
576               classname="junit.framework.Protectable"/>
577
578    <!-- Xalan -->
579    <available property="xalan.available"
580               classname="org.apache.xalan.Version"/>
581
582
583    <!-- Ant 1.6beta and later don't need or want this check -->
584    <!--
585    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
586          unless="junit.available"/>
587
588    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
589          unless="xalan.available"/>
590    -->
591
592  </target>
593
438  
439    <!-- Various demos and test programs -->
440  
# Line 707 | Line 551 | As of 2013-02, the very latest lambda 8
551  
552        <formatter type="brief"/>
553  
554 <      <test name="JSR166TestCase" haltonfailure="no">
554 >      <test name="${jsr166.tckTestClass}" haltonfailure="no">
555        </test>
556  
557      </junit>
# Line 719 | Line 563 | As of 2013-02, the very latest lambda 8
563      <run-jtreg-tests
564         target="7"
565         workdir="${build.4jdk7.dir}"
566 <       classes="${4jdk7product.jar}"/>
566 >       classes="${4jdk7product.jar}"
567 >       jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
568    </target>
569  
570  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines