Project

General

Profile

« Previous | Next » 

Revision 1116

Added by Jing Tao over 22 years ago

Change directories setting for junit test and junit nettest.

View differences:

build.xml
147 147
      <filter token="debuglevel" value="${debuglevel}" />
148 148
      <filter token="datafilepath" value="${datafilepath}" />
149 149
      <property name="srcdir" value="./src" />
150
      <property name="junittestsdir" value="./junittests" />
151
      <property name="junitnettestsdir" value="./junitnettests" />
150
      <property name="junittestsdir" value="./test/edu/ucsb/nceas/metacattest" />
151
      <property name="junitnettestsdir" value="./test/edu/ucsb/nceas/metacatnettest" />
152 152
      <property name="build.dir" value="./build"/>
153 153
      <property name="build.src" value="${build.dir}/src"/>
154 154
      <property name="build.dest" value="${build.dir}/classes"/>
155 155
      <property name="build.docs" value="${build.dir}/docs"/>
156 156
      <property name="build.samples" value="${build.dir}/samples"/>
157 157
      <property name="build.tests" value="${build.dir}/tests"/>
158
      <property name="build.junittests" value="${build.dir}/junittests"/>
159
      <property name="build.junitnettests" value="${build.dir}/junitnettests"/>
158
      <property name="build.metacattest" value="${build.tests}/metacattest"/>
159
      <property name="build.metacatnettest" value="${build.tests}/metacatnettest"/>
160 160
      <property name="build.data" value="${build.dir}/data"/>
161 161
      <property name="build.javadocs" value="${build.dir}/docs/api"/>
162 162
      <property name="build.img" value="${installdir}/${image-path}"/>
......
284 284
   
285 285
   <target name="test" depends="install">
286 286
      <!-- copy and compile the tests into a jar file -->
287
      <mkdir dir="${build.junittests}"/>
287
      <mkdir dir="${build.metacattest}"/>
288 288
      <javac srcdir="${junittestsdir}"
289
             destdir="${build.junittests}"
289
             destdir="${build.metacattest}"
290 290
             classpath="${cpath}:${build.dir}/${name}.jar"
291 291
	     includes="**/*.java" />
292 292

  
293 293
      <jar jarfile="${build.dir}/${name}-junittests.jar" 
294
		    basedir="${build.junittests}"
294
		    basedir="${build.metacattest}"
295 295
          	    includes="**/*.class" />
296 296

  
297 297
      <!-- use the ant "junit" task to run JUnit tests. -->
......
304 304
        <formatter type="plain" />
305 305

  
306 306
        <batchtest fork="yes" todir="${build.dir}">
307
          <fileset dir="${junittestsdir}">
308
            <include name="**/*.java" />
307
          <fileset dir="${build.metacattest}">
308
            <include name="**/*.class" />
309 309
          </fileset>
310 310
        </batchtest>
311 311
     </junit>
......
326 326
	    ***********************************
327 327
      </echo>
328 328
      <!-- copy and compile the tests into a jar file -->
329
      <mkdir dir="${build.junitnettests}"/>
329
      <mkdir dir="${build.metacatnettest}"/>
330 330
      <javac srcdir="${junitnettestsdir}"
331
             destdir="${build.junitnettests}"
331
             destdir="${build.metacatnettest}"
332 332
             classpath="${cpath}:${build.dir}/${name}.jar:${httpclient}"
333 333
             includes="**/*.java" />
334 334

  
335 335
      <jar jarfile="${build.dir}/${name}-junitnettests.jar"
336
                    basedir="${build.junitnettests}"
336
                    basedir="${build.metacatnettest}"
337 337
                    includes="**/*.class" />
338 338

  
339 339
      <!-- use the ant "junit" task to run JUnit tests. -->
......
347 347
        <formatter type="plain" />
348 348

  
349 349
        <batchtest fork="yes" todir="${build.dir}">
350
          <fileset dir="${junitnettestsdir}">
351
            <include name="**/*.java" />
350
          <fileset dir="${build.metacatnettest}">
351
            <include name="**/*.class" />
352 352
          </fileset>
353 353
        </batchtest>
354 354
     </junit>

Also available in: Unified diff