skimage: revert r9642
git-svn-id: http://skia.googlecode.com/svn/trunk@9647 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
parent
1277cf05cc
commit
c7e1873c85
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1,9 +0,0 @@
|
||||
{
|
||||
"actual-results" : {
|
||||
"failed" : null,
|
||||
"failure-ignored" : null,
|
||||
"no-comparison" : null,
|
||||
"succeeded" : null
|
||||
},
|
||||
"expected-results" : null
|
||||
}
|
@ -1,9 +0,0 @@
|
||||
{
|
||||
"actual-results" : {
|
||||
"failed" : null,
|
||||
"failure-ignored" : null,
|
||||
"no-comparison" : null,
|
||||
"succeeded" : null
|
||||
},
|
||||
"expected-results" : null
|
||||
}
|
@ -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!"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user