[PATCH] D102643: [analyzer][Z3][NFC] Use GTEST_SKIP instead of hacks

[Balázs Benics via Phabricator via cfe-commits]

steakhal created this revision.
steakhal added reviewers: bkramer, martong, NoQ, Szelethus, mikhail.ramalho.
Herald added subscribers: ASDenysPetrov, dkrupp, donat.nagy, a.sidorin, 
rnkovacs, szepet, baloghadamsoftware, xazax.hun, whisperity.
steakhal requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.

Since @bkramer bumped gtest to 1.10.0 I think it's a good time to clean up some 
of my hacks.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D102643

Files:
  clang/unittests/StaticAnalyzer/FalsePositiveRefutationBRVisitorTest.cpp


Index: clang/unittests/StaticAnalyzer/FalsePositiveRefutationBRVisitorTest.cpp
===================================================================
--- clang/unittests/StaticAnalyzer/FalsePositiveRefutationBRVisitorTest.cpp
+++ 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();



Index: clang/unittests/StaticAnalyzer/FalsePositiveRefutationBRVisitorTest.cpp
===================================================================
--- clang/unittests/StaticAnalyzer/FalsePositiveRefutationBRVisitorTest.cpp
+++ 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();

_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits