Skip to content

Commit 1748588

Browse files
trnljyemin
authored andcommitted
Removed test-artifact tasks and added test-nodeps to run on jenkins
1 parent 33e3eb2 commit 1748588

File tree

1 file changed

+2
-36
lines changed

1 file changed

+2
-36
lines changed

build.xml

Lines changed: 2 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,6 @@ limitations under the License.
6060
<pathelement path="${build.main.dir}" />
6161
<pathelement path="${build.test.dir}" />
6262
</path>
63-
<path id="artifact.classpath">
64-
<pathelement path="${build.test.dir}" />
65-
<pathelement location="lib/testng-6.3.1.jar"/>
66-
<pathelement location="${artifact.name}"/>
67-
</path>
6863

6964
<!-- ******************************************************************* -->
7065
<!-- Tasks definition -->
@@ -289,8 +284,9 @@ limitations under the License.
289284
</javac>
290285
</target>
291286

292-
<target name="test" depends="test-compile">
287+
<target name="test" depends="test-compile, test-nodeps"/>
293288

289+
<target name="test-nodeps">
294290
<testng classpathref="${test.classpath}" outputdir="${test.dir}" listeners="com.mongodb.util.TestNGListener" haltonfailure="false" verbose="1" >
295291
<jvmarg value="-Xmx512M" />
296292
<jvmarg value="-ea" />
@@ -300,36 +296,6 @@ limitations under the License.
300296
</testng>
301297
</target>
302298

303-
<target name="test-artifact-compile" depends="init">
304-
<property name="myclasspath" refid="artifact.classpath"/>
305-
<!-- Emit the property to the ant console -->
306-
<echo message="Classpath = ${myclasspath}"/>
307-
308-
<javac
309-
srcdir="src/test"
310-
destdir="${build.test.dir}"
311-
optimize="off"
312-
deprecation="off"
313-
source="${build.conf.javac.source}"
314-
encoding="ISO-8859-1"
315-
fork="true"
316-
debug="on"
317-
includeantruntime="false">
318-
<classpath refid="artifact.classpath"/>
319-
<compilerarg value="-Xlint:all,-rawtypes"/>
320-
</javac>
321-
</target>
322-
323-
<target name="test-artifact" depends="test-artifact-compile">
324-
325-
<testng classpathref="artifact.classpath" outputdir="${test.dir}" listeners="com.mongodb.util.TestNGListener" haltonfailure="false" verbose="1" >
326-
<jvmarg value="-Xmx512M" />
327-
<jvmarg value="-ea" />
328-
<jvmarg value="-Dcom.mongodb.slaveAcceptableLatencyMS=${test.com.mongodb.slaveAcceptableLatencyMS}"/>
329-
<classfileset dir="${build.test.dir}" includes="**/${test.classes}.class" />
330-
</testng>
331-
</target>
332-
333299
<!-- ******************************************************************* -->
334300
<!-- The coverage targets -->
335301
<!-- ******************************************************************* -->

0 commit comments

Comments
 (0)