Fix bug in setting directories for tests.

tests/StreamTest.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 "SkRandom.h"
 #include "SkOSFile.h"
@@ skipping 17 matching lines @@
         REPORTER_ASSERT(reporter, bytes == len);
         REPORTER_ASSERT(reporter, !memcmp(tmp, src, len));
     }
 
     // expect EOF
     size_t bytes = stream->read(tmp, 1);
     REPORTER_ASSERT(reporter, 0 == bytes);
 }
 
 static void test_filestreams(skiatest::Reporter* reporter, const char* tmpDir) {
-    SkString path;
-    path.printf("%s%s", tmpDir, "wstream_test");
+    SkString path = SkOSPath::SkPathJoin(tmpDir, "wstream_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 41 matching lines @@
     }
 
     {
         SkData* data = ds.copyToData();
         REPORTER_ASSERT(reporter, 100 * 26 == data->size());
         REPORTER_ASSERT(reporter, memcmp(dst, data->data(), data->size()) == 0);
         data->unref();
     }
     delete[] dst;
 
-    if (!skiatest::Test::GetTmpDir().isEmpty()) {
-        test_filestreams(reporter, skiatest::Test::GetTmpDir().c_str());
+    SkString tmpDir = skiatest::Test::GetTmpDir();
+    if (!tmpDir.isEmpty()) {
+        test_filestreams(reporter, tmpDir.c_str());
     }
 }
 
 static void TestPackedUInt(skiatest::Reporter* reporter) {
     // we know that packeduint tries to write 1, 2 or 4 bytes for the length,
     // so we test values around each of those transitions (and a few others)
     const size_t sizes[] = {
         0, 1, 2, 0xFC, 0xFD, 0xFE, 0xFF, 0x100, 0x101, 32767, 32768, 32769,
         0xFFFD, 0xFFFE, 0xFFFF, 0x10000, 0x10001,
         0xFFFFFD, 0xFFFFFE, 0xFFFFFF, 0x1000000, 0x1000001,
@@ skipping 40 matching lines @@
 }
 
 static void TestStreams(skiatest::Reporter* reporter) {
     TestWStream(reporter);
     TestPackedUInt(reporter);
     TestNullData();
 }
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS("Stream", StreamTestClass, TestStreams)