Use Env::LocalTempFilename for a temp filename.

This function works both in and outside of tests. Additionally,
LocalTempFilename works well on Windows where as TmpDir is a little problematic
because of bazel oddities.

PiperOrigin-RevId: 296250888
Change-Id: I2a8bc52ad784eda4d00f63c91eec681cc91e16e7
This commit is contained in:
Brian Atkinson 2020-02-20 11:01:43 -08:00 committed by TensorFlower Gardener
parent a165c7fa08
commit 8bb7420492

View File

@ -16,7 +16,6 @@ limitations under the License.
#include "tensorflow/core/lib/io/inputbuffer.h"
#include <vector>
#include "tensorflow/core/platform/env.h"
#include "tensorflow/core/lib/core/coding.h"
#include "tensorflow/core/lib/core/errors.h"
@ -24,6 +23,7 @@ limitations under the License.
#include "tensorflow/core/lib/core/status_test_util.h"
#include "tensorflow/core/lib/strings/str_util.h"
#include "tensorflow/core/lib/strings/strcat.h"
#include "tensorflow/core/platform/env.h"
#include "tensorflow/core/platform/logging.h"
#include "tensorflow/core/platform/test.h"
@ -37,7 +37,8 @@ static std::vector<int> BufferSizes() {
TEST(InputBuffer, ReadLine_Empty) {
Env* env = Env::Default();
string fname = testing::TmpDir() + "/inputbuffer_test";
string fname;
ASSERT_TRUE(env->LocalTempFilename(&fname));
TF_ASSERT_OK(WriteStringToFile(env, fname, ""));
for (auto buf_size : BufferSizes()) {
@ -51,7 +52,8 @@ TEST(InputBuffer, ReadLine_Empty) {
TEST(InputBuffer, ReadLine1) {
Env* env = Env::Default();
string fname = testing::TmpDir() + "/inputbuffer_test";
string fname;
ASSERT_TRUE(env->LocalTempFilename(&fname));
TF_CHECK_OK(
WriteStringToFile(env, fname, "line one\nline two\nline three\n"));
@ -74,7 +76,8 @@ TEST(InputBuffer, ReadLine1) {
TEST(InputBuffer, ReadLine_NoTrailingNewLine) {
Env* env = Env::Default();
string fname = testing::TmpDir() + "/inputbuffer_test";
string fname;
ASSERT_TRUE(env->LocalTempFilename(&fname));
TF_ASSERT_OK(WriteStringToFile(env, fname, "line one\nline two\nline three"));
for (auto buf_size : BufferSizes()) {
@ -96,7 +99,8 @@ TEST(InputBuffer, ReadLine_NoTrailingNewLine) {
TEST(InputBuffer, ReadLine_EmptyLines) {
Env* env = Env::Default();
string fname = testing::TmpDir() + "/inputbuffer_test";
string fname;
ASSERT_TRUE(env->LocalTempFilename(&fname));
TF_CHECK_OK(
WriteStringToFile(env, fname, "line one\n\n\nline two\nline three"));
@ -123,7 +127,8 @@ TEST(InputBuffer, ReadLine_EmptyLines) {
TEST(InputBuffer, ReadLine_CRLF) {
Env* env = Env::Default();
string fname = testing::TmpDir() + "/inputbuffer_test";
string fname;
ASSERT_TRUE(env->LocalTempFilename(&fname));
TF_ASSERT_OK(WriteStringToFile(env, fname,
"line one\r\n\r\n\r\nline two\r\nline three"));
@ -150,7 +155,8 @@ TEST(InputBuffer, ReadLine_CRLF) {
TEST(InputBuffer, ReadNBytes) {
Env* env = Env::Default();
string fname = testing::TmpDir() + "/inputbuffer_test";
string fname;
ASSERT_TRUE(env->LocalTempFilename(&fname));
TF_ASSERT_OK(WriteStringToFile(env, fname, "0123456789"));
// ReadNBytes(int64, string*).
@ -223,7 +229,8 @@ TEST(InputBuffer, ReadNBytes) {
TEST(InputBuffer, SkipNBytes) {
Env* env = Env::Default();
string fname = testing::TmpDir() + "/inputbuffer_test";
string fname;
ASSERT_TRUE(env->LocalTempFilename(&fname));
TF_ASSERT_OK(WriteStringToFile(env, fname, "0123456789"));
for (auto buf_size : BufferSizes()) {
@ -258,7 +265,8 @@ TEST(InputBuffer, SkipNBytes) {
TEST(InputBuffer, Seek) {
Env* env = Env::Default();
string fname = testing::TmpDir() + "/inputbuffer_test";
string fname;
ASSERT_TRUE(env->LocalTempFilename(&fname));
TF_ASSERT_OK(WriteStringToFile(env, fname, "0123456789"));
for (auto buf_size : BufferSizes()) {
@ -293,7 +301,8 @@ TEST(InputBuffer, Seek) {
TEST(InputBuffer, ReadVarint32) {
Env* env = Env::Default();
string fname = testing::TmpDir() + "/inputbuffer_test";
string fname;
ASSERT_TRUE(env->LocalTempFilename(&fname));
// Generates data.
std::vector<uint32> data;
@ -331,7 +340,8 @@ TEST(InputBuffer, ReadVarint32) {
TEST(InputBuffer, ReadVarint64) {
Env* env = Env::Default();
string fname = testing::TmpDir() + "/inputbuffer_test";
string fname;
ASSERT_TRUE(env->LocalTempFilename(&fname));
// Generates data.
std::vector<uint64> data;