Ticket #13005: patch-test-no-coverage-for-performance.patch

File patch-test-no-coverage-for-performance.patch, 2.2 KB (added by michael2402, 9 years ago)

  • build.xml 

    diff --git a/build.xml b/build.xml
index 5382cf8..e962d93 100644
    a b Build-Date: ${build.tstamp}  
    312312        <delete file="${src.dir}/org/w3/_2001/xmlschema/Adapter1.java"/>
    313313        <delete dir="${src.dir}/org/openstreetmap/josm/data/imagery/types"/>
    314314        <delete file="${epsg.output}"/>
     315        <delete dir="${test.dir}/build"/>
    315316    </target>
    316317    <macrodef name="init-test-preferences">
    317318        <attribute name="testfamily"/>
    … … Build-Date: ${build.tstamp}  
    382383    <macrodef name="call-junit">
    383384        <attribute name="testfamily"/>
    384385        <attribute name="testITsuffix" default=""/>
     386        <attribute name="coverage" default="true"/>
    385387        <sequential>
    386388            <echo message="Running @{testfamily}@{testITsuffix} tests with JUnit"/>
    387             <jacoco:coverage destfile="${test.dir}/jacoco@{testITsuffix}.exec">
     389            <jacoco:coverage destfile="${test.dir}/jacoco@{testITsuffix}.exec" enabled="@{coverage}">
    388390                <junit printsummary="yes" fork="true" forkmode="once">
    389391                    <jvmarg value="-Dfile.encoding=UTF-8"/>
    390392                    <jvmarg line="-addmods java.xml.bind" if:set="isJava9" />
    … … Build-Date: ${build.tstamp}  
    414416        description="Run unit, functional and performance tests. OSM API (TEST) account shall be set with -Dosm.username and -Dosm.password">
    415417        <call-junit testfamily="unit"/>
    416418        <call-junit testfamily="functional"/>
    417         <call-junit testfamily="performance"/>
     419        <call-junit testfamily="performance" coverage="false"/>
    418420    </target>
    419421    <target name="test-it" depends="test-compile" unless="test-it.notRequired"
    420422        description="Run integration tests. OSM API (TEST) account shall be set with -Dosm.username and -Dosm.password">
    421423        <call-junit testfamily="unit" testITsuffix="IT"/>
    422424        <call-junit testfamily="functional" testITsuffix="IT"/>
    423         <call-junit testfamily="performance" testITsuffix="IT"/>
     425        <call-junit testfamily="performance" testITsuffix="IT" coverage="false"/>
    424426    </target>
    425427    <target name="test-html" depends="test, test-it" description="Generate HTML test reports">
    426428        <!-- May require additional ant dependencies like ant-trax package -->