revert to llvm support for valgrind

Author: aaronj0

unittests/CppInterOp/FunctionReflectionTest.cpp

@@ -531,7 +531,7 @@ TEST(FunctionReflectionTest, ExistsFunctionTemplate) {
 }
 
 TEST(FunctionReflectionTest, InstantiateTemplateFunctionFromString) {
-  if (RUNNING_ON_VALGRIND)
+  if (llvm::sys::RunningOnValgrind())
     GTEST_SKIP() << "XFAIL due to Valgrind report";
   Cpp::CreateInterpreter();
   std::string code = R"(#include <memory>)";
@@ -734,7 +734,7 @@ TEST(FunctionReflectionTest, IsStaticMethod) {
 }
 
 TEST(FunctionReflectionTest, GetFunctionAddress) {
-  if (RUNNING_ON_VALGRIND)
+  if (llvm::sys::RunningOnValgrind())
     GTEST_SKIP() << "XFAIL due to Valgrind report";
   std::vector<Decl*> Decls, SubDecls;
   std::string code = "int f1(int i) { return i * i; }";
@@ -775,7 +775,7 @@ TEST(FunctionReflectionTest, IsVirtualMethod) {
 }
 
 TEST(FunctionReflectionTest, JitCallAdvanced) {
-  if (RUNNING_ON_VALGRIND)
+  if (llvm::sys::RunningOnValgrind())
     GTEST_SKIP() << "XFAIL due to Valgrind report";
   std::vector<Decl*> Decls;
   std::string code = R"(
@@ -799,7 +799,7 @@ TEST(FunctionReflectionTest, JitCallAdvanced) {
 
 
 TEST(FunctionReflectionTest, GetFunctionCallWrapper) {
-  if (RUNNING_ON_VALGRIND)
+  if (llvm::sys::RunningOnValgrind())
     GTEST_SKIP() << "XFAIL due to Valgrind report";
   std::vector<Decl*> Decls;
   std::string code = R"(
@@ -1010,7 +1010,7 @@ TEST(FunctionReflectionTest, GetFunctionArgDefault) {
 }
 
 TEST(FunctionReflectionTest, Construct) {
-  if (RUNNING_ON_VALGRIND)
+  if (llvm::sys::RunningOnValgrind())
     GTEST_SKIP() << "XFAIL due to Valgrind report";
   Cpp::CreateInterpreter();
 
@@ -1046,7 +1046,7 @@ TEST(FunctionReflectionTest, Construct) {
 }
 
 TEST(FunctionReflectionTest, Destruct) {
-  if (RUNNING_ON_VALGRIND)
+  if (llvm::sys::RunningOnValgrind())
     GTEST_SKIP() << "XFAIL due to Valgrind report";
   Cpp::CreateInterpreter();
 

unittests/CppInterOp/InterpreterTest.cpp

@@ -45,7 +45,7 @@ TEST(InterpreterTest, DebugFlag) {
 }
 
 TEST(InterpreterTest, Evaluate) {
-  if (RUNNING_ON_VALGRIND)
+  if (llvm::sys::RunningOnValgrind())
     GTEST_SKIP() << "XFAIL due to Valgrind report";
   //  EXPECT_TRUE(Cpp::Evaluate(I, "") == 0);
   //EXPECT_TRUE(Cpp::Evaluate(I, "__cplusplus;") == 201402);
@@ -61,7 +61,7 @@ TEST(InterpreterTest, Evaluate) {
 }
 
 TEST(InterpreterTest, Process) {
-  if (RUNNING_ON_VALGRIND)
+  if (llvm::sys::RunningOnValgrind())
     GTEST_SKIP() << "XFAIL due to Valgrind report";
   Cpp::CreateInterpreter();
   EXPECT_TRUE(Cpp::Process("") == 0);

unittests/CppInterOp/JitTest.cpp

@@ -12,7 +12,7 @@ static int printf_jit(const char* format, ...) {
 }
 
 TEST(JitTest, InsertOrReplaceJitSymbol) {
-  if (RUNNING_ON_VALGRIND)
+  if (llvm::sys::RunningOnValgrind())
     GTEST_SKIP() << "XFAIL due to Valgrind report";
   std::vector<Decl*> Decls;
   std::string code = R"(

unittests/CppInterOp/ScopeReflectionTest.cpp

@@ -800,7 +800,7 @@ template<typename T> T TrivialFnTemplate() { return T(); }
 }
 
 TEST(ScopeReflectionTest, InstantiateTemplateFunctionFromString) {
-  if (RUNNING_ON_VALGRIND)
+  if (llvm::sys::RunningOnValgrind())
     GTEST_SKIP() << "XFAIL due to Valgrind report";
   Cpp::CreateInterpreter();
   std::string code = R"(#include <memory>)";
@@ -940,7 +940,7 @@ TEST(ScopeReflectionTest, GetClassTemplateInstantiationArgs) {
 
 
 TEST(ScopeReflectionTest, IncludeVector) {
-  if (RUNNING_ON_VALGRIND)
+  if (llvm::sys::RunningOnValgrind())
       GTEST_SKIP() << "XFAIL due to Valgrind report";
   std::string code = R"(
     #include <vector>

unittests/CppInterOp/TypeReflectionTest.cpp

@@ -523,7 +523,7 @@ TEST(TypeReflectionTest, IsPODType) {
 }
 
 TEST(TypeReflectionTest, IsSmartPtrType) {
-  if (RUNNING_ON_VALGRIND)
+  if (llvm::sys::RunningOnValgrind())
     GTEST_SKIP() << "XFAIL due to Valgrind report";
   Cpp::CreateInterpreter();
 

unittests/CppInterOp/Utils.h

@@ -5,14 +5,7 @@
 
 #include <memory>
 #include <vector>
-
-#ifndef __APPLE__
-  #include <valgrind/valgrind.h>
-#endif //__APPLE__
-
-#ifdef __APPLE__
-  #define RUNNING_ON_VALGRIND 0
-#endif //__APPLE__
+#include "llvm/Support/Valgrind.h"
 
 using namespace clang;
 using namespace llvm;