diff options
| author | Roman Artemev <rartemev@microsoft.com> | 2017-06-02 11:47:04 -0700 |
|---|---|---|
| committer | Roman Artemev <rartemev@microsoft.com> | 2017-06-02 11:47:04 -0700 |
| commit | 19dabb0e79a08f9925d205a0d22114a75df10967 (patch) | |
| tree | 4c3bb7fe95e3e8d49b259cec31460e8e551e6b5b /tests/src | |
| parent | adaaa2e65127660166b7d2a3454e154f61f8218f (diff) | |
| download | coreclr-19dabb0e79a08f9925d205a0d22114a75df10967.tar.gz coreclr-19dabb0e79a08f9925d205a0d22114a75df10967.tar.bz2 coreclr-19dabb0e79a08f9925d205a0d22114a75df10967.zip | |
attempt to fix r2r test failures
Diffstat (limited to 'tests/src')
| -rw-r--r-- | tests/src/CLRTest.Jit.targets | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/src/CLRTest.Jit.targets b/tests/src/CLRTest.Jit.targets index b1bdeef21e..7364c7f20a 100644 --- a/tests/src/CLRTest.Jit.targets +++ b/tests/src/CLRTest.Jit.targets @@ -24,10 +24,10 @@ WARNING: When setting properties based on their current state (for example: Returns="$(JitDisasmBashScript)"> <PropertyGroup> <InputAssemblyName Condition="('$(CLRTestKind)' == 'RunOnly') and ('$(RunningOnUnix)' == 'true')">$([MSBuild]::MakeRelative($(OutputPath.Replace("/","\\")), $(_CLRTestToRunFileFullPath.Replace("/","\\"))).Replace("\\","/"))</InputAssemblyName> - <InputAssemblyName Condition="('$(CLRTestKind)' == 'RunOnly') and ('$(RunningOnUnix)' != 'true')">$([MSBuild]::MakeRelative($(OutputPath), $(_CLRTestToRunFileFullPath)))</InputAssemblyName> + <InputAssemblyName Condition="('$(CLRTestKind)' == 'RunOnly') and ('$(RunningOnUnix)' != 'true')">$([MSBuild]::MakeRelative($(OutputPath), $(_CLRTestToRunFileFullPath)).Replace("\","/"))</InputAssemblyName> <InputAssemblyName Condition="'$(CLRTestKind)' == 'BuildAndRun'">$(MSBuildProjectName).exe</InputAssemblyName> <JitDisasmOut Condition="'$(RunningOnUnix)' == 'true'">$([MSBuild]::MakeRelative($(OutputPath.Replace("/","\\")), $(BaseOutputPathWithConfig.Replace("/","\\"))dasm\$(BuildProjectRelativeDir.Replace("/","\\"))).Replace("\\","/"))</JitDisasmOut> - <JitDisasmOut Condition="'$(RunningOnUnix)' != 'true'">$([MSBuild]::MakeRelative($(OutputPath), $(BaseOutputPathWithConfig)dasm\$(BuildProjectRelativeDir)))</JitDisasmOut> + <JitDisasmOut Condition="'$(RunningOnUnix)' != 'true'">$([MSBuild]::MakeRelative($(OutputPath), $(BaseOutputPathWithConfig)dasm\$(BuildProjectRelativeDir)).Replace("\","/"))</JitDisasmOut> <JitDisasmBashScript> <![CDATA[ # JitDisasm Script @@ -77,7 +77,7 @@ if defined RunningJitDisasm ( Returns="$(IlasmRoundTripBashScript)"> <PropertyGroup> <InputAssemblyName Condition="('$(CLRTestKind)' == 'RunOnly') and ('$(RunningOnUnix)' == 'true')">$([MSBuild]::MakeRelative($(OutputPath.Replace("/","\\")), $(_CLRTestToRunFileFullPath.Replace("/","\\"))).Replace("\\","/"))</InputAssemblyName> - <InputAssemblyName Condition="('$(CLRTestKind)' == 'RunOnly') and ('$(RunningOnUnix)' != 'true')">$([MSBuild]::MakeRelative($(OutputPath), $(_CLRTestToRunFileFullPath)))</InputAssemblyName> + <InputAssemblyName Condition="('$(CLRTestKind)' == 'RunOnly') and ('$(RunningOnUnix)' != 'true')">$([MSBuild]::MakeRelative($(OutputPath), $(_CLRTestToRunFileFullPath)).Replace("\","/"))</InputAssemblyName> <InputAssemblyName Condition="'$(CLRTestKind)' == 'BuildAndRun'">$(MSBuildProjectName).exe</InputAssemblyName> <DisassemblyName>$(MSBuildProjectName).dasm.il</DisassemblyName> <TargetAssemblyName>$(MSBuildProjectName).asm.exe</TargetAssemblyName> |