Skip to content

[UnitTests] Support for x64. fixes #3191 #3202

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SlavaRa merged 15 commits into from
Dec 21, 2020
Merged

[UnitTests] Support for x64. fixes #3191 #3202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
5b389d9
WIP
Dec 20, 2020
426c702
WIP
Dec 20, 2020
1a818f6
WIP
Dec 20, 2020
aa5adb4
WIP
Dec 20, 2020
088d3c2
WIP
Dec 20, 2020
897e77d
WIP
Dec 20, 2020
8bb291c
WIP
Dec 20, 2020
25bc5a0
WIP
Dec 20, 2020
04bb74e
WIP
Dec 20, 2020
ef10deb
WIP
Dec 20, 2020
a16599b
WIP
Dec 20, 2020
c25a796
WIP
Dec 20, 2020
0dc57ff
Merge branch 'development' of https://github.com/fdorg/flashdevelop i…
Dec 21, 2020
952af78
WIP
Dec 21, 2020
c4462d5
WIP
Dec 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions CI/build.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,17 @@
:: Extract version from HEAD
call SetVersion.bat

:: Build the main solution and run tests
msbuild FlashDevelop.sln /p:Configuration=Debug+Tests /p:Platform="x64" /t:Rebuild %MSBuildLogger%

:: Check for build errors
if %errorlevel% neq 0 goto :error

if "%AppVeyorCI%" neq "" powershell.exe -file ci\tests.ps1

:: Check for build errors
if %errorlevel% neq 0 goto :error

:: Build the main solution and run tests
msbuild FlashDevelop.sln /p:Configuration=Release+Tests /p:Platform="x86" /t:Rebuild %MSBuildLogger%

Expand Down
9 changes: 7 additions & 2 deletions CI/tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ If ($env:HAXEPATH -eq $null)
{
cinst.exe haxe --version 4.1.4 -y --no-progress
$env:HAXEPATH = [System.IO.Directory]::GetDirectories("C:\ProgramData\chocolatey\lib\haxe", "haxe_*")[0];
If ($env:HAXEPATH -eq $null)
{
Write-Output "HAXEPATH is invalid"
exit 1
}
}

If ((Get-Command "nunit3-console.exe" -ErrorAction SilentlyContinue) -ne $null)
Expand All @@ -30,8 +35,8 @@ If ((Get-Command "nunit3-console.exe" -ErrorAction SilentlyContinue) -ne $null)

cd $path
#nunit3-console.exe $testFiles --result=myresults.xml;format=AppVeyor
nunit3-console.exe $testFiles --x86
#nunit3-console.exe $testFiles
#nunit3-console.exe $testFiles --x86
nunit3-console.exe $testFiles

#It turns out it's not needed to upload the file
#if ((Test-Path env:\APPVEYOR_JOB_ID) -And (Test-Path TestResult.xml))
Expand Down
8 changes: 4 additions & 4 deletions FlashDevelop.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -922,17 +922,17 @@ Global
{F44D3125-12E8-4143-B250-84C5D89D253C}.Debug+Tests|Any CPU.Build.0 = Debug|Any CPU
{F44D3125-12E8-4143-B250-84C5D89D253C}.Debug+Tests|x64.ActiveCfg = Debug|x64
{F44D3125-12E8-4143-B250-84C5D89D253C}.Debug+Tests|x64.Build.0 = Debug|x64
{F44D3125-12E8-4143-B250-84C5D89D253C}.Debug+Tests|x86.ActiveCfg = Debug|Any CPU
{F44D3125-12E8-4143-B250-84C5D89D253C}.Debug+Tests|x86.Build.0 = Debug|Any CPU
{F44D3125-12E8-4143-B250-84C5D89D253C}.Debug+Tests|x86.ActiveCfg = Debug|x86
{F44D3125-12E8-4143-B250-84C5D89D253C}.Debug+Tests|x86.Build.0 = Debug|x86
{F44D3125-12E8-4143-B250-84C5D89D253C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F44D3125-12E8-4143-B250-84C5D89D253C}.Release|x64.ActiveCfg = Release|Any CPU
{F44D3125-12E8-4143-B250-84C5D89D253C}.Release|x86.ActiveCfg = Release|Any CPU
{F44D3125-12E8-4143-B250-84C5D89D253C}.Release+Tests|Any CPU.ActiveCfg = Release|Any CPU
{F44D3125-12E8-4143-B250-84C5D89D253C}.Release+Tests|Any CPU.Build.0 = Release|Any CPU
{F44D3125-12E8-4143-B250-84C5D89D253C}.Release+Tests|x64.ActiveCfg = Release|x64
{F44D3125-12E8-4143-B250-84C5D89D253C}.Release+Tests|x64.Build.0 = Release|x64
{F44D3125-12E8-4143-B250-84C5D89D253C}.Release+Tests|x86.ActiveCfg = Release|Any CPU
{F44D3125-12E8-4143-B250-84C5D89D253C}.Release+Tests|x86.Build.0 = Release|Any CPU
{F44D3125-12E8-4143-B250-84C5D89D253C}.Release+Tests|x86.ActiveCfg = Release|x86
{F44D3125-12E8-4143-B250-84C5D89D253C}.Release+Tests|x86.Build.0 = Release|x86
{8B5A1C53-AF20-4379-A8D1-31822ACC6AD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8B5A1C53-AF20-4379-A8D1-31822ACC6AD8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8B5A1C53-AF20-4379-A8D1-31822ACC6AD8}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down
7 changes: 4 additions & 3 deletions Tests/External/Plugins/ASCompletion.Tests/Completion/ASGeneratorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1325,11 +1325,12 @@ static IEnumerable<TestCaseData> ParseFunctionParametersTestCases
public List<MemberModel> ParseFunctionParameters(string fileName)
{
SetSrc(sci, ReadAllText(fileName));
var ctx = ASContext.GetLanguageContext(sci.ConfigurationLanguage);
var list = new MemberList();
list.Merge(ASContext.GetLanguageContext(sci.ConfigurationLanguage).GetVisibleExternalElements());
list.Merge(ASContext.Context.CurrentModel.Imports);
list.Merge(ctx.GetVisibleExternalElements());
list.Merge(ctx.CurrentModel.Imports);
ASContext.Context.GetVisibleExternalElements().Returns(list);
var result = ASGenerator.ParseFunctionParameters(sci, sci.CurrentPos) .Select(it => it.result.Type ?? it.result.Member).ToList();
var result = ASGenerator.ParseFunctionParameters(sci, sci.CurrentPos).Select(it => it.result.Type ?? it.result.Member).ToList();
return result;
}

Expand Down
18 changes: 18 additions & 0 deletions Tests/PluginCore/PluginCore.Tests/PluginCore.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,24 @@
<WarningLevel>4</WarningLevel>
<LangVersion>9</LangVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>..\..\..\FlashDevelop\Bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<LangVersion>9</LangVersion>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>..\..\..\FlashDevelop\Bin\Debug\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<LangVersion>9</LangVersion>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>..\..\..\FlashDevelop\Bin\Debug\</OutputPath>
Expand Down