[Tests] Explicitly link test_binary.bin against in-tree libc++ (#19)

Author: kuilpd

lldb/unittests/DIL/DILTests.cpp

@@ -1571,11 +1571,11 @@ TEST_F(EvalTest, TestCxxStaticCast) {
 
   // Cast to nullptr.
   EXPECT_THAT(Eval("static_cast<nullptr_t>((int)0)"),
-              IsError("static_cast from 'int' to 'nullptr_t' (canonically "
+              IsError("static_cast from 'int' to 'std::__1::nullptr_t' (canonically "
                       "referred to as 'std::nullptr_t')"
                       " is not allowed"));
   EXPECT_THAT(Eval("static_cast<nullptr_t>((void*)0)"),
-              IsError("static_cast from 'void *' to 'nullptr_t' (canonically "
+              IsError("static_cast from 'void *' to 'std::__1::nullptr_t' (canonically "
                       "referred to as 'std::nullptr_t')"
                       " is not allowed"));
 
@@ -1797,18 +1797,17 @@ TEST_F(EvalTest, TestCxxReinterpretCast) {
       Eval("reinterpret_cast<void*>(nullptr)"),
       IsError("reinterpret_cast from 'std::nullptr_t' to 'void *' is not "
               "allowed"));
-  GTEST_SKIP() << "Unknown error string mismatch";
   EXPECT_THAT(
       Eval("reinterpret_cast<nullptr_t>(ptr)"),
-      IsError("reinterpret_cast from 'int *' to 'nullptr_t' "
+      IsError("reinterpret_cast from 'int *' to 'std::__1::nullptr_t' "
               "(canonically referred to as 'std::nullptr_t') is not allowed"));
   EXPECT_THAT(
       Eval("reinterpret_cast<nullptr_t>(0)"),
-      IsError("reinterpret_cast from 'int' to 'nullptr_t' "
+      IsError("reinterpret_cast from 'int' to 'std::__1::nullptr_t' "
               "(canonically referred to as 'std::nullptr_t') is not allowed"));
   EXPECT_THAT(
       Eval("reinterpret_cast<nullptr_t>(nullptr)"),
-      IsError("reinterpret_cast from 'std::nullptr_t' to 'nullptr_t' "
+      IsError("reinterpret_cast from 'std::nullptr_t' to 'std::__1::nullptr_t' "
               "(canonically referred to as 'std::nullptr_t') is not allowed"));
 }
 

lldb/unittests/DIL/Inputs/CMakeLists.txt

@@ -10,17 +10,20 @@ if ("libcxx" IN_LIST LLVM_ENABLE_RUNTIMES)
   else()
     set(LIBCXX_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXX_LIBDIR_SUFFIX})
     set(LIBCXX_GENERATED_INCLUDE_DIR "${CMAKE_BINARY_DIR}/include/c++/v1")
-    set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${CMAKE_BINARY_DIR}/include/c++/v1")
+  endif()
+
+  if(DEFINED LIBCXX_GENERATED_INCLUDE_TARGET_DIR)
+    set(INCLUDE_TARGET_DIR_OPTION "-cxx-isystem" "${LIBCXX_GENERATED_INCLUDE_TARGET_DIR}")
   endif()
 
   get_target_property(EXE_PATH DILTests RUNTIME_OUTPUT_DIRECTORY)
   add_custom_command(
     OUTPUT test_binary.bin
     COMMAND $<TARGET_FILE:clang> ${CMAKE_CURRENT_SOURCE_DIR}/test_binary.cc
             -O0 -g -std=c++17 -fuse-ld=lld -B$<TARGET_FILE:lld>
-            -L ${LIBCXX_LIBRARY_DIR} -stdlib=libc++ -lc++ 
-            -I ${LIBCXX_GENERATED_INCLUDE_DIR}
-            -I ${LIBCXX_GENERATED_INCLUDE_TARGET_DIR}
+            -nostdlib++ -nostdinc++ -cxx-isystem ${LIBCXX_GENERATED_INCLUDE_DIR}
+            ${INCLUDE_TARGET_DIR_OPTION}
+            -L${LIBCXX_LIBRARY_DIR} -Wl,-rpath,${LIBCXX_LIBRARY_DIR} -lc++
             -o ${EXE_PATH}/Inputs/test_binary.bin
     DEPENDS test_binary.cc clang lld
   )