[llvm-commits] [test-suite] r51369 - /test-suite/trunk/RunSafely.sh

[Tanya M. Lattner]

Yes, it can be merged in.

-Tanya

On Wed, 21 May 2008, Matthijs Kooijman wrote:

> Tanya,
>
> should this commit perhaps be included in the release? It makes the
> test-suite work on Ubuntu and BSD's. Or is the test-suite not included with a
> release?
>
> Gr.
>
> Matthijs
>
> On Wed, May 21, 2008 at 10:47:33AM -0000, Matthijs Kooijman wrote:
>> Author: matthijs
>> Date: Wed May 21 05:47:32 2008
>> New Revision: 51369
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=51369&view=rev
>> Log:
>> Run test-suite commands in (another) subshell. This ensures that the output of
>> the program and the time command is properly separated. This used to work only
>> on shells that have a builtin "time" command (such as bash). This change makes
>> things work consistently among different shells (tested on bash, dash and
>> FreeBSD sh) and should be POSIX compatible.
>>
>> A similar change is probably needed for the remote execution part, but someone
>> who is using that should have a look at it.
>>
>>
>> Modified:
>>     test-suite/trunk/RunSafely.sh
>>
>> Modified: test-suite/trunk/RunSafely.sh
>> URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/RunSafely.sh?rev=51369&r1=51368&r2=51369&view=diff
>>
>> ==============================================================================
>> --- test-suite/trunk/RunSafely.sh (original)
>> +++ test-suite/trunk/RunSafely.sh Wed May 21 05:47:32 2008
>> @@ -105,7 +105,7 @@
>>  fi
>>
>>  if [ "x$RHOST" = x ] ; then
>> -  ( sh -c "$ULIMITCMD time -p $COMMAND >$OUTFILE 2>&1 < $INFILE; echo exit \$?" ) 2>&1 \
>> +  ( sh -c "$ULIMITCMD time -p sh -c '$COMMAND >$OUTFILE 2>&1 < $INFILE; echo exit \$?'" ) 2>&1 \
>>      | awk -- '\
>>  BEGIN     { cpu = 0.0; }
>>  /^user/   { cpu += $2; print; }
>>
>>
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at cs.uiuc.edu
>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>>
>