MirAL

Merge lp:~alan-griffiths/miral/tweak-testrun-for-local-mir into lp:miral

  1. tweak-testrun-for-local-mir
  2. Merge into trunk
Proposed by Alan Griffiths
Status: Merged
Approved by: Gerry Boland
Approved revision: 244
Merged at revision: 244
Proposed branch: lp:~alan-griffiths/miral/tweak-testrun-for-local-mir
Merge into: lp:miral
Diff against target: 11 lines (+1/-1)
1 file modified
scripts/testrun (+1/-1)
To merge this branch: bzr merge lp:~alan-griffiths/miral/tweak-testrun-for-local-mir
Reviewer Review Type Date Requested Status
Gerry Boland (community) Approve
Review via email: mp+301398@code.launchpad.net

Commit message

In the "testrun" script copy LD_LIBRARY_PATH to the shell environment. (This simplifies running with a local version of Mir.)

To post a comment you must log in.
Revision history for this message
Gerry Boland (gerboland) wrote :

No objection here

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'scripts/testrun'
2--- scripts/testrun 2016-07-27 09:34:17 +0000
3+++ scripts/testrun 2016-07-28 16:13:16 +0000
4@@ -12,7 +12,7 @@
5 if [ -e "${socket}" ]; then echo "Error: '${socket}' already exists"; exit 1 ;fi
6
7 sudo ls >> /dev/null
8-sudo DISPLAY=${xmir_display} ${builddir}bin/${miral_server} --vt 4 --arw-file --file ${socket} $* &
9+sudo LD_LIBRARY_PATH=${LD_LIBRARY_PATH} DISPLAY=${xmir_display} ${builddir}bin/${miral_server} --vt 4 --arw-file --file ${socket} $* &
10
11 while [ ! -e "${socket}" ]; do echo "waiting for ${socket}"; sleep 1 ;done
12

Subscribers

People subscribed via source and target branches