diff options
| author | Edward O'Callaghan <eocallaghan@auroraux.org> | 2009-10-27 23:23:41 +0000 |
|---|---|---|
| committer | Edward O'Callaghan <eocallaghan@auroraux.org> | 2009-10-27 23:23:41 +0000 |
| commit | 1bafa6de57c5bea8b9b0d536cbda4ac96900a9d0 (patch) | |
| tree | 2dd8458fe8882ed5e816e2ceb04ef6d83b8f4b22 /compiler-rt | |
| parent | cd3939ef0ed644caea98e19ff16ede325fd61149 (diff) | |
| download | bcm5719-llvm-1bafa6de57c5bea8b9b0d536cbda4ac96900a9d0.tar.gz bcm5719-llvm-1bafa6de57c5bea8b9b0d536cbda4ac96900a9d0.zip | |
Fix cmake test suit for compiler-rt.
llvm-svn: 85339
Diffstat (limited to 'compiler-rt')
| -rw-r--r-- | compiler-rt/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | compiler-rt/cmake/Modules/MacroAddCheckTest.cmake | 3 | ||||
| -rw-r--r-- | compiler-rt/test/CMakeLists.txt | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt index fe0821a66c0..4e6f56563b3 100644 --- a/compiler-rt/CMakeLists.txt +++ b/compiler-rt/CMakeLists.txt @@ -50,5 +50,5 @@ ENDIF( BUILD_BLOCKS_RUNTIME ) ADD_SUBDIRECTORY( lib ) # Tests are being ignored for until the very basics are working. -#INCLUDE( MacroAddCheckTest ) +INCLUDE( MacroAddCheckTest ) ADD_SUBDIRECTORY( test ) diff --git a/compiler-rt/cmake/Modules/MacroAddCheckTest.cmake b/compiler-rt/cmake/Modules/MacroAddCheckTest.cmake index 266ed0fb189..a1391218871 100644 --- a/compiler-rt/cmake/Modules/MacroAddCheckTest.cmake +++ b/compiler-rt/cmake/Modules/MacroAddCheckTest.cmake @@ -7,5 +7,6 @@ set(CMAKE_C_FLAGS_PROFILING "-g -pg") macro (MACRO_ADD_CHECK_TEST _testName _testSource) add_executable(${_testName} ${_testSource}) target_link_libraries(${_testName} ${ARGN}) - add_test(${_testName} ${CMAKE_CURRENT_BINARY_DIR}/${_testName}) + get_target_property(_targetLocation ${_testName} LOCATION) + add_test(${_testName} ${_targetLocation}) endmacro (MACRO_ADD_CHECK_TEST) diff --git a/compiler-rt/test/CMakeLists.txt b/compiler-rt/test/CMakeLists.txt index dedcde90f36..c8486b80938 100644 --- a/compiler-rt/test/CMakeLists.txt +++ b/compiler-rt/test/CMakeLists.txt @@ -1,6 +1,7 @@ PROJECT( tests C ) SET( CompilerRT_LIBRARY CompilerRT ) +INCLUDE_DIRECTORIES(${CompilerRT_SOURCE_DIR}/lib) # create test library # add_library(${CompilerRT_LIBRARY} STATIC support.c cmdline.c) |
