[Openmp-commits] [openmp] r243295 - Merging r243165:

[Hans Wennborg]

Author: hans
Date: Mon Jul 27 13:16:38 2015
New Revision: 243295

URL: http://llvm.org/viewvc/llvm-project?rev=243295&view=rev
Log:
Merging r243165:
------------------------------------------------------------------------
r243165 | hans | 2015-07-24 14:24:48 -0700 (Fri, 24 Jul 2015) | 11 lines

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/branches/release_37/   (props changed)
    openmp/branches/release_37/runtime/cmake/LibompMicroTests.cmake

Propchange: openmp/branches/release_37/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 27 13:16:38 2015
@@ -1 +1 @@
-/openmp/trunk:242285,242298,242301,242604,243017
+/openmp/trunk:242285,242298,242301,242604,243017,243165

Modified: openmp/branches/release_37/runtime/cmake/LibompMicroTests.cmake
URL: http://llvm.org/viewvc/llvm-project/openmp/branches/release_37/runtime/cmake/LibompMicroTests.cmake?rev=243295&r1=243294&r2=243295&view=diff
==============================================================================
--- openmp/branches/release_37/runtime/cmake/LibompMicroTests.cmake (original)
+++ openmp/branches/release_37/runtime/cmake/LibompMicroTests.cmake Mon Jul 27 13:16:38 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
 )