AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

skimage: revert r9642

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@9647 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
epoger@google.com 2013-06-18 02:53:16 +00:00
parent 1277cf05cc
commit c7e1873c85
4 changed files with 1 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/skimage_main.cpp
View File

@ -515,8 +515,7 @@ int tool_main(int argc, char** argv) {
decodeFileAndWrite(fullname.c_str(), outDirPtr); decodeFileAndWrite(fullname.c_str(), outDirPtr);
} while (iter.next(&filename)); } while (iter.next(&filename));
} else { } else {
// FLAGS_readPath[i] is an empty or nonexistent directory, decodeFileAndWrite(FLAGS_readPath[i], outDirPtr);
// so do nothing.
} }
} }

9
tools/tests/skimage/output-expected/empty-dir/expectations.json
View File

@ -1,9 +0,0 @@
{
"actual-results" : {
"failed" : null,
"failure-ignored" : null,
"no-comparison" : null,
"succeeded" : null
},
"expected-results" : null
}

9
tools/tests/skimage/output-expected/nonexistent-dir/expectations.json
View File

@ -1,9 +0,0 @@
{
"actual-results" : {
"failed" : null,
"failure-ignored" : null,
"no-comparison" : null,
"succeeded" : null
},
"expected-results" : null
}

21
tools/tests/skimage_self_test.py
View File

@ -9,7 +9,6 @@ import filecmp
import os import os
import subprocess import subprocess
import sys import sys
import tempfile
class BinaryNotFoundException(Exception): class BinaryNotFoundException(Exception):
def __str__ (self): def __str__ (self):
@ -71,26 +70,6 @@ def main():
# TODO(scroggo): Add a test that compares expectations and image files that # TODO(scroggo): Add a test that compares expectations and image files that
# are known to NOT match, and make sure it returns an error. # 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. # Done with all tests.
print "Self tests succeeded!" print "Self tests succeeded!"