Write/compare against expectations in skimage tool.

gyp/tools.gyp

 # GYP file to build various tools.
 #
 # To build on Linux:
 #  ./gyp_skia tools.gyp && make tools
 #
 {
   'includes': [
     'apptype_console.gypi',
   ],
   'targets': [
@@ skipping 60 matching lines @@
         'flags.gyp:flags',
         'images.gyp:images',
       ],
     },
     {
       'target_name': 'skimage',
       'type': 'executable',
       'sources': [
         '../tools/skimage_main.cpp',
       ],
+      'include_dirs': [
+        # For SkBitmapHasher.h
+        '../src/utils/',
+      ],
       'dependencies': [
         'skia_base_libs.gyp:skia_base_libs',
         'effects.gyp:effects',
+        'flags.gyp:flags',
+        'gm.gyp:gm_expectations',
         'images.gyp:images',
-        'flags.gyp:flags',
+        'jsoncpp.gyp:jsoncpp',
+        'utils.gyp:utils',
       ],
     },
     {
       'target_name': 'render_pictures',
       'type': 'executable',
       'sources': [
         '../tools/render_pictures_main.cpp',
       ],
       'include_dirs': [
         '../src/pipe/utils/',
@@ skipping 206 matching lines @@
       },
     ],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: