Support running tests from the VS IDE and XCode.

Untested, but should work :)

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@124975 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index c4237eb051260eb3c4a1f790ecc8b56d2648e703..4c15e8f5f8624c61518e69f7b22b8f31777c7531 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -50,10 +50,12 @@ if(PYTHONINTERP_FOUND)
   if( LLVM_MAIN_SRC_DIR )
     set(LIT "${LLVM_SOURCE_DIR}/utils/lit/lit.py")
   else()
-    set(LIT "${PATH_TO_LLVM_BUILD}/bin/llvm-lit")
+    set(LIT "${PATH_TO_LLVM_BUILD}/bin/${CMAKE_CFG_INTDIR}/llvm-lit")
   endif()
 
-  set(CLANG_TEST_EXTRA_ARGS "--path=${CLANG_BINARY_DIR}/bin")
+  if( PATH_TO_LLVM_BUILD )
+    set(CLANG_TEST_EXTRA_ARGS "--path=${CLANG_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}")
+  endif()
 
   option(CLANG_TEST_USE_VG "Run Clang tests under Valgrind" OFF)
   if(CLANG_TEST_USE_VG)