Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9768)

Unified Diff: chrome/test/data/safe_browsing/dmg/generate_test_data.sh

Issue 2748453002: Fix chrome/test/data/safe_browsing/dmg/generate_test_data.sh to not silently fail. (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/test/data/safe_browsing/dmg/make_hfs.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/data/safe_browsing/dmg/generate_test_data.sh
diff --git a/chrome/test/data/safe_browsing/dmg/generate_test_data.sh b/chrome/test/data/safe_browsing/dmg/generate_test_data.sh
index 7edcafe9c416c32a6dd7d8408399260cb5b62e3d..a1a6b6557c2be91a85ce69b8e19204e0592eee1c 100755
--- a/chrome/test/data/safe_browsing/dmg/generate_test_data.sh
+++ b/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
« no previous file with comments | « no previous file | chrome/test/data/safe_browsing/dmg/make_hfs.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698