Merge pull request #150 from google/sr

Added JoinPath and StrCat

1 files changed, 16 insertions, 4 deletions

diff --git a/src/testharness.cc b/src/testharness.cc
index afdfac3..35bf893 100644
--- a/src/testharness.cc
+++ b/src/testharness.cc
@@ -66,12 +66,24 @@ int RunAllTests() {
   return 0;
 }
 
-ScopedTempFile::ScopedTempFile(const std::string &filename) {
+ScopedTempFile::ScopedTempFile(absl::string_view filename) {
   char pid[64];
-  snprintf(pid, sizeof(pid), "%u", getpid());
-  filename_ = "/tmp/.XXX.tmp." + filename + "." + pid;
+  snprintf(pid, sizeof(pid), "%u",
+#ifdef OS_WIN
+           static_cast<uint32>(::GetCurrentProcessId())
+#else
+           ::getpid()
+#endif
+  );
+  filename_ = string_util::StrCat(".XXX.tmp.", filename, ".", pid);
 }
 
-ScopedTempFile::~ScopedTempFile() { ::unlink(filename_.c_str()); }
+ScopedTempFile::~ScopedTempFile() {
+#ifdef OS_WIN
+  ::DeleteFile(WPATH(filename_.c_str()));
+#else
+  ::unlink(filename_.c_str());
+#endif
+}
 }  // namespace test
 }  // namespace sentencepiece