[PATCH] D51423: Fix DebugCounterTest when running all SupportTests

[Alexandre Ganea via Phabricator via llvm-commits]

aganea created this revision.
aganea added reviewers: gbiv, zhizhouy.
Herald added a reviewer: george.burgess.iv.
Herald added a subscriber: llvm-commits.

This fixes DebugCounterTest.CounterCheck when all SupportTests are being ran for a Debug target.


Repository:
  rL LLVM

https://reviews.llvm.org/D51423

Files:
  unittests/Support/DebugCounterTest.cpp


Index: unittests/Support/DebugCounterTest.cpp
===================================================================
--- unittests/Support/DebugCounterTest.cpp
+++ unittests/Support/DebugCounterTest.cpp
@@ -18,6 +18,14 @@
               "Counter used for unit test");
 
 TEST(DebugCounterTest, CounterCheck) {
+  // Unfortunately, the CommandLineTest.GetCommandLineArguments test would
+  // unregister the global counter above.
+  if (!DebugCounter::instance().getCounterId("test-counter")) {
+    const_cast<unsigned &>(TestCounter) =
+        DebugCounter::instance().registerCounter("test-counter",
+                                                 "Counter used for unit test");
+  }
+
   EXPECT_FALSE(DebugCounter::isCounterSet(TestCounter));
 
   auto DC = &DebugCounter::instance();


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D51423.163075.patch
Type: text/x-patch
Size: 788 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180829/e3fa95b4/attachment.bin>