[Nhibernate-commit] SF.net SVN: nhibernate:[4550] trunk/nhibernate

[<te...@us...>]

Revision: 4550
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4550&view=rev
Author:   tehlike
Date:     2009-07-01 13:46:24 +0000 (Wed, 01 Jul 2009)

Log Message:
-----------
Changes to build files to produce xml outputs for tests.

Modified Paths:
--------------
    trunk/nhibernate/build-common/common-project.xml
    trunk/nhibernate/build-common/common.xml
    trunk/nhibernate/default.build
    trunk/nhibernate/teamcity.build

Modified: trunk/nhibernate/build-common/common-project.xml
===================================================================
--- trunk/nhibernate/build-common/common-project.xml	2009-06-30 17:32:16 UTC (rev 4549)
+++ trunk/nhibernate/build-common/common-project.xml	2009-07-01 13:46:24 UTC (rev 4550)
@@ -222,8 +222,9 @@
 
 	<target name="common.run-tests"
 		description="Run NUnit tests">
-		<exec program="${root.dir}/Tools/nunit/nunit-console-x86.exe">
-			<arg line="${bin.dir}/${project::get-name()}.dll" />
+		<call target="common.find-nunit" unless="${property::exists('nunit.found')}" />
+		<exec program="${nunit-console}">
+			<arg line="${bin.dir}/${project::get-name()}.dll /xml:${testresults.dir}/${project::get-name()}.dll-results.xml " />
 		</exec>
 
 		<!--<nunit2>

Modified: trunk/nhibernate/build-common/common.xml
===================================================================
--- trunk/nhibernate/build-common/common.xml	2009-06-30 17:32:16 UTC (rev 4549)
+++ trunk/nhibernate/build-common/common.xml	2009-07-01 13:46:24 UTC (rev 4550)
@@ -174,8 +174,12 @@
 		<property name="build.root.dir" value="${root.dir}/build/${build.name}" />
 		<property name="build.dir" value="${build.root.dir}" />
 		<property name="bin.dir" value="${build.dir}/bin/${nant.settings.currentframework}" dynamic="true" />
+		<property name="testresults.dir" 	value="${bin.dir}/test-results" />
+		<property name="tools.dir" value="${root.dir}/Tools"/>
 	</target>
+	
 
+
 	<target name="set-framework-configuration">
 		<if test="${not(target::exists('set-'+framework::get-target-framework()+'-framework-configuration'))}">
 			<fail message="The '${framework::get-target-framework()}' framework is not supported by this version of NHibernate." />
@@ -242,5 +246,9 @@
 		</fileset>
 		<resourcefileset id="project.resources" />
 	</target>
+	
+	<target name="common.find-nunit">
+		<property name="nunit-console" value="${tools.dir}/NUnit/nunit-console-x86.exe" />
+	</target>
 
 </project>

Modified: trunk/nhibernate/default.build
===================================================================
--- trunk/nhibernate/default.build	2009-06-30 17:32:16 UTC (rev 4549)
+++ trunk/nhibernate/default.build	2009-07-01 13:46:24 UTC (rev 4550)
@@ -47,6 +47,7 @@
 
 	<target name="prepare-build-directory" depends="init">
 		<mkdir dir="${bin.dir}" />
+		<mkdir dir="${testresults.dir}" />
 		<call target="copy-referenced-assemblies" />
 	</target>
 

Modified: trunk/nhibernate/teamcity.build
===================================================================
--- trunk/nhibernate/teamcity.build	2009-06-30 17:32:16 UTC (rev 4549)
+++ trunk/nhibernate/teamcity.build	2009-07-01 13:46:24 UTC (rev 4550)
@@ -2,10 +2,9 @@
 <project name="NHibernate TeamCity Build" xmlns="http://nant.sf.net/release/0.85-rc3/nant.xsd" default="clean-configure-test">
 	<property name="root.dir" value="." />
 	<include buildfile="${root.dir}/default.build" />
-	<!--
 	<if test="${not property::exists('CCNetLabel') and not property::exists('build.number')}">
 		<fail>This build file is for use with CruiseControl.NET or TeamCity</fail>
-	</if>-->
+	</if>
 	
 	<property name="build.number" value="${CCNetLabel}" if="${property::exists('CCNetLabel')}" />
 
@@ -13,8 +12,6 @@
 
 	</target>
 	<target name="copy-teamcity-configuration">
-		<copy file="${teamcity.dotnet.nunitaddin}-2.5.0.dll" todir="${root.dir}/Tools/nunit/addins" />
-		<copy file="${teamcity.dotnet.nunitaddin}-2.5.0.pdb" todir="${root.dir}/Tools/nunit/addins" />
 		<copy file="build-common/teamcity-hibernate.cfg.xml" tofile="${bin.dir}/hibernate.cfg.xml"  />
 	</target>
 </project>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.