Skip to content

Commit 1aa9efd

Browse files
committed
ccnet#302 Cleanup since MSBuild can handle unit tests
1 parent 77f241d commit 1aa9efd

File tree

1 file changed

+1
-57
lines changed

1 file changed

+1
-57
lines changed

ccnet.build

Lines changed: 1 addition & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -209,66 +209,10 @@
209209
<target name="runNUnitTests" depends="build" description="Run the NUnit tests">
210210
<loadtasks assembly="${nauckit.nant.assembly}" />
211211

212-
<!-- Hack to copy all required files into the UnitTest dictionary until xbuild on Mono 2.5 is fixed -->
213-
<if test="${framework::get-family(nant.settings.currentframework) == 'mono'}">
214-
<copy todir ="${path::combine(build.dir, 'UnitTests')}" overwrite="true" verbose="${nant.verbosity}">
215-
<fileset basedir="${path::combine(build.dir, 'CCTray')}" failonempty="true">
216-
<include name="*/**" />
217-
</fileset>
218-
</copy>
219-
<copy todir ="${path::combine(build.dir, 'UnitTests')}" overwrite="true" verbose="${nant.verbosity}">
220-
<fileset basedir="${path::combine(build.dir, 'Core')}" failonempty="true">
221-
<include name="*/**" />
222-
</fileset>
223-
</copy>
224-
<copy todir ="${path::combine(build.dir, 'UnitTests')}" overwrite="true" verbose="${nant.verbosity}">
225-
<fileset basedir="${path::combine(build.dir, 'Objection')}" failonempty="true">
226-
<include name="*/**" />
227-
</fileset>
228-
</copy>
229-
<copy todir ="${path::combine(build.dir, 'UnitTests')}" overwrite="true" verbose="${nant.verbosity}">
230-
<fileset basedir="${path::combine(build.dir, 'Remote')}" failonempty="true">
231-
<include name="*/**" />
232-
</fileset>
233-
</copy>
234-
<copy todir ="${path::combine(build.dir, 'UnitTests')}" overwrite="true" verbose="${nant.verbosity}">
235-
<fileset basedir="${path::combine(build.dir, 'Server')}" failonempty="true">
236-
<include name="*/**" />
237-
</fileset>
238-
</copy>
239-
<copy todir ="${path::combine(build.dir, 'UnitTests')}" overwrite="true" verbose="${nant.verbosity}">
240-
<fileset basedir="${path::combine(build.dir, 'WebDashboard')}" failonempty="true">
241-
<include name="*/**" />
242-
</fileset>
243-
</copy>
244-
<copy todir ="${path::combine(build.dir, 'UnitTests')}" overwrite="true" verbose="${nant.verbosity}">
245-
<fileset basedir="${path::combine(src.dir, 'packages/NUnit.3.12.0/lib/net45')}" failonempty="true">
246-
<include name="nunit.framework.dll" />
247-
</fileset>
248-
</copy>
249-
<copy todir ="${path::combine(build.dir, 'UnitTests')}" overwrite="true" verbose="${nant.verbosity}">
250-
<fileset basedir="${tools.dir}" failonempty="true">
251-
<include name="sleeper.exe" />
252-
</fileset>
253-
</copy>
254-
<copy todir ="${path::combine(build.dir, 'UnitTests')}" overwrite="true" verbose="${nant.verbosity}">
255-
<fileset basedir="${src.dir}" failonempty="true">
256-
<include name="xsl/**" />
257-
</fileset>
258-
</copy>
259-
<copy todir ="${path::combine(build.dir, 'UnitTests')}" overwrite="true" verbose="${nant.verbosity}">
260-
<fileset basedir="${path::combine( path::combine(src.dir, 'UnitTests'), 'resources')}" failonempty="true">
261-
<include name="*/**" />
262-
</fileset>
263-
</copy>
264-
<copy file="${path::combine( path::combine(src.dir, 'UnitTests'), 'test.config')}" tofile="${path::combine( path::combine(build.dir, 'UnitTests'), 'ThoughtWorks.CruiseControl.UnitTests.dll.config')}" verbose="${nant.verbosity}" />
265-
</if>
266-
267212
<exec program="${nunit.executable}" >
268213
<arg value="${path::combine( path::combine(build.dir, 'UnitTests'), 'ThoughtWorks.CruiseControl.UnitTests.dll')}" />
269214
<arg value="--result=${path::combine(build.metrics.dir, 'nunit-result.xml')}" />
270-
<arg value="--where &quot;cat != Integration&quot;" />
271-
215+
<arg value="--where &quot;cat != Integration&quot;" />
272216
</exec>
273217
</target>
274218

0 commit comments

Comments
 (0)