Ignore:
Timestamp:
2016-06-19T15:19:44+02:00 (8 years ago)
Author:
donvip
Message:

use a single test config directory for all plugins. This simplifies the tree structure, and speeds up SVN operations as the increase of svn:externals entries slows down every svn update command

Location:
applications/editors/josm/plugins
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins

    • Property svn:externals

      •  

        old new  
        55https://github.com/JOSM/tofix-plugin/trunk tofix
        66https://github.com/JOSM/JOSM-continuos-download/trunk continuosDownload
         7https://josm.openstreetmap.de/svn/trunk/test/config 00_core_test_config

  • applications/editors/josm/plugins/build-common.xml

    r32322 r32326  
    432432    <macrodef name="init-test-preferences">
    433433        <sequential>
    434             <copy file="${plugin.test.dir}/config/preferences.template.xml" tofile="${plugin.test.dir}/config/unit-josm.home/preferences.xml"/>
    435             <replace file="${plugin.test.dir}/config/unit-josm.home/preferences.xml" encoding="UTF-8" token="@OSM_USERNAME@" value="${osm.username}"/>
    436             <replace file="${plugin.test.dir}/config/unit-josm.home/preferences.xml" encoding="UTF-8" token="@OSM_PASSWORD@" value="${osm.password}"/>
     434            <copy file="../00_core_test_config/preferences.template.xml" tofile="../00_core_test_config/unit-josm.home/preferences.xml"/>
     435            <replace file="../00_core_test_config/unit-josm.home/preferences.xml" encoding="UTF-8" token="@OSM_USERNAME@" value="${osm.username}"/>
     436            <replace file="../00_core_test_config/unit-josm.home/preferences.xml" encoding="UTF-8" token="@OSM_PASSWORD@" value="${osm.password}"/>
    437437        </sequential>
    438438    </macrodef>
    … …  
    450450        <delete dir="${plugin.test.dir}/report"/>
    451451        <delete file="${plugin.test.dir}/jacoco.exec" />
    452         <delete file="${plugin.test.dir}/config/unit-josm.home/preferences.xml" />
    453         <delete dir="${plugin.test.dir}/config/unit-josm.home/cache" failonerror="false"/>
     452        <delete file="../00_core_test_config/unit-josm.home/preferences.xml" />
     453        <delete dir="../00_core_test_config/unit-josm.home/cache" failonerror="false"/>
    454454    </target>
    455455    <target name="test-compile" depends="test-init,dist" if="test.present">
    … …  
    476476                <junit printsummary="yes" fork="true" forkmode="once" dir="${basedir}">
    477477                    <jvmarg value="-Dfile.encoding=UTF-8"/>
    478                     <sysproperty key="josm.home" value="${plugin.test.dir}/config/unit-josm.home"/>
     478                    <sysproperty key="josm.home" value="../00_core_test_config/unit-josm.home"/>
    479479                    <sysproperty key="josm.test.data" value="${plugin.test.dir}/data"/>
    480480                    <sysproperty key="java.awt.headless" value="true"/>
Note: See TracChangeset for help on using the changeset viewer.