Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/testsLibPath into lp:ubuntu-ui-toolkit/staging

Proposed by Cris Dywan
Status: Merged
Approved by: Zsombor Egri
Approved revision: 1751
Merged at revision: 1753
Proposed branch: lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/testsLibPath
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 12 lines (+1/-1)
1 file modified
tests/unit/runtest.sh (+1/-1)
To merge this branch: bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/testsLibPath
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Zsombor Egri Approve
Review via email: mp+280137@code.launchpad.net

Commit message

runtest.sh needs to add subdirs to the libpath

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Zsombor Egri (zsombi) wrote :

I was missing this!!!

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/unit/runtest.sh'
2--- tests/unit/runtest.sh 2015-11-23 20:28:37 +0000
3+++ tests/unit/runtest.sh 2015-12-10 11:46:48 +0000
4@@ -26,7 +26,7 @@
5
6 _TARGET=$(basename $1)
7 _TESTFILE=$(basename $2)
8-_LIB_PATH="${BUILD_DIR}/lib:$LD_LIBRARY_PATH"
9+_LIB_PATH="${BUILD_DIR}/lib:${BUILD_DIR}/qml/Ubuntu/Components:${BUILD_DIR}/qml/Ubuntu/Test:$LD_LIBRARY_PATH"
10 _IMPORT_PATH="${BUILD_DIR}/qml:$QML2_IMPORT_PATH"
11 _THEMES_PATH="${BUILD_DIR}/qml"
12 _XML="${BUILD_DIR}/tests/test_$_TARGET_$_TESTFILE.xml"

Subscribers

People subscribed via source and target branches