[Pkg-cli-apps-commits] [fsharp] 45/71: test fixes for running tests on Windows
Christopher Halse Rogers
raof-guest at moszumanska.debian.org
Fri Jan 17 05:18:14 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 434d99da58b08117758dbcd3cac89148e48d4036
Author: Don Syme <donsyme at fastmail.fm>
Date: Fri Nov 29 23:46:07 2013 +0000
test fixes for running tests on Windows
---
tests/fsharp/core/control/test.fsx | 3 +
tests/fsharp/core/namespaces/test.fsi | 2 +-
.../core/netcore/ConsoleApplication1/Program.cs | 72 +++++++++++-----------
.../netcorelibrary1/netcoretestinglibrary.fsproj | 4 +-
.../core/portable/ConsoleApplication1/Program.cs | 68 ++++++++++----------
.../portablelibrary1/portabletestinglibrary.fsproj | 4 +-
6 files changed, 78 insertions(+), 75 deletions(-)
diff --git a/tests/fsharp/core/control/test.fsx b/tests/fsharp/core/control/test.fsx
index 85e4fb2..3aeb935 100644
--- a/tests/fsharp/core/control/test.fsx
+++ b/tests/fsharp/core/control/test.fsx
@@ -2070,8 +2070,11 @@ let RunAll() =
OnCancelTests.Run()
GenerateTests.Run()
ParallelTests.Run()
+#if Portable
+#else
AsyncWaitOneTest1.Run()
AsyncGenerateTests.Run()
+#endif
#if ALL_IN_ONE
let RUN() = RunAll(); failures
diff --git a/tests/fsharp/core/namespaces/test.fsi b/tests/fsharp/core/namespaces/test.fsi
index 12388fc..bd7c814 100644
--- a/tests/fsharp/core/namespaces/test.fsi
+++ b/tests/fsharp/core/namespaces/test.fsi
@@ -6,7 +6,7 @@ type A = A | B | C
module Utils = begin
val failures : bool ref
- val report_failure : unit -> unit
+ val report_failure : string -> unit
val test : string -> bool -> unit
end
diff --git a/tests/fsharp/core/netcore/ConsoleApplication1/Program.cs b/tests/fsharp/core/netcore/ConsoleApplication1/Program.cs
index e2e869f..4f14e36 100644
--- a/tests/fsharp/core/netcore/ConsoleApplication1/Program.cs
+++ b/tests/fsharp/core/netcore/ConsoleApplication1/Program.cs
@@ -18,40 +18,40 @@ namespace PortableTestEntry
{
SetHooks();
- Run("Core_access", () => { var x = Core_access.aa; });
- Run("Core_apporder", () => { var x = Core_apporder.aa; });
- Run("Core_array", () => { var x = Core_array.aa; });
- Run("Core_attributes", () => { var x = Core_attributes.aa; });
- Run("Core_comprehensions", () => { var x = Core_comprehensions.aa; });
- Run("Core_control", () => { var x = Core_control.aa; });
- Run("Core_controlChamenos", () => { var x = Core_controlChamenos.aa; });
- Run("Core_controlMailBox", () => { var x = Core_controlMailBox.aa; });
- Run("Core_controlStackOverflow", () => { var x = Core_controlStackOverflow.aa; });
- Run("Core_csext", () => { var x = Core_csext.aa; });
- Run("Core_innerpoly", () => { var x = Core_innerpoly.aa; });
- Run("Core_int32", () => { var x = Core_int32.aa; });
- Run("Core_lazy", () => { var x = Core_lazy.aa; });
- Run("Core_letrec", () => { var x = Core_letrec.aa; });
- Run("Core_libtest", () => { var x = Core_libtest.aa; });
- Run("Core_lift", () => { var x = Core_lift.aa; });
- Run("Core_longnames", () => { var x = Core_longnames.aa; });
- Run("Core_map", () => { var x = Core_map.aa; });
- Run("Core_measures", () => { var x = Core_measures.aa; });
- Run("Core_genericMeasures", () => { var x = Core_genericMeasures.aa; });
- Run("Core_nested", () => { var x = Core_nested.aa; });
- Run("Core_patterns", () => { var x = Core_patterns.aa; });
- Run("Core_printf", () => { var x = Core_printf.aa; });
- Run("Core_queriesCustomQueryOps", () => { var x = Core_queriesCustomQueryOps.aa; });
- Run("Core_queriesLeafExpressionConvert", () => { var x = Core_queriesLeafExpressionConvert.aa; });
- Run("Core_queriesNullableOperators", () => { var x = Core_queriesNullableOperators.aa; });
- Run("Core_queriesOverIEnumerable", () => { var x = Core_queriesOverIEnumerable.aa; });
- Run("Core_queriesOverIQueryable", () => { var x = Core_queriesOverIQueryable.aa; });
- Run("Core_quotes", () => { var x = Core_quotes.aa; });
- Run("Core_seq", () => { var x = Core_seq.aa; });
- Run("Core_subtype", () => { var x = Core_subtype.aa; });
- Run("Core_syntax", () => { var x = Core_syntax.aa; });
- Run("Core_tlr", () => { var x = Core_tlr.aa; });
- Run("Core_unicode", () => { var x = Core_unicode.aa; });
+ RUN("Core_access", () => { var x = Core_access.RUN(); });
+ RUN("Core_apporder", () => { var x = Core_apporder.RUN(); });
+ RUN("Core_array", () => { var x = Core_array.RUN(); });
+ RUN("Core_attributes", () => { var x = Core_attributes.RUN(); });
+ RUN("Core_comprehensions", () => { var x = Core_comprehensions.RUN(); });
+ RUN("Core_control", () => { var x = Core_control.RUN(); });
+ RUN("Core_controlChamenos", () => { var x = Core_controlChamenos.RUN(); });
+ RUN("Core_controlMailBox", () => { var x = Core_controlMailBox.RUN(); });
+ RUN("Core_controlStackOverflow", () => { var x = Core_controlStackOverflow.RUN(); });
+ RUN("Core_csext", () => { var x = Core_csext.RUN(); });
+ RUN("Core_innerpoly", () => { var x = Core_innerpoly.RUN(); });
+ RUN("Core_int32", () => { var x = Core_int32.RUN(); });
+ RUN("Core_lazy", () => { var x = Core_lazy.RUN(); });
+ RUN("Core_letrec", () => { var x = Core_letrec.RUN(); });
+ RUN("Core_libtest", () => { var x = Core_libtest.RUN(); });
+ RUN("Core_lift", () => { var x = Core_lift.RUN(); });
+ RUN("Core_longnames", () => { var x = Core_longnames.RUN(); });
+ RUN("Core_map", () => { var x = Core_map.RUN(); });
+ RUN("Core_measures", () => { var x = Core_measures.RUN(); });
+ RUN("Core_genericMeasures", () => { var x = Core_genericMeasures.RUN<int>(); });
+ RUN("Core_nested", () => { var x = Core_nested.RUN(); });
+ RUN("Core_patterns", () => { var x = Core_patterns.RUN(); });
+ RUN("Core_printf", () => { var x = Core_printf.RUN(); });
+ RUN("Core_queriesCustomQueryOps", () => { var x = Core_queriesCustomQueryOps.RUN(); });
+ RUN("Core_queriesLeafExpressionConvert", () => { var x = Core_queriesLeafExpressionConvert.RUN(); });
+ RUN("Core_queriesNullableOperators", () => { var x = Core_queriesNullableOperators.RUN(); });
+ RUN("Core_queriesOverIEnumerable", () => { var x = Core_queriesOverIEnumerable.RUN(); });
+ RUN("Core_queriesOverIQueryable", () => { var x = Core_queriesOverIQueryable.RUN(); });
+ RUN("Core_quotes", () => { var x = Core_quotes.RUN(); });
+ RUN("Core_seq", () => { var x = Core_seq.RUN(); });
+ RUN("Core_subtype", () => { var x = Core_subtype.RUN(); });
+ RUN("Core_syntax", () => { var x = Core_syntax.RUN(); });
+ RUN("Core_tlr", () => { var x = Core_tlr.RUN(); });
+ RUN("Core_unicode", () => { var x = Core_unicode.RUN(); });
return returnCode;
}
@@ -91,9 +91,9 @@ namespace PortableTestEntry
}
// execute and handle errors for individual test areas
- static void Run(string testArea, Action action)
+ static void RUN(string testArea, Action action)
{
- Console.WriteLine("Running area {0}", testArea);
+ Console.WriteLine("RUNning area {0}", testArea);
try
{
diff --git a/tests/fsharp/core/netcore/netcorelibrary1/netcoretestinglibrary.fsproj b/tests/fsharp/core/netcore/netcorelibrary1/netcoretestinglibrary.fsproj
index 65d53e2..81809bd 100644
--- a/tests/fsharp/core/netcore/netcorelibrary1/netcoretestinglibrary.fsproj
+++ b/tests/fsharp/core/netcore/netcorelibrary1/netcoretestinglibrary.fsproj
@@ -24,7 +24,7 @@
<Optimize>false</Optimize>
<Tailcalls>false</Tailcalls>
<OutputPath>bin\Debug\</OutputPath>
- <DefineConstants>TRACE;DEBUG;Portable;NetCore;COMPILED</DefineConstants>
+ <DefineConstants>TRACE;DEBUG;Portable;NetCore;COMPILED;ALL_IN_ONE</DefineConstants>
<WarningLevel>3</WarningLevel>
<DocumentationFile>bin\Debug\NetCoreLibrary1.XML</DocumentationFile>
</PropertyGroup>
@@ -33,7 +33,7 @@
<Optimize>true</Optimize>
<Tailcalls>true</Tailcalls>
<OutputPath>bin\Release\</OutputPath>
- <DefineConstants>TRACE;Portable;NetCore</DefineConstants>
+ <DefineConstants>TRACE;Portable;NetCore;ALL_IN_ONE</DefineConstants>
<WarningLevel>3</WarningLevel>
<DocumentationFile>bin\Release\NetCoreLibrary1.XML</DocumentationFile>
</PropertyGroup>
diff --git a/tests/fsharp/core/portable/ConsoleApplication1/Program.cs b/tests/fsharp/core/portable/ConsoleApplication1/Program.cs
index e2e869f..086d5b0 100644
--- a/tests/fsharp/core/portable/ConsoleApplication1/Program.cs
+++ b/tests/fsharp/core/portable/ConsoleApplication1/Program.cs
@@ -18,40 +18,40 @@ namespace PortableTestEntry
{
SetHooks();
- Run("Core_access", () => { var x = Core_access.aa; });
- Run("Core_apporder", () => { var x = Core_apporder.aa; });
- Run("Core_array", () => { var x = Core_array.aa; });
- Run("Core_attributes", () => { var x = Core_attributes.aa; });
- Run("Core_comprehensions", () => { var x = Core_comprehensions.aa; });
- Run("Core_control", () => { var x = Core_control.aa; });
- Run("Core_controlChamenos", () => { var x = Core_controlChamenos.aa; });
- Run("Core_controlMailBox", () => { var x = Core_controlMailBox.aa; });
- Run("Core_controlStackOverflow", () => { var x = Core_controlStackOverflow.aa; });
- Run("Core_csext", () => { var x = Core_csext.aa; });
- Run("Core_innerpoly", () => { var x = Core_innerpoly.aa; });
- Run("Core_int32", () => { var x = Core_int32.aa; });
- Run("Core_lazy", () => { var x = Core_lazy.aa; });
- Run("Core_letrec", () => { var x = Core_letrec.aa; });
- Run("Core_libtest", () => { var x = Core_libtest.aa; });
- Run("Core_lift", () => { var x = Core_lift.aa; });
- Run("Core_longnames", () => { var x = Core_longnames.aa; });
- Run("Core_map", () => { var x = Core_map.aa; });
- Run("Core_measures", () => { var x = Core_measures.aa; });
- Run("Core_genericMeasures", () => { var x = Core_genericMeasures.aa; });
- Run("Core_nested", () => { var x = Core_nested.aa; });
- Run("Core_patterns", () => { var x = Core_patterns.aa; });
- Run("Core_printf", () => { var x = Core_printf.aa; });
- Run("Core_queriesCustomQueryOps", () => { var x = Core_queriesCustomQueryOps.aa; });
- Run("Core_queriesLeafExpressionConvert", () => { var x = Core_queriesLeafExpressionConvert.aa; });
- Run("Core_queriesNullableOperators", () => { var x = Core_queriesNullableOperators.aa; });
- Run("Core_queriesOverIEnumerable", () => { var x = Core_queriesOverIEnumerable.aa; });
- Run("Core_queriesOverIQueryable", () => { var x = Core_queriesOverIQueryable.aa; });
- Run("Core_quotes", () => { var x = Core_quotes.aa; });
- Run("Core_seq", () => { var x = Core_seq.aa; });
- Run("Core_subtype", () => { var x = Core_subtype.aa; });
- Run("Core_syntax", () => { var x = Core_syntax.aa; });
- Run("Core_tlr", () => { var x = Core_tlr.aa; });
- Run("Core_unicode", () => { var x = Core_unicode.aa; });
+ Run("Core_access", () => { var x = Core_access.RUN(); });
+ Run("Core_apporder", () => { var x = Core_apporder.RUN(); });
+ Run("Core_array", () => { var x = Core_array.RUN(); });
+ Run("Core_attributes", () => { var x = Core_attributes.RUN(); });
+ Run("Core_comprehensions", () => { var x = Core_comprehensions.RUN(); });
+ Run("Core_control", () => { var x = Core_control.RUN(); });
+ Run("Core_controlChamenos", () => { var x = Core_controlChamenos.RUN(); });
+ Run("Core_controlMailBox", () => { var x = Core_controlMailBox.RUN(); });
+ Run("Core_controlStackOverflow", () => { var x = Core_controlStackOverflow.RUN(); });
+ Run("Core_csext", () => { var x = Core_csext.RUN(); });
+ Run("Core_innerpoly", () => { var x = Core_innerpoly.RUN(); });
+ Run("Core_int32", () => { var x = Core_int32.RUN(); });
+ Run("Core_lazy", () => { var x = Core_lazy.RUN(); });
+ Run("Core_letrec", () => { var x = Core_letrec.RUN(); });
+ Run("Core_libtest", () => { var x = Core_libtest.RUN(); });
+ Run("Core_lift", () => { var x = Core_lift.RUN(); });
+ Run("Core_longnames", () => { var x = Core_longnames.RUN(); });
+ Run("Core_map", () => { var x = Core_map.RUN(); });
+ Run("Core_measures", () => { var x = Core_measures.RUN(); });
+ Run("Core_genericMeasures", () => { var x = Core_genericMeasures.RUN<int>(); });
+ Run("Core_nested", () => { var x = Core_nested.RUN(); });
+ Run("Core_patterns", () => { var x = Core_patterns.RUN(); });
+ Run("Core_printf", () => { var x = Core_printf.RUN(); });
+ Run("Core_queriesCustomQueryOps", () => { var x = Core_queriesCustomQueryOps.RUN(); });
+ Run("Core_queriesLeafExpressionConvert", () => { var x = Core_queriesLeafExpressionConvert.RUN(); });
+ Run("Core_queriesNullableOperators", () => { var x = Core_queriesNullableOperators.RUN(); });
+ Run("Core_queriesOverIEnumerable", () => { var x = Core_queriesOverIEnumerable.RUN(); });
+ Run("Core_queriesOverIQueryable", () => { var x = Core_queriesOverIQueryable.RUN(); });
+ Run("Core_quotes", () => { var x = Core_quotes.RUN(); });
+ Run("Core_seq", () => { var x = Core_seq.RUN(); });
+ Run("Core_subtype", () => { var x = Core_subtype.RUN(); });
+ Run("Core_syntax", () => { var x = Core_syntax.RUN(); });
+ Run("Core_tlr", () => { var x = Core_tlr.RUN(); });
+ Run("Core_unicode", () => { var x = Core_unicode.RUN(); });
return returnCode;
}
diff --git a/tests/fsharp/core/portable/portablelibrary1/portabletestinglibrary.fsproj b/tests/fsharp/core/portable/portablelibrary1/portabletestinglibrary.fsproj
index bc37d0a..3a49d23 100644
--- a/tests/fsharp/core/portable/portablelibrary1/portabletestinglibrary.fsproj
+++ b/tests/fsharp/core/portable/portablelibrary1/portabletestinglibrary.fsproj
@@ -23,7 +23,7 @@
<Optimize>false</Optimize>
<Tailcalls>false</Tailcalls>
<OutputPath>bin\Debug\</OutputPath>
- <DefineConstants>TRACE;DEBUG;Portable</DefineConstants>
+ <DefineConstants>TRACE;DEBUG;Portable;ALL_IN_ONE</DefineConstants>
<WarningLevel>3</WarningLevel>
<DocumentationFile>bin\Debug\PortableLibrary1.XML</DocumentationFile>
</PropertyGroup>
@@ -32,7 +32,7 @@
<Optimize>true</Optimize>
<Tailcalls>true</Tailcalls>
<OutputPath>bin\Release\</OutputPath>
- <DefineConstants>TRACE;Portable</DefineConstants>
+ <DefineConstants>TRACE;Portable;ALL_IN_ONE</DefineConstants>
<WarningLevel>3</WarningLevel>
<DocumentationFile>bin\Release\PortableLibrary1.XML</DocumentationFile>
</PropertyGroup>
--
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