From e8caf863d7cb4f2493ed2fbc74f69644ff9415d3 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Wed, 11 Feb 2015 09:58:37 -0800
Subject: --disable-verify is obsolete but does nothing

---
 install-template.sh |  2 +-
 test.sh             | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/install-template.sh b/install-template.sh
index f96a484..adbcc2f 100644
--- a/install-template.sh
+++ b/install-template.sh
@@ -693,7 +693,6 @@ VAL_OPTIONS=""
 
 flag uninstall "only uninstall from the installation prefix"
 valopt destdir "" "set installation root"
-opt verify 1 "verify that the installed binaries run correctly"
 valopt prefix "/usr/local" "set installation prefix"
 
 # Avoid prepending an extra / to the prefix path if there's no destdir
@@ -710,6 +709,7 @@ valopt mandir "$CFG_DESTDIR_PREFIX/share/man" "install man pages in PATH"
 opt ldconfig 1 "run ldconfig after installation (Linux only)"
 valopt components "" "comma-separated list of components to install"
 flag list-components "list available components"
+opt verify 1 "obsolete"
 flag verbose "run with verbose output"
 
 if [ $HELP -eq 1 ]
diff --git a/test.sh b/test.sh
index 9405674..db05d67 100755
--- a/test.sh
+++ b/test.sh
@@ -1132,6 +1132,16 @@ destdir_no_trailing_slash() {
 }
 runtest destdir_no_trailing_slash
 
+disable_verify_noop() {
+    # Obsolete --disable-verify flag doesn't generate error
+    try sh "$S/gen-installer.sh" \
+       --image-dir="$TEST_DIR/image1" \
+       --work-dir="$WORK_DIR" \
+       --output-dir="$OUT_DIR"
+    try "$WORK_DIR/package/install.sh" --prefix="$PREFIX_DIR" --disable-verify
+}
+runtest disable_verify_noop
+
 
 # TODO: mandir/libdir/bindir, etc.
 
-- 
cgit v1.2.1