[Openmp-commits] [openmp] r243165 - LibompMicroTests.cmake: Invoke 'test' instead of using '[ x -eq y ]'

[Hans Wennborg]

Thanks. Merged in r243295.

 - Hans

On Mon, Jul 27, 2015 at 7:35 AM, Peyton, Jonathan L
<jonathan.l.peyton at intel.com> wrote:
> Yes.
>
> -- Johnny
>
> -----Original Message-----
> From: hwennborg at google.com [mailto:hwennborg at google.com] On Behalf Of Hans Wennborg
> Sent: Friday, July 24, 2015 4:41 PM
> To: Peyton, Jonathan L
> Cc: openmp-commits at cs.uiuc.edu
> Subject: Re: [Openmp-commits] [openmp] r243165 - LibompMicroTests.cmake: Invoke 'test' instead of using '[ x -eq y ]'
>
> I assume this is OK for merging to 3.7?
>
> On Fri, Jul 24, 2015 at 2:24 PM, Hans Wennborg <hans at hanshq.net> wrote:
>> Author: hans
>> Date: Fri Jul 24 16:24:48 2015
>> New Revision: 243165
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=243165&view=rev
>> Log:
>> LibompMicroTests.cmake: Invoke 'test' instead of using '[ x -eq y ]'
>>
>> I was getting this cmake error on Mac OS X:
>>
>>   CMake Error: Error in cmake code at
>>   /tmp/openmp/runtime/cmake/LibompMicroTests.cmake:140:
>>   Parse error.  Function missing ending ")".  Instead found bad character with text "[".
>>
>> Perhaps invoking 'test' is less confusing for cmake.
>>
>> Differential Revision: http://reviews.llvm.org/D11493
>>
>> Modified:
>>     openmp/trunk/runtime/cmake/LibompMicroTests.cmake
>>
>> Modified: openmp/trunk/runtime/cmake/LibompMicroTests.cmake
>> URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/cmake/LibompMicroTests.cmake?rev=243165&r1=243164&r2=243165&view=diff
>> ==============================================================================
>> --- openmp/trunk/runtime/cmake/LibompMicroTests.cmake (original)
>> +++ openmp/trunk/runtime/cmake/LibompMicroTests.cmake Fri Jul 24 16:24:48 2015
>> @@ -137,7 +137,7 @@ add_custom_command(
>>    OUTPUT  test-relo/.success test-relo/readelf.log
>>    COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/test-relo
>>    COMMAND readelf -d ${LIBOMP_OUTPUT_DIRECTORY}/${LIBOMP_LIB_FILE} > test-relo/readelf.log
>> -  COMMAND grep -e TEXTREL test-relo/readelf.log \; [ $$? -eq 1 ]
>> +  COMMAND grep -e TEXTREL test-relo/readelf.log \; test $$? -eq 1
>>    COMMAND ${CMAKE_COMMAND} -E touch test-relo/.success
>>    DEPENDS omp
>>  )
>>
>>
>> _______________________________________________
>> Openmp-commits mailing list
>> Openmp-commits at dcs-maillist2.engr.illinois.edu
>> http://lists.cs.uiuc.edu/mailman/listinfo/openmp-commits