aboutsummaryrefslogtreecommitdiffhomepage
path: root/tensorflow/core/util/tensor_slice_reader_test.cc
diff options
context:
space:
mode:
authorGravatar Vijay Vasudevan <vrv@google.com>2016-01-27 13:54:08 -0800
committerGravatar Vijay Vasudevan <vrv@google.com>2016-01-27 14:01:22 -0800
commitc3c27f275f94af6e32ecaff66a6bf439abdaff5b (patch)
tree528d0353eee14787aeefc52918afb9b32dd7bfbd /tensorflow/core/util/tensor_slice_reader_test.cc
parent0cee1d3dac5961a08594c3734eea14fc490f3250 (diff)
TensorFlow: ASSERT_OK and EXPECT_OK are also defined in other projects
that are built with TensorFlow (protobuf), so prefix our macros with TF_ to make them project specific. Change: 113197186
Diffstat (limited to 'tensorflow/core/util/tensor_slice_reader_test.cc')
-rw-r--r--tensorflow/core/util/tensor_slice_reader_test.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/tensorflow/core/util/tensor_slice_reader_test.cc b/tensorflow/core/util/tensor_slice_reader_test.cc
index f1252b8b1e..928ebb8140 100644
--- a/tensorflow/core/util/tensor_slice_reader_test.cc
+++ b/tensorflow/core/util/tensor_slice_reader_test.cc
@@ -107,7 +107,7 @@ void SimpleFloatHelper(TensorSliceWriter::CreateBuilderFunction create_function,
// Now we need to read the tensor slices
const string filepattern = strings::StrCat(fname_base, "_*");
TensorSliceReader reader(filepattern, open_function);
- EXPECT_OK(reader.status());
+ TF_EXPECT_OK(reader.status());
EXPECT_EQ(2, reader.num_files());
// We query some of the tensors
@@ -231,7 +231,7 @@ void SimpleIntXHelper(TensorSliceWriter::CreateBuilderFunction create_function,
// Now we need to read the tensor slices
const string filepattern = strings::StrCat(fname_base, "_*");
TensorSliceReader reader(filepattern, open_function);
- EXPECT_OK(reader.status());
+ TF_EXPECT_OK(reader.status());
EXPECT_EQ(2, reader.num_files());
// We query some of the tensors