Skip to content

Add support for --pathmap #6609

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
KevinRansom merged 11 commits into from
Apr 24, 2019
Merged

Add support for --pathmap #6609

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0755bd7
Merge pull request #1 from Microsoft/master
petera76 Oct 16, 2018
edc7e76
Add support for --pathmap
Oct 19, 2018
80b56c7
Merge branch 'master' into 3812-support-pathmap
saul Apr 22, 2019
fe2046c
Fix build
saul Apr 22, 2019
c8a4c40
Update FSharp.Compiler.Service.fsproj
saul Apr 22, 2019
dee635a
Merge remote-tracking branch 'upstream/master' into 3812-support-pathmap
saul Apr 23, 2019
d566379
Markup
saul Apr 23, 2019
9f7bcd6
Fix tests
saul Apr 23, 2019
ff0a960
Update help40.437.1033.bsl
saul Apr 23, 2019
f3553a4
Update help40-nologo.437.1033.bsl
saul Apr 23, 2019
718a6b0
Update help40.437.1033.bsl
saul Apr 23, 2019
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
Prev Previous commit
Next Next commit
Fix tests
  • Loading branch information
@saul
saul committed Apr 23, 2019
commit 9f7bcd60fa4ecc4195c8cd1a4a5e9d0710d63755
6 changes: 3 additions & 3 deletions tests/fsharpqa/Source/CompilerOptions/fsc/determinism/env.lst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@

# Confirm in normal not-deterministic mode, the same file compiled twice leads to different exes & pdbs
# NOTE: we need to use the timeout because non-determinism in fsc is due to datetime, so we need to guarentee at least 1 sec difference
SOURCE=dummy.fs PRECMD="\$FSC_PIPE dummy.fs && \$FSI_PIPE copyArtifacts.fsx" POSTCMD="\$FSI_PIPE --nologo --quiet --exec binaryCompare.fsx false"
SOURCE=dummy.fs SCFLAGS="--debug:full" PRECMD="\$FSC_PIPE --debug:full dummy.fs && \$FSI_PIPE copyArtifacts.fsx" POSTCMD="\$FSI_PIPE --nologo --quiet --exec binaryCompare.fsx false"
SOURCE=dummy.fs SCFLAGS="--debug:pdbonly" PRECMD="\$FSC_PIPE --debug:pdbonly dummy.fs && \$FSI_PIPE copyArtifacts.fsx" POSTCMD="\$FSI_PIPE --nologo --quiet --exec binaryCompare.fsx false"
SOURCE=dummy.fs PRECMD="\$FSC_PIPE dummy.fs && \$FSI_PIPE copyArtifacts.fsx" POSTCMD="\$FSI_PIPE --nologo --quiet --exec binaryCompare.fsx false"
SOURCE=dummy.fs SCFLAGS="--debug:full" PRECMD="\$FSC_PIPE --debug:full dummy.fs && \$FSI_PIPE copyArtifacts.fsx" POSTCMD="\$FSI_PIPE --nologo --quiet --exec binaryCompare.fsx false"
SOURCE=dummy.fs SCFLAGS="--debug:pdbonly" PRECMD="\$FSC_PIPE --debug:pdbonly dummy.fs && \$FSI_PIPE copyArtifacts.fsx" POSTCMD="\$FSI_PIPE --nologo --quiet --exec binaryCompare.fsx false"
SOURCE=dummy.fs SCFLAGS="--debug:portable" PRECMD="\$FSC_PIPE --debug:portable dummy.fs && \$FSI_PIPE copyArtifacts.fsx" POSTCMD="\$FSI_PIPE --nologo --quiet --exec binaryCompare.fsx false"
SOURCE=dummy.fs SCFLAGS="--debug:embedded" PRECMD="\$FSC_PIPE --debug:embedded dummy.fs && \$FSI_PIPE copyArtifacts.fsx" POSTCMD="\$FSI_PIPE --nologo --quiet --exec binaryCompare.fsx false"

Expand Down
2 changes: 2 additions & 0 deletions tests/fsharpqa/Source/CompilerOptions/fsc/help/help40.437.1033.bsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ Copyright (c) Microsoft Corporation. All Rights Reserved.
--deterministic[+|-] Produce a deterministic assembly
(including module version GUID and
timestamp)
--pathmap:<path=sourcePath;...> Maps physical paths to source path
names output by the compiler
--crossoptimize[+|-] Enable or disable cross-module
optimizations

Expand Down
7 changes: 4 additions & 3 deletions tests/fsharpqa/run.fsharpqa.test.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@ let addToPath path =
if not(Array.contains path splits) then
setEnvVar "PATH" (path + (string Path.PathSeparator) + currentPath)

let nugetCache = Path.Combine(System.Environment.GetEnvironmentVariable "USERPROFILE", ".nuget", "packages")
let rootFolder = Path.Combine(__SOURCE_DIRECTORY__, "..", "..")
let compilerBinFolder = Path.Combine(rootFolder, releaseOrDebug, "net40", "bin")
setEnvVar "CSC_PIPE" (Path.Combine(rootFolder, "packages", "Microsoft.Net.Compilers.2.7.0", "tools", "csc.exe"))
let compilerBinFolder = Path.Combine(rootFolder, "artifacts", "bin", "fsc", releaseOrDebug, "net472")
setEnvVar "CSC_PIPE" (Path.Combine(nugetCache, "Microsoft.Net.Compilers", "2.7.0", "tools", "csc.exe"))
setEnvVar "FSC" (Path.Combine(compilerBinFolder, "fsc.exe"))
setEnvVar "FSCOREDLLPATH" (Path.Combine(compilerBinFolder, "FSharp.Core.dll"))
addToPath compilerBinFolder
Expand All @@ -35,7 +36,7 @@ let runPerl arguments =

use perlProcess =
ProcessStartInfo(
FileName = Path.Combine(rootFolder, "packages", "StrawberryPerl64.5.22.2.1", "Tools", "perl", "bin", "perl.exe"),
FileName = Path.Combine(nugetCache, "StrawberryPerl64", "5.22.2.1", "Tools", "perl", "bin", "perl.exe"),
Arguments = (arguments |> Array.map(fun a -> @"""" + a + @"""") |> String.concat " "),
WorkingDirectory = Path.Combine(rootFolder, "tests", "fsharpqa", "source"),
RedirectStandardOutput = true,
Expand Down