diff options
| author | Michael Cortez | 2009-08-06 11:22:10 -0700 |
|---|---|---|
| committer | Michael Cortez | 2009-08-06 11:22:10 -0700 |
| commit | 72e597bcbaba7317f806562a4df34a434ce0aa9d (patch) | |
| tree | c787e6b95529c82719503cb809cc0c60306cc67f /OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs | |
| parent | Merge branch 'master' into groups-core-contrib (diff) | |
| parent | Merge branch 'master' of git://opensimulator.org/git/opensim (diff) | |
| download | opensim-SC-72e597bcbaba7317f806562a4df34a434ce0aa9d.zip opensim-SC-72e597bcbaba7317f806562a4df34a434ce0aa9d.tar.gz opensim-SC-72e597bcbaba7317f806562a4df34a434ce0aa9d.tar.bz2 opensim-SC-72e597bcbaba7317f806562a4df34a434ce0aa9d.tar.xz | |
Merge branch 'master' into groups-core-contrib
Diffstat (limited to 'OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs')
| -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 | } |