commit 925e31e749fc369ebd2ebd7994693b767e674e97
author Hal Canary <halcanary@google.com> Mon Dec 11 14:42:58 2017 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Dec 12 18:22:39 2017 +0000
tree 1c667218a5d94e0b2a8d3d35c209a8def119ebec
parent c896eddc1cf77ffaaa0d0cb68caac7e251cdb727

dm: require tmpDir, reasonable defaults

Change-Id: I9d84ce1ebbe417160a29ca2221b1df04901238e3
Reviewed-on: https://skia-review.googlesource.com/83541
Commit-Queue: Hal Canary <halcanary@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>

tests/StreamBufferTest.cpp

diff --git a/tests/StreamBufferTest.cpp b/tests/StreamBufferTest.cpp
index 35bebad..5435bf9 100644
--- a/tests/StreamBufferTest.cpp
+++ b/tests/StreamBufferTest.cpp
@@ -28,6 +28,9 @@
 // Test buffering from the beginning, by different amounts.
 static void test_buffer_from_beginning(skiatest::Reporter* r, std::unique_ptr<SkStream> stream,
                                        size_t length) {
+    if (!stream) {
+        return;
+    }
     SkStreamBuffer buffer(std::move(stream));
 
     // Buffer an arbitrary amount:
@@ -46,6 +49,9 @@
 // Test flushing the stream as we read.
 static void test_flushing(skiatest::Reporter* r, std::unique_ptr<SkStream> stream, size_t length,
                           bool getDataAtPosition) {
+    if (!stream) {
+        return;
+    }
     SkStreamBuffer buffer(std::move(stream));
     const size_t step = 5;
     for (size_t position = 0; position + step <= length; position += step) {
@@ -78,6 +84,10 @@
     if (!tmpDir.isEmpty()) {
         path = SkOSPath::Join(tmpDir.c_str(), subdir);
         SkFILEWStream writer(path.c_str());
+        if (!writer.isValid()) {
+            ERRORF(r, "unable to write to '%s'\n", path.c_str());
+            return;
+        }
         writer.write(gText, size);
     }
 
@@ -85,9 +95,11 @@
         std::function<std::unique_ptr<SkStream>()>  createStream;
         bool                                        skipIfNoTmpDir;
     } factories[] = {
-        { [&data]() { return skstd::make_unique<SkMemoryStream>(data); },       false },
-        { [&data]() { return skstd::make_unique<NotAssetMemStream>(data); },    false },
-        { [&path]() { return skstd::make_unique<SkFILEStream>(path.c_str()); }, true  },
+        { [&data]() { return skstd::make_unique<SkMemoryStream>(data); },       false  },
+        { [&data]() { return skstd::make_unique<NotAssetMemStream>(data); },    false  },
+        { [&path]() { return path.isEmpty()
+                             ? nullptr
+                             : skstd::make_unique<SkFILEStream>(path.c_str()); }, true },
     };
 
     for (auto f : factories) {