diff --git a/tests/fsharp/FSharp.Tests.fsproj b/tests/fsharp/FSharp.Tests.fsproj
index cc09622d025..9fb41bcc3cf 100644
--- a/tests/fsharp/FSharp.Tests.fsproj
+++ b/tests/fsharp/FSharp.Tests.fsproj
@@ -67,6 +67,7 @@
+
diff --git a/tests/fsharp/FSharpTestSuiteAsserts.fs b/tests/fsharp/FSharpTestSuiteAsserts.fs
new file mode 100644
index 00000000000..f862421f6cd
--- /dev/null
+++ b/tests/fsharp/FSharpTestSuiteAsserts.fs
@@ -0,0 +1,22 @@
+module FSharpTestSuiteAsserts
+
+open PlatformHelpers
+open FSharpTestSuiteTypes
+
+let requireVSUltimate cfg = attempt {
+ do! match cfg.INSTALL_SKU with
+ | Some (Ultimate) -> Success
+ | x ->
+ // IF /I "%INSTALL_SKU%" NEQ "ULTIMATE" (
+ // echo Test not supported except on Ultimate
+ NUnitConf.skip (sprintf "Test not supported except on Ultimate, was %A" x)
+ // exit /b 0
+ // )
+ }
+
+let requireENCulture () = attempt {
+ do! match System.Threading.Thread.CurrentThread.CurrentCulture.TwoLetterISOLanguageName with
+ | "en" -> Success
+ | c ->
+ NUnitConf.skip (sprintf "Test not supported except en Culture, was %s" c)
+ }
diff --git a/tests/fsharp/core/tests_core.fs b/tests/fsharp/core/tests_core.fs
index 502b941e219..c51f82cd296 100644
--- a/tests/fsharp/core/tests_core.fs
+++ b/tests/fsharp/core/tests_core.fs
@@ -7,20 +7,10 @@ open NUnit.Framework
open NUnitConf
open PlatformHelpers
open FSharpTestSuiteTypes
+open FSharpTestSuiteAsserts
let testContext = FSharpTestSuite.testContext
-let requireVSUltimate cfg = attempt {
- do! match cfg.INSTALL_SKU with
- | Some (Ultimate) -> Success
- | x ->
- // IF /I "%INSTALL_SKU%" NEQ "ULTIMATE" (
- // echo Test not supported except on Ultimate
- NUnitConf.skip (sprintf "Test not supported except on Ultimate, was %A" x)
- // exit /b 0
- // )
- }
-
module Access =
[]
let access p = check (attempt {
@@ -667,7 +657,6 @@ module Printing =
// if NOT EXIST z.output.test.200.bsl COPY z.output.test.200.txt z.output.test.200.bsl
// %PRDIFF% z.output.test.200.txt z.output.test.200.bsl > z.output.test.200.diff
[]
- [] //not enough
[]
[]
[]
@@ -676,6 +665,8 @@ module Printing =
let printing flag diffFileOut expectedFileOut diffFileErr expectedFileErr = check (attempt {
let { Directory = dir; Config = cfg } = testContext ()
+ do! requireENCulture ()
+
let exec p = Command.exec dir cfg.EnvironmentVariables { Output = Inherit; Input = None; } p >> checkResult
let peverify = Commands.peverify exec cfg.PEVERIFY "/nologo"
let copy from' = Commands.copy_y dir from' >> checkResult
diff --git a/tests/fsharp/typeProviders/tests_typeProviders.fs b/tests/fsharp/typeProviders/tests_typeProviders.fs
index 119f827a0df..40b4e2d6b81 100644
--- a/tests/fsharp/typeProviders/tests_typeProviders.fs
+++ b/tests/fsharp/typeProviders/tests_typeProviders.fs
@@ -7,20 +7,10 @@ open NUnit.Framework
open FSharpTestSuiteTypes
open NUnitConf
open PlatformHelpers
+open FSharpTestSuiteAsserts
let testContext = FSharpTestSuite.testContext
-let requireVSUltimate cfg = attempt {
- do! match cfg.INSTALL_SKU with
- | Some (Ultimate) -> Success
- | x ->
- // IF /I "%INSTALL_SKU%" NEQ "ULTIMATE" (
- // echo Test not supported except on Ultimate
- NUnitConf.skip (sprintf "Test not supported except on Ultimate, was %A" x)
- // exit /b 0
- // )
- }
-
module DiamondAssembly =
let build cfg dir = attempt {
@@ -361,6 +351,8 @@ module NegTests =
let negTests name = check (attempt {
let { Directory = dir; Config = cfg } = testContext ()
+ do! requireENCulture ()
+
let exec p = Command.exec dir cfg.EnvironmentVariables { Output = Inherit; Input = None; } p >> checkResult
let fsc = Commands.fsc exec cfg.FSC
let del = Commands.rm dir