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.140 by jsr166, Mon May 20 19:12:23 2013 UTC vs.
Revision 1.143 by dl, Wed Jul 10 17:09:45 2013 UTC

# Line 309 | Line 309 | As of 2013-02, the very latest lambda 8
309    </target>
310  
311  
312  <target name="test"
313          depends="configure-tests, report-tests"
314          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
315
316
312    <target name="docs"
313            description="Builds javadocs for src/main to dist dir">
314  
# Line 337 | 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 380 | Line 381 | As of 2013-02, the very latest lambda 8
381    </target>
382  
383  
383  <!-- Internal targets -->
384
385
384    <target name="dist-jar"
385            depends="clean, jar">
386      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 394 | Line 392 | As of 2013-02, the very latest lambda 8
392    </target>
393  
394  
397  <target name="compile-tests"
398          depends="jar">
399
400    <mkdir dir="${build.testcases.dir}"/>
401
402    <javac srcdir="${tck.src.dir}"
403           destdir="${build.testcases.dir}"
404           debug="${build.debug}"
405           debuglevel="${build.debuglevel}"
406           deprecation="${build.deprecation}"
407           source="6"
408           classpath="${junit.jar}"
409           bootclasspath="@{product.jar}:${bootclasspath6}"
410           includeAntRuntime="false"
411           includeJavaRuntime="false"
412           executable="${javac8}"
413           fork="true">
414
415      <include name="**/*.java"/>
416      <compilerarg value="-XDignore.symbol.file=true"/>
417      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
418      <compilerarg line="${build.args}"/>
419
420    </javac>
421
422    <javac srcdir="${test.src.dir}"
423           destdir="${build.testcases.dir}"
424           debug="${build.debug}"
425           debuglevel="${build.debuglevel}"
426           deprecation="${build.deprecation}"
427           source="6"
428           classpath=""
429           bootclasspath="@{product.jar}:${bootclasspath6}"
430           includeAntRuntime="false"
431           includeJavaRuntime="false"
432           executable="${javac8}"
433           fork="true">
434
435      <include name="jsr166/test/**/*.java"/>
436      <compilerarg value="-XDignore.symbol.file=true"/>
437      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
438      <compilerarg line="${build.args}"/>
439
440    </javac>
441
442 <!--
443    <javac srcdir="${jtreg.src.dir}"
444          destdir="${build.testcases.dir}"
445            debug="${build.debug}"
446       debuglevel="${build.debuglevel}"
447      deprecation="${build.deprecation}"
448           source="${build.sourcelevel}"
449             fork="true">
450
451      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
452      <compilerarg value="-XDignore.symbol.file=true"/>
453      <compilerarg line="${build.args}"/>
454
455    </javac>
456 -->
457
458  </target>
459
395    <target name="test-tck"
396            depends="jar"
397            description="Runs tck tests for main directly">
# Line 476 | 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  
484  <target name="run-tests"
485          depends="compile-tests">
486
487    <!-- May be overridden by user.properties -->
488    <property name="testcase" value="*"/>
489
490    <mkdir dir="${build.reports.dir}"/>
491
492    <junit printsummary="true"
493             showoutput="true"
494          errorProperty="junit.failed"
495        failureProperty="junit.failed"
496                    dir="${build.reports.dir}"
497                    jvm="${java8}"
498                   fork="true">
499
500      <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
501      <jvmarg value="-server"/>
502      <jvmarg value="-showversion"/>
503
504      <classpath refid="test.classpath"/>
505
506      <formatter type="xml"/>
507
508      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
509        <fileset dir="${tck.src.dir}">
510          <include name="**/${testcase}Test.java"/>
511        </fileset>
512      </batchtest>
513
514      <batchtest todir="${build.reports.dir}" if="do.test.old">
515        <fileset dir="${test.src.dir}">
516          <include name="jsr166/test/**/${testcase}Test.java"/>
517        </fileset>
518      </batchtest>
519
520 <!--
521      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
522        <fileset dir="${jtreg.src.dir}">
523          <include name="**/${testcase}Test.java"/>
524        </fileset>
525      </batchtest>
526 -->
527
528    </junit>
529
530  </target>
531
532
533  <target name="report-tests"
534          depends="run-tests">
535
536    <!-- Sets junit.report.format to frames if redirection is present,
537         otherwise sets it to noframes. -->
538    <available property="junit.report.format"
539                  value="frames"
540              classname="org.apache.xalan.lib.Redirect"
541    />
542    <property name="junit.report.format" value="noframes"/>
543
544    <junitreport todir="${build.reports.dir}">
545      <fileset dir="${build.reports.dir}">
546        <include name="TEST-*.xml"/>
547      </fileset>
548      <report format="${junit.report.format}" todir="${build.reports.dir}"
549      />
550    </junitreport>
551
552    <fail message="Test Cases Failed" if="junit.failed"/>
553
554  </target>
419  
420  
421    <target name="configure-compiler">
# Line 571 | Line 435 | As of 2013-02, the very latest lambda 8
435    </target>
436  
437  
574  <target name="configure-tests"
575       depends="configure-compiler">
576
577    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
578    <available property="junit.available"
579               classname="junit.framework.Protectable"/>
580
581    <!-- Xalan -->
582    <available property="xalan.available"
583               classname="org.apache.xalan.Version"/>
584
585
586    <!-- Ant 1.6beta and later don't need or want this check -->
587    <!--
588    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
589          unless="junit.available"/>
590
591    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
592          unless="xalan.available"/>
593    -->
594
595  </target>
596
438  
439    <!-- Various demos and test programs -->
440  
# Line 722 | 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