Fix for caller of GetTmpDir.

tests/DataRefTest.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "Test.h"
 #include "SkData.h"
 #include "SkDataSet.h"
@@ skipping 242 matching lines @@
     SkAutoTUnref<SkData> r1(SkData::NewWithCString(str));
 
     REPORTER_ASSERT(reporter, r0->equals(r1));
 
     SkAutoTUnref<SkData> r2(SkData::NewWithCString(NULL));
     REPORTER_ASSERT(reporter, 1 == r2->size());
     REPORTER_ASSERT(reporter, 0 == *r2->bytes());
 }
 
 static void test_files(skiatest::Reporter* reporter) {
-    if (skiatest::Test::GetTmpDir().isEmpty()) {
+    SkString tmpDir = skiatest::Test::GetTmpDir();
+    if (tmpDir.isEmpty()) {
         return;
     }
 
-    const char* tmpDir = skiatest::Test::GetTmpDir().c_str();
-    SkString path;
-    path.printf("%s%s", tmpDir, "data_test");
+    SkString path = SkOSPath::SkPathJoin(tmpDir.c_str(), "data_test");
 
     const char s[] = "abcdefghijklmnopqrstuvwxyz";
     {
         SkFILEWStream writer(path.c_str());
         if (!writer.isValid()) {
             SkString msg;
             msg.printf("Failed to create tmp file %s\n", path.c_str());
             reporter->reportFailed(msg.c_str());
             return;
         }
@@ skipping 39 matching lines @@
     tmp->unref();
 
     test_cstring(reporter);
     test_dataset(reporter);
     test_files(reporter);
 }
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS("Data", DataTestClass, TestData)
 DEFINE_TESTCLASS("DataTable", DataTableTestClass, TestDataTable)