Fixed iOS tests

NLua · May 10, 2020 · ed65f21 · ed65f21
1 parent 5707809
commit ed65f21
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 25 deletions.
diff --git a/.gitignore b/.gitignore
@@ -35,3 +35,8 @@ tests/build/xamarintvos/obj/
 tests/build/xamarintvos/bin/
 tests/build/xamarinios/bin/
 build/uap10.0/obj/
+TestResults/
+tests/build/xamarintvos/TEST-Result-Xamarin.TVOS.xml
+tests/build/xamarinios/result.xml
+tests/build/xamarinios/TEST-Result-Xamarin.iOS.xml
+tests/build/xamarintvos/result.xml
diff --git a/tests/build/netcore/NLuaTest.Core.csproj b/tests/build/netcore/NLuaTest.Core.csproj
@@ -75,18 +75,14 @@
       <Link>scripts\test.lua</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="..\..\scripts\test.win_32.luac">
-      <Link>scripts\test.win_32.luac</Link>
+    <None Include="..\..\scripts\test_32.luac">
+      <Link>scripts\test_32.luac</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="..\..\scripts\test_64.luac">
       <Link>scripts\test_64.luac</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="..\..\scripts\test.win_64.luac">
-      <Link>scripts\test.win_64.luac</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\build\netcore\NLua.NetCore.csproj" />

diff --git a/tests/build/xamarinios/NLuaTest.XamariniOS.csproj b/tests/build/xamarinios/NLuaTest.XamariniOS.csproj
@@ -45,12 +45,12 @@
     <MtouchFastDev>true</MtouchFastDev>
     <IOSDebuggerPort>13196</IOSDebuggerPort>
     <MtouchLink>SdkOnly</MtouchLink>
-    <MtouchArch>x86_64</MtouchArch>
+    <MtouchArch>ARMv7</MtouchArch>
     <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
     <DeviceSpecificBuild>false</DeviceSpecificBuild>
     <MtouchVerbosity>
     </MtouchVerbosity>
-    <MtouchExtraArgs>--setenv=NUNIT_ENABLE_XML_OUTPUT=true --setenv=NUNIT_SKIP_LOG_HEADER=true</MtouchExtraArgs>
+    <MtouchExtraArgs>--setenv=NUNIT_ENABLE_XML_OUTPUT=true --setenv=NUNIT_SKIP_LOG_HEADER=true --enable-repl --nolink</MtouchExtraArgs>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
     <Optimize>true</Optimize>
@@ -68,7 +68,7 @@
     <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
     <MtouchVerbosity>
     </MtouchVerbosity>
-    <MtouchExtraArgs>--setenv=NUNIT_ENABLE_XML_OUTPUT=true --setenv=NUNIT_SKIP_LOG_HEADER=true</MtouchExtraArgs>
+    <MtouchExtraArgs>--setenv=NUNIT_ENABLE_XML_OUTPUT=true --setenv=NUNIT_SKIP_LOG_HEADER=true --interpreter</MtouchExtraArgs>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
     <Optimize>true</Optimize>
@@ -84,7 +84,7 @@
     <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
     <MtouchVerbosity>
     </MtouchVerbosity>
-    <MtouchExtraArgs>--setenv=NUNIT_ENABLE_XML_OUTPUT=true --setenv=NUNIT_SKIP_LOG_HEADER=true</MtouchExtraArgs>
+    <MtouchExtraArgs>--setenv=NUNIT_ENABLE_XML_OUTPUT=true --setenv=NUNIT_SKIP_LOG_HEADER=true --enable-repl --nolink</MtouchExtraArgs>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <Optimize>true</Optimize>
@@ -96,11 +96,11 @@
     <CodesignKey>iPhone Developer</CodesignKey>
     <MtouchNoSymbolStrip>true</MtouchNoSymbolStrip>
     <MtouchLink>SdkOnly</MtouchLink>
-    <MtouchArch>x86_64</MtouchArch>
+    <MtouchArch>ARMv7</MtouchArch>
     <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
     <MtouchVerbosity>
     </MtouchVerbosity>
-    <MtouchExtraArgs>--setenv=NUNIT_ENABLE_XML_OUTPUT=true --setenv=NUNIT_SKIP_LOG_HEADER=true</MtouchExtraArgs>
+    <MtouchExtraArgs>--setenv=NUNIT_ENABLE_XML_OUTPUT=true --setenv=NUNIT_SKIP_LOG_HEADER=true --enable-repl --nolink</MtouchExtraArgs>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/tests/build/xamarintvos/NLuaTest.XamarinTVOS.csproj b/tests/build/xamarintvos/NLuaTest.XamarinTVOS.csproj
@@ -29,7 +29,7 @@
     <DeviceSpecificBuild>false</DeviceSpecificBuild>
     <MtouchVerbosity>
     </MtouchVerbosity>
-    <MtouchExtraArgs>--setenv=NUNIT_ENABLE_XML_OUTPUT=true --setenv=NUNIT_SKIP_LOG_HEADER=true</MtouchExtraArgs>
+    <MtouchExtraArgs>--setenv=NUNIT_ENABLE_XML_OUTPUT=true --setenv=NUNIT_SKIP_LOG_HEADER=true --enable-repl --nolink</MtouchExtraArgs>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
     <DebugType>pdbonly</DebugType>
@@ -49,7 +49,7 @@
     <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
     <MtouchVerbosity>
     </MtouchVerbosity>
-    <MtouchExtraArgs>--setenv=NUNIT_ENABLE_XML_OUTPUT=true --setenv=NUNIT_SKIP_LOG_HEADER=true</MtouchExtraArgs>
+    <MtouchExtraArgs>--setenv=NUNIT_ENABLE_XML_OUTPUT=true --setenv=NUNIT_SKIP_LOG_HEADER=true --interpreter</MtouchExtraArgs>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
     <Optimize>true</Optimize>
@@ -65,7 +65,7 @@
     <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
     <MtouchVerbosity>
     </MtouchVerbosity>
-    <MtouchExtraArgs>--setenv=NUNIT_ENABLE_XML_OUTPUT=true --setenv=NUNIT_SKIP_LOG_HEADER=true</MtouchExtraArgs>
+    <MtouchExtraArgs>--setenv=NUNIT_ENABLE_XML_OUTPUT=true --setenv=NUNIT_SKIP_LOG_HEADER=true --enable-repl --nolink</MtouchExtraArgs>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
     <DebugSymbols>true</DebugSymbols>
@@ -88,7 +88,7 @@
     <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
     <MtouchVerbosity>
     </MtouchVerbosity>
-    <MtouchExtraArgs>--setenv=NUNIT_ENABLE_XML_OUTPUT=true --setenv=NUNIT_SKIP_LOG_HEADER=true</MtouchExtraArgs>
+    <MtouchExtraArgs>--setenv=NUNIT_ENABLE_XML_OUTPUT=true --setenv=NUNIT_SKIP_LOG_HEADER=true --interpreter</MtouchExtraArgs>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />

diff --git a/tests/scripts/test.win_64.luac b/tests/scripts/test.win_64.luac
diff --git a/tests/scripts/test.win_32.luac → tests/scripts/test_32.luac b/tests/scripts/test.win_32.luac → tests/scripts/test_32.luac
diff --git a/tests/scripts/test_64.luac b/tests/scripts/test_64.luac
diff --git a/tests/src/LoadFileTests.cs b/tests/src/LoadFileTests.cs
@@ -70,7 +70,7 @@ public void TestBinaryLoadFile()
                 lua.LoadCLRPackage();
 
                 if (IntPtr.Size == 4)
-                    file = GetScriptsPath("test.win_32.luac");
+                    file = GetScriptsPath("test_32.luac");
                 else
                 {
                     file = GetScriptsPath("test_64.luac");

diff --git a/tests/src/NLuaTest.Shared.Scripts.projitems b/tests/src/NLuaTest.Shared.Scripts.projitems
@@ -49,16 +49,12 @@
       <Link>scripts\test.lua</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="$(MSBuildThisFileDirectory)..\scripts\test.win_32.luac">
-      <Link>scripts\test.win_32.luac</Link>
+    <None Include="$(MSBuildThisFileDirectory)..\scripts\test_32.luac">
+      <Link>scripts\test_32.luac</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="$(MSBuildThisFileDirectory)..\scripts\test.win_64.luac">
-      <Link>scripts\test.win_64.luac</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="$(MSBuildThisFileDirectory)..\scripts\test.win_64.luac">
-      <Link>scripts\test.win_64.luac</Link>
+    <None Include="$(MSBuildThisFileDirectory)..\scripts\test_64.luac">
+      <Link>scripts\test_64.luac</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="$(MSBuildThisFileDirectory)..\scripts\test_64.luac">