diff --git a/clang/unittests/StaticAnalyzer/FalsePositiveRefutationBRVisitorTest.cpp b/clang/unittests/StaticAnalyzer/FalsePositiveRefutationBRVisitorTest.cpp --- a/clang/unittests/StaticAnalyzer/FalsePositiveRefutationBRVisitorTest.cpp +++ b/clang/unittests/StaticAnalyzer/FalsePositiveRefutationBRVisitorTest.cpp @@ -19,13 +19,6 @@ #include "llvm/Config/llvm-config.h" #include "gtest/gtest.h" -// FIXME: Use GTEST_SKIP() instead if GTest is updated to version 1.10.0 -#ifdef LLVM_WITH_Z3 -#define SKIP_WITHOUT_Z3 -#else -#define SKIP_WITHOUT_Z3 return -#endif - namespace clang { namespace ento { namespace { @@ -109,7 +102,7 @@ "-Xclang", "-analyzer-config", "-Xclang", "crosscheck-with-z3=true"}; TEST(FalsePositiveRefutationBRVisitor, UnSatInTheMiddleNoReport) { - SKIP_WITHOUT_Z3; + GTEST_SKIP() << "Requires the LLVM_WITH_Z3 cmake option."; constexpr auto Code = R"( void reachedWithContradiction(); void reachedWithNoContradiction(); @@ -140,7 +133,7 @@ } TEST(FalsePositiveRefutationBRVisitor, UnSatAtErrorNodeWithNewSymbolNoReport) { - SKIP_WITHOUT_Z3; + GTEST_SKIP() << "Requires the LLVM_WITH_Z3 cmake option."; constexpr auto Code = R"( void reportIfCanBeTrue(bool); void reachedWithNoContradiction(); @@ -172,7 +165,7 @@ TEST(FalsePositiveRefutationBRVisitor, UnSatAtErrorNodeDueToRefinedConstraintNoReport) { - SKIP_WITHOUT_Z3; + GTEST_SKIP() << "Requires the LLVM_WITH_Z3 cmake option."; constexpr auto Code = R"( void reportIfCanBeTrue(bool); void reachedWithNoContradiction();