@@ -18,6 +18,7 @@ usage() {
1818 echo " -f, --fake Force use of fake Qml modules." >&2
1919 echo " -p, --pinlock Use a pin protected user." >&2
2020 echo " -k, --keylock Use a passphrase protected user." >&2
21+ echo " -l, --lightdm Use the specified lightdm mock." >&2
2122 echo " -g, --gdb Run through gdb." >&2
2223 echo " -h, --help Show this help." >&2
2324 echo " -m, --nomousetouch Run without -mousetouch argument." >&2
@@ -25,16 +26,20 @@ usage() {
2526 exit 1
2627}
2728
28−ARGS=`getopt -n$0 -u -a --longoptions="fake,pinlock,keylock,gdb,help,nomousetouch" -o "fpkghm" -- "$@"`
29+ARGS=`getopt -n$0 -u -a --longoptions="fake,pinlock,keylock,gdb,help,lightdm:,nomousetouch" -o "fpkl:ghm" -- "$@"`
2930[ $? -ne 0 ] && usage
3031eval set -- "$ARGS"
3132
3233while [ $# -gt 0 ]
3334do
3435 case "$1" in
35− -f|--fake) FAKE=true; USE_MOCKS=true;;
36− -p|--pinlock) PINLOCK=true; USE_MOCKS=true;;
37− -k|--keylock) KEYLOCK=true; USE_MOCKS=true;;
36+ -f|--fake) USE_MOCKS=true;;
37+ -p|--pinlock) USE_MOCKS=true; LIGHTDM_MOCK=single-pin;;
38+ -k|--keylock) USE_MOCKS=true; LIGHTDM_MOCK=single-passphrase;;
39+ -l|--lightdm) LIGHTDM_MOCK=$2; shift;
40+ if [ -z "$LIGHTDM_MOCK" ]; then
41+ echo "Please specify an argument to --lightdm"
42+ fi;;
3843 -g|--gdb) GDB=true;;
3944 -h|--help) usage;;
4045 -m|--nomousetouch) MOUSE_TOUCH=false;;
@@ -43,27 +48,23 @@ do
4348 shift
4449done
4550
46−if $FAKE; then
47− export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/LightDM/single
51+if [ -z "$LIGHTDM_MOCK" ]; then
52+ LIGHTDM_MOCK=single
4853fi
4954
50−if $PINLOCK; then
51− export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/LightDM/single-pin
52−fi
53−
54−if $KEYLOCK; then
55− export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/LightDM/single-passphrase
56−fi
55+# Even without USE_MOCKS set, we want to fake our lightdm backend, because it's
56+# annoying to be prompted for your password when testing. To get the same
57+# backend used in production, pass '--lightdm=demo'.
58+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/LightDM/$LIGHTDM_MOCK
5759
5860if $USE_MOCKS; then
5961 rm -f $PWD/builddir/nonmirplugins/LightDM # undo symlink (from below) for cleanliness
6062 export QML2_IMPORT_PATH=$QML2_IMPORT_PATH:$PWD/builddir/tests/mocks:$PWD/builddir/plugins:$PWD/builddir/modules
63+ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics
6164else
62− # Still fake no-login user for convenience (it's annoying to be prompted for your password when testing)
63− # And in particular, just link our LightDM mock into the nonmirplugins folder. We don't want the rest of
64− # our plugins to be used.
65− ln -s $PWD/builddir/tests/mocks/LightDM $PWD/builddir/nonmirplugins/
66− export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/LightDM/single
65+ # Just link our LightDM mock into the nonmirplugins folder. We don't want
66+ # the rest of our plugins to be used.
67+ ln -sf $PWD/builddir/tests/mocks/LightDM $PWD/builddir/nonmirplugins/
6768fi
6869
6970QML_PHONE_SHELL_ARGS=""