diff options
| author | Lluis Sanchez <lluis@xamarin.com> | 2013-07-30 18:57:22 +0400 |
|---|---|---|
| committer | Lluis Sanchez <lluis@xamarin.com> | 2013-07-30 18:57:22 +0400 |
| commit | 75930077ddb4cba97e0177d972b61b748502f091 (patch) | |
| tree | 20340f53029b531ab5bad93f8cc94e7f52209e2e /Testing | |
| parent | 6249a432bfdde0be9cd137c9cee29756d611d924 (diff) | |
[Tests] Don't add the test assembly if it has already been provided
Diffstat (limited to 'Testing')
| -rw-r--r-- | Testing/GtkTestRunner.csproj | 1 | ||||
| -rw-r--r-- | Testing/GtkTestRunner/Main.cs | 4 | ||||
| -rw-r--r-- | Testing/MacTestRunner/Main.cs | 5 |
3 files changed, 8 insertions, 2 deletions
diff --git a/Testing/GtkTestRunner.csproj b/Testing/GtkTestRunner.csproj index ecc15fe4..7983b3bc 100644 --- a/Testing/GtkTestRunner.csproj +++ b/Testing/GtkTestRunner.csproj @@ -55,6 +55,7 @@ <Reference Include="nunit.util"> <HintPath>libs\nunit.util.dll</HintPath> </Reference> + <Reference Include="System.Core" /> </ItemGroup> <ItemGroup> <Compile Include="GtkTestRunner\Main.cs" /> diff --git a/Testing/GtkTestRunner/Main.cs b/Testing/GtkTestRunner/Main.cs index 67e04bb5..d17a48d0 100644 --- a/Testing/GtkTestRunner/Main.cs +++ b/Testing/GtkTestRunner/Main.cs @@ -24,6 +24,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. using System; +using System.Linq; using Xwt; using System.Collections.Generic; using System.Threading; @@ -41,7 +42,8 @@ namespace GtkTestRunner list.Add ("-domain=None"); list.Add ("-noshadow"); list.Add ("-nothread"); - list.Add (typeof (MainClass).Assembly.Location); + if (!list.Contains (typeof (MainClass).Assembly.Location)) + list.Add (typeof (MainClass).Assembly.Location); NUnit.ConsoleRunner.Runner.Main (list.ToArray ()); ReferenceImageManager.ShowImageVerifier (); } diff --git a/Testing/MacTestRunner/Main.cs b/Testing/MacTestRunner/Main.cs index f2be6bfb..95a56f50 100644 --- a/Testing/MacTestRunner/Main.cs +++ b/Testing/MacTestRunner/Main.cs @@ -2,6 +2,7 @@ using System; using Xwt; using System.IO; using System.Collections.Generic; +using System.Linq; namespace MacTest { @@ -12,10 +13,12 @@ namespace MacTest Xwt.Application.Initialize (Xwt.ToolkitType.Cocoa); ReferenceImageManager.Init ("MacTestRunner"); - var list = new List<string> (args); + var list = new List<string> (); list.Add ("-domain=None"); list.Add ("-noshadow"); list.Add ("-nothread"); + if (!list.Contains (typeof (MainClass).Assembly.Location)) + list.Add (typeof (MainClass).Assembly.Location); NUnit.ConsoleRunner.Runner.Main (list.ToArray ()); ReferenceImageManager.ShowImageVerifier (); } |