Fix chrome/test/data/safe_browsing/dmg/generate_test_data.sh to not silently fail.

generate_test_data.sh uses `hdiutil create` and `hdiutil convert`. The former
can overwrite an existing output file, but the latter cannot. This led to the
following error:

  hdiutil: convert failed - File exists

But this message was getting swallowed because the script 1) did not do `set -e`
to stop on errors, and 2) redirect all output to /dev/null. This also fixes both
of those issues.

BUG=696529
R=thakis@chromium.org

Review-Url: https://codereview.chromium.org/2748453002
Cr-Commit-Position: refs/heads/master@{#456141}

chrome/test/data/safe_browsing/dmg/generate_test_data.sh

@@ -4,6 +4,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+set -eu
+
 THIS_DIR=$(dirname "$0")
 
 OUT_DIR="$1"
@@ -22,6 +24,10 @@ if [[ ! -d "$1" ]]; then
 fi
 
 generate_test_data() {
+  # `hdiutil convert` cannot overwrite files, so remove items in the output
+  # directory.
+  rm -f "${OUT_DIR}"/*
+
   # HFS Raw Images #############################################################
 
   MAKE_HFS="${THIS_DIR}/make_hfs.sh"
@@ -34,7 +40,7 @@ generate_test_data() {
   echo "This is a test DMG file. It has been generated from " \
       "chrome/test/data/safe_browsing/dmg/generate_test_data.sh" \
           > "${DMG_SOURCE}/README.txt"
-  dd if=/dev/urandom of="${DMG_SOURCE}/random" bs=512 count=4
+  dd if=/dev/urandom of="${DMG_SOURCE}/random" bs=512 count=4 &> /dev/null
 
   DMG_TEMPLATE_FORMAT="UDRO"
   DMG_FORMATS="UDRW UDCO UDZO UDBZ UFBI UDTO UDSP"
@@ -46,7 +52,7 @@ generate_test_data() {
     hdiutil create -srcfolder "${DMG_SOURCE}" \
       -format "${DMG_TEMPLATE_FORMAT}" -layout "${layout}" \
       -volname "${DMG_NAME}" \
-      -ov "${OUT_DIR}/${DMG_NAME}"
+      "${OUT_DIR}/${DMG_NAME}"
   done
 
   # Convert each template into the different compression format.
@@ -80,5 +86,5 @@ generate_test_data() {
   rm -rf "${DMG_SOURCE}"
 }
 
-# Silence any log output.
-generate_test_data &> /dev/null
+# Silence any stdout, but keep stderr.
+generate_test_data > /dev/null

chrome/test/data/safe_browsing/dmg/make_hfs.sh

@@ -7,7 +7,7 @@
 # This script is used to generate an HFS file system with several types of
 # files of different sizes.
 
-set -e
+set -eu
 
 FILESYSTEM_TYPE="$1"
 RAMDISK_SIZE="$2"
@@ -46,7 +46,7 @@ pushd third
 pushd fourth
 pushd fifth
 
-dd if=/dev/random of=random bs=1 count=768
+dd if=/dev/random of=random bs=1 count=768 &> /dev/null
 
 popd   # fourth
 
@@ -75,5 +75,5 @@ popd  # Original PWD
 
 # Unmount the volume, copy the raw device to a file, and then destroy it.
 diskutil unmount ${RAMDISK_VOLUME}
-dd if=${RAMDISK_VOLUME} of="${OUT_FILE}"
+dd if=${RAMDISK_VOLUME} of="${OUT_FILE}" &> /dev/null
 diskutil eject ${RAMDISK_VOLUME}