diff options
| author |  epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-06-18 02:53:16 +0000 |
|---|---|---|
| committer | epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-06-18 02:53:16 +0000 |
| commit | c7e1873c85b108aa2f8f6cc5b2a911993e42751b (patch) | |
| tree | 50f50cc02bc0cbd190a32e01ec086bc9701cf911 /tools | |
| parent | 1277cf05cc7de138ee81472aedded14bc5db6418 (diff) | |
skimage: revert r9642
git-svn-id: http://skia.googlecode.com/svn/trunk@9647 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/skimage_main.cpp | 3 | ||||
| -rw-r--r-- | tools/tests/skimage/output-expected/empty-dir/expectations.json | 9 | ||||
| -rw-r--r-- | tools/tests/skimage/output-expected/nonexistent-dir/expectations.json | 9 | ||||
| -rwxr-xr-x | tools/tests/skimage_self_test.py | 21 |
4 files changed, 1 insertions, 41 deletions
diff --git a/tools/skimage_main.cpp b/tools/skimage_main.cpp index b115392abb..107d3bfdb8 100644 --- a/tools/skimage_main.cpp +++ b/tools/skimage_main.cpp @@ -515,8 +515,7 @@ int tool_main(int argc, char** argv) { decodeFileAndWrite(fullname.c_str(), outDirPtr); } while (iter.next(&filename)); } else { - // FLAGS_readPath[i] is an empty or nonexistent directory, - // so do nothing. + decodeFileAndWrite(FLAGS_readPath[i], outDirPtr); } } diff --git a/tools/tests/skimage/output-expected/empty-dir/expectations.json b/tools/tests/skimage/output-expected/empty-dir/expectations.json deleted file mode 100644 index 1ce8e2774c..0000000000 --- a/tools/tests/skimage/output-expected/empty-dir/expectations.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "actual-results" : { - "failed" : null, - "failure-ignored" : null, - "no-comparison" : null, - "succeeded" : null - }, - "expected-results" : null -} diff --git a/tools/tests/skimage/output-expected/nonexistent-dir/expectations.json b/tools/tests/skimage/output-expected/nonexistent-dir/expectations.json deleted file mode 100644 index 1ce8e2774c..0000000000 --- a/tools/tests/skimage/output-expected/nonexistent-dir/expectations.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "actual-results" : { - "failed" : null, - "failure-ignored" : null, - "no-comparison" : null, - "succeeded" : null - }, - "expected-results" : null -} diff --git a/tools/tests/skimage_self_test.py b/tools/tests/skimage_self_test.py index 24164d4a51..cb66fe1729 100755 --- a/tools/tests/skimage_self_test.py +++ b/tools/tests/skimage_self_test.py @@ -9,7 +9,6 @@ import filecmp import os import subprocess import sys -import tempfile class BinaryNotFoundException(Exception): def __str__ (self): @@ -71,26 +70,6 @@ def main(): # TODO(scroggo): Add a test that compares expectations and image files that # are known to NOT match, and make sure it returns an error. - # Generate an expectations file from an empty directory. - empty_dir = tempfile.mkdtemp() - expectations_path = os.path.join(file_dir, "skimage", "output-actual", - "empty-dir", "expectations.json") - subprocess.check_call([skimage_binary, "--readPath", empty_dir, - "--createExpectationsPath", expectations_path]) - golden_expectations = os.path.join(file_dir, "skimage", "output-expected", - "empty-dir", "expectations.json") - DieIfFilesMismatch(expected=golden_expectations, actual=expectations_path) - os.rmdir(empty_dir) - - # Generate an expectations file from a nonexistent directory. - expectations_path = os.path.join(file_dir, "skimage", "output-actual", - "nonexistent-dir", "expectations.json") - subprocess.check_call([skimage_binary, "--readPath", "/nonexistent/dir", - "--createExpectationsPath", expectations_path]) - golden_expectations = os.path.join(file_dir, "skimage", "output-expected", - "nonexistent-dir", "expectations.json") - DieIfFilesMismatch(expected=golden_expectations, actual=expectations_path) - # Done with all tests. print "Self tests succeeded!" |