[Pkg-cli-apps-commits] [fsharp] 21/71: Minor changes to run tests for F# 3.1

[Christopher Halse Rogers]

This is an automated email from the git hooks/post-receive script.

raof-guest pushed a commit to tag 3.1.0
in repository fsharp.

commit 2ba174340964f903ce6b39915b3fa88eb6d35574
Author: Don Syme <donsyme at fastmail.fm>
Date:   Thu Nov 28 15:15:52 2013 +0000

    Minor changes to run tests for F# 3.1
---
 CHANGES.txt      | 20 ++++++++++++++++++++
 README.md        | 20 ++++++++++++++++++++
 tests/config.bat |  2 +-
 tests/run40.bat  |  2 +-
 tests/run40d.bat |  2 +-
 5 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
new file mode 100644
index 0000000..7437c03
--- /dev/null
+++ b/CHANGES.txt
@@ -0,0 +1,20 @@
+
+HEAD
+  * Added tests
+
+  * Merged F# 3.1 open source release
+
+  * Fixed build logic for F# 3.1
+
+3.0.30
+  * Partial fix for allowing F# 3.1 projects to compile using xbuild (also 
+    requires xbuild fix)
+
+  * Remove a multitude of links in xbuild directories in favour of targets 
+    files which include the canonical targets
+
+3.0.29
+
+  * Proper DESTDIR support (very useful for making custom deb/rpm packages)
+
+
diff --git a/README.md b/README.md
index 3c1a961..353779b 100644
--- a/README.md
+++ b/README.md
@@ -161,6 +161,26 @@ the command line, see above.
 The F# support in MonoDevelop uses an in-process background compiler. On the Mac this causes pausing garbage
 collections to kick in which makes editing the compiler in MonoDevelop awkward.
 
+### Running tests (on Windows)
+
+
+Set up a shell (release mode)
+
+```
+cd tests
+run40.bat   
+ngen install ..\lib\release\fsc.exe
+ngen install ..\lib\release\fsi.exe
+```
+Run the tests:
+```
+.\build-and-run.bat
+```
+Look in build-and-run.log.
+
+
+
+
 ### Building F# Core Unit Tests for .NET 4.x (optional)
 
 This uses the proto compiler to build the unit tests that check some parts of `FSharp.Core.dll` and `FSharp.Compiler.dll`. There is also another set of tests under `tests\fsharp`.
diff --git a/tests/config.bat b/tests/config.bat
index 276be18..c9a6f74 100644
--- a/tests/config.bat
+++ b/tests/config.bat
@@ -199,7 +199,7 @@ IF EXIST "%FSCBinPath%\FSharp.Core.dll" set FSCOREDLLPATH=%FSCBinPath%
 set FSCOREDLLPATH=%FSCOREDLLPATH%\FSharp.Core.dll
 
 set FSCOREDLL20PATH=%FSCOREDLL20PATH%\FSharp.Core.dll
-IF EXIST "%FSCBinPath%..\..\net20\bin\FSharp.Core.dll" set FSCOREDLL20PATH=%FSCBinPath%..\..\net20\bin\FSharp.Core.dll
+IF EXIST "%FSCBinPath%net20\FSharp.Core.dll" set FSCOREDLL20PATH=%FSCBinPath%net20\FSharp.Core.dll
 IF EXIST "%FSCBinPath%Runtime\2.0\FSharp.Core.dll" set FSCOREDLL20PATH=%FSCBinPath%Runtime\2.0\FSharp.Core.dll
 
 REM == Set standard flags for invoking powershell scripts
diff --git a/tests/run40.bat b/tests/run40.bat
index 5b167ae..14ee36a 100644
--- a/tests/run40.bat
+++ b/tests/run40.bat
@@ -4,7 +4,7 @@ set _SCRIPT_DRIVE=%~d0
 set _SCRIPT_PATH=%~p0
 set _SCRIPT_ROOT=%_SCRIPT_DRIVE%%_SCRIPT_PATH%
 
-set PATH=%ProgramFiles(x86)%\Microsoft SDKs\Windows\v8.1A\bin\NETFX 4.5.1 Tools;%ProgramFiles(x86)%\Microsoft Visual Studio 12.0\Common7\IDE;%_SCRIPT_ROOT%\..\Release\net40\bin;%_SCRIPT_ROOT%\..\Proto\built\net40\bin;%SystemRoot%\Microsoft.NET\Framework\v4.0.30319;%PATH%
+set PATH=%ProgramFiles(x86)%\Microsoft SDKs\Windows\v8.1A\bin\NETFX 4.5.1 Tools;%ProgramFiles(x86)%\Microsoft Visual Studio 12.0\Common7\IDE;%_SCRIPT_ROOT%\..\lib\release;%SystemRoot%\Microsoft.NET\Framework\v4.0.30319;%PATH%
 
 set FSHARP_HOME=%_SCRIPT_ROOT%
 
diff --git a/tests/run40d.bat b/tests/run40d.bat
index 6d1c684..7ad5b9c 100644
--- a/tests/run40d.bat
+++ b/tests/run40d.bat
@@ -4,7 +4,7 @@ set _SCRIPT_DRIVE=%~d0
 set _SCRIPT_PATH=%~p0
 set _SCRIPT_ROOT=%_SCRIPT_DRIVE%%_SCRIPT_PATH%
 
-set PATH=%ProgramFiles(x86)%\Microsoft SDKs\Windows\v8.1A\bin\NETFX 4.5.1 Tools;%ProgramFiles(x86)%\Microsoft Visual Studio 12.0\Common7\IDE;%_SCRIPT_ROOT%\..\Debug\net40\bin;%_SCRIPT_ROOT%\..\Proto\built\net40\bin;%SystemRoot%\Microsoft.NET\Framework\v4.0.30319;%PATH%
+set PATH=%ProgramFiles(x86)%\Microsoft SDKs\Windows\v8.1A\bin\NETFX 4.5.1 Tools;%ProgramFiles(x86)%\Microsoft Visual Studio 12.0\Common7\IDE;%_SCRIPT_ROOT%\..\lib\debug;%SystemRoot%\Microsoft.NET\Framework\v4.0.30319;%PATH%
 
 set FSHARP_HOME=%_SCRIPT_ROOT%
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/fsharp.git