Merge pull request google#1114 from antmicro:48292-move-xls-expect-ok…

…-and-eq PiperOrigin-RevId: 559914741
kammoh · Aug 25, 2023 · 6cdd064 · 6cdd064
2 parents 1b669d9 + daa1c78
commit 6cdd064
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/xls/common/status/matchers.h b/xls/common/status/matchers.h
@@ -570,6 +570,12 @@ IsOkAndHolds(InnerMatcher&& inner_matcher) {
                        xls::status_testing::internal_status::AddFatalFailure( \
                            #rexpr, _))
 
+// Executes an expression that returns a absl::StatusOr, and compares the
+// contained variable to rexpr if the error code is OK.
+// If the Status is non-OK it generates a nonfatal test failure
+#define XLS_EXPECT_OK_AND_EQ(lhs, rexpr) \
+  EXPECT_THAT(lhs, status_testing::IsOkAndHolds(rexpr));
+
 }  // namespace status_testing
 }  // namespace xls
 

diff --git a/xls/noc/simulation/indexer_test.cc b/xls/noc/simulation/indexer_test.cc
@@ -21,10 +21,6 @@
 #include "xls/noc/config/network_config.pb.h"
 #include "xls/noc/config/network_config_proto_builder.h"
 
-// TODO(tedhong): 2021-01-10 Move this to xls/common
-#define XLS_EXPECT_OK_AND_EQ(lhs, rexpr) \
-  EXPECT_THAT(lhs, status_testing::IsOkAndHolds(rexpr));
-
 namespace xls {
 namespace noc {
 namespace {