Skip to content

Fix tests #10766

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vzarytovskii merged 1 commit into from
Dec 21, 2020
Merged

Fix tests #10766

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tests/FSharp.Test.Utilities/CompilerAssert.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ let main argv = 0"""
#endif
let timeout = 30000
let exitCode, output, errors = Commands.executeProcess (Some filename) arguments (Path.GetDirectoryName(outputFilePath)) timeout
(exitCode, output |> String.concat Environment.NewLine, errors |> String.concat Environment.NewLine)
(exitCode, output |> String.concat "\n", errors |> String.concat "\n")

static member CompileWithErrors(cmpl: Compilation, expectedErrors, ?ignoreWarnings) =
let ignoreWarnings = defaultArg ignoreWarnings false
Expand Down Expand Up @@ -496,7 +496,7 @@ let main argv = 0"""
executeBuiltApp outputFilePath deps))

static member ExecutionHasOutput(cmpl: Compilation, expectedOutput: string) =
CompilerAssert.Execute(cmpl, newProcess = true, onOutput = (fun output -> Assert.AreEqual(expectedOutput, output)))
CompilerAssert.Execute(cmpl, newProcess = true, onOutput = (fun output -> Assert.AreEqual(expectedOutput, output, sprintf "'%s' = '%s'" expectedOutput output)))

/// Assert that the given source code compiles with the `defaultProjectOptions`, with no errors or warnings
static member CompileOfAst isExe source =
Expand Down