Preparations for running skimage tool on bots.

tools/tests/skimage_self_test.py

 #!/usr/bin/env python
 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Self-test for skimage.
 
 import os
 import subprocess
 import sys
@@ skipping 31 matching lines @@
 
     # Run skimage twice, first to create an expectations file, and then
     # comparing to it.
 
     # Both commands will run the binary, reading from resources.
     cmd_line = [skimage_binary]
     resources_dir = os.path.join(trunk_dir, 'resources')
     cmd_line.extend(["-r", resources_dir])
 
     # Create the expectations file
-    results_dir = os.path.join(file_dir, "skimage")
+    results_file = os.path.join(file_dir, "skimage", "self_test_results.json")
     create_expectations_cmd = cmd_line + ["--createExpectationsPath",
-                                          results_dir]
+                                          results_file]
     subprocess.check_call(create_expectations_cmd)
 
     # Now read from the expectations file
-    results_file = os.path.join(results_dir, "results.json")
     check_expectations_cmd = cmd_line + ["--readExpectationsPath",
                                          results_file]
     subprocess.check_call(check_expectations_cmd)
     print "Self tests succeeded!"
 
 if __name__ == "__main__":
     main()