Getting android to build

This commit is contained in:
Lars Brubaker 2016-09-28 10:24:11 -07:00
parent cfe2ad7493
commit c16cede87a
3 changed files with 8 additions and 1 deletions

@ -1 +1 @@
Subproject commit f5527750c618e301aec536be6f3e5b7b05ad7bdf
Subproject commit f6ce2512c92e83136d5eaf06188a09a6214822b6

View file

@ -2,7 +2,9 @@
using MatterHackers.Agg.UI.Tests;
using MatterHackers.GuiAutomation;
using MatterHackers.MatterControl;
#if !__ANDROID__
using MatterHackers.MatterControl.Tests.Automation;
#endif
using NUnit.Framework;
using System;
using System.Collections.Generic;
@ -102,6 +104,7 @@ namespace MatterControl.Tests
Console.WriteLine(referencedItems);
}
#if !__ANDROID__
[Test, RequiresSTA, RunInApplicationDomain]
public void MatterControlRuns()
{
@ -120,6 +123,7 @@ namespace MatterControl.Tests
AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun, maxTimeToRun: 200);
Assert.IsTrue(testHarness.AllTestsPassed(1));
}
#endif
[Test, Category("ReleaseQuality")]
public void MatterControlDependenciesAreOptimized()

View file

@ -28,7 +28,10 @@ either expressed or implied, of the FreeBSD Project.
*/
using MatterHackers.Agg.PlatformAbstract;
using MatterHackers.MatterSlice.Tests;
#if !__ANDROID__
using MatterHackers.MatterControl.Tests.Automation;
#endif
using MatterHackers.PolygonMesh;
using MatterHackers.PolygonMesh.Processors;
using MatterHackers.VectorMath;