paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-04 11:46:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fix -rpath passing to linker for Windows OS by

Browse Source 
avoiding use of single quotes.
  * Use 'ulimit -t ' instead of timeout for bash shells.

git-svn-id: trunk@19477 -
This commit is contained in:
pierre 2011-10-12 12:33:24 +00:00
parent 37432368e5
commit e366c013e3
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/utils/dotest.pp
View File

@ -730,7 +730,9 @@ begin
if Config.NeedLibrary then if Config.NeedLibrary then
begin begin
if CompilerTarget<>'darwin' then if CompilerTarget<>'darwin' then
args:=args+' -Fl'+TestOutputDir+' ''-k-rpath .''' { do not use single quote for -k as they are mishandled on
Windows Shells }
args:=args+' -Fl'+TestOutputDir+' -k-rpath -k.'
else else
args:=args+' -Fl'+TestOutputDir; args:=args+' -Fl'+TestOutputDir;
end; end;
@ -1115,11 +1117,13 @@ begin
if UseTimeout then if UseTimeout then
begin begin
execcmd:=execcmd+'timeout -9 ';
if Config.Timeout=0 then if Config.Timeout=0 then
Config.Timeout:=DefaultTimeout; Config.Timeout:=DefaultTimeout;
str(Config.Timeout,s); str(Config.Timeout,s);
execcmd:=execcmd+s; if (RemoteShellBase='bash') then
execcmd:=execcmd+'ulimit -t '+s+'; '
else
execcmd:=execcmd+'timeout -9 '+s;
end; end;
{ as we moved to RemotePath, if path is not absolute { as we moved to RemotePath, if path is not absolute
we need to use ./execfilename only } we need to use ./execfilename only }