Fix bug in setting directories for tests.

tests/skia_test.cpp

Index: tests/skia_test.cpp
diff --git a/tests/skia_test.cpp b/tests/skia_test.cpp
index 238252d7377629e19f193b1f7de93d945fa75b0b..f6c7839609d5f2ab39151589ae7e603c477b3622 100644
--- a/tests/skia_test.cpp
+++ b/tests/skia_test.cpp
@@ -112,22 +112,6 @@ private:
     bool fAllowThreaded;
 };
 
-static const char* make_canonical_dir_path(const char* path, SkString* storage) {
-    if (path) {
-        // clean it up so it always has a trailing searator
-        size_t len = strlen(path);
-        if (0 == len) {
-            path = NULL;
-        } else if (SkPATH_SEPARATOR != path[len - 1]) {
-            // resize to len + 1, to make room for searator
-            storage->set(path, len + 1);
-            storage->writable_str()[len] = SkPATH_SEPARATOR;
-            path = storage->c_str();
-        }
-    }
-    return path;
-}
-
 static SkString gTmpDir;

[epoger, 2013/06/04 15:15:34]

Hey, if this change fixes an existing problem, I'm in favor of committing it. 
But it seems to me that a cleaner approach would be:

1. remove global gTmpDir variable
2. rewrite Test::GetTmpDir() to just return an SkString derived from
FLAGS_tmpDir
3. adjust any callers to Test::GetTmpDir() to use SkOSPath::SkPathJoin() to
assemble their paths, rather than path.printf("%s%s", tmpDir, "data_test");

And, I suppose, the same sort of changes for gResourcePath.

[scroggo, 2013/06/04 19:50:39]

Done.
Done. I am not convinced this is better, but it seems just as good to me.
Done.
Interestingly, no one uses gResourcePath... When it was created it wasn't used,
but presumably a later change used it. I was about to delete it, but I plan on
using it with a future change.

[epoger, 2013/06/05 14:34:14]

My reasoning was: why use 2 global variables (gTmpDir and FLAGS_tmpDir) when
just 1 will do?

I guess the downside is that, because FLAGS_tmpDir is a char* instead of an
SkString, we need to create the SkString every time GetTmpDir() is called.  So
this is a performance hit.

I'm happy either way.

 
 const SkString& Test::GetTmpDir() {
@@ -219,10 +203,10 @@ int tool_main(int argc, char** argv) {
     SkCommandLineFlags::Parse(argc, argv);
 
     if (!FLAGS_tmpDir.isEmpty()) {
-        make_canonical_dir_path(FLAGS_tmpDir[0], &gTmpDir);
+        gTmpDir = SkOSPath::SkPathJoin(FLAGS_tmpDir[0], NULL);
     }
     if (!FLAGS_resourcePath.isEmpty()) {
-        make_canonical_dir_path(FLAGS_resourcePath[0], &gResourcePath);
+        gResourcePath = SkOSPath::SkPathJoin(FLAGS_resourcePath[0], NULL);
     }
 
 #if SK_ENABLE_INST_COUNT