test-help.sh: Skip trivial-httpd if enabled

Because it runs a binary in ${libexecdir}, it will only work if
libostree was already installed, which makes the build-time test fail.
It also doesn't produce the output we expect: its usage mechanism
mentions "ostree-trivial-httpd", not "ostree trivial-httpd".

Signed-off-by: Simon McVittie <smcv@collabora.com>
Closes: #1177
Approved by: jlebon

diff --git a/tests/test-help.sh b/tests/test-help.sh
index 75fe0c11e326e8335f9718913fadebe898e2fdac..ad74aaf90f3859958a095b73d68bc9ca6ddb90cf 100755 (executable)
--- a/tests/test-help.sh
+++ b/tests/test-help.sh
@@ -75,7 +75,16 @@ test_recursive() {
         assert_file_empty out
 
         for subcmd in $builtins; do
-            test_recursive "$cmd $subcmd"
+            case "$subcmd" in
+                (trivial-httpd)
+                    # Skip trivial-httpd if enabled, it doesn't work
+                    # uninstalled (and also doesn't produce the output
+                    # we expect).
+                    ;;
+                (*)
+                    test_recursive "$cmd $subcmd"
+                    ;;
+            esac
         done
     fi
 }