Conditionally skip valgrind xfails using llvm::sys

Author: aaronj0

unittests/CppInterOp/CUDATest.cpp

@@ -61,8 +61,8 @@ TEST(CUDATest, CUDAH) {
 }
 
 TEST(CUDATest, CUDARuntime) {
-  if (!HasCudaSDK())
-    GTEST_SKIP() << "Skipping CUDA tests as CUDA SDK not found";
+  if (!HasCudaRuntime())
+    GTEST_SKIP() << "Skipping CUDA tests as CUDA runtime not found";
 
   EXPECT_TRUE(HasCudaRuntime());
 }

unittests/CppInterOp/FunctionReflectionTest.cpp

@@ -1,5 +1,6 @@
 #include "Utils.h"
 
+#include "llvm/Support/Valgrind.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/Interpreter/CppInterOp.h"
 #include "clang/Frontend/CompilerInstance.h"
@@ -531,7 +532,8 @@ TEST(FunctionReflectionTest, ExistsFunctionTemplate) {
 }
 
 TEST(FunctionReflectionTest, InstantiateTemplateFunctionFromString) {
-  GTEST_SKIP() << "XFAIL due to Valgrind report";
+  if (llvm::sys::RunningOnValgrind())
+    GTEST_SKIP() << "XFAIL due to Valgrind report";
   Cpp::CreateInterpreter();
   std::string code = R"(#include <memory>)";
   Interp->process(code);
@@ -733,7 +735,8 @@ TEST(FunctionReflectionTest, IsStaticMethod) {
 }
 
 TEST(FunctionReflectionTest, GetFunctionAddress) {
-  GTEST_SKIP() << "XFAIL due to Valgrind report";
+  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; }";
 
@@ -773,7 +776,8 @@ TEST(FunctionReflectionTest, IsVirtualMethod) {
 }
 
 TEST(FunctionReflectionTest, JitCallAdvanced) {
-  GTEST_SKIP() << "XFAIL due to Valgrind report";
+  if (llvm::sys::RunningOnValgrind())
+    GTEST_SKIP() << "XFAIL due to Valgrind report";
   std::vector<Decl*> Decls;
   std::string code = R"(
       typedef struct _name {
@@ -796,7 +800,8 @@ TEST(FunctionReflectionTest, JitCallAdvanced) {
 
 
 TEST(FunctionReflectionTest, GetFunctionCallWrapper) {
-  GTEST_SKIP() << "XFAIL due to Valgrind report";
+  if (llvm::sys::RunningOnValgrind())
+    GTEST_SKIP() << "XFAIL due to Valgrind report";
   std::vector<Decl*> Decls;
   std::string code = R"(
     int f1(int i) { return i * i; }
@@ -1006,7 +1011,8 @@ TEST(FunctionReflectionTest, GetFunctionArgDefault) {
 }
 
 TEST(FunctionReflectionTest, Construct) {
-  GTEST_SKIP() << "XFAIL due to Valgrind report";
+  if (llvm::sys::RunningOnValgrind())
+    GTEST_SKIP() << "XFAIL due to Valgrind report";
   Cpp::CreateInterpreter();
 
   Interp->declare(R"(
@@ -1041,7 +1047,8 @@ TEST(FunctionReflectionTest, Construct) {
 }
 
 TEST(FunctionReflectionTest, Destruct) {
-  GTEST_SKIP() << "XFAIL due to Valgrind report";
+  if (llvm::sys::RunningOnValgrind())
+    GTEST_SKIP() << "XFAIL due to Valgrind report";
   Cpp::CreateInterpreter();
 
   Interp->declare(R"(

unittests/CppInterOp/InterpreterTest.cpp

@@ -44,7 +44,8 @@ TEST(InterpreterTest, DebugFlag) {
 }
 
 TEST(InterpreterTest, Evaluate) {
-  GTEST_SKIP() << "XFAIL due to Valgrind report";
+  if (llvm::sys::RunningOnValgrind())
+    GTEST_SKIP() << "XFAIL due to Valgrind report";
   //  EXPECT_TRUE(Cpp::Evaluate(I, "") == 0);
   //EXPECT_TRUE(Cpp::Evaluate(I, "__cplusplus;") == 201402);
   // Due to a deficiency in the clang-repl implementation to get the value we
@@ -59,7 +60,8 @@ TEST(InterpreterTest, Evaluate) {
 }
 
 TEST(InterpreterTest, Process) {
-  GTEST_SKIP() << "XFAIL due to Valgrind report";
+  if (llvm::sys::RunningOnValgrind())
+    GTEST_SKIP() << "XFAIL due to Valgrind report";
   Cpp::CreateInterpreter();
   EXPECT_TRUE(Cpp::Process("") == 0);
   EXPECT_TRUE(Cpp::Process("int a = 12;") == 0);

unittests/CppInterOp/JitTest.cpp

@@ -1,6 +1,7 @@
 #include "Utils.h"
 
 #include "clang/Interpreter/CppInterOp.h"
+#include "llvm/Support/Valgrind.h"
 
 #include "gtest/gtest.h"
 
@@ -12,7 +13,8 @@ static int printf_jit(const char* format, ...) {
 }
 
 TEST(JitTest, InsertOrReplaceJitSymbol) {
-  GTEST_SKIP() << "XFAIL due to Valgrind report";
+  if (llvm::sys::RunningOnValgrind())
+    GTEST_SKIP() << "XFAIL due to Valgrind report";
   std::vector<Decl*> Decls;
   std::string code = R"(
     extern "C" int printf(const char*,...);

unittests/CppInterOp/ScopeReflectionTest.cpp

@@ -1,4 +1,5 @@
 #include "Utils.h"
+#include "llvm/Support/Valgrind.h"
 #include "clang/Interpreter/CppInterOp.h"
 
 #include "clang/AST/ASTContext.h"
@@ -799,7 +800,8 @@ template<typename T> T TrivialFnTemplate() { return T(); }
 }
 
 TEST(ScopeReflectionTest, InstantiateTemplateFunctionFromString) {
-  GTEST_SKIP() << "XFAIL due to Valgrind report";
+  if (llvm::sys::RunningOnValgrind())
+    GTEST_SKIP() << "XFAIL due to Valgrind report";
   Cpp::CreateInterpreter();
   std::string code = R"(#include <memory>)";
   Interp->process(code);

unittests/CppInterOp/TypeReflectionTest.cpp

@@ -1,5 +1,6 @@
 #include "Utils.h"
 
+#include "llvm/Support/Valgrind.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/Interpreter/CppInterOp.h"
 #include "clang/Frontend/CompilerInstance.h"
@@ -523,7 +524,8 @@ TEST(TypeReflectionTest, IsPODType) {
 }
 
 TEST(TypeReflectionTest, IsSmartPtrType) {
-  GTEST_SKIP() << "XFAIL due to Valgrind report";
+  if (llvm::sys::RunningOnValgrind())
+    GTEST_SKIP() << "XFAIL due to Valgrind report";
   Cpp::CreateInterpreter();
 
   Interp->declare(R"(