aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorSean Dague2009-05-27 12:53:29 +0000
committerSean Dague2009-05-27 12:53:29 +0000
commit85e91ddb67cd1f158d0e4e4b153f7472eb0ae86c (patch)
tree2964c8f7961ceb18270918b85bdc8b968cdc34f0
parentthe new Tests were defined before the Tests.Common dll in prebuild, (diff)
downloadopensim-SC_OLD-85e91ddb67cd1f158d0e4e4b153f7472eb0ae86c.zip
opensim-SC_OLD-85e91ddb67cd1f158d0e4e4b153f7472eb0ae86c.tar.gz
opensim-SC_OLD-85e91ddb67cd1f158d0e4e4b153f7472eb0ae86c.tar.bz2
opensim-SC_OLD-85e91ddb67cd1f158d0e4e4b153f7472eb0ae86c.tar.xz
Revert "* Added IntegrationTest Attribute and tagged the ODETestClass"
This reverts commit 8f0096cc7b112fea8f69f391224911f624482747. To get us back to compiling on fresh checkouts.
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODETestClass.cs3
-rw-r--r--OpenSim/Tests/Common/IntegrationTestAttribute.cs17
-rw-r--r--prebuild.xml1
3 files changed, 1 insertions, 20 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODETestClass.cs b/OpenSim/Region/Physics/OdePlugin/ODETestClass.cs
index a269d31..6ee23db 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODETestClass.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODETestClass.cs
@@ -33,11 +33,10 @@ using OpenSim.Framework;
33using OpenSim.Region.Physics.Manager; 33using OpenSim.Region.Physics.Manager;
34using log4net; 34using log4net;
35using System.Reflection; 35using System.Reflection;
36using OpenSim.Tests.Common;
37 36
38namespace OpenSim.Region.Physics.OdePlugin 37namespace OpenSim.Region.Physics.OdePlugin
39{ 38{
40 [IntegrationTest] 39 [TestFixture]
41 public class ODETestClass 40 public class ODETestClass
42 { 41 {
43 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 42 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
diff --git a/OpenSim/Tests/Common/IntegrationTestAttribute.cs b/OpenSim/Tests/Common/IntegrationTestAttribute.cs
deleted file mode 100644
index c721710..0000000
--- a/OpenSim/Tests/Common/IntegrationTestAttribute.cs
+++ /dev/null
@@ -1,17 +0,0 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4
5namespace OpenSim.Tests.Common
6{
7 [AttributeUsage(AttributeTargets.All,
8 AllowMultiple = false,
9 Inherited = true)]
10 public class IntegrationTestAttribute : LongRunningAttribute
11 {
12 public IntegrationTestAttribute()
13 : base("Integration")
14 {
15 }
16 }
17}
diff --git a/prebuild.xml b/prebuild.xml
index 854185f..884d4ed 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -502,7 +502,6 @@
502 <Reference name="OpenSim.Region.Physics.Manager"/> 502 <Reference name="OpenSim.Region.Physics.Manager"/>
503 <Reference name="Ode.NET.dll" /> 503 <Reference name="Ode.NET.dll" />
504 <Reference name="nunit.framework.dll" /> 504 <Reference name="nunit.framework.dll" />
505 <Reference name="OpenSim.Tests.Common"/>
506 <Reference name="log4net.dll"/> 505 <Reference name="log4net.dll"/>
507 506
508 <Files> 507 <Files>