commit 3e3790d00827e75d39b77a14bca2756a14a51b3c
author Bill Richardson <wfrichar@chromium.org> Mon Jul 14 15:05:54 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Thu Jul 17 06:50:37 2014 +0000
tree cbc397cfa9eb60fc7f3e08f3cd29b04962e2c972
parent 0f6679e8582219b40e2ab5485992827a92c18bcd

Install and use futility when running tests

As we build features into futility, the standalone executables disappear.
Tests that invoke those executables will need to invoke futility instead.

BUG=chromium:224734
BRANCH=ToT
TEST=make runtests

Signed-off-by: Bill Richardson <wfrichar@chromium.org>
Change-Id: I75230f6901aab8d978fa5d12505c243e1c90c938
Reviewed-on: https://chromium-review.googlesource.com/207926
Reviewed-by: Randall Spangler <rspangler@chromium.org>

tests/gen_test_keys.sh

diff --git a/tests/gen_test_keys.sh b/tests/gen_test_keys.sh
index fff5ec7..5575cd5 100755
--- a/tests/gen_test_keys.sh
+++ b/tests/gen_test_keys.sh
@@ -30,7 +30,7 @@
       -out ${key_base}.crt
 
     # Generate pre-processed key for use by RSA signature verification code.
-    ${UTIL_DIR}/dumpRSAPublicKey -cert ${key_base}.crt \
+    ${BIN_DIR}/dumpRSAPublicKey -cert ${key_base}.crt \
       > ${key_base}.keyb
 
     alg_index=0
@@ -38,14 +38,14 @@
     do
       alg=$((${key_index} * 3 + ${alg_index}))
   # wrap the public key
-      ${UTIL_DIR}/vbutil_key \
+      ${BIN_DIR}/vbutil_key \
         --pack "${key_base}.sha${sha_type}.vbpubk" \
         --key "${key_base}.keyb" \
         --version 1 \
         --algorithm ${alg}
 
   # wrap the private key
-      ${UTIL_DIR}/vbutil_key \
+      ${BIN_DIR}/vbutil_key \
         --pack "${key_base}.sha${sha_type}.vbprivk" \
         --key "${key_base}.pem" \
         --algorithm ${alg}