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.193 by jsr166, Fri Dec 11 23:58:52 2015 UTC vs.
Revision 1.195 by jsr166, Thu Dec 17 23:55:06 2015 UTC

# Line 289 | Line 289
289      </patternset>
290    </fileset>
291  
292 +  <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
293 +  <property name="jtreg.flags" value=""/>
294 +
295    <macrodef name="run-jtreg-tests">
296      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
297      <attribute name="source" default="7"/>
# Line 326 | Line 329
329        <arg value="-automatic"/>
330        <arg value="-k:!ignore"/>
331        <arg line="@{jtregflags}"/>
332 +      <arg line="${jtreg.flags}"/>
333      </jtreg>
334      </sequential>
335    </macrodef>
# Line 388 | Line 392
392        <compilerarg line="${build.args}"/>
393  
394      </javac>
395 +
396 +    <!-- We need jdk9's Contended annotation, but at compile time only -->
397 +    <delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>
398    </target>
399  
400  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines