Fix failures

https://lab.llvm.org/buildbot/#/builders/17/builds/23269 breaks because
we are doing some asm calls that only work on x86

https://lab.llvm.org/buildbot/#/builders/68/builds/34092/steps/6/logs/stdio
breaks because some comparators where being done incorrectly.

diff --git a/lldb/unittests/Process/Linux/PerfTests.cpp b/lldb/unittests/Process/Linux/PerfTests.cpp
index c12aa097dd3ca5dac9f41ddc5591320cd8c82a27..6332cd97676c9593d41c36d5287be037f91338ec 100644 (file)
--- a/lldb/unittests/Process/Linux/PerfTests.cpp
+++ b/lldb/unittests/Process/Linux/PerfTests.cpp
@@ -6,6 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
+#ifdef __x86_64__
+
 #include "Perf.h"
 
 #include "llvm/Support/Error.h"
@@ -83,3 +85,5 @@ TEST(Perf, TscConversion) {
   ASSERT_LT(converted_tsc_diff.count(),
             (SLEEP_NANOS + acceptable_overhead).count());
 }
+
+#endif // __x86_64__

diff --git a/lldb/unittests/Utility/TraceGDBRemotePacketsTest.cpp b/lldb/unittests/Utility/TraceGDBRemotePacketsTest.cpp
index b3f8538ee8b6884e936df946075076cc051db3b0..47f55181ca38aeb202c26346ea85f0d66d8a4dbe 100644 (file)
--- a/lldb/unittests/Utility/TraceGDBRemotePacketsTest.cpp
+++ b/lldb/unittests/Utility/TraceGDBRemotePacketsTest.cpp
@@ -94,7 +94,6 @@ TEST(TraceGDBRemotePacketsTest, IntelPTGetStateResponseEmpty) {
   // portions of the JSON representation are unchanged.
   ASSERT_EQ(toJSON(response), toJSON(*deserialized_response));
   // Ensure that the tsc_conversion's are nullptr.
-  ASSERT_EQ(response.tsc_perf_zero_conversion, None);
-  ASSERT_EQ(response.tsc_perf_zero_conversion,
-            deserialized_response->tsc_perf_zero_conversion);
+  ASSERT_FALSE((bool)response.tsc_perf_zero_conversion);
+  ASSERT_FALSE((bool)deserialized_response->tsc_perf_zero_conversion);
 }