git.iko.soy/unity8
on xenial help sign in
Support overriding QML2_IMPORT_PATH in run script.
commite6ec0cb286cdc3efdbdf7bea83962860d5735cea authorMichał Sawicz <michal.sawicz@canonical.com> dateWed 27 Nov 2013, 12:50 (13 years ago) parentb10721b
1 file changed+4−4
compare with xenial
unifiedsplit
run+4−4
run+4−4
@@ -40,19 +40,19 @@ do
4040done
4141
4242if $FAKE; then
43− export QML2_IMPORT_PATH=$PWD/builddir/tests/mocks:$PWD/builddir/plugins:$PWD/builddir/modules
43+ export QML2_IMPORT_PATH=$QML2_IMPORT_PATH:$PWD/builddir/tests/mocks:$PWD/builddir/plugins:$PWD/builddir/modules
4444 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/LightDM/single
4545else
46− export QML2_IMPORT_PATH=`pkg-config --variable=plugindir unity-shell-api`
46+ export QML2_IMPORT_PATH=$QML2_IMPORT_PATH:`pkg-config --variable=plugindir unity-shell-api`
4747fi
4848
4949if $PINLOCK; then
50− export QML2_IMPORT_PATH=$PWD/builddir/tests/mocks:$PWD/builddir/plugins:$PWD/builddir/modules
50+ export QML2_IMPORT_PATH=$QML2_IMPORT_PATH:$PWD/builddir/tests/mocks:$PWD/builddir/plugins:$PWD/builddir/modules
5151 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/LightDM/single-pin
5252fi
5353
5454if $KEYLOCK; then
55− export QML2_IMPORT_PATH=$PWD/builddir/tests/mocks:$PWD/builddir/plugins:$PWD/builddir/modules
55+ export QML2_IMPORT_PATH=$QML2_IMPORT_PATH:$PWD/builddir/tests/mocks:$PWD/builddir/plugins:$PWD/builddir/modules
5656 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/LightDM/single-passphrase
5757fi
5858