/[cvs]/jsr166/build.xml
ViewVC logotype

Diff of /jsr166/build.xml

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.192 by jsr166, Mon Nov 30 00:51:40 2015 UTC revision 1.195 by jsr166, Thu Dec 17 23:55:06 2015 UTC
# Line 289  Line 289 
289      </patternset>      </patternset>
290    </fileset>    </fileset>
291    
292      <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
293      <property name="jtreg.flags" value=""/>
294    
295    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
296      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
297      <attribute name="source" default="7"/>      <attribute name="source" default="7"/>
# Line 310  Line 313 
313      <delete dir="@{workdir}/JTwork"   quiet="true"/>      <delete dir="@{workdir}/JTwork"   quiet="true"/>
314      <delete dir="@{workdir}/JTreport" quiet="true"/>      <delete dir="@{workdir}/JTreport" quiet="true"/>
315      <mkdir dir="@{workdir}/JTwork/scratch"/>      <mkdir dir="@{workdir}/JTwork/scratch"/>
316      <mkdir dir="@{workdir}/JTreport"/>      <!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
317        <mkdir dir="@{workdir}/JTreport/html"/>
318        <mkdir dir="@{workdir}/JTreport/text"/>
319      <jtreg dir="${jtreg@{target}.src.dir}"      <jtreg dir="${jtreg@{target}.src.dir}"
320             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
321             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork"
# Line 324  Line 329 
329        <arg value="-automatic"/>        <arg value="-automatic"/>
330        <arg value="-k:!ignore"/>        <arg value="-k:!ignore"/>
331        <arg line="@{jtregflags}"/>        <arg line="@{jtregflags}"/>
332          <arg line="${jtreg.flags}"/>
333      </jtreg>      </jtreg>
334      </sequential>      </sequential>
335    </macrodef>    </macrodef>
# Line 386  Line 392 
392        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
393    
394      </javac>      </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>    </target>
399    
400    

Legend:
Removed from v.1.192  
changed lines
  Added in v.1.195

dl@cs.oswego.edu
ViewVC Help
Powered by ViewVC 1.1.27