[tomboy] Support building Hyena.Json unit tests when mono-nunit available.



commit beec2a7fc89a0412f3a2b1940cbecd3da73a2736
Author: Sandy Armstrong <sanfordarmstrong gmail com>
Date:   Sun May 17 07:23:59 2009 -0700

    Support building Hyena.Json unit tests when mono-nunit available.
---
 Tomboy.mdp                                         |    1 +
 .../Hyena.Json/Tests/DeserializerTests.cs          |    2 +-
 .../Hyena.Json/Tests/TokenizerTests.cs             |    2 +-
 Tomboy/Addins/WebSyncService/Makefile.am           |   18 ++++++++++++------
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/Tomboy.mdp b/Tomboy.mdp
index c043990..f7bcef5 100644
--- a/Tomboy.mdp
+++ b/Tomboy.mdp
@@ -173,6 +173,7 @@
     <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
     <ProjectReference type="Gac" localcopy="True" refto="pango-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="Mono.Cairo, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
+    <ProjectReference type="Gac" localcopy="True" refto="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77" />
   </References>
   <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" ExecuteTargetName="run">
     <BuildFilesVar />
diff --git a/Tomboy/Addins/WebSyncService/Hyena.Json/Tests/DeserializerTests.cs b/Tomboy/Addins/WebSyncService/Hyena.Json/Tests/DeserializerTests.cs
index e5c9927..e699ebd 100644
--- a/Tomboy/Addins/WebSyncService/Hyena.Json/Tests/DeserializerTests.cs
+++ b/Tomboy/Addins/WebSyncService/Hyena.Json/Tests/DeserializerTests.cs
@@ -37,7 +37,7 @@ using Hyena.Json;
 namespace Hyena.Json.Tests
 {
     [TestFixture]
-    public class DeserializerTests : Hyena.Tests.TestBase
+    public class DeserializerTests
     {
         private Deserializer deserializer;
         
diff --git a/Tomboy/Addins/WebSyncService/Hyena.Json/Tests/TokenizerTests.cs b/Tomboy/Addins/WebSyncService/Hyena.Json/Tests/TokenizerTests.cs
index 696fa95..1ebf328 100644
--- a/Tomboy/Addins/WebSyncService/Hyena.Json/Tests/TokenizerTests.cs
+++ b/Tomboy/Addins/WebSyncService/Hyena.Json/Tests/TokenizerTests.cs
@@ -37,7 +37,7 @@ using Hyena.Json;
 namespace Hyena.Json.Tests
 {
     [TestFixture]
-    public class TokenizerTests : Hyena.Tests.TestBase
+    public class TokenizerTests
     {
         private Tokenizer tokenizer;
         
diff --git a/Tomboy/Addins/WebSyncService/Makefile.am b/Tomboy/Addins/WebSyncService/Makefile.am
index e14ddec..0357fd6 100644
--- a/Tomboy/Addins/WebSyncService/Makefile.am
+++ b/Tomboy/Addins/WebSyncService/Makefile.am
@@ -1,14 +1,20 @@
 include $(top_srcdir)/Makefile.include
 
-CSFLAGS = 		\
-	-debug 		\
-	-define:DEBUG 	\
-	-target:library
+if HAVE_NUNIT
+    TEST_FLAGS = -define:ENABLE_TESTS
+endif
 
-ASSEMBLIES = 					\
+CSFLAGS = \
+	-debug			\
+	-define:DEBUG	\
+	-target:library	\
+	$(TEST_FLAGS)
+
+ASSEMBLIES = \
 	$(LINK_TOMBOY_EXE)			\
-	$(GTKSHARP_LIBS) 				\
+	$(GTKSHARP_LIBS)			\
 	$(LINK_MONO_ADDINS)			\
+	$(NUNIT_LIBS)				\
 	-r:Mono.Posix
 
 #



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]