[Pkg-cli-apps-commits] [fsharp] 50/71: Test fixes for Windows, keep running after error in 'run.bat' script
Christopher Halse Rogers
raof-guest at moszumanska.debian.org
Fri Jan 17 05:18:15 UTC 2014
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 58e5c97b57ae03b65ec8b6e39a9d0aeb66b38408
Author: Don Syme <donsyme at fastmail.fm>
Date: Sat Nov 30 12:12:19 2013 +0000
Test fixes for Windows, keep running after error in 'run.bat' script
---
README.md | 19 +++++++++++--------
tests/fsharp/core/tdirs | 4 ++--
.../fsharp/core/topinit/test_deterministic_init.fs | 2 +-
tests/fsharp/single-test-run.bat | 21 +++++++++++++++++++++
4 files changed, 35 insertions(+), 11 deletions(-)
diff --git a/README.md b/README.md
index 0392b6b..57109c8 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,12 @@
-This is the F# compiler, core library and core tools (open source edition). It uses the Apache 2.0 license.
+This is the F# compiler, core library and core tools (open edition). It uses the Apache 2.0 license.
-The `master` branch is for the latest version of F# (currently F# 3.0).
+The `master` branch is for the latest version of F# (currently F# 3.1).
To bootstrap the compiler, binaries built from an earlier version of this project are used.
## Requirements
-Requires mono 2.9 or higher. Prefer Mono 3.0.
+Requires mono 3.0 or higher.
On OSX, requires automake 2.69. To install from [homebrew](http://mxcl.github.com/homebrew):
```
@@ -36,21 +36,24 @@ sudo make install
```
By default that makes optimized binaries. To make debug, use ```make CONFIG=debug```
-### On Windows, using msbuild (e.g.. if .NET is installed)
-If you have only VS2012 or VS2013 installed, and not VS2010, you'll need to install the F# 2.0 Runtime (http://www.microsoft.com/en-us/download/details.aspx?id=13450)�.
+### On Windows, using msbuild
+
+If you have only VS2012 or VS2013 installed, and not VS2010, you'll need to install the F# 2.0 Runtime (http://www.microsoft.com/en-us/download/details.aspx?id=13450).
+
+Build using:
```
build.bat
```
This build the proto compiler, then the library, then the final compiler.
-You can also build these independently using
+
+You can also build these independently using:
```
+cd src
msbuild fsharp-proto-build.proj
msbuild fsharp-library-build.proj /p:TargetFramework=net40 /p:Configuration=Release
msbuild fsharp-compiler-build.proj /p:TargetFramework=net40 /p:Configuration=Release
-
```
-
You can also build the FSharp.Core for .NET 2.0, Xamarin Android, Xamarin iOS,
Portable Profile47 (net45+sl5+win8), Portable Profile88 (net4+sl4+wp71+win8), XNA 4.0 for Xbox 360,
Silverlight 5.0 and Windows Phone 7.1, profiles:
diff --git a/tests/fsharp/core/tdirs b/tests/fsharp/core/tdirs
index 2f09e2b..d894d0e 100644
--- a/tests/fsharp/core/tdirs
+++ b/tests/fsharp/core/tdirs
@@ -26,7 +26,7 @@ lazy
letrec
libtest
lift
-load-script
+#load-script
longnames
map
math
@@ -61,4 +61,4 @@ syntax
tlr
topinit
unicode
-verify
\ No newline at end of file
+verify
diff --git a/tests/fsharp/core/topinit/test_deterministic_init.fs b/tests/fsharp/core/topinit/test_deterministic_init.fs
index 7911525..ea3d5f9 100644
--- a/tests/fsharp/core/topinit/test_deterministic_init.fs
+++ b/tests/fsharp/core/topinit/test_deterministic_init.fs
@@ -597,5 +597,5 @@ printfn "Touching value in module Lib85..."
printfn " --> Lib85.x = %A" Lib85.x
printfn "Checking this did cause initialization of module Lib85..."
checkInitialized "Lib85" InitFlag85.init
-System.IO.File.ALL_IN_ONE
+System.IO.File.WriteAllText("test.ok","ok")
exit 0
diff --git a/tests/fsharp/single-test-run.bat b/tests/fsharp/single-test-run.bat
index 8b06ac4..30069c4 100644
--- a/tests/fsharp/single-test-run.bat
+++ b/tests/fsharp/single-test-run.bat
@@ -88,16 +88,19 @@ goto :ERROR
:Ok
echo Ran fsharp %~f0 ok.
+endlocal
exit /b 0
goto :EOF
:Skip
echo Skipped %~f0
+endlocal
exit /b 0
goto :EOF
:Error
call %SCRIPT_ROOT%\ChompErr.bat %ERRORLEVEL% %~f0 "%ERRORMSG%"
+endlocal
exit /b %ERRORLEVEL%
goto :EOF
@@ -113,6 +116,7 @@ if NOT EXIST dont.pipe.to.stdin (
dir test.ok > NUL 2>&1 ) || (
@echo FSI_STDIN failed;
set ERRORMSG=%ERRORMSG% FSI_STDIN failed;
+ goto Error
)
)
goto :EOF
@@ -125,6 +129,7 @@ if NOT EXIST dont.pipe.to.stdin (
dir test.ok > NUL 2>&1 ) || (
@echo FSI_STDIN_OPT failed
set ERRORMSG=%ERRORMSG% FSI_STDIN_OPT failed;
+ goto Error
)
)
goto :EOF
@@ -137,6 +142,7 @@ if NOT EXIST dont.pipe.to.stdin (
dir test.ok > NUL 2>&1 ) || (
@echo FSI_STDIN_GUI failed;
set ERRORMSG=%ERRORMSG% FSI_STDIN_GUI failed;
+ goto Error
)
)
goto :EOF
@@ -149,6 +155,7 @@ if NOT EXIST dont.run.as.script (
dir test.ok > NUL 2>&1 ) || (
@echo FSI_FILE failed
set ERRORMSG=%ERRORMSG% FSI_FILE failed;
+ goto Error
)
)
goto :EOF
@@ -160,6 +167,7 @@ goto :EOF
dir test.ok > NUL 2>&1 ) || (
@echo :FSC_BASIC failed
set ERRORMSG=%ERRORMSG% FSC_BASIC failed;
+ goto Error
)
goto :EOF
@@ -170,6 +178,7 @@ goto :EOF
dir test.ok > NUL 2>&1 ) || (
@echo :FSC_BASIC_64 failed
set ERRORMSG=%ERRORMSG% FSC_BASIC_64 failed;
+ goto Error
)
goto :EOF
@@ -181,6 +190,7 @@ if exist test-hw.* (
dir test.ok > NUL 2>&1 ) || (
@echo :FSC_HW failed
set ERRORMSG=%ERRORMSG% FSC_HW failed;
+ goto Error
)
)
goto :EOF
@@ -192,6 +202,7 @@ goto :EOF
dir test.ok > NUL 2>&1 ) || (
@echo :FSC_O3 failed
set ERRORMSG=%ERRORMSG% FSC_03 failed;
+ goto Error
)
goto :EOF
@@ -202,6 +213,7 @@ goto :EOF
dir test.ok > NUL 2>&1 ) || (
@echo :FSC_OPT_MINUS_DEBUG failed
set ERRORMSG=%ERRORMSG% FSC_OPT_MINUS_DEBUG failed;
+ goto Error
)
goto :EOF
@@ -212,6 +224,7 @@ goto :EOF
dir test.ok > NUL 2>&1 ) || (
@echo :FSC_OPT_PLUS_DEBUG failed
set ERRORMSG=%ERRORMSG% FSC_OPT_PLUS_DEBUG failed;
+ goto Error
)
goto :EOF
@@ -224,6 +237,7 @@ if NOT EXIST dont.use.generated.signature (
dir test.ok > NUL 2>&1 ) || (
@echo :GENERATED_SIGNATURE failed
set ERRORMSG=%ERRORMSG% FSC_GENERATED_SIGNATURE failed;
+ goto Error
)
)
)
@@ -238,6 +252,7 @@ if NOT EXIST dont.use.empty.signature (
dir test.ok > NUL 2>&1 ) || (
@echo :EMPTY_SIGNATURE failed
set ERRORMSG=%ERRORMSG% FSC_EMPTY_SIGNATURE failed;
+ goto Error
)
)
)
@@ -252,6 +267,7 @@ if NOT EXIST dont.use.empty.signature (
dir test.ok > NUL 2>&1 ) || (
@echo :EMPTY_SIGNATURE_OPT --optimize failed
set ERRORMSG=%ERRORMSG% EMPTY_SIGNATURE_OPT --optimize failed;
+ goto Error
)
)
)
@@ -264,6 +280,7 @@ goto :EOF
dir test.ok > NUL 2>&1 ) || (
@echo :FRENCH failed
set ERRORMSG=%ERRORMSG% FRENCH failed;
+ goto Error
)
goto :EOF
@@ -274,6 +291,7 @@ goto :EOF
dir test.ok > NUL 2>&1 ) || (
@echo :SPANISH failed
set ERRORMSG=%ERRORMSG% SPANISH failed;
+ goto Error
)
goto :EOF
@@ -285,6 +303,7 @@ if NOT EXIST dont.compile.test.as.dll (
dir test.ok > NUL 2>&1 ) || (
@echo :AS_DLL failed
set ERRORMSG=%ERRORMSG% AS_DLL failed;
+ goto Error
)
)
goto :EOF
@@ -298,6 +317,7 @@ if NOT EXIST dont.use.wrapper.namespace (
dir test.ok > NUL 2>&1 ) || (
@echo :WRAPPER_NAMESPACE failed
set ERRORMSG=%ERRORMSG% WRAPPER_NAMESPACE failed;
+ goto Error
)
)
)
@@ -312,6 +332,7 @@ if NOT EXIST dont.use.wrapper.namespace (
dir test.ok > NUL 2>&1 ) || (
@echo :WRAPPER_NAMESPACE_OPT failed
set ERRORMSG=%ERRORMSG% WRAPPER_NAMESPACE_OPT failed;
+ goto Error
)
)
)
--
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