on xenial help sign in
Further clean up of run.sh
commit2011589e94867dc20385d8fad0475320e04daad2 authorDaniel d'Andrada <daniel.dandrada@canonical.com> dateTue 20 Jan 2015, 11:09 (12 years ago) parent28ef73d
1 file changed+2−10
run.sh+2−10
run.sh+2−10
@@ -6,8 +6,6 @@ export QML2_IMPORT_PATH
66QML_PHONE_SHELL_PATH=./builddir/src/unity8
77GDB=false
88FAKE=false
9−PINLOCK=false
10−KEYLOCK=false
119USE_MOCKS=false
1210MOUSE_TOUCH=true
1311
@@ -23,7 +21,7 @@ usage() {
2321 exit 1
2422}
2523
26−ARGS=`getopt -n$0 -u -a --longoptions="fake,gdb,help:,nomousetouch" -o "fpkl:ghm" -- "$@"`
24+ARGS=`getopt -n$0 -u -a --longoptions="fake,gdb,help:,nomousetouch" -o "fghm" -- "$@"`
2725[ $? -ne 0 ] && usage
2826eval set -- "$ARGS"
2927
@@ -39,15 +37,9 @@ do
3937 shift
4038done
4139
42−if [ -z "$LIGHTDM_MOCK" ]; then
43− LIGHTDM_MOCK=single
44−fi
45−
46−
4740if $USE_MOCKS; then
48− rm -f $PWD/builddir/nonmirplugins/LightDM # undo symlink (from below) for cleanliness
4941 export QML2_IMPORT_PATH=$QML2_IMPORT_PATH:$PWD/builddir/tests/mocks:$PWD/builddir/plugins:$PWD/builddir/modules
50− export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/LightDM/liblightdm
42+ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/LightDM/liblightdm:$PWD/builddir/tests/mocks/libusermetrics
5143else
5244 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/plugins/LightDM/liblightdm
5345fi