[Pkg-cli-apps-commits] [fsharp] 22/71: integrate fix to path for diff tool

[Christopher Halse Rogers]

This is an automated email from the git hooks/post-receive script.

raof-guest pushed a commit to tag 3.1.0
in repository fsharp.

commit d4f6942d8654e47e8cf2bacc7aabb68b02b53c7c
Author: Don Syme <donsyme at fastmail.fm>
Date:   Thu Nov 28 18:38:13 2013 +0000

    integrate fix to path for diff tool
---
 tests/config.bat | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/config.bat b/tests/config.bat
index c9a6f74..4929b12 100644
--- a/tests/config.bat
+++ b/tests/config.bat
@@ -29,7 +29,7 @@ REM add %FSCBinPath% to path only if not already there. Otherwise, the path keep
 echo %path%; | find /i "%FSCBinPath%;" > NUL
 if ERRORLEVEL 1    set PATH=%PATH%;%FSCBinPath%
 
-if "%FSDIFF%"=="" set FSDIFF=%FSHARP_HOME%\src\tests\fsharpqa\testenv\bin\%processor_architecture%\diff.exe -dew
+if "%FSDIFF%"=="" set FSDIFF=%SCRIPT_ROOT%fsharpqa\testenv\bin\%processor_architecture%\diff.exe -dew 
 
 rem check if we're already configured, if not use the configuration from the last line of the config file
 if "%fsc%"=="" ( 
@@ -203,7 +203,7 @@ IF EXIST "%FSCBinPath%net20\FSharp.Core.dll" set FSCOREDLL20PATH=%FSCBinPath%net
 IF EXIST "%FSCBinPath%Runtime\2.0\FSharp.Core.dll" set FSCOREDLL20PATH=%FSCBinPath%Runtime\2.0\FSharp.Core.dll
 
 REM == Set standard flags for invoking powershell scripts
-IF NOT DEFINED PSH_FLAGS SET PSH_FLAGS=-nologo -noprofile -executionpolicy Unrestricted
+IF NOT DEFINED PSH_FLAGS SET PSH_FLAGS=-nologo -noprofile -executionpolicy bypass
 
 if DEFINED _UNATTENDEDLOG exit /b 0
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/fsharp.git