Browse Source

Fixed output filenames

Xanathar 10 years ago
parent
commit
cd8d1444c3

+ 8 - 1
src/MoonSharp.Interpreter.Tests/TestRunner.cs

@@ -43,6 +43,13 @@ namespace MoonSharp.Interpreter.Tests
 		}
 		}
 
 
 		public void Test(string whichTest = null)
 		public void Test(string whichTest = null)
+		{
+			foreach (TestResult tr in IterateOnTests(whichTest))
+				loggerAction(tr);
+		}
+
+
+		public IEnumerable<TestResult> IterateOnTests(string whichTest = null)
 		{
 		{
 			int ok = 0;
 			int ok = 0;
 			int fail = 0;
 			int fail = 0;
@@ -72,7 +79,7 @@ namespace MoonSharp.Interpreter.Tests
 						++total;
 						++total;
 					}
 					}
 
 
-					loggerAction(tr);
+					yield return tr;
 				}
 				}
 			}
 			}
 
 

+ 2 - 2
src/MoonSharp.Interpreter.Tests/_Projects/MoonSharp.Interpreter.Tests.Embeddable.portable40/MoonSharp.Interpreter.Tests.Embeddable.portable40.csproj

@@ -8,8 +8,8 @@
     <ProjectGuid>{28B8B747-5683-46C0-B308-62E6D3C2F4CB}</ProjectGuid>
     <ProjectGuid>{28B8B747-5683-46C0-B308-62E6D3C2F4CB}</ProjectGuid>
     <OutputType>Library</OutputType>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>MoonSharp.Interpreter.Tests.Embeddable.portable40</RootNamespace>
-    <AssemblyName>MoonSharp.Interpreter.Tests.Embeddable.portable40</AssemblyName>
+    <RootNamespace>MoonSharp.Interpreter.Tests</RootNamespace>
+    <AssemblyName>MoonSharp.Interpreter.Tests</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <DefaultLanguage>en-US</DefaultLanguage>
     <FileAlignment>512</FileAlignment>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>

+ 1 - 1
src/MoonSharp.Interpreter/_Projects/MoonSharp.Interpreter.net40-client/MoonSharp.Interpreter.net40-client.csproj

@@ -8,7 +8,7 @@
     <OutputType>Library</OutputType>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>MoonSharp.Interpreter.net40_client</RootNamespace>
     <RootNamespace>MoonSharp.Interpreter.net40_client</RootNamespace>
-    <AssemblyName>MoonSharp.Interpreter.net40-client</AssemblyName>
+    <AssemblyName>MoonSharp.Interpreter</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile>Client</TargetFrameworkProfile>
     <TargetFrameworkProfile>Client</TargetFrameworkProfile>

+ 2 - 2
src/MoonSharp.Interpreter/_Projects/MoonSharp.Interpreter.portable40/MoonSharp.Interpreter.portable40.csproj

@@ -8,8 +8,8 @@
     <ProjectGuid>{49F32476-FCA0-45FD-8F89-0C7C0D15E409}</ProjectGuid>
     <ProjectGuid>{49F32476-FCA0-45FD-8F89-0C7C0D15E409}</ProjectGuid>
     <OutputType>Library</OutputType>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>MoonSharp.Intepreter.portable40</RootNamespace>
-    <AssemblyName>MoonSharp.Intepreter.portable40</AssemblyName>
+    <RootNamespace>MoonSharp.Interpreter</RootNamespace>
+    <AssemblyName>MoonSharp.Interpreter</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <DefaultLanguage>en-US</DefaultLanguage>
     <FileAlignment>512</FileAlignment>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>

+ 0 - 0
src/Unity/UnityTestBed/Assets/nunit.framework.xml → src/Unity/UnityTestBed/Assets/Plugins/nunit.framework.xml


+ 8 - 9
src/Unity/UnityTestBed/Assets/TestRunner.cs

@@ -7,7 +7,6 @@ using MoonSharp.Interpreter.Loaders;
 
 
 public class TestRunner : MonoBehaviour
 public class TestRunner : MonoBehaviour
 {
 {
-	Thread m_Thread;
 	string m_Text = "";
 	string m_Text = "";
 	object m_Lock = new object();
 	object m_Lock = new object();
 	bool m_LastWasLine = true;
 	bool m_LastWasLine = true;
@@ -15,12 +14,7 @@ public class TestRunner : MonoBehaviour
 	// Use this for initialization
 	// Use this for initialization
 	void Start()
 	void Start()
 	{
 	{
-		Script.WarmUp();
-
-		m_Thread = new Thread(() => DoTests());
-		m_Thread.Name = "Tests";
-		m_Thread.IsBackground = true;
-		m_Thread.Start();
+		StartCoroutine(DoTests());
 	}
 	}
 
 
 
 
@@ -31,10 +25,15 @@ public class TestRunner : MonoBehaviour
 	}
 	}
 
 
 
 
-	void DoTests()
+	IEnumerator DoTests()
 	{
 	{
 		MoonSharp.Interpreter.Tests.TestRunner tr = new MoonSharp.Interpreter.Tests.TestRunner(Log);
 		MoonSharp.Interpreter.Tests.TestRunner tr = new MoonSharp.Interpreter.Tests.TestRunner(Log);
-		tr.Test();
+
+		foreach (var r in tr.IterateOnTests())
+		{
+			Log(r);
+			yield return null;
+		}
 	}
 	}
 
 
 	void Log(TestResult r)
 	void Log(TestResult r)

BIN
src/Unity/UnityTestBed/ProjectSettings/ProjectSettings.asset


+ 8 - 13
src/Unity/UnityTestBed/UnityVS.UnityTestBed.CSharp.csproj

@@ -7,16 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{AB7EF7C3-E7B9-30AA-7BD5-D186BE943024}</ProjectGuid>
     <ProjectGuid>{AB7EF7C3-E7B9-30AA-7BD5-D186BE943024}</ProjectGuid>
     <OutputType>Library</OutputType>
     <OutputType>Library</OutputType>
-    <RootNamespace>
-    </RootNamespace>
+    <RootNamespace></RootNamespace>
     <AssemblyName>Assembly-CSharp</AssemblyName>
     <AssemblyName>Assembly-CSharp</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ProjectTypeGuids>{E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>
     <TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <TargetFrameworkProfile>Unity Subset v3.5</TargetFrameworkProfile>
     <TargetFrameworkProfile>Unity Subset v3.5</TargetFrameworkProfile>
-    <CompilerResponseFile>
-    </CompilerResponseFile>
+    <CompilerResponseFile></CompilerResponseFile>
     <UnityProjectType>Game:1</UnityProjectType>
     <UnityProjectType>Game:1</UnityProjectType>
     <UnityBuildTarget>StandaloneWindows:5</UnityBuildTarget>
     <UnityBuildTarget>StandaloneWindows:5</UnityBuildTarget>
     <UnityVersion>5.0.0f4</UnityVersion>
     <UnityVersion>5.0.0f4</UnityVersion>
@@ -54,25 +52,22 @@
     <Reference Include="UnityEngine.UI">
     <Reference Include="UnityEngine.UI">
       <HintPath>Library\UnityAssemblies\UnityEngine.UI.dll</HintPath>
       <HintPath>Library\UnityAssemblies\UnityEngine.UI.dll</HintPath>
     </Reference>
     </Reference>
-    <Reference Include="UnityEngine.UI">
-      <HintPath>Library\UnityAssemblies\UnityEngine.UI.dll</HintPath>
-    </Reference>
     <Reference Include="MoonSharp.Interpreter">
     <Reference Include="MoonSharp.Interpreter">
-      <HintPath>Assets\MoonSharp.Interpreter.dll</HintPath>
+      <HintPath>Assets\Plugins\MoonSharp.Interpreter.dll</HintPath>
     </Reference>
     </Reference>
     <Reference Include="MoonSharp.Interpreter.Tests">
     <Reference Include="MoonSharp.Interpreter.Tests">
-      <HintPath>Assets\MoonSharp.Interpreter.Tests.dll</HintPath>
+      <HintPath>Assets\Plugins\MoonSharp.Interpreter.Tests.dll</HintPath>
     </Reference>
     </Reference>
     <Reference Include="nunit.framework">
     <Reference Include="nunit.framework">
-      <HintPath>Assets\nunit.framework.dll</HintPath>
+      <HintPath>Assets\Plugins\nunit.framework.dll</HintPath>
     </Reference>
     </Reference>
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
     <Compile Include="Assets\TestRunner.cs" />
     <Compile Include="Assets\TestRunner.cs" />
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
-    <None Include="Assets\MoonSharp.Interpreter.xml" />
-    <None Include="Assets\nunit.framework.xml" />
+    <None Include="Assets\Plugins\MoonSharp.Interpreter.xml" />
+    <None Include="Assets\Plugins\nunit.framework.xml" />
     <None Include="Assets\Resources\MoonSharp\Scripts\000-sanity.t.txt" />
     <None Include="Assets\Resources\MoonSharp\Scripts\000-sanity.t.txt" />
     <None Include="Assets\Resources\MoonSharp\Scripts\001-if.t.txt" />
     <None Include="Assets\Resources\MoonSharp\Scripts\001-if.t.txt" />
     <None Include="Assets\Resources\MoonSharp\Scripts\002-table.t.txt" />
     <None Include="Assets\Resources\MoonSharp\Scripts\002-table.t.txt" />
@@ -157,4 +152,4 @@
     <None Include="Assets\Resources\Scripts\TestMore\Modules\Test\More.txt" />
     <None Include="Assets\Resources\Scripts\TestMore\Modules\Test\More.txt" />
   </ItemGroup>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\SyntaxTree\UnityVS\2013\UnityVS.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\SyntaxTree\UnityVS\2013\UnityVS.CSharp.targets" />
-</Project>
+</Project>

BIN
src/Unity/UnityTestBed/Assets/MoonSharp.Interpreter.Tests.dll → src/Unity/UnityTestBed/_outputs/ios/Data/Managed/MoonSharp.Interpreter.Tests.dll


+ 0 - 0
src/Unity/UnityTestBed/Assets/MoonSharp.Interpreter.dll → src/Unity/UnityTestBed/_outputs/ios/Data/Managed/MoonSharp.Interpreter.dll


+ 0 - 0
src/Unity/UnityTestBed/Assets/nunit.framework.dll → src/Unity/UnityTestBed/_outputs/ios/Data/Managed/nunit.framework.dll