Fix for caller of GetTmpDir.
authorscroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
Fri, 7 Jun 2013 14:30:36 +0000 (14:30 +0000)
committerscroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
Fri, 7 Jun 2013 14:30:36 +0000 (14:30 +0000)
Since I changed GetTmpDir to create an SkString each time, it
needs to be assigned to a variable in order for it to stick around.
Update a test which I missed because my client was out of date.

Review URL: https://codereview.chromium.org/15719006

git-svn-id: http://skia.googlecode.com/svn/trunk@9475 2bbb7eff-a529-9590-31e7-b0007b416f81

tests/DataRefTest.cpp

index 9ff7034..b6daaf9 100644 (file)
@@ -260,13 +260,12 @@ static void test_cstring(skiatest::Reporter* reporter) {
 }
 
 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";
     {