From 5e9b09084557a5a80f838786eef7f37d3fa0e010 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 14 Aug 2017 15:13:32 -0700
Subject: Listed new testable dll in THIS file

---
 .nant/local.include | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to '.nant')

diff --git a/.nant/local.include b/.nant/local.include
index 5ff9644..7a1f1c6 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -145,7 +145,12 @@
   </exec>
   <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.services.inventoryservice.tests)==0}" /> 
 
-  <delete dir="%temp%"/>
+  <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.tests.permissions">
+    <arg value="./bin/OpenSim.Tests.Permissions.dll" />
+  </exec>
+  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests.permissions)==0}" /> 
+
+<delete dir="%temp%"/>
 </target>
 
 <target name="test-stress" depends="build, find-nunit">
@@ -271,6 +276,7 @@
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.data.tests)==0}" /> 
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.capabilities.handlers.tests)==0}" /> 
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.services.inventoryservice.tests)==0}" /> 
+ <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests.permissions)==0}" /> 
 </target>
 
 <target name="doxygen">
-- 
cgit v1.1


From ea448d9d6b7c2fdae91b23e440c9c0c3b3fff552 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 14 Aug 2017 15:26:06 -0700
Subject: Forgot to add this too (nant auto tests)

---
 .nant/local.include | 5 +++++
 1 file changed, 5 insertions(+)

(limited to '.nant')

diff --git a/.nant/local.include b/.nant/local.include
index 7a1f1c6..2bc2be6 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -265,6 +265,11 @@
     <arg value="-xml=test-results/OpenSim.Services.InventoryService.Tests.dll-Results.xml" />
   </exec>
 
+ <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.tests.permissions">
+    <arg value="./bin/OpenSim.Tests.Permissions.dll" />
+    <arg value="-xml=test-results/OpenSim.Tests.Permissions.dll-Results.xml" />
+  </exec>
+
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests)==0}" /> 
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.tests)==0}" /> 
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.servers.tests)==0}" /> 
-- 
cgit v1.1


From 856d218f99e30868789f4f765f1113554d02155a Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 14 Aug 2017 15:58:42 -0700
Subject: Comment that test dll for now. It's making jenkins fail.

---
 .nant/local.include | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to '.nant')

diff --git a/.nant/local.include b/.nant/local.include
index 2bc2be6..c4a056c 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -145,11 +145,13 @@
   </exec>
   <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.services.inventoryservice.tests)==0}" /> 
 
+<!-- This uses SetUpFixture, which older versions of nant don't seem to understand, so commenting for now
   <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.tests.permissions">
     <arg value="./bin/OpenSim.Tests.Permissions.dll" />
   </exec>
   <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests.permissions)==0}" /> 
-
+-->
+  
 <delete dir="%temp%"/>
 </target>
 
@@ -265,11 +267,13 @@
     <arg value="-xml=test-results/OpenSim.Services.InventoryService.Tests.dll-Results.xml" />
   </exec>
 
+<!--
  <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.tests.permissions">
     <arg value="./bin/OpenSim.Tests.Permissions.dll" />
     <arg value="-xml=test-results/OpenSim.Tests.Permissions.dll-Results.xml" />
   </exec>
-
+-->
+  
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests)==0}" /> 
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.tests)==0}" /> 
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.servers.tests)==0}" /> 
@@ -281,7 +285,7 @@
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.data.tests)==0}" /> 
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.capabilities.handlers.tests)==0}" /> 
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.services.inventoryservice.tests)==0}" /> 
- <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests.permissions)==0}" /> 
+<!-- <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests.permissions)==0}" />  -->
 </target>
 
 <target name="doxygen">
-- 
cgit v1.1


From 40f4b30361d10db4ac35bcec5e172e8f6ae012c4 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 14 Aug 2017 16:33:21 -0700
Subject: Strengthen the tests for the possibility that SetUpFixture does not
 run in the beginning.

---
 .nant/local.include | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to '.nant')

diff --git a/.nant/local.include b/.nant/local.include
index c4a056c..be79d1c 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -145,12 +145,10 @@
   </exec>
   <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.services.inventoryservice.tests)==0}" /> 
 
-<!-- This uses SetUpFixture, which older versions of nant don't seem to understand, so commenting for now
   <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.tests.permissions">
     <arg value="./bin/OpenSim.Tests.Permissions.dll" />
   </exec>
   <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests.permissions)==0}" /> 
--->
   
 <delete dir="%temp%"/>
 </target>
@@ -267,12 +265,10 @@
     <arg value="-xml=test-results/OpenSim.Services.InventoryService.Tests.dll-Results.xml" />
   </exec>
 
-<!--
  <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.tests.permissions">
     <arg value="./bin/OpenSim.Tests.Permissions.dll" />
     <arg value="-xml=test-results/OpenSim.Tests.Permissions.dll-Results.xml" />
   </exec>
--->
   
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests)==0}" /> 
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.tests)==0}" /> 
@@ -285,7 +281,7 @@
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.data.tests)==0}" /> 
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.capabilities.handlers.tests)==0}" /> 
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.services.inventoryservice.tests)==0}" /> 
-<!-- <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests.permissions)==0}" />  -->
+ <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests.permissions)==0}" /> 
 </target>
 
 <target name="doxygen">
-- 
cgit v1.1