commit 4615b96345d57a09e058a3fc43755d132a025019
author Mike Frysinger <vapier@chromium.org> Fri Oct 05 14:18:51 2012 -0400
committer Gerrit <chrome-bot@google.com> Fri Oct 05 15:21:10 2012 -0700
tree 92db1648a3358e46d4d5e5a2b3cde1b812a29d51
parent 09a8447862c7d111d6abdd7891508df1a8f1cc5b

signer scripts: return an error when loading configs fail

If we are given a config file that doesn't exist, return an error rather
ignoring it.  This way we don't accidentally give images a pass when we
didn't properly test them.

BUG=None
TEST=`./security_test_image --board=x86-alex --baselines=/` now shows 3 failures rather than all pass
BRANCH=None

Change-Id: I9d130db05befaeac8fcca921f0e43f47c2461f9f
Reviewed-on: https://gerrit.chromium.org/gerrit/34795
Reviewed-by: Ryan Cui <rcui@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>

scripts/image_signing/ensure_no_nonrelease_files.sh

diff --git a/scripts/image_signing/ensure_no_nonrelease_files.sh b/scripts/image_signing/ensure_no_nonrelease_files.sh
index 5a07248..1b6625f 100755
--- a/scripts/image_signing/ensure_no_nonrelease_files.sh
+++ b/scripts/image_signing/ensure_no_nonrelease_files.sh
@@ -35,7 +35,7 @@
         configfile="$2"
     fi
     # Either way, load test-expectations data from config.
-    . "$configfile"
+    . "$configfile" || return 1
 
     local rootfs=$(make_temp_dir)
     mount_image_partition_ro "$image" 3 "$rootfs"

scripts/image_signing/ensure_sane_lsb-release.sh

diff --git a/scripts/image_signing/ensure_sane_lsb-release.sh b/scripts/image_signing/ensure_sane_lsb-release.sh
index bbdffeb..a5abc3c 100755
--- a/scripts/image_signing/ensure_sane_lsb-release.sh
+++ b/scripts/image_signing/ensure_sane_lsb-release.sh
@@ -125,7 +125,7 @@
   fi
   # Either way, load test-expectations data from config.
   echo -n "Loading config from $configfile... "
-  . "$configfile"
+  . "$configfile" || return 1
   echo "Done."
 
   local rootfs=$(make_temp_dir)

scripts/image_signing/ensure_secure_kernelparams.sh

diff --git a/scripts/image_signing/ensure_secure_kernelparams.sh b/scripts/image_signing/ensure_secure_kernelparams.sh
index e0e49b9..31d6d64 100755
--- a/scripts/image_signing/ensure_secure_kernelparams.sh
+++ b/scripts/image_signing/ensure_secure_kernelparams.sh
@@ -75,7 +75,7 @@
         configfile="$2"
     fi
     # Either way, load test-expectations data from config.
-    . "$configfile"
+    . "$configfile" || return 1
 
     local kernelblob=$(make_temp_file)
     # TODO(jimhebert): Perform the kernel security tests on both the kernel