Просмотр исходного кода

Pass DMDIRC_HOME to unit tests.

Fixes Issue 0003635: make ant set DMDIRC_HOME env variable when running unit tests.

Change-Id: I5a2ee45945b2f511dbf63114e567e8ef992c65fe
Reviewed-on: http://gerrit.dmdirc.com/644
Automatic-Compile: Chris Smith <chris@dmdirc.com>
Reviewed-by: Chris Smith <chris@dmdirc.com>
tags/0.6.3b1
Shane Mc Cormack 14 лет назад
Родитель
Сommit
dfbe987b8c
1 измененных файлов: 7 добавлений и 0 удалений
  1. 7
    0
      nbproject/build-impl.xml

+ 7
- 0
nbproject/build-impl.xml Просмотреть файл

@@ -29,6 +29,7 @@ is divided into following sections:
29 29
     <path id="plugins.libs">
30 30
         <fileset dir="modules/plugins/lib" includes="*.jar"/>
31 31
     </path>
32
+    <property name="test_profile_dir" value="./test_profile"/>
32 33
     <target name="-pre-init">
33 34
         <!-- Empty placeholder for easier customization. -->
34 35
         <!-- You can override this target in the ../build.xml file. -->
@@ -204,10 +205,12 @@ is divided into following sections:
204 205
             <attribute default="${excludes}" name="excludes"/>
205 206
             <attribute default="**" name="testincludes"/>
206 207
             <sequential>
208
+                <delete dir="${test_profile_dir}"/>
207 209
                 <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" timeout="120000">
208 210
                     <classpath>
209 211
                         <pathelement path="${clover.jar}"/>
210 212
                     </classpath>
213
+                    <env key="DMDIRC_HOME" value="${test_profile_dir}"/>
211 214
                     <classpath refid="plugins.libs"/>
212 215
                     <batchtest todir="${build.test.results.dir}">
213 216
                         <clover-optimized-testset>
@@ -243,6 +246,7 @@ is divided into following sections:
243 246
                     <formatter type="xml"/>
244 247
                     <jvmarg line="${run.jvmargs}"/>
245 248
                 </junit>
249
+                <delete dir="${test_profile_dir}"/>
246 250
             </sequential>
247 251
         </macrodef>
248 252
     </target>
@@ -253,8 +257,10 @@ is divided into following sections:
253 257
             <attribute default="${excludes}" name="excludes"/>
254 258
             <attribute default="**" name="testincludes"/>
255 259
             <sequential>
260
+                <delete dir="${test_profile_dir}"/>
256 261
                 <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" timeout="120000">
257 262
                     <classpath refid="plugins.libs"/>
263
+                    <env key="DMDIRC_HOME" value="${test_profile_dir}"/>
258 264
                     <batchtest todir="${build.test.results.dir}">
259 265
                         <fileset dir="${main.test.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
260 266
                             <filename name="@{testincludes}"/>
@@ -277,6 +283,7 @@ is divided into following sections:
277 283
                     <formatter type="xml"/>
278 284
                     <jvmarg line="${run.jvmargs}"/>
279 285
                 </junit>
286
+                <delete dir="${test_profile_dir}"/>
280 287
             </sequential>
281 288
         </macrodef>
282 289
     </target>

Загрузка…
Отмена
Сохранить