commit d013028f4c07bec6db9563a04b14d465c3c06b05
author Gilad Arnold <garnold@chromium.org> Mon May 13 08:12:39 2013 -0700
committer ChromeBot <chrome-bot@google.com> Mon May 13 14:23:41 2013 -0700
tree d9552fe5634ce54687788788c40f14885a16fe22
parent 43116436524744f065ff29cfbe31e045339a1204

paycheck: fix integration test script

Now that paycheck comes equipped with the Chrome OS standard public key
and infers metadata signature filenames automatically, we don't need
these extra arguments handed to the test script. Also, fixes a small bug
in option inference during paycheck invocation.

BUG=None
TEST=integration test script works as intended

Change-Id: If2c0d512c2e9476c3788e9c7179e954ba2502657
Reviewed-on: https://gerrit.chromium.org/gerrit/50985
Tested-by: Gilad Arnold <garnold@chromium.org>
Reviewed-by: Don Garrett <dgarrett@chromium.org>
Commit-Queue: Gilad Arnold <garnold@chromium.org>

scripts/paycheck.py

diff --git a/scripts/paycheck.py b/scripts/paycheck.py
index de5a7e7..0ca2a76 100755
--- a/scripts/paycheck.py
+++ b/scripts/paycheck.py
@@ -121,7 +121,8 @@
   # There are several options that imply --check.
   opts.check = (opts.check or opts.report or opts.assert_type or
                 opts.block_size or opts.allow_unhashed or
-                opts.disabled_tests or opts.key or opts.meta_sig or
+                opts.disabled_tests or opts.meta_sig or
+                opts.key != default_key or
                 opts.root_part_size != _DEFAULT_ROOTFS_PART_SIZE or
                 opts.kern_part_size != _DEFAULT_KERNEL_PART_SIZE)
 

scripts/test_paycheck.sh

diff --git a/scripts/test_paycheck.sh b/scripts/test_paycheck.sh
index 4d763c4..bbec907 100755
--- a/scripts/test_paycheck.sh
+++ b/scripts/test_paycheck.sh
@@ -68,19 +68,16 @@
 
 usage_and_exit() {
   cat >&2 <<EOF
-Usage: ${0##*/} pubkey old_full_payload old_full_metasig \\
-         delta_payload delta_metasig new_full_payload new_full_metasig
+Usage: ${0##*/} old_full_payload delta_payload new_full_payload
 EOF
   exit
 }
 
 check_payload() {
   payload_file=$1
-  metasig_file=$2
-  payload_type=$3
+  payload_type=$2
 
-  time ${paycheck} -r - -k ${pubkey_file} -m ${metasig_file} \
-    -t ${payload_type} ${payload_file}
+  time ${paycheck} -t ${payload_type} ${payload_file}
 }
 
 trace_kern_block() {
@@ -118,16 +115,12 @@
   # Read command-line arguments.
   if [ $# == 1 ] && [ "$1" == "-h" ]; then
     usage_and_exit
-  elif [ $# != 7 ]; then
+  elif [ $# != 3 ]; then
     die "Error: unexpected number of arguments"
   fi
-  pubkey_file="$1"
-  old_full_payload="$2"
-  old_full_metasig="$3"
-  delta_payload="$4"
-  delta_metasig="$5"
-  new_full_payload="$6"
-  new_full_metasig="$7"
+  old_full_payload="$1"
+  delta_payload="$2"
+  new_full_payload="$3"
 
   # Find paycheck.py
   paycheck=${0%/*}/paycheck.py
@@ -137,9 +130,9 @@
 
   # Check the payloads statically.
   log "Checking payloads..."
-  check_payload "${old_full_payload}" "${old_full_metasig}" full
-  check_payload "${new_full_payload}" "${new_full_metasig}" full
-  check_payload "${delta_payload}" "${delta_metasig}" delta
+  check_payload "${old_full_payload}" full
+  check_payload "${new_full_payload}" full
+  check_payload "${delta_payload}" delta
   log "Done"
 
   # Trace a random block between 0-1024 on all payloads.