Preparations for running skimage tool on bots.

tools/tests/skimage_self_test.py

Index: tools/tests/skimage_self_test.py
diff --git a/tools/tests/skimage_self_test.py b/tools/tests/skimage_self_test.py
index 94a514458e3f58156e95449755500706cd9da19c..d2d072ff41d396e71f2cb787beff02961cef16a0 100755
--- a/tools/tests/skimage_self_test.py
+++ b/tools/tests/skimage_self_test.py
@@ -49,13 +49,12 @@ def main():
     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)