Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim

5 files changed, 13 insertions, 13 deletions

diff --git a/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs
index f030531..0c2f5df 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs
@@ -41,8 +41,8 @@ namespace OpenSim.Data.SQLite.Tests
         [TestFixtureSetUp]
         public void Init()
         {
-            // SQLite doesn't work on power linux
-            if (Directory.Exists("/proc/ppc64"))
+            // SQLite doesn't work on power or z linux
+            if (Directory.Exists("/proc/ppc64") || Directory.Exists("/proc/dasd"))
             {
                 Assert.Ignore();
             }
@@ -61,4 +61,4 @@ namespace OpenSim.Data.SQLite.Tests
             File.Delete(file);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs
index 1249e76..30f6641 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs
@@ -41,8 +41,8 @@ namespace OpenSim.Data.SQLite.Tests
         [TestFixtureSetUp]
         public void Init()
         {
-            // SQLite doesn't work on power linux
-            if (Directory.Exists("/proc/ppc64"))
+            // SQLite doesn't work on power or z linux
+            if (Directory.Exists("/proc/ppc64") || Directory.Exists("/proc/dasd"))
             {
                 Assert.Ignore();
             }
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs
index 17fa86c..98458a3 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs
@@ -41,8 +41,8 @@ namespace OpenSim.Data.SQLite.Tests
         [TestFixtureSetUp]
         public void Init()
         {
-            // SQLite doesn't work on power linux
-            if (Directory.Exists("/proc/ppc64"))
+            // SQLite doesn't work on power or z linux
+            if (Directory.Exists("/proc/ppc64") || Directory.Exists("/proc/dasd"))
             {
                 Assert.Ignore();
             }
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs
index 7a75808..abb97cf 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs
@@ -41,8 +41,8 @@ namespace OpenSim.Data.SQLite.Tests
         [TestFixtureSetUp]
         public void Init()
         {
-            // SQLite doesn't work on power linux
-            if (Directory.Exists("/proc/ppc64"))
+            // SQLite doesn't work on power or z linux
+            if (Directory.Exists("/proc/ppc64") || Directory.Exists("/proc/dasd"))
             {
                 Assert.Ignore();
             }
@@ -61,4 +61,4 @@ namespace OpenSim.Data.SQLite.Tests
             File.Delete(file);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs
index 52dac39..c9953c5 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs
@@ -41,8 +41,8 @@ namespace OpenSim.Data.SQLite.Tests
         [TestFixtureSetUp]
         public void Init()
         {
-            // SQLite doesn't work on power linux
-            if (Directory.Exists("/proc/ppc64"))
+            // SQLite doesn't work on power or z linux
+            if (Directory.Exists("/proc/ppc64") || Directory.Exists("/proc/dasd"))
             {
                 Assert.Ignore();
             }
@@ -61,4 +61,4 @@ namespace OpenSim.Data.SQLite.Tests
             File.Delete(file);
         }
     }
-}
\ No newline at end of file
+}