[Pkg-cli-apps-commits] [fsharp] 22/60: Fix tests for portable 7, 78, 259 so they run (changeset 1302499)
Christopher Halse Rogers
raof-guest at moszumanska.debian.org
Sun Sep 14 08:13:38 UTC 2014
This is an automated email from the git hooks/post-receive script.
raof-guest pushed a commit to branch master
in repository fsharp.
commit 0030835016f33e51ee77b32ddbc74ba94288fb93
Author: latkin <latkin at microsoft.com>
Date: Mon Jul 21 16:33:45 2014 -0700
Fix tests for portable 7, 78, 259 so they run (changeset 1302499)
---
tests/RunTests.cmd | 8 ++++----
tests/config.bat | 4 ++--
tests/fsharp/core/netcore/netcore259/build.bat | 2 +-
tests/fsharp/core/netcore/netcore259/run.bat | 4 ++--
tests/fsharp/core/netcore/netcore7/build.bat | 2 +-
tests/fsharp/core/netcore/netcore7/run.bat | 2 +-
tests/fsharp/core/netcore/netcore78/build.bat | 2 +-
tests/fsharp/core/netcore/netcore78/run.bat | 2 +-
.../netcoreautomationhelperlibrary.fsproj | 6 +++---
tests/test.lst | 4 +++-
10 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/tests/RunTests.cmd b/tests/RunTests.cmd
index 191cfcb..51ea15a 100644
--- a/tests/RunTests.cmd
+++ b/tests/RunTests.cmd
@@ -96,8 +96,8 @@ set FSCOREDLLPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETF
set FSCOREDLL20PATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETFramework\v2.0\2.3.0.0
set FSCOREDLLPORTABLEPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETPortable\2.3.5.1
set FSCOREDLLNETCOREPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETCore\3.3.1.0
-set FSCOREDLLNETCORE78PATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETCore\3.4.78.310
-set FSCOREDLLNETCORE259PATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETCore\3.4.259.310
+set FSCOREDLLNETCORE78PATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETCore\3.78.3.1
+set FSCOREDLLNETCORE259PATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETCore\3.259.3.1
set FSDATATPPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\4.3.0.0\Type Providers
REM == open source logic
@@ -105,8 +105,8 @@ if exist "%FSCBinPath%\FSharp.Core.dll" set FSCOREDLLPATH=%FSCBinPath%
if exist "%FSCBinPath%\..\..\net20\bin\FSharp.Core.dll" set FSCOREDLL20PATH=%FSCBinPath%\..\..\net20\bin
if exist "%FSCBinPath%\..\..\portable47\bin\FSharp.Core.dll" set FSCOREDLLPORTABLEPATH=%FSCBinPath%\..\..\portable47\bin
if exist "%FSCBinPath%\..\..\portable7\bin\FSharp.Core.dll" set FSCOREDLLNETCOREPATH=%FSCBinPath%\..\..\portable7\bin
-IF EXIST "%FSCBinPath%\..\..\portable78\bin\FSharp.Core.dll" set FSCOREDLLNETCORE78PATH=%FSCBinPath%\..\..\portable78\bin
-IF EXIST "%FSCBinPath%\..\..\portable259\bin\FSharp.Core.dll" set FSCOREDLLNETCORE259PATH=%FSCBinPath%\..\..\portable259\bin
+IF exist "%FSCBinPath%\..\..\portable78\bin\FSharp.Core.dll" set FSCOREDLLNETCORE78PATH=%FSCBinPath%\..\..\portable78\bin
+IF exist "%FSCBinPath%\..\..\portable259\bin\FSharp.Core.dll" set FSCOREDLLNETCORE259PATH=%FSCBinPath%\..\..\portable259\bin
if exist "%FSCBinPath%\FSharp.Data.TypeProviders.dll" set FSDATATPPATH=%FSCBinPath%
set FSCOREDLLPATH=%FSCOREDLLPATH%\FSharp.Core.dll
diff --git a/tests/config.bat b/tests/config.bat
index cd2c802..5e0e44c 100644
--- a/tests/config.bat
+++ b/tests/config.bat
@@ -261,8 +261,8 @@ set FSCOREDLLPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETF
set FSCOREDLL20PATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETFramework\v2.0\2.3.0.0
set FSCOREDLLPORTABLEPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETPortable\2.3.5.1
set FSCOREDLLNETCOREPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETCore\3.3.1.0
-set FSCOREDLLNETCORE78PATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETCore\3.4.78.310
-set FSCOREDLLNETCORE259PATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETCore\3.4.259.310
+set FSCOREDLLNETCORE78PATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETCore\3.78.3.1
+set FSCOREDLLNETCORE259PATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETCore\3.259.3.1
set FSDATATPPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\4.3.0.0\Type Providers
REM == Check if using open build instead
diff --git a/tests/fsharp/core/netcore/netcore259/build.bat b/tests/fsharp/core/netcore/netcore259/build.bat
index 46c7563..7980f02 100644
--- a/tests/fsharp/core/netcore/netcore259/build.bat
+++ b/tests/fsharp/core/netcore/netcore259/build.bat
@@ -6,5 +6,5 @@ IF /I "%INSTALL_SKU%" NEQ "ULTIMATE" (
exit /b 0
)
-"%MSBUILDTOOLSPATH%\msbuild.exe" ..\netcore.sln /p:Configuration=Debug
+"%MSBUILDTOOLSPATH%\msbuild.exe" ..\netcore.sln /p:Configuration=Debug /p:TestProfile=Profile259
exit /b %ERRORLEVEL%
\ No newline at end of file
diff --git a/tests/fsharp/core/netcore/netcore259/run.bat b/tests/fsharp/core/netcore/netcore259/run.bat
index 734ce70..eebda71 100644
--- a/tests/fsharp/core/netcore/netcore259/run.bat
+++ b/tests/fsharp/core/netcore/netcore259/run.bat
@@ -9,9 +9,9 @@ IF /I "%INSTALL_SKU%" NEQ "ULTIMATE" (
exit /b 0
)
-set CONTROL_FAILURES_LOG=%~dp0\control_failures.log
+set CONTROL_FAILURES_LOG=%~dp0..\ConsoleApplication1\bin\Debug\Profile259\control_failures.log
-..\ConsoleApplication1\bin\Debug\profile359\PortableTestEntry.exe
+..\ConsoleApplication1\bin\Debug\Profile259\PortableTestEntry.exe
endlocal
exit /b %ERRORLEVEL%
diff --git a/tests/fsharp/core/netcore/netcore7/build.bat b/tests/fsharp/core/netcore/netcore7/build.bat
index 46c7563..683c349 100644
--- a/tests/fsharp/core/netcore/netcore7/build.bat
+++ b/tests/fsharp/core/netcore/netcore7/build.bat
@@ -6,5 +6,5 @@ IF /I "%INSTALL_SKU%" NEQ "ULTIMATE" (
exit /b 0
)
-"%MSBUILDTOOLSPATH%\msbuild.exe" ..\netcore.sln /p:Configuration=Debug
+"%MSBUILDTOOLSPATH%\msbuild.exe" ..\netcore.sln /p:Configuration=Debug /p:TestProfile=Profile7
exit /b %ERRORLEVEL%
\ No newline at end of file
diff --git a/tests/fsharp/core/netcore/netcore7/run.bat b/tests/fsharp/core/netcore/netcore7/run.bat
index e999ffe..1aed470 100644
--- a/tests/fsharp/core/netcore/netcore7/run.bat
+++ b/tests/fsharp/core/netcore/netcore7/run.bat
@@ -9,7 +9,7 @@ IF /I "%INSTALL_SKU%" NEQ "ULTIMATE" (
exit /b 0
)
-set CONTROL_FAILURES_LOG=%~dp0\control_failures.log
+set CONTROL_FAILURES_LOG=%~dp0..\ConsoleApplication1\bin\Debug\profile7\control_failures.log
..\ConsoleApplication1\bin\Debug\profile7\PortableTestEntry.exe
endlocal
diff --git a/tests/fsharp/core/netcore/netcore78/build.bat b/tests/fsharp/core/netcore/netcore78/build.bat
index 46c7563..32aaa55 100644
--- a/tests/fsharp/core/netcore/netcore78/build.bat
+++ b/tests/fsharp/core/netcore/netcore78/build.bat
@@ -6,5 +6,5 @@ IF /I "%INSTALL_SKU%" NEQ "ULTIMATE" (
exit /b 0
)
-"%MSBUILDTOOLSPATH%\msbuild.exe" ..\netcore.sln /p:Configuration=Debug
+"%MSBUILDTOOLSPATH%\msbuild.exe" ..\netcore.sln /p:Configuration=Debug /p:TestProfile=Profile78
exit /b %ERRORLEVEL%
\ No newline at end of file
diff --git a/tests/fsharp/core/netcore/netcore78/run.bat b/tests/fsharp/core/netcore/netcore78/run.bat
index caf7c73..febb05d 100644
--- a/tests/fsharp/core/netcore/netcore78/run.bat
+++ b/tests/fsharp/core/netcore/netcore78/run.bat
@@ -9,7 +9,7 @@ IF /I "%INSTALL_SKU%" NEQ "ULTIMATE" (
exit /b 0
)
-set CONTROL_FAILURES_LOG=%~dp0\control_failures.log
+set CONTROL_FAILURES_LOG=%~dp0..\ConsoleApplication1\bin\Debug\profile78\control_failures.log
..\ConsoleApplication1\bin\Debug\profile78\PortableTestEntry.exe
endlocal
diff --git a/tests/fsharp/core/netcore/netcoreautomationhelperlibrary/netcoreautomationhelperlibrary.fsproj b/tests/fsharp/core/netcore/netcoreautomationhelperlibrary/netcoreautomationhelperlibrary.fsproj
index 1ce3c7b..31ad3f9 100644
--- a/tests/fsharp/core/netcore/netcoreautomationhelperlibrary/netcoreautomationhelperlibrary.fsproj
+++ b/tests/fsharp/core/netcore/netcoreautomationhelperlibrary/netcoreautomationhelperlibrary.fsproj
@@ -17,19 +17,19 @@
<SccAuxPath>SAK</SccAuxPath>
<SccLocalPath>SAK</SccLocalPath>
</PropertyGroup>
- <PropertyGroup Condition=" '$(TestProfile)'=='' or '$(TestProfile)'=='Profile7'">
+ <PropertyGroup Condition="'$(TestProfile)'=='Profile7'">
<TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
<TargetFSharpCoreVersion>3.3.1.0</TargetFSharpCoreVersion>
<ProfileCorePath>$(FSCOREDLLNETCOREPATH)</ProfileCorePath>
</PropertyGroup>
<PropertyGroup Condition=" '$(TestProfile)'=='Profile78'">
<TargetFrameworkProfile>Profile78</TargetFrameworkProfile>
- <TargetFSharpCoreVersion>3.4.78.310</TargetFSharpCoreVersion>
+ <TargetFSharpCoreVersion>3.78.3.1</TargetFSharpCoreVersion>
<ProfileCorePath>$(FSCOREDLLNETCORE78PATH)</ProfileCorePath>
</PropertyGroup>
<PropertyGroup Condition=" '$(TestProfile)'=='Profile259'">
<TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
- <TargetFSharpCoreVersion>3.4.259.310</TargetFSharpCoreVersion>
+ <TargetFSharpCoreVersion>3.259.3.1</TargetFSharpCoreVersion>
<ProfileCorePath>$(FSCOREDLLNETCORE259PATH)</ProfileCorePath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/test.lst b/tests/test.lst
index a37bb5f..caabec1 100644
--- a/tests/test.lst
+++ b/tests/test.lst
@@ -52,7 +52,9 @@ Core04 fsharp\core\members\ops
Core05 ..\testsprivate\fsharp\core\mscorlib
Core05 fsharp\core\namespaces
Core05 fsharp\core\nested
-Core05 fsharp\core\netcore
+Core05 fsharp\core\netcore7
+Core05 fsharp\core\netcore78
+Core05 fsharp\core\netcore259
Core05 fsharp\core\parsing
Core05 fsharp\core\patterns
Core05 fsharp\core\pinvoke
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/fsharp.git
More information about the Pkg-cli-apps-commits
mailing list