vm_run_skia_try/write_json_summary: run skpdiff within imagediffdb, not on its own

compute_engine_scripts/telemetry/telemetry_slave_scripts/vm_run_skia_try.sh

 #!/bin/bash
 #
 # Applies a Skia patch and compares images of SKPs with render_pictures.
 #
 # The script should be run from the skia-telemetry-slave GCE instance's
 # /home/default/skia-repo/buildbot/compute_engine_scripts/telemetry/telemetry_slave_scripts
 # directory.
 #
 # Copyright 2013 Google Inc. All Rights Reserved.
 # Author: rmistry@google.com (Ravi Mistry)
@@ skipping 98 matching lines @@
 # Download the SKP files from Google Storage if the local TIMESTAMP is out of date.
 LOCAL_SKP_DIR=/home/default/storage/skps/$PAGESETS_TYPE/$CHROMIUM_BUILD_DIR
 GS_SKP_DIR=gs://chromium-skia-gm/telemetry/skps/slave$SLAVE_NUM/$PAGESETS_TYPE/$CHROMIUM_BUILD_DIR
 mkdir -p $LOCAL_SKP_DIR
 are_timestamps_equal $LOCAL_SKP_DIR $GS_SKP_DIR
 if [ $? -eq 1 ]; then
   gsutil cp $GS_SKP_DIR/* $LOCAL_SKP_DIR
 fi
 
 SKIA_TRUNK_LOCATION=/home/default/skia-repo/trunk
+TELEMETRY_SLAVE_SCRIPTS_DIR=/home/default/skia-repo/buildbot/compute_engine_scripts/telemetry/telemetry_slave_scripts
 
 function cleanup_slave_before_exit {
   reset_skia_checkout
   copy_log_to_gs
   delete_worker_file $WORKER_FILE
   rm -rf /tmp/*${RUN_ID}* 
   rm -rf /tmp/diffs
   rm -rf /tmp/whitediffs
 }
 
@@ skipping 47 matching lines @@
   if [ $? -ne 0 ]; then
       echo "== Patch failed to apply. Exiting. =="
       cleanup_slave_before_exit
       exit 1
   fi
   echo "== Applied patch successfully =="
 else
   echo "== Empty patch specified =="
 fi
 build_tools $MESA_WITHPATCH_RUN
-IMG_ROOT=/tmp/
-OUTPUT_DIR_WITHPATCH_DIR_NAME=withpatch-pictures-$RUN_ID
-OUTPUT_DIR_WITHPATCH=${IMG_ROOT}${OUTPUT_DIR_WITHPATCH_DIR_NAME}
+IMG_ROOT=/tmp
+OUTPUT_DIR_WITHPATCH=$IMG_ROOT/withpatch-pictures-$RUN_ID
 mkdir -p $OUTPUT_DIR_WITHPATCH
 run_render_pictures $OUTPUT_DIR_WITHPATCH $MESA_WITHPATCH_RUN
 
 echo "== Removing the patch, building, and running render_pictures =="
 reset_skia_checkout
 make clean
 build_tools $MESA_NOPATCH_RUN
-OUTPUT_DIR_NOPATCH_DIR_NAME=nopatch-pictures-$RUN_ID
-OUTPUT_DIR_NOPATCH=${IMG_ROOT}${OUTPUT_DIR_NOPATCH_DIR_NAME}
+OUTPUT_DIR_NOPATCH=$IMG_ROOT/nopatch-pictures-$RUN_ID
 mkdir -p $OUTPUT_DIR_NOPATCH
 run_render_pictures $OUTPUT_DIR_NOPATCH $MESA_NOPATCH_RUN
 
-echo "== Run skpdiff to get the CSV with perceptual similarity metrics =="
-SKPDIFF_OUTPUT_FILE=/tmp/skpdiff-$RUN_ID.csv
-./out/Release/skpdiff \
-  -f $OUTPUT_DIR_NOPATCH $OUTPUT_DIR_WITHPATCH \
-  --csv $SKPDIFF_OUTPUT_FILE \
-  -d perceptual
-
 echo "== Comparing pictures and saving differences in JSON output file =="
-cd /home/default/skia-repo/buildbot/compute_engine_scripts/telemetry/telemetry_slave_scripts
 JSON_SUMMARY_DIR=/tmp/summary-$RUN_ID
 mkdir -p $JSON_SUMMARY_DIR
-python write_json_summary.py \
+python $TELEMETRY_SLAVE_SCRIPTS_DIR/write_json_summary.py \
   --img_root=$IMG_ROOT \
   --nopatch_json=$OUTPUT_DIR_NOPATCH/summary.json \
-  --nopatch_img_dir_name=$OUTPUT_DIR_NOPATCH_DIR_NAME \
+  --nopatch_images_base_url=file:/$OUTPUT_DIR_NOPATCH \

[epoger, 2014/03/03 21:51:05]

I *think* this will work, but I am not 100% sure, because the unittest uses a
mock ImageDiffDB which doesn't actually try to compute any diffs.

Ravi, can you please try it out and make sure?

It would probably be better for the unittest to either use a real ImageDiffDB
pointing at images on local disk, or for the mock ImageDiffDB to make lots of
assertions about the arguments that get passed to it during the test.

[rmistry, 2014/03/04 13:14:19]

I am ok with submitting this and then I will run end-to-end tests on it.
The unittest should probably not use a real ImageDiffDB but your suggestion
about lots of assertions in the mock one makes sense to me.

[epoger, 2014/03/04 14:44:42]

Thanks.
Added a TODO in imagediffdb_mock.py

   --withpatch_json=$OUTPUT_DIR_WITHPATCH/summary.json \
-  --withpatch_img_dir_name=$OUTPUT_DIR_WITHPATCH_DIR_NAME \
+  --withpatch_images_base_url=file:/$OUTPUT_DIR_WITHPATCH \
   --output_file_path=$JSON_SUMMARY_DIR/slave$SLAVE_NUM.json \
   --gs_output_dir=$OUTPUT_FILE_GS_LOCATION \
   --gs_skp_dir=$GS_SKP_DIR \
   --slave_num=$SLAVE_NUM \
-  --gm_json_path=/home/default/skia-repo/trunk/gm/gm_json.py \
-  --imagediffdb_path=/home/default/skia-repo/trunk/gm/rebaseline_server/imagediffdb.py \
-  --skpdiff_output_csv=$SKPDIFF_OUTPUT_FILE
+  --gm_json_path=$SKIA_TRUNK_LOCATION/gm/gm_json.py \
+  --imagediffdb_path=$SKIA_TRUNK_LOCATION/gm/rebaseline_server/imagediffdb.py
 
 echo "== Copy everything to Google Storage =="
 # Get list of failed file names and upload only those to Google Storage.
 ARRAY=`cat $JSON_SUMMARY_DIR/slave${SLAVE_NUM}.json | grep 'fileName' | cut -d ':' -f 2 | cut -d "\"" -f2`
 for i in ${ARRAY[@]}; do
   gsutil cp $OUTPUT_DIR_NOPATCH/$i $OUTPUT_FILE_GS_LOCATION/slave$SLAVE_NUM/nopatch-images/
   gsutil cp $OUTPUT_DIR_WITHPATCH/$i $OUTPUT_FILE_GS_LOCATION/slave$SLAVE_NUM/withpatch-images/
 done
 # Copy the diffs and whitediffs to Google Storage.
 gsutil cp $IMG_ROOT/diffs/* $OUTPUT_FILE_GS_LOCATION/slave$SLAVE_NUM/diffs/
 gsutil cp $IMG_ROOT/whitediffs/* $OUTPUT_FILE_GS_LOCATION/slave$SLAVE_NUM/whitediffs/
 
 # Set google.com permissions on all uploaded images.
 gsutil acl ch -g google.com:READ $OUTPUT_FILE_GS_LOCATION/slave$SLAVE_NUM/nopatch-images/*
 gsutil acl ch -g google.com:READ $OUTPUT_FILE_GS_LOCATION/slave$SLAVE_NUM/withpatch-images/*
 gsutil acl ch -g google.com:READ $OUTPUT_FILE_GS_LOCATION/slave$SLAVE_NUM/diffs/*
 gsutil acl ch -g google.com:READ $OUTPUT_FILE_GS_LOCATION/slave$SLAVE_NUM/whitediffs/*
 gsutil cp $JSON_SUMMARY_DIR/* $OUTPUT_FILE_GS_LOCATION/slave$SLAVE_NUM/
 
 cleanup_slave_before_exit