testing

Author: kr-2003

clang/unittests/Interpreter/InterpreterTest.cpp

@@ -15,15 +15,17 @@
 #include "clang/AST/Decl.h"
 #include "clang/AST/DeclGroup.h"
 #include "clang/AST/Mangle.h"
+#include "clang/Basic/Version.h"
+#include "clang/Config/config.h"
 #include "clang/Frontend/CompilerInstance.h"
 #include "clang/Frontend/TextDiagnosticPrinter.h"
 #include "clang/Interpreter/Interpreter.h"
 #include "clang/Interpreter/RemoteJITUtils.h"
 #include "clang/Interpreter/Value.h"
 #include "clang/Sema/Lookup.h"
 #include "clang/Sema/Sema.h"
-#include "llvm/TargetParser/Host.h"
 #include "llvm/Support/Error.h"
+#include "llvm/TargetParser/Host.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
@@ -82,18 +84,15 @@ static std::string getOrcRuntimePath() {
   llvm::sys::path::remove_filename(RuntimePath); // Remove "clang"
   llvm::sys::path::remove_filename(RuntimePath); // Remove "tools"
 
-  llvm::sys::path::append(RuntimePath, "lib", "clang", "20", "lib");
+  llvm::sys::path::append(RuntimePath, CLANG_INSTALL_LIBDIR_BASENAME, "clang",
+                          CLANG_VERSION_MAJOR_STRING, "lib");
 
-  // Add platform-specific runtime library
   llvm::Triple SystemTriple(llvm::sys::getProcessTriple());
-  if (SystemTriple.isOSDarwin()) {
+  if (SystemTriple.isOSBinFormatMachO()) {
     llvm::sys::path::append(RuntimePath, "darwin", "liborc_rt_osx.a");
-  } else if (SystemTriple.isOSLinux()) {
+  } else if (SystemTriple.isOSBinFormatELF()) {
     llvm::sys::path::append(RuntimePath, "x86_64-unknown-linux-gnu",
                             "liborc_rt.a");
-  } else {
-    // Add other platforms as needed
-    llvm::sys::path::append(RuntimePath, "liborc_rt.a");
   }
 
   return RuntimePath.str().str();
@@ -118,15 +117,14 @@ createInterpreterWithRemoteExecution(const Args &ExtraArgs = {},
 
   if ((SystemTriple.isOSBinFormatELF() || SystemTriple.isOSBinFormatMachO())) {
     std::string OOPExecutor = getExecutorPath();
-    std::cout << "Executor Path: " << OOPExecutor << "\n";
     if (!llvm::sys::fs::exists(OOPExecutor)) {
       std::cout << "Executor path does not exist: " << OOPExecutor << std::endl;
       return nullptr;
     }
 
     std::string OrcRuntimePath = getOrcRuntimePath();
 
-    if(!llvm::sys::fs::exists(OrcRuntimePath)) {
+    if (!llvm::sys::fs::exists(OrcRuntimePath)) {
       std::cout << "ORC runtime path does not exist: " << OrcRuntimePath
                 << std::endl;
     }
@@ -151,10 +149,6 @@ createInterpreterWithRemoteExecution(const Args &ExtraArgs = {},
                                        setvbuf(stdout, nullptr, _IONBF, 0);
                                        setvbuf(stderr, nullptr, _IONBF, 0);
                                      }));
-    OrcRuntimePath = getOrcRuntimePath();
-
-    std::cout << "Orc Runtime Path: " << OrcRuntimePath << "\n";
-
     if (EPC) {
       CB.SetTargetTriple(EPC->getTargetTriple().getTriple());
       JB = ExitOnError(clang::Interpreter::createLLJITBuilder(std::move(EPC),