[clang-tools-extra] 7ebf7d9 - [clangd] Delete regex assertion, breaking on windows too...

Sam McCall via cfe-commits cfe-commits at lists.llvm.org
Tue May 19 07:07:55 PDT 2020


Author: Sam McCall
Date: 2020-05-19T16:07:01+02:00
New Revision: 7ebf7d91e6132ba619f5b27895fc1b5f536a101b

URL: https://github.com/llvm/llvm-project/commit/7ebf7d91e6132ba619f5b27895fc1b5f536a101b
DIFF: https://github.com/llvm/llvm-project/commit/7ebf7d91e6132ba619f5b27895fc1b5f536a101b.diff

LOG: [clangd] Delete regex assertion, breaking on windows too...

Added: 
    

Modified: 
    clang-tools-extra/clangd/unittests/support/TraceTests.cpp

Removed: 
    


################################################################################
diff  --git a/clang-tools-extra/clangd/unittests/support/TraceTests.cpp b/clang-tools-extra/clangd/unittests/support/TraceTests.cpp
index 953002b69a46..f4ff8782d78e 100644
--- a/clang-tools-extra/clangd/unittests/support/TraceTests.cpp
+++ b/clang-tools-extra/clangd/unittests/support/TraceTests.cpp
@@ -25,7 +25,6 @@ namespace {
 
 using testing::_;
 using testing::ElementsAre;
-using testing::MatchesRegex;
 using testing::SizeIs;
 using testing::StartsWith;
 
@@ -170,16 +169,11 @@ TEST_F(CSVMetricsTracerTest, RecordsValues) {
   Counter.record(1, "");
   Dist.record(2, "y");
 
-  auto Lines = outputLines();
-  ASSERT_THAT(
-      Lines,
-      ElementsAre("Kind,Metric,Label,Value,Timestamp",
-                  StartsWith("d,dist,x,1.000000e+00,"),
-                  StartsWith("c,cnt,,1.000000e+00,"),
-                  StartsWith("d,dist,y,2.000000e+00,"), ""));
-  // Also check timestamp format.
-  EXPECT_THAT(Lines[1].str(),
-              MatchesRegex(R"(d,dist,x,1\.000000e\+00,[0-9]+\.[0-9]{6})"));
+  ASSERT_THAT(outputLines(),
+              ElementsAre("Kind,Metric,Label,Value,Timestamp",
+                          StartsWith("d,dist,x,1.000000e+00,"),
+                          StartsWith("c,cnt,,1.000000e+00,"),
+                          StartsWith("d,dist,y,2.000000e+00,"), ""));
 }
 
 TEST_F(CSVMetricsTracerTest, Escaping) {


        


More information about the cfe-commits mailing list