Merge branch 'master' into groups-core-contrib
commit
72e597bcba
|
@ -41,8 +41,8 @@ namespace OpenSim.Data.SQLite.Tests
|
||||||
[TestFixtureSetUp]
|
[TestFixtureSetUp]
|
||||||
public void Init()
|
public void Init()
|
||||||
{
|
{
|
||||||
// SQLite doesn't work on power linux
|
// SQLite doesn't work on power or z linux
|
||||||
if (Directory.Exists("/proc/ppc64"))
|
if (Directory.Exists("/proc/ppc64") || Directory.Exists("/proc/dasd"))
|
||||||
{
|
{
|
||||||
Assert.Ignore();
|
Assert.Ignore();
|
||||||
}
|
}
|
||||||
|
@ -61,4 +61,4 @@ namespace OpenSim.Data.SQLite.Tests
|
||||||
File.Delete(file);
|
File.Delete(file);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -41,8 +41,8 @@ namespace OpenSim.Data.SQLite.Tests
|
||||||
[TestFixtureSetUp]
|
[TestFixtureSetUp]
|
||||||
public void Init()
|
public void Init()
|
||||||
{
|
{
|
||||||
// SQLite doesn't work on power linux
|
// SQLite doesn't work on power or z linux
|
||||||
if (Directory.Exists("/proc/ppc64"))
|
if (Directory.Exists("/proc/ppc64") || Directory.Exists("/proc/dasd"))
|
||||||
{
|
{
|
||||||
Assert.Ignore();
|
Assert.Ignore();
|
||||||
}
|
}
|
||||||
|
|
|
@ -41,8 +41,8 @@ namespace OpenSim.Data.SQLite.Tests
|
||||||
[TestFixtureSetUp]
|
[TestFixtureSetUp]
|
||||||
public void Init()
|
public void Init()
|
||||||
{
|
{
|
||||||
// SQLite doesn't work on power linux
|
// SQLite doesn't work on power or z linux
|
||||||
if (Directory.Exists("/proc/ppc64"))
|
if (Directory.Exists("/proc/ppc64") || Directory.Exists("/proc/dasd"))
|
||||||
{
|
{
|
||||||
Assert.Ignore();
|
Assert.Ignore();
|
||||||
}
|
}
|
||||||
|
|
|
@ -41,8 +41,8 @@ namespace OpenSim.Data.SQLite.Tests
|
||||||
[TestFixtureSetUp]
|
[TestFixtureSetUp]
|
||||||
public void Init()
|
public void Init()
|
||||||
{
|
{
|
||||||
// SQLite doesn't work on power linux
|
// SQLite doesn't work on power or z linux
|
||||||
if (Directory.Exists("/proc/ppc64"))
|
if (Directory.Exists("/proc/ppc64") || Directory.Exists("/proc/dasd"))
|
||||||
{
|
{
|
||||||
Assert.Ignore();
|
Assert.Ignore();
|
||||||
}
|
}
|
||||||
|
@ -61,4 +61,4 @@ namespace OpenSim.Data.SQLite.Tests
|
||||||
File.Delete(file);
|
File.Delete(file);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -41,8 +41,8 @@ namespace OpenSim.Data.SQLite.Tests
|
||||||
[TestFixtureSetUp]
|
[TestFixtureSetUp]
|
||||||
public void Init()
|
public void Init()
|
||||||
{
|
{
|
||||||
// SQLite doesn't work on power linux
|
// SQLite doesn't work on power or z linux
|
||||||
if (Directory.Exists("/proc/ppc64"))
|
if (Directory.Exists("/proc/ppc64") || Directory.Exists("/proc/dasd"))
|
||||||
{
|
{
|
||||||
Assert.Ignore();
|
Assert.Ignore();
|
||||||
}
|
}
|
||||||
|
@ -61,4 +61,4 @@ namespace OpenSim.Data.SQLite.Tests
|
||||||
File.Delete(file);
|
File.Delete(file);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue