This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rGb6301a018d58: [clang-format][NFC] Output tokens on test
assert (authored by sstwcw).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D148482/new/
https://reviews.llvm.org/D148482
Files:
clang/unittests/Format/TokenAnnotatorTest.cpp
Index: clang/unittests/Format/TokenAnnotatorTest.cpp
===================================================================
--- clang/unittests/Format/TokenAnnotatorTest.cpp
+++ clang/unittests/Format/TokenAnnotatorTest.cpp
@@ -841,7 +841,7 @@
" [[nodiscard]] constexpr operator T() const { "
"return number_zero_v<T>; }\n"
"};");
- ASSERT_EQ(Tokens.size(), 44u);
+ ASSERT_EQ(Tokens.size(), 44u) << Tokens;
EXPECT_TOKEN(Tokens[13], tok::kw_requires, TT_RequiresClause);
EXPECT_TOKEN(Tokens[14], tok::kw_requires, TT_RequiresExpression);
EXPECT_TOKEN(Tokens[15], tok::l_brace, TT_RequiresExpressionLBrace);
@@ -1605,7 +1605,7 @@
// Test for block label colons.
Tokens = Annotate("begin : x\n"
"end : x");
- ASSERT_EQ(Tokens.size(), 7u);
+ ASSERT_EQ(Tokens.size(), 7u) << Tokens;
EXPECT_TOKEN(Tokens[1], tok::colon, TT_VerilogBlockLabelColon);
EXPECT_TOKEN(Tokens[4], tok::colon, TT_VerilogBlockLabelColon);
// Test that the dimension colon is annotated correctly.
@@ -1632,15 +1632,15 @@
EXPECT_TOKEN(Tokens[9], tok::colon, TT_GotoLabelColon);
// Non-blocking assignments.
Tokens = Annotate("a <= b;");
- ASSERT_EQ(Tokens.size(), 5u);
+ ASSERT_EQ(Tokens.size(), 5u) << Tokens;
EXPECT_TOKEN(Tokens[1], tok::lessequal, TT_BinaryOperator);
EXPECT_TOKEN_PRECEDENCE(Tokens[1], prec::Assignment);
Tokens = Annotate("if (a <= b) break;");
- ASSERT_EQ(Tokens.size(), 9u);
+ ASSERT_EQ(Tokens.size(), 9u) << Tokens;
EXPECT_TOKEN(Tokens[3], tok::lessequal, TT_BinaryOperator);
EXPECT_TOKEN_PRECEDENCE(Tokens[3], prec::Relational);
Tokens = Annotate("a <= b <= a;");
- ASSERT_EQ(Tokens.size(), 7u);
+ ASSERT_EQ(Tokens.size(), 7u) << Tokens;
EXPECT_TOKEN(Tokens[1], tok::lessequal, TT_BinaryOperator);
EXPECT_TOKEN_PRECEDENCE(Tokens[1], prec::Assignment);
EXPECT_TOKEN(Tokens[3], tok::lessequal, TT_BinaryOperator);
@@ -1648,12 +1648,12 @@
// Port lists in module instantiation.
Tokens = Annotate("module_x instance_1(port_1), instance_2(port_2);");
- ASSERT_EQ(Tokens.size(), 12u);
+ ASSERT_EQ(Tokens.size(), 12u) << Tokens;
EXPECT_TOKEN(Tokens[2], tok::l_paren, TT_VerilogInstancePortLParen);
EXPECT_TOKEN(Tokens[7], tok::l_paren, TT_VerilogInstancePortLParen);
Tokens = Annotate("module_x #(parameter) instance_1(port_1), "
"instance_2(port_2);");
- ASSERT_EQ(Tokens.size(), 16u);
+ ASSERT_EQ(Tokens.size(), 16u) << Tokens;
EXPECT_TOKEN(Tokens[2], tok::l_paren, TT_VerilogInstancePortLParen);
EXPECT_TOKEN(Tokens[6], tok::l_paren, TT_VerilogInstancePortLParen);
EXPECT_TOKEN(Tokens[11], tok::l_paren, TT_VerilogInstancePortLParen);
Index: clang/unittests/Format/TokenAnnotatorTest.cpp
===================================================================
--- clang/unittests/Format/TokenAnnotatorTest.cpp
+++ clang/unittests/Format/TokenAnnotatorTest.cpp
@@ -841,7 +841,7 @@
" [[nodiscard]] constexpr operator T() const { "
"return number_zero_v<T>; }\n"
"};");
- ASSERT_EQ(Tokens.size(), 44u);
+ ASSERT_EQ(Tokens.size(), 44u) << Tokens;
EXPECT_TOKEN(Tokens[13], tok::kw_requires, TT_RequiresClause);
EXPECT_TOKEN(Tokens[14], tok::kw_requires, TT_RequiresExpression);
EXPECT_TOKEN(Tokens[15], tok::l_brace, TT_RequiresExpressionLBrace);
@@ -1605,7 +1605,7 @@
// Test for block label colons.
Tokens = Annotate("begin : x\n"
"end : x");
- ASSERT_EQ(Tokens.size(), 7u);
+ ASSERT_EQ(Tokens.size(), 7u) << Tokens;
EXPECT_TOKEN(Tokens[1], tok::colon, TT_VerilogBlockLabelColon);
EXPECT_TOKEN(Tokens[4], tok::colon, TT_VerilogBlockLabelColon);
// Test that the dimension colon is annotated correctly.
@@ -1632,15 +1632,15 @@
EXPECT_TOKEN(Tokens[9], tok::colon, TT_GotoLabelColon);
// Non-blocking assignments.
Tokens = Annotate("a <= b;");
- ASSERT_EQ(Tokens.size(), 5u);
+ ASSERT_EQ(Tokens.size(), 5u) << Tokens;
EXPECT_TOKEN(Tokens[1], tok::lessequal, TT_BinaryOperator);
EXPECT_TOKEN_PRECEDENCE(Tokens[1], prec::Assignment);
Tokens = Annotate("if (a <= b) break;");
- ASSERT_EQ(Tokens.size(), 9u);
+ ASSERT_EQ(Tokens.size(), 9u) << Tokens;
EXPECT_TOKEN(Tokens[3], tok::lessequal, TT_BinaryOperator);
EXPECT_TOKEN_PRECEDENCE(Tokens[3], prec::Relational);
Tokens = Annotate("a <= b <= a;");
- ASSERT_EQ(Tokens.size(), 7u);
+ ASSERT_EQ(Tokens.size(), 7u) << Tokens;
EXPECT_TOKEN(Tokens[1], tok::lessequal, TT_BinaryOperator);
EXPECT_TOKEN_PRECEDENCE(Tokens[1], prec::Assignment);
EXPECT_TOKEN(Tokens[3], tok::lessequal, TT_BinaryOperator);
@@ -1648,12 +1648,12 @@
// Port lists in module instantiation.
Tokens = Annotate("module_x instance_1(port_1), instance_2(port_2);");
- ASSERT_EQ(Tokens.size(), 12u);
+ ASSERT_EQ(Tokens.size(), 12u) << Tokens;
EXPECT_TOKEN(Tokens[2], tok::l_paren, TT_VerilogInstancePortLParen);
EXPECT_TOKEN(Tokens[7], tok::l_paren, TT_VerilogInstancePortLParen);
Tokens = Annotate("module_x #(parameter) instance_1(port_1), "
"instance_2(port_2);");
- ASSERT_EQ(Tokens.size(), 16u);
+ ASSERT_EQ(Tokens.size(), 16u) << Tokens;
EXPECT_TOKEN(Tokens[2], tok::l_paren, TT_VerilogInstancePortLParen);
EXPECT_TOKEN(Tokens[6], tok::l_paren, TT_VerilogInstancePortLParen);
EXPECT_TOKEN(Tokens[11], tok::l_paren, TT_VerilogInstancePortLParen);
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
