diff --git a/tests/fsharp/core/quotes/cslib.dll b/tests/fsharp/core/quotes/cslib.dll deleted file mode 100644 index 79b530ded94..00000000000 Binary files a/tests/fsharp/core/quotes/cslib.dll and /dev/null differ diff --git a/tests/fsharp/tests.fs b/tests/fsharp/tests.fs index 338bad2e373..27a80b2e9e3 100644 --- a/tests/fsharp/tests.fs +++ b/tests/fsharp/tests.fs @@ -72,16 +72,6 @@ module CoreTests = exec cfg ("." ++ "test-langversion-46.exe") "" testOkFile.CheckExists() - - // This test stays in FsharpSuite for a later migration phases, it uses hardcoded #r to a C# compiled cslib.dll inside - [] - let ``quotes-FSC-FSC_DEBUG`` () = singleTestBuildAndRun "core/quotes" FSC_DEBUG - - [] - let ``quotes-FSC-BASIC`` () = singleTestBuildAndRun "core/quotes" FSC_OPTIMIZED - - [] - let ``quotes-FSI-BASIC`` () = singleTestBuildAndRun "core/quotes" FSI #endif @@ -818,12 +808,11 @@ module CoreTests = #endif -#if !NETCOREAPP +#if !NETCOREAPP [] let quotes () = let cfg = testConfig "core/quotes" - csc cfg """/nologo /target:library /out:cslib.dll""" ["cslib.cs"] fsc cfg "%s -o:test.exe -r cslib.dll -g" cfg.fsc_flags ["test.fsx"] @@ -864,6 +853,30 @@ module CoreTests = testOkFile.CheckExists() end + // Previously a comment here said: + // "This test stays in FsharpSuite for a later migration phases, it uses hardcoded #r to a C# compiled cslib.dll inside" + // This is resolved by compiling cslib.dll separately in each test. + [] + let ``quotes-FSC-FSC_DEBUG`` () = + let cfg = testConfig "core/quotes" + csc cfg """/nologo /target:library /out:cslib.dll""" ["cslib.cs"] + + singleTestBuildAndRun "core/quotes" FSC_DEBUG + + [] + let ``quotes-FSC-BASIC`` () = + let cfg = testConfig "core/quotes" + csc cfg """/nologo /target:library /out:cslib.dll""" ["cslib.cs"] + + singleTestBuildAndRun "core/quotes" FSC_OPTIMIZED + + [] + let ``quotes-FSI-BASIC`` () = + let cfg = testConfig "core/quotes" + csc cfg """/nologo /target:library /out:cslib.dll""" ["cslib.cs"] + + singleTestBuildAndRun "core/quotes" FSI + [] let parsing () = let cfg = testConfig "core/parsing"