summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorBernd Weimer <bernd.weimer@pelagicore.com>2020-03-10 13:20:57 +0100
committerBernd Weimer <bernd.weimer@pelagicore.com>2020-03-10 17:01:12 +0100
commit4b34b5999ad2d3e81ae6c618ae6b942bb879f4d6 (patch)
treeab24d14e8d38073e9b90de5cf814f5ed84c6bf68 /util
parentf43d30ffba0ed8d11b3819d2fad63e6bf1cf34b8 (diff)
downloadqtapplicationmanager-4b34b5999ad2d3e81ae6c618ae6b942bb879f4d6.tar.gz
Improve tests and bash completion
- The tst_main test failed in older appman versions, if there is a leftover cache file from a newer version and vice versa - Adapted test output to fit deferred logging output - Added "--dbus" option values to bash completion Change-Id: Ica2600c61992ab8e87683d468af3fbdec766f944 Reviewed-by: Robert Griebl <robert.griebl@qt.io>
Diffstat (limited to 'util')
-rw-r--r--util/bash/appman-prompt8
1 files changed, 7 insertions, 1 deletions
diff --git a/util/bash/appman-prompt b/util/bash/appman-prompt
index 96bd017c..1776377b 100644
--- a/util/bash/appman-prompt
+++ b/util/bash/appman-prompt
@@ -37,11 +37,17 @@ _appman()
--installed-apps-manifest-dir --load-dummydata --log-instant --logging-rule --no-cache --no-dlt-logging \
--no-fullscreen --no-security --no-ui-watchdog -o --option --qml-debug --single-app \
--slow-animations --verbose --version --wayland-socket-name"
+ dbusopts="session system none"
if [[ ${cur} == -* ]] ; then
COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
else
- COMPREPLY=( $( compgen -f -- ${cur}) )
+ COMPREPLY=( $(compgen -W "${dbusopts}" -- ${cur}) )
+ if [ ${COMP_CWORD} -gt 1 ] && [[ ${COMP_WORDS[COMP_CWORD-1]} == "--dbus" ]] ; then
+ COMPREPLY=( $(compgen -W "${dbusopts}" -- ${cur}) )
+ else
+ COMPREPLY=( $( compgen -f -- ${cur}) )
+ fi
fi
}
complete -o filenames -F _appman appman appman-qmltestrunner