futility: Be more accepting of how it's invoked

Now that futility is pretty much working as intended, we don't
have to be quite so picky in the way it's being invoked. Up until
now, it's only worked when invoked as "futility" or as one of the
built-in commands, such as "dump_fmap".

This change removes those restrictions. You can invoke futility
under any name you wish. If it recognizes the name as a built-in
command, great. Otherwise it will require a valid command as the
first arg, just like it always has.

BUG=none
BRANCH=ToT, Samus
TEST=make runtests

In addtion to the new test included with this CL, I manually ran

  lddtree --copy-to-tree=blah --generate-wrappers /usr/bin/futility
  ./blah/usr/bin/futility dump_fmap -h tests/futility/data/bios_peppy_mp.bin

Before this CL, the wrapper didn't work because the binary was
being invoked as futility.elf, which was rejected. After this CL,
the wrapper works fine.

Change-Id: Iafdaff6e07ed294a7d29e4cff599ace0a3089229
Signed-off-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/223386
Reviewed-by: Hung-Te Lin <hungte@chromium.org>

1 files changed, 41 insertions, 7 deletions

diff --git a/tests/futility/test_main.sh b/tests/futility/test_main.sh
index 17a54675..83fc53db 100755
--- a/tests/futility/test_main.sh
+++ b/tests/futility/test_main.sh
@@ -10,18 +10,18 @@ TMP="$me.tmp"
 cd "$OUTDIR"
 
 # No args returns nonzero exit code
-"$FUTILITY" && false
+${FUTILITY} && false
 
 # It's weird but okay if the command is a full path.
-"$FUTILITY" /fake/path/to/help  > "$TMP"
+${FUTILITY} /fake/path/to/help  > "$TMP"
 grep Usage "$TMP"
 
 # Make sure logging does something.
 LOG="/tmp/futility.log"
 [ -f ${LOG} ] && mv ${LOG} ${LOG}.backup
 touch ${LOG}
-"$FUTILITY" help
-grep "$FUTILITY" ${LOG}
+${FUTILITY} help
+grep ${FUTILITY} ${LOG}
 rm -f ${LOG}
 [ -f ${LOG}.backup ] && mv ${LOG}.backup ${LOG}
 
@@ -29,16 +29,50 @@ rm -f ${LOG}
 DEPRECATED="dev_sign_file"
 
 for i in $DEPRECATED; do
-  ln -sf "$FUTILITY" $i
+  ln -sf ${FUTILITY} $i
   if ./$i 2>${TMP}.outmsg ; then false; fi
   grep deprecated ${TMP}.outmsg
   # They may still fail when invoked through futility
   # but with a different error message.
-  "$FUTILITY" $i 1>${TMP}.outmsg2 2>&1 || true
+  ${FUTILITY} $i 1>${TMP}.outmsg2 2>&1 || true
   if grep deprecated ${TMP}.outmsg2; then false; fi
   rm -f $i
 done
 
+# Use some known digests to verify that things work...
+DEVKEYS=${SRCDIR}/tests/devkeys
+SHA=e78ce746a037837155388a1096212ded04fb86eb
+
+# all progs in the pipelines should work
+set -o pipefail
+
+# If it's invoked as the name of a command we know, it should do that command
+ln -sf ${FUTILITY} vbutil_key
+./vbutil_key --unpack ${DEVKEYS}/installer_kernel_data_key.vbpubk | grep ${SHA}
+ln -sf ${FUTILITY} vbutil_keyblock
+./vbutil_keyblock --unpack ${DEVKEYS}/installer_kernel.keyblock | grep ${SHA}
+cp ${FUTILITY} show
+./show ${SCRIPTDIR}/data/rec_kernel_part.bin | grep ${SHA}
+
+# If it's invoked by any other name, expect the command to be the first arg.
+ln -sf ${FUTILITY} muggle
+./muggle vbutil_key --unpack ${DEVKEYS}/installer_kernel_data_key.vbpubk \
+  | grep ${SHA}
+ln -sf ${FUTILITY} buggle
+./buggle vbutil_keyblock --unpack ${DEVKEYS}/installer_kernel.keyblock \
+  | grep ${SHA}
+cp ${FUTILITY} boo
+./boo show ${SCRIPTDIR}/data/rec_kernel_part.bin | grep ${SHA}
+
+
+# we expect the first command fail, but the output to match anyway
+set +o pipefail
+
+# If it can't figure out the command at all, it should complain.
+${FUTILITY} muggle | grep Usage:
+./buggle futility | grep Usage:
+./boo | grep Usage:
+
 # cleanup
-rm -f ${TMP}*
+rm -f ${TMP}* vbutil_key vbutil_keyblock show muggle buggle boo
 exit 0