This is an archive of the discontinued LLVM Phabricator instance.

LibompMicroTests.cmake: Invoke 'test' instead of using '[ x -eq y ]'
ClosedPublic

Authored by hans on Jul 24 2015, 1:27 PM.

Download Raw Diff

Details

Reviewers

Commits

rGa7981210396a: Merging r243165: --------------------------------------------------------------…
rGfd4dfdcea1c9: LibompMicroTests.cmake: Invoke 'test' instead of using '[ x -eq y ]'
rOMP243165: LibompMicroTests.cmake: Invoke 'test' instead of using '[ x -eq y ]'
rL243165: LibompMicroTests.cmake: Invoke 'test' instead of using '[ x -eq y ]'

Summary

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.

Diff Detail

Repository: rL LLVM

Event Timeline

hans updated this revision to Diff 30599.Jul 24 2015, 1:27 PM

hans retitled this revision from to LibompMicroTests.cmake: Invoke 'test' instead of using '[ x -eq y ]'.

hans updated this object.

hans added a reviewer: jlpeyton.

hans added a subscriber: openmp-commits.

LGTM.

This revision is now accepted and ready to land.Jul 24 2015, 1:50 PM

Closed by commit rL243165: LibompMicroTests.cmake: Invoke 'test' instead of using '[ x -eq y ]' (authored by hans). · Explain WhyJul 24 2015, 2:25 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents

Path

Size

openmp/

trunk/

runtime/

cmake/

LibompMicroTests.cmake

2 lines

Diff 30608

openmp/trunk/runtime/cmake/LibompMicroTests.cmake

	Show First 20 Lines • Show All 131 Lines • ▼ Show 20 Lines
	endif()			endif()

	# test-relo			# test-relo
	add_custom_target(libomp-test-relo DEPENDS test-relo/.success)			add_custom_target(libomp-test-relo DEPENDS test-relo/.success)
	add_custom_command(			add_custom_command(
	OUTPUT test-relo/.success test-relo/readelf.log			OUTPUT test-relo/.success test-relo/readelf.log
	COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/test-relo			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 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			COMMAND ${CMAKE_COMMAND} -E touch test-relo/.success
	DEPENDS omp			DEPENDS omp
	)			)

	# test-execstack			# test-execstack
	add_custom_target(libomp-test-execstack DEPENDS test-execstack/.success)			add_custom_target(libomp-test-execstack DEPENDS test-execstack/.success)
	add_custom_command(			add_custom_command(
	OUTPUT test-execstack/.success			OUTPUT test-execstack/.success
	▲ Show 20 Lines • Show All 67 Lines • Show Last 20 Lines