git.iko.soy/unity8
on xenial help sign in
Further clean up of run.sh
2011589Daniel d'Andrada
run.sh+2−10
compare with xenial
unifiedsplit
@@ -6,8 +6,6 @@ export QML2_IMPORT_PATH
6QML_PHONE_SHELL_PATH=./builddir/src/unity8
6QML_PHONE_SHELL_PATH=./builddir/src/unity8
7GDB=false
7GDB=false
8FAKE=false
8FAKE=false
9−PINLOCK=false
10−KEYLOCK=false
11USE_MOCKS=false
9USE_MOCKS=false
12MOUSE_TOUCH=true
10MOUSE_TOUCH=true
13
11
@@ -23,7 +21,7 @@ usage() {
23 exit 1
21 exit 1
24}
22}
25
23
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" -- "$@"`
27[ $? -ne 0 ] && usage
25[ $? -ne 0 ] && usage
28eval set -- "$ARGS"
26eval set -- "$ARGS"
29
27
@@ -39,15 +37,9 @@ do
39 shift
37 shift
40done
38done
41
39
42−if [ -z "$LIGHTDM_MOCK" ]; then
43− LIGHTDM_MOCK=single
44−fi
45−
46−
47if $USE_MOCKS; then
40if $USE_MOCKS; then
48− rm -f $PWD/builddir/nonmirplugins/LightDM # undo symlink (from below) for cleanliness
49 export QML2_IMPORT_PATH=$QML2_IMPORT_PATH:$PWD/builddir/tests/mocks:$PWD/builddir/plugins:$PWD/builddir/modules
41 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
51else
43else
52 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/plugins/LightDM/liblightdm
44 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/plugins/LightDM/liblightdm
53fi
45fi