From a1d9fe6eecf82540d31d34bba988e4838d295302 Mon Sep 17 00:00:00 2001
From: Bill Richardson <wfrichar@chromium.org>
Date: Fri, 5 Sep 2014 12:52:27 -0700
Subject: futility: stop using the symlink names in utility scripts

We still create the symlinks (FOO -> futility), but this
change invokes those built-in functions with "futility FOO ..."
instead of using the FOO symlink.

Note that the scripts/ directory is unchanged. That's a
separate CL, since we don't have tests for that.

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

In addition to running "make runtests", I temporarily
modified the Makefile to avoid creating the symlinks at all.
The tests still passed.

Change-Id: I96863259b9df02a3611f759a7509bf4090ae03e8
Signed-off-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/216717
Reviewed-by: Randall Spangler <rspangler@chromium.org>
---
 tests/run_vbutil_tests.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'tests/run_vbutil_tests.sh')

diff --git a/tests/run_vbutil_tests.sh b/tests/run_vbutil_tests.sh
index 47d8dfc0..84f66d1a 100755
--- a/tests/run_vbutil_tests.sh
+++ b/tests/run_vbutil_tests.sh
@@ -18,7 +18,7 @@ function test_vbutil_key_single {
 
     echo -e "For signing key ${COL_YELLOW}RSA-$keylen/$hashalgo${COL_STOP}:"
     # Pack the key
-    ${BIN_DIR}/vbutil_key \
+    ${FUTILITY} vbutil_key \
         --pack ${TESTKEY_SCRATCH_DIR}/key_alg${algonum}.vbpubk \
         --key ${TESTKEY_DIR}/key_rsa${keylen}.keyb \
         --version 1 \
@@ -30,7 +30,7 @@ function test_vbutil_key_single {
 
     # Unpack the key
     # TODO: should verify we get the same key back out?
-    ${BIN_DIR}/vbutil_key \
+    ${FUTILITY} vbutil_key \
         --unpack ${TESTKEY_SCRATCH_DIR}/key_alg${algonum}.vbpubk
     if [ $? -ne 0 ]
     then
@@ -75,7 +75,7 @@ ${datahashalgo}${COL_STOP}"
           rm -f ${keyblockfile}
 
           # Wrap private key
-          ${BIN_DIR}/vbutil_key \
+          ${FUTILITY} vbutil_key \
             --pack ${TESTKEY_SCRATCH_DIR}/key_alg${algonum}.vbprivk \
             --key ${TESTKEY_DIR}/key_rsa${signing_keylen}.pem \
             --algorithm $signing_algonum
@@ -86,7 +86,7 @@ ${datahashalgo}${COL_STOP}"
           fi
 
           # Wrap public key
-          ${BIN_DIR}/vbutil_key \
+          ${FUTILITY} vbutil_key \
             --pack ${TESTKEY_SCRATCH_DIR}/key_alg${algonum}.vbpubk \
             --key ${TESTKEY_DIR}/key_rsa${signing_keylen}.keyb \
             --algorithm $signing_algonum
@@ -97,7 +97,7 @@ ${datahashalgo}${COL_STOP}"
           fi
 
           # Pack
-          ${BIN_DIR}/vbutil_keyblock --pack ${keyblockfile} \
+          ${FUTILITY} vbutil_keyblock --pack ${keyblockfile} \
             --datapubkey \
               ${TESTKEY_SCRATCH_DIR}/key_alg${data_algonum}.vbpubk \
             --signprivate \
@@ -109,7 +109,7 @@ ${datahashalgo}${COL_STOP}"
           fi
 
           # Unpack
-          ${BIN_DIR}/vbutil_keyblock --unpack ${keyblockfile} \
+          ${FUTILITY} vbutil_keyblock --unpack ${keyblockfile} \
             --datapubkey \
             ${TESTKEY_SCRATCH_DIR}/key_alg${data_algonum}.vbpubk2 \
             --signpubkey \
@@ -134,7 +134,7 @@ ${datahashalgo}${COL_STOP}"
 external signer.${COL_STOP}"
           # Pack using external signer
           # Pack
-          ${BIN_DIR}/vbutil_keyblock --pack ${keyblockfile} \
+          ${FUTILITY} vbutil_keyblock --pack ${keyblockfile} \
             --datapubkey \
               ${TESTKEY_SCRATCH_DIR}/key_alg${data_algonum}.vbpubk \
             --signprivate_pem \
@@ -149,7 +149,7 @@ external signer.${COL_STOP}"
           fi
 
           # Unpack
-          ${BIN_DIR}/vbutil_keyblock --unpack ${keyblockfile} \
+          ${FUTILITY} vbutil_keyblock --unpack ${keyblockfile} \
             --datapubkey \
             ${TESTKEY_SCRATCH_DIR}/key_alg${data_algonum}.vbpubk2 \
             --signpubkey \
-- 
cgit v1.2.1