commit 561bd5f11b6e9907c5ea734777f1334b6d0e1e21
author Louis Dionne <ldionne.2@gmail.com> Tue Oct 12 14:15:33 2021 -0400
committer Copybara-Service <copybara-worker@google.com> Wed Oct 13 05:05:20 2021 -0700
tree e8176b78e3fa4620ef494cac17c4ebd76f093c52
parent cf16a2f305d26b18e76f0091b09f1532b77e89bf

[libc++abi] Change LIBCXXABI_NO_TIMER to LIBCXXABI_USE_TIMER

Instead of always defining LIBCXXABI_NO_TIMER to run the tests, only
define LIBCXXABI_USE_TIMER when we want to enable the timer. This makes
the libc++abi testing configuration simpler.

As a fly-by fix, remove the unused LIBUNWIND_NO_TIMER macro from libunwind.

Differential Revision: https://reviews.llvm.org/D111667

GitOrigin-RevId: df3de7647e034797ae3c965d6737bc0a4bc7a779

test/libcxxabi/test/config.py

diff --git a/test/libcxxabi/test/config.py b/test/libcxxabi/test/config.py
index 843441f..5855240 100644
--- a/test/libcxxabi/test/config.py
+++ b/test/libcxxabi/test/config.py
@@ -44,7 +44,6 @@
 
     def configure_compile_flags(self):
         self.cxx.compile_flags += [
-            '-DLIBCXXABI_NO_TIMER',
             '-D_LIBCPP_ENABLE_CXX17_REMOVED_UNEXPECTED_FUNCTIONS',
         ]
         if self.get_lit_bool('enable_exceptions', True):

test/support/timer.h

diff --git a/test/support/timer.h b/test/support/timer.h
index 7109627..27dc5f6 100644
--- a/test/support/timer.h
+++ b/test/support/timer.h
@@ -9,8 +9,8 @@
 #ifndef TIMER_H
 #define TIMER_H
 
-// Define LIBCXXABI_NO_TIMER to disable testing with a timer.
-#ifndef LIBCXXABI_NO_TIMER
+// Define LIBCXXABI_USE_TIMER to enable testing with a timer.
+#if defined(LIBCXXABI_USE_TIMER)
 
 #include <chrono>
 #include <cstdio>
@@ -38,7 +38,7 @@
     TimePoint m_start;
 };
 
-#else /* LIBCXXABI_NO_TIMER */
+#else /* LIBCXXABI_USE_TIMER */
 
 class timer
 {
@@ -49,6 +49,6 @@
     ~timer() {}
 };
 
-#endif /* LIBCXXABI_NO_TIMER */
+#endif /* LIBCXXABI_USE_TIMER */
 
 #endif /* TIMER_H */