From 444ce6bf48142b0436328e7da35f0bb09a377877 Mon Sep 17 00:00:00 2001 From: Ty Overby Date: Fri, 22 Jan 2016 15:29:00 -0800 Subject: [PATCH 1/4] add testing code back --- jenkins-build.cmd | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/jenkins-build.cmd b/jenkins-build.cmd index dcb8b3b757..f621d06642 100644 --- a/jenkins-build.cmd +++ b/jenkins-build.cmd @@ -108,10 +108,40 @@ echo Building the test tree using configuration: %BUILD_PROFILE% echo Running update scripts +REM Build the tools that are used for testing @echo on call tests/BuildTestTools.cmd %BUILD_PROFILE% @if ERRORLEVEL 1 echo Error: 'BuildTestTools.cmd %BUILD_PROFILE%' failed && goto :failure +REM Actually run the tests + +call src\update.cmd %BUILD_PROFILE% -ngen +call vsintegration\update-vsintegration.cmd %BUILD_PROFILE% + +call RunTests.cmd %BUILD_PROFILE% fsharp Smoke +@if ERRORLEVEL 1 type testresults\fsharp_failures.log && echo Error: 'RunTests.cmd release fsharp %CONF_CAMBRIDGE_SUITE%' failed && goto :failure + +REM call RunTests.cmd %BUILD_PROFILE% fsharpqa Smoke +REM @if ERRORLEVEL 1 type testresults\fsharpqa_failures.log && echo Error: 'RunTests.cmd release fsharpqa %CONF_QA_SUITE%' failed && goto :failure + +REM call RunTests.cmd %BUILD_PROFILE% compilerunit +REM @if ERRORLEVEL 1 echo Error: 'RunTests.cmd release compilerunit' failed && goto :failure + +REM call RunTests.cmd %BUILD_PROFILE% coreunit +REM @if ERRORLEVEL 1 echo Error: 'RunTests.cmd release coreunit' failed && goto :failure + +REM call RunTests.cmd %BUILD_PROFILE% coreunitportable47 +REM @if ERRORLEVEL 1 echo Error: 'RunTests.cmd release coreunitportable47' failed && goto :failure + +REM call RunTests.cmd %BUILD_PROFILE% coreunitportable7 +REM @if ERRORLEVEL 1 echo Error: 'RunTests.cmd release coreunitportable7' failed && goto :failure + +REM call RunTests.cmd %BUILD_PROFILE% coreunitportable78 +REM @if ERRORLEVEL 1 echo Error: 'RunTests.cmd release coreunitportable78' failed && goto :failure + +REM call RunTests.cmd %BUILD_PROFILE% coreunitportable259 +REM @if ERRORLEVEL 1 echo Error: 'RunTests.cmd release coreunitportable259' failed && goto :failure + goto :eof :failure From 35554a3f091be2c1a2db2ea3a520c5ef49211ea6 Mon Sep 17 00:00:00 2001 From: Ty Overby Date: Fri, 22 Jan 2016 17:07:12 -0800 Subject: [PATCH 2/4] move to the tests folder before running tests --- jenkins-build.cmd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jenkins-build.cmd b/jenkins-build.cmd index f621d06642..158c6faf92 100644 --- a/jenkins-build.cmd +++ b/jenkins-build.cmd @@ -118,6 +118,8 @@ REM Actually run the tests call src\update.cmd %BUILD_PROFILE% -ngen call vsintegration\update-vsintegration.cmd %BUILD_PROFILE% +cd tests + call RunTests.cmd %BUILD_PROFILE% fsharp Smoke @if ERRORLEVEL 1 type testresults\fsharp_failures.log && echo Error: 'RunTests.cmd release fsharp %CONF_CAMBRIDGE_SUITE%' failed && goto :failure From d12be06c31adefb3e0c39062f8e8d6032b4fb76a Mon Sep 17 00:00:00 2001 From: Ty Overby Date: Thu, 28 Jan 2016 10:04:55 -0800 Subject: [PATCH 3/4] remove hardcoded error strings --- jenkins-build.cmd | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/jenkins-build.cmd b/jenkins-build.cmd index 158c6faf92..d9c77e73fe 100644 --- a/jenkins-build.cmd +++ b/jenkins-build.cmd @@ -22,7 +22,7 @@ goto :USAGE echo Usage: echo Builds the source tree using a specific configuration -echo appveyor-build.cmd ^ +echo jenkins-build.cmd ^ exit /b 1 :ARGUMENTS_OK @@ -121,28 +121,28 @@ call vsintegration\update-vsintegration.cmd %BUILD_PROFILE% cd tests call RunTests.cmd %BUILD_PROFILE% fsharp Smoke -@if ERRORLEVEL 1 type testresults\fsharp_failures.log && echo Error: 'RunTests.cmd release fsharp %CONF_CAMBRIDGE_SUITE%' failed && goto :failure +@if ERRORLEVEL 1 type testresults\fsharp_failures.log && echo Error: 'RunTests.cmd %BUILD_PROFILE% fsharp %CONF_CAMBRIDGE_SUITE%' failed && goto :failure REM call RunTests.cmd %BUILD_PROFILE% fsharpqa Smoke -REM @if ERRORLEVEL 1 type testresults\fsharpqa_failures.log && echo Error: 'RunTests.cmd release fsharpqa %CONF_QA_SUITE%' failed && goto :failure +REM @if ERRORLEVEL 1 type testresults\fsharpqa_failures.log && echo Error: 'RunTests.cmd %BUILD_PROFILE% fsharpqa %CONF_QA_SUITE%' failed && goto :failure REM call RunTests.cmd %BUILD_PROFILE% compilerunit -REM @if ERRORLEVEL 1 echo Error: 'RunTests.cmd release compilerunit' failed && goto :failure +REM @if ERRORLEVEL 1 echo Error: 'RunTests.cmd %BUILD_PROFILE% compilerunit' failed && goto :failure REM call RunTests.cmd %BUILD_PROFILE% coreunit -REM @if ERRORLEVEL 1 echo Error: 'RunTests.cmd release coreunit' failed && goto :failure +REM @if ERRORLEVEL 1 echo Error: 'RunTests.cmd %BUILD_PROFILE% coreunit' failed && goto :failure REM call RunTests.cmd %BUILD_PROFILE% coreunitportable47 -REM @if ERRORLEVEL 1 echo Error: 'RunTests.cmd release coreunitportable47' failed && goto :failure +REM @if ERRORLEVEL 1 echo Error: 'RunTests.cmd %BUILD_PROFILE% coreunitportable47' failed && goto :failure REM call RunTests.cmd %BUILD_PROFILE% coreunitportable7 -REM @if ERRORLEVEL 1 echo Error: 'RunTests.cmd release coreunitportable7' failed && goto :failure +REM @if ERRORLEVEL 1 echo Error: 'RunTests.cmd %BUILD_PROFILE% coreunitportable7' failed && goto :failure REM call RunTests.cmd %BUILD_PROFILE% coreunitportable78 -REM @if ERRORLEVEL 1 echo Error: 'RunTests.cmd release coreunitportable78' failed && goto :failure +REM @if ERRORLEVEL 1 echo Error: 'RunTests.cmd %BUILD_PROFILE% coreunitportable78' failed && goto :failure REM call RunTests.cmd %BUILD_PROFILE% coreunitportable259 -REM @if ERRORLEVEL 1 echo Error: 'RunTests.cmd release coreunitportable259' failed && goto :failure +REM @if ERRORLEVEL 1 echo Error: 'RunTests.cmd %BUILD_PROFILE% coreunitportable259' failed && goto :failure goto :eof From 8b62a0634d6e608f0aa950bdc80fe3bcf9f0fc6b Mon Sep 17 00:00:00 2001 From: Ty Overby Date: Thu, 28 Jan 2016 17:48:08 -0800 Subject: [PATCH 4/4] try fake signing --- .gitignore | 1 + jenkins-build.cmd | 5 +-- packages.config | 3 +- src/update.cmd | 96 +++++++++++++++++++---------------------------- 4 files changed, 44 insertions(+), 61 deletions(-) diff --git a/.gitignore b/.gitignore index 89a796baf2..91e9655a89 100644 --- a/.gitignore +++ b/.gitignore @@ -80,6 +80,7 @@ vsintegration/src/vs/FsPkgs/FSharp.Project/FS/FSharp.ProjectSystem.FSharp.fsi vsintegration/src/vs/FsPkgs/FSharp.Project/FS/ctofiles/ tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Utils.dll tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExprLibrary.dll +tests\nunit3args.txt *.csproj.user *.sln.DotSettings.user *.ide diff --git a/jenkins-build.cmd b/jenkins-build.cmd index d9c77e73fe..e2480920e4 100644 --- a/jenkins-build.cmd +++ b/jenkins-build.cmd @@ -107,6 +107,8 @@ echo Building the test tree using configuration: %BUILD_PROFILE% @if ERRORLEVEL 1 echo Error: VS integration unit tests build failed && goto :failure echo Running update scripts +call src\update.cmd %BUILD_PROFILE% -ngen +call vsintegration\update-vsintegration.cmd %BUILD_PROFILE% REM Build the tools that are used for testing @echo on @@ -115,9 +117,6 @@ call tests/BuildTestTools.cmd %BUILD_PROFILE% REM Actually run the tests -call src\update.cmd %BUILD_PROFILE% -ngen -call vsintegration\update-vsintegration.cmd %BUILD_PROFILE% - cd tests call RunTests.cmd %BUILD_PROFILE% fsharp Smoke diff --git a/packages.config b/packages.config index 4f461daca1..376aade208 100644 --- a/packages.config +++ b/packages.config @@ -4,4 +4,5 @@ - \ No newline at end of file + + diff --git a/src/update.cmd b/src/update.cmd index 088073d6c7..cdd69665f2 100644 --- a/src/update.cmd +++ b/src/update.cmd @@ -22,67 +22,49 @@ exit /b 1 :ok set BINDIR=%~dp0..\%1\net40\bin - -if /i "%PROCESSOR_ARCHITECTURE%"=="x86" set X86_PROGRAMFILES=%ProgramFiles% -if /I "%PROCESSOR_ARCHITECTURE%"=="AMD64" set X86_PROGRAMFILES=%ProgramFiles(x86)% - -set REGEXE32BIT=reg.exe -if not "%OSARCH%"=="x86" set REGEXE32BIT=%WINDIR%\syswow64\reg.exe - - FOR /F "tokens=2* delims= " %%A IN ('%REGEXE32BIT% QUERY "HKLM\Software\Microsoft\Microsoft SDKs\NETFXSDK\4.6\WinSDK-NetFx40Tools" /v InstallationFolder') DO SET WINSDKNETFXTOOLS=%%B -if "%WINSDKNETFXTOOLS%"=="" FOR /F "tokens=2* delims= " %%A IN ('%REGEXE32BIT% QUERY "HKLM\Software\Microsoft\Microsoft SDKs\Windows\v8.1A\WinSDK-NetFx40Tools" /v InstallationFolder') DO SET WINSDKNETFXTOOLS=%%B -if "%WINSDKNETFXTOOLS%"=="" FOR /F "tokens=2* delims= " %%A IN ('%REGEXE32BIT% QUERY "HKLM\Software\Microsoft\Microsoft SDKs\Windows\v8.0A\WinSDK-NetFx40Tools" /v InstallationFolder') DO SET WINSDKNETFXTOOLS=%%B -if "%WINSDKNETFXTOOLS%"=="" FOR /F "tokens=2* delims= " %%A IN ('%REGEXE32BIT% QUERY "HKLM\Software\Microsoft\Microsoft SDKs\Windows\v7.1\WinSDK-NetFx40Tools" /v InstallationFolder') DO SET WINSDKNETFXTOOLS=%%B -if "%WINSDKNETFXTOOLS%"=="" FOR /F "tokens=2* delims= " %%A IN ('%REGEXE32BIT% QUERY "HKLM\Software\Microsoft\Microsoft SDKs\Windows\v7.0A\WinSDK-NetFx40Tools" /v InstallationFolder') DO SET WINSDKNETFXTOOLS=%%B - -set GACUTIL="%WINSDKNETFXTOOLS%gacutil.exe" -set SN32="%WINSDKNETFXTOOLS%sn.exe" -set SN64="%WINSDKNETFXTOOLS%x64\sn.exe" -set NGEN32=%windir%\Microsoft.NET\Framework\v4.0.30319\ngen.exe -set NGEN64=%windir%\Microsoft.NET\Framework64\v4.0.30319\ngen.exe - -rem Disable strong-name validation for F# binaries built from open source that are signed with the microsoft key -%SN32% -Vr FSharp.Core,b03f5f7f11d50a3a -%SN32% -Vr FSharp.Build,b03f5f7f11d50a3a -%SN32% -Vr FSharp.Compiler.Interactive.Settings,b03f5f7f11d50a3a -%SN32% -Vr FSharp.Compiler.Hosted,b03f5f7f11d50a3a - -%SN32% -Vr FSharp.Compiler,b03f5f7f11d50a3a -%SN32% -Vr FSharp.Compiler.Server.Shared,b03f5f7f11d50a3a -%SN32% -Vr FSharp.Editor,b03f5f7f11d50a3a -%SN32% -Vr FSharp.LanguageService,b03f5f7f11d50a3a -%SN32% -Vr FSharp.LanguageService.Base,b03f5f7f11d50a3a -%SN32% -Vr FSharp.LanguageService.Compiler,b03f5f7f11d50a3a -%SN32% -Vr FSharp.ProjectSystem.Base,b03f5f7f11d50a3a -%SN32% -Vr FSharp.ProjectSystem.FSharp,b03f5f7f11d50a3a -%SN32% -Vr FSharp.ProjectSystem.PropertyPages,b03f5f7f11d50a3a -%SN32% -Vr FSharp.VS.FSI,b03f5f7f11d50a3a -%SN32% -Vr Unittests,b03f5f7f11d50a3a -%SN32% -Vr Salsa,b03f5f7f11d50a3a +set FAKESIGN=".\packages\FakeSign.0.9.2\tools\FakeSign.exe" + +rem Fakesign the path to these dlls. +rem the location of these should be %BINDIR\ +%FAKESIGN% %BINDIR%\FSharp.Core,b03f5f7f11d50a3a +%FAKESIGN% %BINDIR%\FSharp.Build,b03f5f7f11d50a3a +%FAKESIGN% %BINDIR%\FSharp.Compiler.Interactive.Settings,b03f5f7f11d50a3a +%FAKESIGN% %BINDIR%\FSharp.Compiler.Hosted,b03f5f7f11d50a3a + +%FAKESIGN% %BINDIR%\FSharp.Compiler,b03f5f7f11d50a3a +%FAKESIGN% %BINDIR%\FSharp.Compiler.Server.Shared,b03f5f7f11d50a3a +%FAKESIGN% %BINDIR%\FSharp.Editor,b03f5f7f11d50a3a +%FAKESIGN% %BINDIR%\FSharp.LanguageService,b03f5f7f11d50a3a +%FAKESIGN% %BINDIR%\FSharp.LanguageService.Base,b03f5f7f11d50a3a +%FAKESIGN% %BINDIR%\FSharp.LanguageService.Compiler,b03f5f7f11d50a3a +%FAKESIGN% %BINDIR%\FSharp.ProjectSystem.Base,b03f5f7f11d50a3a +%FAKESIGN% %BINDIR%\FSharp.ProjectSystem.FSharp,b03f5f7f11d50a3a +%FAKESIGN% %BINDIR%\FSharp.ProjectSystem.PropertyPages,b03f5f7f11d50a3a +%FAKESIGN% %BINDIR%\FSharp.VS.FSI,b03f5f7f11d50a3a +%FAKESIGN% %BINDIR%\Unittests,b03f5f7f11d50a3a +%FAKESIGN% %BINDIR%\Salsa,b03f5f7f11d50a3a if /i "%PROCESSOR_ARCHITECTURE%"=="AMD64" ( - %SN64% -Vr FSharp.Core,b03f5f7f11d50a3a - %SN64% -Vr FSharp.Build,b03f5f7f11d50a3a - %SN64% -Vr FSharp.Compiler.Interactive.Settings,b03f5f7f11d50a3a - %SN64% -Vr FSharp.Compiler.Hosted,b03f5f7f11d50a3a - - %SN64% -Vr FSharp.Compiler,b03f5f7f11d50a3a - %SN64% -Vr FSharp.Compiler.Server.Shared,b03f5f7f11d50a3a - %SN64% -Vr FSharp.Editor,b03f5f7f11d50a3a - %SN64% -Vr FSharp.LanguageService,b03f5f7f11d50a3a - %SN64% -Vr FSharp.LanguageService.Base,b03f5f7f11d50a3a - %SN64% -Vr FSharp.LanguageService.Compiler,b03f5f7f11d50a3a - %SN64% -Vr FSharp.ProjectSystem.Base,b03f5f7f11d50a3a - %SN64% -Vr FSharp.ProjectSystem.FSharp,b03f5f7f11d50a3a - %SN64% -Vr FSharp.ProjectSystem.PropertyPages,b03f5f7f11d50a3a - %SN64% -Vr FSharp.VS.FSI,b03f5f7f11d50a3a - %SN64% -Vr Unittests,b03f5f7f11d50a3a - %SN64% -Vr Salsa,b03f5f7f11d50a3a + %FAKESIGN% %BINDIR%\FSharp.Core,b03f5f7f11d50a3a + %FAKESIGN% %BINDIR%\FSharp.Build,b03f5f7f11d50a3a + %FAKESIGN% %BINDIR%\FSharp.Compiler.Interactive.Settings,b03f5f7f11d50a3a + %FAKESIGN% %BINDIR%\FSharp.Compiler.Hosted,b03f5f7f11d50a3a + + %FAKESIGN% %BINDIR%\FSharp.Compiler,b03f5f7f11d50a3a + %FAKESIGN% %BINDIR%\FSharp.Compiler.Server.Shared,b03f5f7f11d50a3a + %FAKESIGN% %BINDIR%\FSharp.Editor,b03f5f7f11d50a3a + %FAKESIGN% %BINDIR%\FSharp.LanguageService,b03f5f7f11d50a3a + %FAKESIGN% %BINDIR%\FSharp.LanguageService.Base,b03f5f7f11d50a3a + %FAKESIGN% %BINDIR%\FSharp.LanguageService.Compiler,b03f5f7f11d50a3a + %FAKESIGN% %BINDIR%\FSharp.ProjectSystem.Base,b03f5f7f11d50a3a + %FAKESIGN% %BINDIR%\FSharp.ProjectSystem.FSharp,b03f5f7f11d50a3a + %FAKESIGN% %BINDIR%\FSharp.ProjectSystem.PropertyPages,b03f5f7f11d50a3a + %FAKESIGN% %BINDIR%\FSharp.VS.FSI,b03f5f7f11d50a3a + %FAKESIGN% %BINDIR%\Unittests,b03f5f7f11d50a3a + %FAKESIGN% %BINDIR%\Salsa,b03f5f7f11d50a3a ) -rem Only GACing FSharp.Core for now -%GACUTIL% /if %BINDIR%\FSharp.Core.dll - +rem rem NGen fsc, fsi, fsiAnyCpu, and FSharp.Build.dll if /i not "%2"=="-ngen" goto :donengen