[CMake] Fix compiler-rt tests after r173617

llvm-svn: 173668

4 files changed, 5 insertions, 12 deletions

diff --git a/compiler-rt/cmake/Modules/AddCompilerRT.cmake b/compiler-rt/cmake/Modules/AddCompilerRT.cmake
index dbc38c55afe..d084bf04888 100644
--- a/compiler-rt/cmake/Modules/AddCompilerRT.cmake
+++ b/compiler-rt/cmake/Modules/AddCompilerRT.cmake
@@ -113,9 +113,7 @@ set(COMPILER_RT_GTEST_INCLUDE_CFLAGS
 #                      LINK_FLAGS <link flags>)
 macro(add_compiler_rt_test test_suite test_name)
   parse_arguments(TEST "OBJECTS;DEPS;LINK_FLAGS" "" ${ARGN})
-  set(OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR})
-  file(MAKE_DIRECTORY ${OUTPUT_DIR})
-  set(output_bin "${OUTPUT_DIR}/${test_name}")
+  set(output_bin "${CMAKE_CURRENT_BINARY_DIR}/${test_name}")
   add_custom_command(
     OUTPUT ${output_bin}
     COMMAND clang ${TEST_OBJECTS} -o "${output_bin}"
diff --git a/compiler-rt/lib/asan/tests/CMakeLists.txt b/compiler-rt/lib/asan/tests/CMakeLists.txt
index c3bd6aa37a1..eada5cb2af2 100644
--- a/compiler-rt/lib/asan/tests/CMakeLists.txt
+++ b/compiler-rt/lib/asan/tests/CMakeLists.txt
@@ -196,9 +196,8 @@ if(ANDROID)
     $<TARGET_OBJECTS:asan_inst_test>
   )
   # Setup correct output directory and link flags.
-  get_unittest_directory(OUTPUT_DIR)
   set_target_properties(AsanTest PROPERTIES
-    RUNTIME_OUTPUT_DIRECTORY ${OUTPUT_DIR})
+    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
   set_target_link_flags(AsanTest ${ASAN_LINK_FLAGS})
   target_link_libraries(AsanTest clang_rt.asan-arm-android)
   # Add unit test to test suite.
diff --git a/compiler-rt/lib/msan/tests/CMakeLists.txt b/compiler-rt/lib/msan/tests/CMakeLists.txt
index d2a28b2cba5..461e5918eee 100644
--- a/compiler-rt/lib/msan/tests/CMakeLists.txt
+++ b/compiler-rt/lib/msan/tests/CMakeLists.txt
@@ -77,9 +77,7 @@ endmacro()
 
 macro(msan_link_shared so_list so_name arch)
   parse_arguments(SOURCE "OBJECTS;LINKFLAGS;DEPS" "" ${ARGN})
-  get_unittest_directory(OUTPUT_DIR)
-  file(MAKE_DIRECTORY ${OUTPUT_DIR})
-  set(output_so "${OUTPUT_DIR}/${so_name}.${arch}.so")
+  set(output_so "${CMAKE_CURRENT_BINARY_DIR}/${so_name}.${arch}.so")
   get_target_flags_for_arch(${arch} TARGET_LINKFLAGS)
   clang_link_shared(${output_so}
                 OBJECTS ${SOURCE_OBJECTS}
@@ -92,13 +90,12 @@ endmacro()
 # of objects in ${ARGN}.
 macro(add_msan_test test_suite test_name arch)
   get_target_flags_for_arch(${arch} TARGET_LINK_FLAGS)
-  get_unittest_directory(OUTPUT_DIR)
   add_compiler_rt_test(${test_suite} ${test_name}
                        OBJECTS ${ARGN}
                        DEPS ${MSAN_RUNTIME_LIBRARIES} ${ARGN}
                        LINK_FLAGS ${MSAN_UNITTEST_LINK_FLAGS}
                                   ${TARGET_LINK_FLAGS}
-                                  "-Wl,-rpath=${OUTPUT_DIR}")
+                                  "-Wl,-rpath=${CMAKE_CURRENT_BINARY_DIR}")
 endmacro()
 
 # Main MemorySanitizer unit tests.
diff --git a/compiler-rt/lib/sanitizer_common/tests/CMakeLists.txt b/compiler-rt/lib/sanitizer_common/tests/CMakeLists.txt
index f83a89cbe37..c6ab99689aa 100644
--- a/compiler-rt/lib/sanitizer_common/tests/CMakeLists.txt
+++ b/compiler-rt/lib/sanitizer_common/tests/CMakeLists.txt
@@ -129,9 +129,8 @@ if(ANDROID)
     -O2 -g
     )
   # Setup correct output directory and link flags.
-  get_unittest_directory(OUTPUT_DIR)
   set_target_properties(SanitizerTest PROPERTIES
-    RUNTIME_OUTPUT_DIRECTORY ${OUTPUT_DIR})
+    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
   set_target_link_flags(SanitizerTest ${SANITIZER_TEST_LINK_FLAGS})
   # Add unit test to test suite.
   add_dependencies(SanitizerUnitTests SanitizerTest)