Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
NLua
Commits
ed65f21b
Commit
ed65f21b
authored
May 09, 2020
by
Vinicius Jarina
Browse files
Fixed iOS tests
parent
57078095
Changes
9
Show whitespace changes
Inline
Side-by-side
.gitignore
View file @
ed65f21b
...
...
@@ -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
tests/build/netcore/NLuaTest.Core.csproj
View file @
ed65f21b
...
...
@@ -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" />
...
...
tests/build/xamarinios/NLuaTest.XamariniOS.csproj
View file @
ed65f21b
...
...
@@ -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>
...
...
tests/build/xamarintvos/NLuaTest.XamarinTVOS.csproj
View file @
ed65f21b
...
...
@@ -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"
/>
...
...
tests/scripts/test.win_64.luac
deleted
100644 → 0
View file @
57078095
File deleted
tests/scripts/test
.win
_32.luac
→
tests/scripts/test_32.luac
View file @
ed65f21b
No preview for this file type
tests/scripts/test_64.luac
View file @
ed65f21b
No preview for this file type
tests/src/LoadFileTests.cs
View file @
ed65f21b
...
...
@@ -70,7 +70,7 @@ namespace LoadFileTests
lua
.
LoadCLRPackage
();
if
(
IntPtr
.
Size
==
4
)
file
=
GetScriptsPath
(
"test
.win
_32.luac"
);
file
=
GetScriptsPath
(
"test_32.luac"
);
else
{
file
=
GetScriptsPath
(
"test_64.luac"
);
...
...
tests/src/NLuaTest.Shared.Scripts.projitems
View file @
ed65f21b
...
...
@@ -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"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment