From 0fa7a0b0339c3fd7264f1259a4a60be43bb6c5dc Mon Sep 17 00:00:00 2001 From: Brian Atkinson Date: Thu, 20 Feb 2020 10:17:48 -0800 Subject: [PATCH] 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: 296239824 Change-Id: I4e636bf150fc5554503e14361a5953598c9db638 --- .../fixed_length_record_dataset_op_test.cc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tensorflow/core/kernels/data/fixed_length_record_dataset_op_test.cc b/tensorflow/core/kernels/data/fixed_length_record_dataset_op_test.cc index 8ffe8f50f96..4eab5ed08f3 100644 --- a/tensorflow/core/kernels/data/fixed_length_record_dataset_op_test.cc +++ b/tensorflow/core/kernels/data/fixed_length_record_dataset_op_test.cc @@ -20,6 +20,12 @@ namespace { constexpr char kNodeName[] = "fixed_length_record_dataset"; constexpr int kOpVersion = 2; +tstring LocalTempFilename() { + std::string path; + CHECK(Env::Default()->LocalTempFilename(&path)); + return tstring(path); +} + class FixedLengthRecordDatasetParams : public DatasetParams { public: FixedLengthRecordDatasetParams(const std::vector& filenames, @@ -105,9 +111,7 @@ Status CreateTestFiles(const std::vector& filenames, // Test case 1: multiple fixed-length record files with ZLIB compression. FixedLengthRecordDatasetParams FixedLengthRecordDatasetParams1() { - std::vector filenames = { - absl::StrCat(testing::TmpDir(), "/text_line_ZLIB_1"), - absl::StrCat(testing::TmpDir(), "/text_line_ZLIB_2")}; + std::vector filenames = {LocalTempFilename(), LocalTempFilename()}; std::vector contents = { absl::StrCat("HHHHH", "111", "222", "333", "FF"), absl::StrCat("HHHHH", "aaa", "bbb", "FF")}; @@ -128,9 +132,7 @@ FixedLengthRecordDatasetParams FixedLengthRecordDatasetParams1() { // Test case 2: multiple fixed-length record files with GZIP compression. FixedLengthRecordDatasetParams FixedLengthRecordDatasetParams2() { - std::vector filenames = { - absl::StrCat(testing::TmpDir(), "/text_line_GZIP_1"), - absl::StrCat(testing::TmpDir(), "/text_line_GZIP_2")}; + std::vector filenames = {LocalTempFilename(), LocalTempFilename()}; std::vector contents = { absl::StrCat("HHHHH", "111", "222", "333", "FF"), absl::StrCat("HHHHH", "aaa", "bbb", "FF")}; @@ -150,9 +152,7 @@ FixedLengthRecordDatasetParams FixedLengthRecordDatasetParams2() { // Test case 3: multiple fixed-length record files without compression. FixedLengthRecordDatasetParams FixedLengthRecordDatasetParams3() { - std::vector filenames = { - absl::StrCat(testing::TmpDir(), "/text_line_UNCOMPRESSED_1"), - absl::StrCat(testing::TmpDir(), "/text_line_UNCOMPRESSED_2")}; + std::vector filenames = {LocalTempFilename(), LocalTempFilename()}; std::vector contents = { absl::StrCat("HHHHH", "111", "222", "333", "FF"), absl::StrCat("HHHHH", "aaa", "bbb", "FF")};