diff options
author | Sean Dague | 2009-05-27 12:53:29 +0000 |
---|---|---|
committer | Sean Dague | 2009-05-27 12:53:29 +0000 |
commit | 85e91ddb67cd1f158d0e4e4b153f7472eb0ae86c (patch) | |
tree | 2964c8f7961ceb18270918b85bdc8b968cdc34f0 | |
parent | the new Tests were defined before the Tests.Common dll in prebuild, (diff) | |
download | opensim-SC-85e91ddb67cd1f158d0e4e4b153f7472eb0ae86c.zip opensim-SC-85e91ddb67cd1f158d0e4e4b153f7472eb0ae86c.tar.gz opensim-SC-85e91ddb67cd1f158d0e4e4b153f7472eb0ae86c.tar.bz2 opensim-SC-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.cs | 3 | ||||
-rw-r--r-- | OpenSim/Tests/Common/IntegrationTestAttribute.cs | 17 | ||||
-rw-r--r-- | prebuild.xml | 1 |
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; | |||
33 | using OpenSim.Region.Physics.Manager; | 33 | using OpenSim.Region.Physics.Manager; |
34 | using log4net; | 34 | using log4net; |
35 | using System.Reflection; | 35 | using System.Reflection; |
36 | using OpenSim.Tests.Common; | ||
37 | 36 | ||
38 | namespace OpenSim.Region.Physics.OdePlugin | 37 | namespace 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 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | |||
5 | namespace 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> |