Skip to content

Commit 0da57da

Browse files
sbohlensbohlen
committed
integrate new test project into build script
1 parent 2280762 commit 0da57da

File tree

3 files changed

+72
-33
lines changed

3 files changed

+72
-33
lines changed

‎Spring.build‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -540,6 +540,7 @@ Commandline Examples:
540540
<nant buildfile="test/Spring/Spring.Data.NHibernate3.Integration.Tests/Spring.Data.NHibernate3.Integration.Tests.build" target="test" if="${build-data}"/>
541541
<nant buildfile="test/Spring/Spring.Data.NHibernate4.Tests/Spring.Data.NHibernate4.Tests.build" target="test" if="${build-data}"/>
542542
<nant buildfile="test/Spring/Spring.Data.NHibernate4.Integration.Tests/Spring.Data.NHibernate4.Integration.Tests.build" target="test" if="${build-data}"/>
543+
<nant buildfile="test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests.build" target="test" if="${build-data and (nant.settings.currentframework == 'net-4.0' or nant.settings.currentframework == 'net-4.5' )}"/>
543544

544545
<nant buildfile="test/Spring/Spring.Services.Tests/Spring.Services.Tests.build" target="test" if="${build-services}"/>
545546
<nant buildfile="test/Spring/Spring.Web.Tests/Spring.Web.Tests.build" target="test" if="${build-web}"/>
@@ -904,6 +905,8 @@ Commandline Examples:
904905
<delete dir="test/Spring/Spring.Data.NHibernate4.Tests/bin" failonerror="false"/>
905906
<delete dir="test/Spring/Spring.Data.NHibernate4.Integration.Tests/obj" failonerror="false"/>
906907
<delete dir="test/Spring/Spring.Data.NHibernate4.Integration.Tests/bin" failonerror="false"/>
908+
<delete dir="test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/bin" failonerror="false"/>
909+
<delete dir="test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/bin" failonerror="false"/>
907910
<delete dir="test/Spring/Spring.Services.Tests/obj" failonerror="false"/>
908911
<delete dir="test/Spring/Spring.Services.Tests/bin" failonerror="false"/>
909912
<delete dir="test/Spring/Spring.Messaging.Nms.Tests/obj" failonerror="false"/>
@@ -1858,6 +1861,7 @@ Commandline Examples:
18581861
<include name="test/Spring/Spring.Data.NHibernate3.Integration.Tests/**"/>
18591862
<include name="test/Spring/Spring.Data.NHibernate4.Tests/**"/>
18601863
<include name="test/Spring/Spring.Data.NHibernate4.Integration.Tests/**"/>
1864+
<include name="test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/**"/>
18611865
<include name="test/Spring/Spring.Messaging.Tests/**"/>
18621866
<include name="test/Spring/Spring.Messaging.Nms.Tests/**"/>
18631867
<include name="test/Spring/Spring.Messaging.Nms.Integration.Tests/**"/>

‎test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,4 @@
11
using System.Reflection;
2-
using System.Runtime.CompilerServices;
3-
using System.Runtime.InteropServices;
42

5-
// General Information about an assembly is controlled through the following
6-
// set of attributes. Change these attribute values to modify the information
7-
// associated with an assembly.
83
[assembly: AssemblyTitle("Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests")]
9-
[assembly: AssemblyDescription("")]
10-
[assembly: AssemblyConfiguration("")]
11-
[assembly: AssemblyCompany("")]
12-
[assembly: AssemblyProduct("Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests")]
13-
[assembly: AssemblyCopyright("Copyright © 2015")]
14-
[assembly: AssemblyTrademark("")]
15-
[assembly: AssemblyCulture("")]
16-
17-
// Setting ComVisible to false makes the types in this assembly not visible
18-
// to COM components. If you need to access a type in this assembly from
19-
// COM, set the ComVisible attribute to true on that type.
20-
[assembly: ComVisible(false)]
21-
22-
// The following GUID is for the ID of the typelib if this project is exposed to COM
23-
[assembly: Guid("3f4ca2dc-e2e6-40cc-90d3-0fdda9912e50")]
24-
25-
// Version information for an assembly consists of the following four values:
26-
//
27-
// Major Version
28-
// Minor Version
29-
// Build Number
30-
// Revision
31-
//
32-
// You can specify all the values or you can default the Build and Revision Numbers
33-
// by using the '*' as shown below:
34-
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.0.0.0")]
36-
[assembly: AssemblyFileVersion("1.0.0.0")]
4+
[assembly: AssemblyDescription("Integration tests for HibernteTxScopeTransactionManager suspension of transactions")]

‎test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests.build‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<?xml version="1.0" ?>
2+
<project name="Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests" default="test" xmlns="http://nant.sf.net/schemas/nant.xsd">
3+
<!--
4+
Required properties:
5+
* current.bin.dir - (path) root level to build to
6+
* current.build.debug - (true|false) debug build?
7+
* current.build.defines.csc - framework-specific build defines for C# compiler
8+
-->
9+
10+
<include buildfile="${spring.basedir}/common-project.include" />
11+
12+
<target name="build">
13+
14+
<!-- build Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests -->
15+
<csc target="library" define="${current.build.defines.csc}"
16+
warnaserror="true"
17+
optimize="${build.optimize}"
18+
debug="${current.build.debug}"
19+
output="${current.bin.dir}/${project::get-name()}.dll"
20+
doc="${current.bin.dir}/${project::get-name()}.xml"
21+
nostdlib="true"
22+
noconfig="true"
23+
>
24+
<nowarn>
25+
<warning number="${nowarn.numbers.test}" />
26+
</nowarn>
27+
<sources failonempty="true">
28+
<include name="**/*.cs" />
29+
<include name="../CommonAssemblyInfo.cs" />
30+
</sources>
31+
<references>
32+
<lib>
33+
<include name="${nh4.lib.dir}"/>
34+
<include name="${iesi4.lib.dir}"/>
35+
</lib>
36+
<include name="mscorlib.dll"/>
37+
<include name="Microsoft.CSharp.dll"/>
38+
<include name="System.dll"/>
39+
<include name="System.Core.dll"/>
40+
<include name="System.Data.dll" />
41+
<include name="System.EnterpriseServices.dll" />
42+
<include name="${current.bin.dir}/*.dll" />
43+
<exclude name="${current.bin.dir}/${project::get-name()}.dll" />
44+
<exclude name="${current.bin.dir}/Spring.Data.NHibernate3*.dll" />
45+
<exclude name="${current.bin.dir}/Spring.Data.NHibernate*Tests*.dll" />
46+
<exclude name="${current.bin.dir}/CloverRuntime.dll" />
47+
</references>
48+
<resources prefix="Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests" dynamicprefix="true" failonempty="true">
49+
<include name="**/*.xml" />
50+
</resources>
51+
</csc>
52+
53+
<!--<copy file="${project::get-base-directory()}/${project::get-name()}.dll.config"
54+
tofile="${current.bin.dir}/${project::get-name()}.dll.config"/> -->
55+
56+
<copy file="${project::get-base-directory()}/app.config"
57+
tofile="${current.bin.dir}/${project::get-name()}.dll.config"/>
58+
59+
60+
</target>
61+
62+
<target name="test" depends="build">
63+
<!-- property name="test.assemblyname" value="${project::get-name()}" / -->
64+
<call target="common.run-tests" />
65+
</target>
66+
67+
</project>

0 commit comments

Comments
 (0)