diff options
author | Melanie | 2009-08-06 21:20:57 +0100 |
---|---|---|
committer | Melanie | 2009-08-06 21:20:57 +0100 |
commit | eb9d584ee0bb95a9fe403516f5f8ef3c2ae8a52e (patch) | |
tree | a5b3d1ab68f5b9974cfed174c96f25cd710b542e /OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs | |
parent | Add the addon modules folder (diff) | |
parent | goose panda (diff) | |
download | opensim-SC_OLD-eb9d584ee0bb95a9fe403516f5f8ef3c2ae8a52e.zip opensim-SC_OLD-eb9d584ee0bb95a9fe403516f5f8ef3c2ae8a52e.tar.gz opensim-SC_OLD-eb9d584ee0bb95a9fe403516f5f8ef3c2ae8a52e.tar.bz2 opensim-SC_OLD-eb9d584ee0bb95a9fe403516f5f8ef3c2ae8a52e.tar.xz |
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs | 4 |
1 files changed, 2 insertions, 2 deletions
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 | |||
41 | [TestFixtureSetUp] | 41 | [TestFixtureSetUp] |
42 | public void Init() | 42 | public void Init() |
43 | { | 43 | { |
44 | // SQLite doesn't work on power linux | 44 | // SQLite doesn't work on power or z linux |
45 | if (Directory.Exists("/proc/ppc64")) | 45 | if (Directory.Exists("/proc/ppc64") || Directory.Exists("/proc/dasd")) |
46 | { | 46 | { |
47 | Assert.Ignore(); | 47 | Assert.Ignore(); |
48 | } | 48 | } |