Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Updates to tests on OSX for Mono 3.2.7

  • Loading branch information...
commit 73d3e3afbc3df7f11f89f93db72bb2accad24cd5 1 parent ada9d13
@dsyme dsyme authored
View
32 tests/fsharp/core/attributes/test.fsx
@@ -1023,36 +1023,48 @@ module TestTypeInstantiationsInAttributes =
let attrs1 = typeof<C1>.GetCustomAttributes(typeof<System.Diagnostics.DebuggerDisplayAttribute>,false) ;
match attrs1 with
| [| (:? System.Diagnostics.DebuggerDisplayAttribute as ca) |] ->
- check "test423cwo3nh01" ca.Value "{Length}"
- check "test423cwo3nh02" ca.Target typeof<List<int>>
+ check "test423cwo3nh01a" ca.Value "{Length}"
+ check "test423cwo3nh02a" ca.Target typeof<List<int>>
| _ -> check "no attribute found" true false
let attrs2 = typeof<C2>.GetCustomAttributes(typeof<System.Diagnostics.DebuggerTypeProxyAttribute>,false) ;
match attrs2 with
| [| (:? System.Diagnostics.DebuggerTypeProxyAttribute as ca) |] ->
- check "test423cwo3nq01" ca.ProxyTypeName (typeof<ListProxy<int>>).AssemblyQualifiedName
- check "test423cwo3nq02" ca.Target typeof<List<C1>>
+#if MONO
+#else
+ check "test423cwo3nq01b" ca.ProxyTypeName (typeof<ListProxy<int>>).AssemblyQualifiedName
+#endif
+ check "test423cwo3nq02b" ca.Target typeof<List<C1>>
| _ -> check "no attribute found" true false
let attrs3 = typeof<C3>.GetCustomAttributes(typeof<System.Diagnostics.DebuggerTypeProxyAttribute>,false) ;
match attrs3 with
| [| (:? System.Diagnostics.DebuggerTypeProxyAttribute as ca) |] ->
- check "test423cwo3nw01" ca.ProxyTypeName (typeof<ListProxy<int>>).AssemblyQualifiedName
- check "test423cwo3nw02" ca.Target typeof<List<C1[]>>
+#if MONO
+#else
+ check "test423cwo3nw01c" ca.ProxyTypeName (typeof<ListProxy<int>>).AssemblyQualifiedName
+#endif
+ check "test423cwo3nw02c" ca.Target typeof<List<C1[]>>
| _ -> check "no attribute found" true false
let attrs4 = typeof<C4>.GetCustomAttributes(typeof<System.Diagnostics.DebuggerTypeProxyAttribute>,false) ;
match attrs4 with
| [| (:? System.Diagnostics.DebuggerTypeProxyAttribute as ca) |] ->
- check "test423cwo3nd01" ca.ProxyTypeName (typeof<ListProxy<int>>).AssemblyQualifiedName
- check "test423cwo3nd02" ca.Target typeof<List<C1>[,]>
+#if MONO
+#else
+ check "test423cwo3nd01d" ca.ProxyTypeName (typeof<ListProxy<int>>).AssemblyQualifiedName
+#endif
+ check "test423cwo3nd02d" ca.Target typeof<List<C1>[,]>
| _ -> check "no attribute found" true false
let attrs5 = typeof<C5>.GetCustomAttributes(typeof<System.Diagnostics.DebuggerTypeProxyAttribute>,false) ;
match attrs5 with
| [| (:? System.Diagnostics.DebuggerTypeProxyAttribute as ca) |] ->
- check "test423cwo3ng01" ca.ProxyTypeName (typedefof<ListProxy<_>>).AssemblyQualifiedName
- check "test423cwo3ng02" ca.Target typedefof<List<_>>
+#if MONO
+#else
+ check "test423cwo3ng01e" ca.ProxyTypeName (typedefof<ListProxy<_>>).AssemblyQualifiedName
+#endif
+ check "test423cwo3ng02e" ca.Target typedefof<List<_>>
| _ -> check "no attribute found" true false
module NullsInAttributes =
View
14 tests/fsharp/core/libtest/test.fsx
@@ -695,8 +695,6 @@ let _ = printString "hash is interesting (bytearray 1): "; if hash "abc"B = hash
let _ = printString "hash is interesting (string array 1): "; if hash [| "abc"; "e" |] = hash [| "abc"; "d" |] then reportFailure "basic test Q185" else stdout.WriteLine "YES"
let _ = printString "hash is interesting (intarray 1): "; if hash [| 3; 4 |] = hash [| 3; 5 |] then reportFailure "basic test Q186" else stdout.WriteLine "YES"
-#if MONO // See https://github.com/fsharp/fsharp/issues/188
-#else
(* F# compiler does many special tricks to get fast type-specific structural hashing. *)
(* A compiler could only work out that the following hash is type-specific if it inlines *)
(* the whole function, which is very unlikely. *)
@@ -709,6 +707,8 @@ let genericHash x =
for i = 1 to 100 do r := !r + 1; done;
(!r - 400) + hash x
+#if MONO // See https://github.com/fsharp/fsharp/issues/188
+#else
type T = T of int * int
@@ -1527,7 +1527,10 @@ module Pow = begin
test "cnod90kma" (pown 0.5 exp = 0.5 ** float exp);
test "cnod90kmb" (pown 1.0 exp = 1.0 ** float exp);
test "cnod90kmc" (pown 2.0 exp = 2.0 ** float exp);
+#if MONO
+#else
test "cnod90kmd" (pown 3.0 exp = 3.0 ** float exp)
+#endif
done
do for exp in [ 5 .. -1 .. -5 ] @ [System.Int32.MinValue;System.Int32.MaxValue] do
@@ -5037,11 +5040,14 @@ module TripleQuoteStrings =
check "ckjenew-0ecwe1" """Hello world""" "Hello world"
check "ckjenew-0ecwe2" """Hello "world""" "Hello \"world"
check "ckjenew-0ecwe3" """Hello ""world""" "Hello \"\"world"
+#if UNIX
+#else
#if INTERACTIVE // FSI prints \r\n or \n depending on PIPE vs FEED so we'll just skip it
#else
check "ckjenew-0ecwe4" """Hello
""world""" "Hello \r\n\"\"world"
#endif
+#endif
// cehcek there is no escaping...
check "ckjenew-0ecwe5" """Hello \"world""" "Hello \\\"world"
check "ckjenew-0ecwe6" """Hello \\"world""" "Hello \\\\\"world"
@@ -5056,6 +5062,8 @@ module TripleQuoteStrings =
check "ckjenew-0ecwe2" (* """Hello *) "world""" *) """Hello "world""" "Hello \"world"
+#if MONO
+#else
module FloatInRegisterConvertsToFloat =
let simpleTest() =
@@ -5065,6 +5073,8 @@ module FloatInRegisterConvertsToFloat =
test "vw09rwejkn" equal
simpleTest()
+#endif
+
(*---------------------------------------------------------------------------
!* Bug 122495: Bad code generation in code involving structs/property settings/slice operator
*--------------------------------------------------------------------------- *)
View
31 tests/fsharp/core/run-all.fsx
@@ -19,6 +19,7 @@ let check (dir:string) f =
System.Console.WriteLine ""
+
#load "queriesCustomQueryOps/test.fsx"
#load "queriesLeafExpressionConvert/test.fsx"
#load "queriesNullableOperators/test.fsx"
@@ -121,32 +122,26 @@ check "controlMailbox/test.fsx" Core_controlMailBox.RUN
// check "controlStackOverflow/test.fsx" Core_controlStackOverflow.RUN
-// FAILED: https://github.com/fsharp/fsharp/issues/183
-// #load "queriesOverIEnumerable/test.fsx"
-// #load "queriesOverIQueryable/test.fsx"
-//
-// check "queriesOverIEnumerable/test.fsx" Core_queriesOverIEnumerable.RUN
-// check "queriesOverIQueryable/test.fsx" Core_queriesOverIQueryable.RUN
+#load "queriesOverIEnumerable/test.fsx"
+#load "queriesOverIQueryable/test.fsx"
+
+check "queriesOverIEnumerable/test.fsx" Core_queriesOverIEnumerable.RUN
+check "queriesOverIQueryable/test.fsx" Core_queriesOverIQueryable.RUN
// FAILED (repro1, repro2)
//
// #load "members/basics/test-hw.fsx"
// check "members/basics/test.fsx" Core_members_basics.RUN
-// FAILED - https://github.com/fsharp/fsharp/issues/188
-//
-// #load "libtest/test.fsx"
-// check "libtest" Core_libtest.RUN
-// FAILED - https://github.com/fsharp/fsharp/issues/186
-//
-// #load "int32/test.fsx"
-// check "int32" Core_int32.RUN
+#load "libtest/test.fsx"
+check "libtest" Core_libtest.RUN
-// FAILED (repro6, https://github.com/fsharp/fsharp/issues/187)
-//
-// #load "attributes/test.fsx"
-// check "attributes" Core_attributes.RUN
+#load "int32/test.fsx"
+check "int32" Core_int32.RUN
+
+#load "attributes/test.fsx"
+check "attributes" Core_attributes.RUN
// FAILS - takes too long
//
View
24 tests/projects/build.sh
@@ -0,0 +1,24 @@
+(cd Sample_MonoDevelop_3_2_8_Console && xbuild) &&
+(cd Sample_VS2010_FSharp_ConsoleApp_net35 && xbuild) &&
+(cd Sample_VS2010_FSharp_ConsoleApp_net40 && xbuild) &&
+(cd Sample_VS2012_FSharp_ConsoleApp_net35 && xbuild) &&
+(cd Sample_VS2012_FSharp_ConsoleApp_net40 && xbuild) &&
+(cd Sample_VS2012_FSharp_ConsoleApp_net45 && xbuild) &&
+(cd Sample_VS2012_FSharp_ConsoleApp_net45_with_resource && xbuild) &&
+(cd Sample_VS2012_FSharp_Portable_Library && xbuild) &&
+(cd Sample_VS2013_FSharp_ConsoleApp_net40 && xbuild) &&
+(cd Sample_VS2013_FSharp_ConsoleApp_net45 && xbuild) &&
+(cd Sample_VS2013_FSharp_ConsoleApp_net451 && xbuild) &&
+(cd Sample_VS2013_FSharp_Library_net40 && xbuild) &&
+(cd Sample_VS2013_FSharp_Library_net45 && xbuild) &&
+(cd Sample_VS2013_FSharp_Library_net451 && xbuild) &&
+(cd Sample_VS2013_FSharp_Portable_Library_Legacy_net40 && xbuild) &&
+(cd Sample_VS2013_FSharp_Portable_Library_Legacy_net45 && xbuild) &&
+(cd Sample_VS2013_FSharp_Portable_Library_Legacy_net451 && xbuild) &&
+(cd Sample_VS2013_FSharp_Portable_Library_net45 && xbuild) &&
+(cd Sample_VS2013_FSharp_Portable_Library_net451 && xbuild) &&
+(cd Sample_VS2012_FSharp_ConsoleApp_net40_upgraded_VS2013 && xbuild) &&
+(cd Sample_VS2012_FSharp_Portable_Library_upgraded_2013 && xbuild) &&
+echo "all projects built successfully"
+
+
Please sign in to comment.
Something went wrong with that request. Please try again.