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.138 by jsr166, Fri Mar 22 18:04:56 2013 UTC vs.
Revision 1.145 by jsr166, Sun Jul 14 22:39:31 2013 UTC

# Line 44 | Line 44 | As of 2013-02, the very latest lambda 8
44    <property name="build.deprecation"    value="false"/>
45    <property name="build.javadoc.access" value="protected"/>
46  
47 +  <!-- Tck options; see JSR166TestCase.java -->
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"/>
58    <property name="build.classes.dir"           location="${build.dir}/classes"/>
# Line 202 | 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">
218          <jvmarg value="-Xbootclasspath/p:@{classes}"/>
219          <jvmarg line="@{jvmflags}"/>
220 +        <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
221 +        <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
222 +        <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
223          <classpath>
224            <pathelement location="${junit.jar}"/>
225            <pathelement location="@{workdir}/tck-classes"/>
# Line 297 | Line 309 | As of 2013-02, the very latest lambda 8
309    </target>
310  
311  
300  <target name="test"
301          depends="configure-tests, report-tests"
302          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
303
304
312    <target name="docs"
313            description="Builds javadocs for src/main to dist dir">
314  
# Line 325 | 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 368 | Line 381 | As of 2013-02, the very latest lambda 8
381    </target>
382  
383  
371  <!-- Internal targets -->
372
373
384    <target name="dist-jar"
385            depends="clean, jar">
386      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 382 | Line 392 | As of 2013-02, the very latest lambda 8
392    </target>
393  
394  
385  <target name="compile-tests"
386          depends="jar">
387
388    <mkdir dir="${build.testcases.dir}"/>
389
390    <javac srcdir="${tck.src.dir}"
391           destdir="${build.testcases.dir}"
392           debug="${build.debug}"
393           debuglevel="${build.debuglevel}"
394           deprecation="${build.deprecation}"
395           source="6"
396           classpath="${junit.jar}"
397           bootclasspath="@{product.jar}:${bootclasspath6}"
398           includeAntRuntime="false"
399           includeJavaRuntime="false"
400           executable="${javac8}"
401           fork="true">
402
403      <include name="**/*.java"/>
404      <compilerarg value="-XDignore.symbol.file=true"/>
405      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
406      <compilerarg line="${build.args}"/>
407
408    </javac>
409
410    <javac srcdir="${test.src.dir}"
411           destdir="${build.testcases.dir}"
412           debug="${build.debug}"
413           debuglevel="${build.debuglevel}"
414           deprecation="${build.deprecation}"
415           source="6"
416           classpath=""
417           bootclasspath="@{product.jar}:${bootclasspath6}"
418           includeAntRuntime="false"
419           includeJavaRuntime="false"
420           executable="${javac8}"
421           fork="true">
422
423      <include name="jsr166/test/**/*.java"/>
424      <compilerarg value="-XDignore.symbol.file=true"/>
425      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
426      <compilerarg line="${build.args}"/>
427
428    </javac>
429
430 <!--
431    <javac srcdir="${jtreg.src.dir}"
432          destdir="${build.testcases.dir}"
433            debug="${build.debug}"
434       debuglevel="${build.debuglevel}"
435      deprecation="${build.deprecation}"
436           source="${build.sourcelevel}"
437             fork="true">
438
439      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
440      <compilerarg value="-XDignore.symbol.file=true"/>
441      <compilerarg line="${build.args}"/>
442
443    </javac>
444 -->
445
446  </target>
447
395    <target name="test-tck"
396            depends="jar"
397            description="Runs tck tests for main directly">
# Line 464 | 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  
472  <target name="run-tests"
473          depends="compile-tests">
474
475    <!-- May be overridden by user.properties -->
476    <property name="testcase" value="*"/>
477
478    <mkdir dir="${build.reports.dir}"/>
479
480    <junit printsummary="true"
481             showoutput="true"
482          errorProperty="junit.failed"
483        failureProperty="junit.failed"
484                    dir="${build.reports.dir}"
485                    jvm="${java8}"
486                   fork="true">
487
488      <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
489      <jvmarg value="-server"/>
490      <jvmarg value="-showversion"/>
491
492      <classpath refid="test.classpath"/>
493
494      <formatter type="xml"/>
495
496      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
497        <fileset dir="${tck.src.dir}">
498          <include name="**/${testcase}Test.java"/>
499        </fileset>
500      </batchtest>
501
502      <batchtest todir="${build.reports.dir}" if="do.test.old">
503        <fileset dir="${test.src.dir}">
504          <include name="jsr166/test/**/${testcase}Test.java"/>
505        </fileset>
506      </batchtest>
507
508 <!--
509      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
510        <fileset dir="${jtreg.src.dir}">
511          <include name="**/${testcase}Test.java"/>
512        </fileset>
513      </batchtest>
514 -->
515
516    </junit>
517
518  </target>
519
520
521  <target name="report-tests"
522          depends="run-tests">
523
524    <!-- Sets junit.report.format to frames if redirection is present,
525         otherwise sets it to noframes. -->
526    <available property="junit.report.format"
527                  value="frames"
528              classname="org.apache.xalan.lib.Redirect"
529    />
530    <property name="junit.report.format" value="noframes"/>
531
532    <junitreport todir="${build.reports.dir}">
533      <fileset dir="${build.reports.dir}">
534        <include name="TEST-*.xml"/>
535      </fileset>
536      <report format="${junit.report.format}" todir="${build.reports.dir}"
537      />
538    </junitreport>
539
540    <fail message="Test Cases Failed" if="junit.failed"/>
541
542  </target>
419  
420  
421    <target name="configure-compiler">
# Line 559 | Line 435 | As of 2013-02, the very latest lambda 8
435    </target>
436  
437  
562  <target name="configure-tests"
563       depends="configure-compiler">
564
565    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
566    <available property="junit.available"
567               classname="junit.framework.Protectable"/>
568
569    <!-- Xalan -->
570    <available property="xalan.available"
571               classname="org.apache.xalan.Version"/>
572
573
574    <!-- Ant 1.6beta and later don't need or want this check -->
575    <!--
576    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
577          unless="junit.available"/>
578
579    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
580          unless="xalan.available"/>
581    -->
582
583  </target>
584
438  
439    <!-- Various demos and test programs -->
440  
# Line 670 | Line 523 | As of 2013-02, the very latest lambda 8
523          <exclude name="LongAccumulatorTest.java"/>
524          <exclude name="LongAdderTest.java"/>
525          <exclude name="CompletableFutureTest.java"/>
526 +        <exclude name="SplittableRandomTest.java"/>
527          <exclude name="StampedLockTest.java"/>
528        </javac-elements>
529      </run-tck-tests>
# Line 698 | Line 552 | As of 2013-02, the very latest lambda 8
552  
553        <formatter type="brief"/>
554  
555 <      <test name="JSR166TestCase" haltonfailure="no">
555 >      <test name="${jsr166.tckTestClass}" haltonfailure="no">
556        </test>
557  
558      </junit>
# Line 710 | Line 564 | As of 2013-02, the very latest lambda 8
564      <run-jtreg-tests
565         target="7"
566         workdir="${build.4jdk7.dir}"
567 <       classes="${4jdk7product.jar}"/>
567 >       classes="${4jdk7product.jar}"
568 >       jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
569    </target>
570  
571  
# Line 1045 | Line 900 | As of 2013-02, the very latest lambda 8
900  
901    <!-- jsr166e -->
902  
903 +  <property name="build.jsr166e.java.version" value="6"/>
904 +  <property name="build.jsr166e.javac" value="${javac6}"/>
905 +
906    <target name="jsr166ecompile"
907            depends="configure-compiler"
908            description="Compiles jsr166e sources">
# Line 1056 | Line 914 | As of 2013-02, the very latest lambda 8
914             debug="${build.debug}"
915             debuglevel="${build.debuglevel}"
916             deprecation="${build.deprecation}"
917 <           source="7"
917 >           source="${build.jsr166e.java.version}"
918             classpath=""
919             includeAntRuntime="false"
920             includeJavaRuntime="false"
921 <           executable="${javac7}"
921 >           executable="${build.jsr166e.javac}"
922             fork="true">
923  
924        <include name="jsr166e/**/*.java"/>
# Line 1093 | Line 951 | As of 2013-02, the very latest lambda 8
951               packagenames="jsr166e.*"
952               link="${jdkapidocs.url}"
953               access="${build.javadoc.access}"
954 <             sourcepath="${topsrc.dir}:${jdk7src.dir}"
955 <             source="7"
954 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
955 >             source="${build.jsr166e.java.version}"
956               executable="${javadoc7}">
957        <arg value="-XDignore.symbol.file=true"/>
958  
# Line 1102 | Line 960 | As of 2013-02, the very latest lambda 8
960    </target>
961  
962  
963 <  <target name="jsr166e-test-tck"
963 >  <target name="jsr166e-test-tck-one-java-version"
964            depends="jsr166ejar"
965            description="Runs tck tests for jsr166e">
966  
967 +    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
968 +
969      <run-tck-tests
970        tck.src.dir="${test.src.dir}/tck-jsr166e"
971 <      target="7"
971 >      target="${build.jsr166e.java.version}"
972        workdir="${build.jsr166e.dir}"
973        classes="${jsr166e.jar}"/>
974    </target>
975  
976 +  <target name="jsr166e-test-tck"
977 +          description="Runs tck tests for jsr166e for multiple java versions">
978 +
979 + <!--     <antcall target="clean"/> -->
980 + <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
981 + <!--       <param name="build.jsr166e.java.version" value="8"/> -->
982 + <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
983 + <!--     </antcall> -->
984 +
985 +    <antcall target="clean"/>
986 +    <antcall target="jsr166e-test-tck-one-java-version">
987 +      <param name="build.jsr166e.java.version" value="7"/>
988 +      <param name="build.jsr166e.javac" value="${javac7}"/>
989 +    </antcall>
990 +
991 +    <antcall target="clean"/>
992 +    <antcall target="jsr166e-test-tck-one-java-version">
993 +      <param name="build.jsr166e.java.version" value="6"/>
994 +      <param name="build.jsr166e.javac" value="${javac6}"/>
995 +    </antcall>
996 +  </target>
997 +
998  
999    <target name="jsr166edist"
1000            depends="jsr166edist-jar, jsr166edist-docs"

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines