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
This commit is contained in:
parent
1b430a7764
commit
2f22e5b359
|
|
@ -75,7 +75,16 @@ test_recursive() {
|
||||||
assert_file_empty out
|
assert_file_empty out
|
||||||
|
|
||||||
for subcmd in $builtins; do
|
for subcmd in $builtins; do
|
||||||
|
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"
|
test_recursive "$cmd $subcmd"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue