experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use io::JoinPath rather than StrCat to build paths.

Browse Source 
This breaks when trying to run on Windows.

PiperOrigin-RevId: 295046481
Change-Id: I46a0c5be12894b7223f545cc842894fb8b2a55e1
This commit is contained in:
Brian Atkinson 2020-02-13 18:20:08 -08:00 committed by TensorFlower Gardener
parent 8eb1ec3ddb
commit a0199a1fef
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tensorflow/core/platform/default/BUILD
View File

@ -418,6 +418,7 @@ cc_library(
"//tensorflow/core/platform:logging", "//tensorflow/core/platform:logging",
"//tensorflow/core/platform:macros", "//tensorflow/core/platform:macros",
"//tensorflow/core/platform:net", "//tensorflow/core/platform:net",
"//tensorflow/core/platform:path",
"//tensorflow/core/platform:strcat", "//tensorflow/core/platform:strcat",
"//tensorflow/core/platform:types", "//tensorflow/core/platform:types",
"@com_google_googletest//:gtest", "@com_google_googletest//:gtest",

13
tensorflow/core/platform/default/test.cc
View File

@ -19,6 +19,7 @@ limitations under the License.
#include "tensorflow/core/platform/logging.h" #include "tensorflow/core/platform/logging.h"
#include "tensorflow/core/platform/net.h" #include "tensorflow/core/platform/net.h"
#include "tensorflow/core/platform/path.h"
#include "tensorflow/core/platform/strcat.h" #include "tensorflow/core/platform/strcat.h"
#include "tensorflow/core/platform/types.h" #include "tensorflow/core/platform/types.h"
@ -61,15 +62,13 @@ string TensorFlowSrcRoot() {
const char* workspace = getenv("TEST_WORKSPACE"); const char* workspace = getenv("TEST_WORKSPACE");
if (env && env[0] != '\0') { if (env && env[0] != '\0') {
if (workspace && workspace[0] != '\0') { if (workspace && workspace[0] != '\0') {
return strings::StrCat(env, "/", workspace, "/tensorflow"); return io::JoinPath(env, workspace, "tensorflow");
} else {
return strings::StrCat(env, "/tensorflow");
} }
} else { return io::JoinPath(env, "tensorflow");
LOG(WARNING) << "TEST_SRCDIR environment variable not set: "
<< "using $PWD/tensorflow as TensorFlowSrcRoot() for tests.";
return "tensorflow";
} }
LOG(WARNING) << "TEST_SRCDIR environment variable not set: "
<< "using $PWD/tensorflow as TensorFlowSrcRoot() for tests.";
return "tensorflow";
} }
} // namespace testing } // namespace testing