Merge lp://staging/~attente/indicator-keyboard/gvfs into lp://staging/indicator-keyboard
Status: | Merged |
---|---|
Approved by: | Sebastien Bacher |
Approved revision: | 105 |
Merged at revision: | 105 |
Proposed branch: | lp://staging/~attente/indicator-keyboard/gvfs |
Merge into: | lp://staging/indicator-keyboard |
Diff against target: |
14 lines (+6/-1) 1 file modified
tests/indicator-keyboard-test.in (+6/-1) |
To merge this branch: | bzr merge lp://staging/~attente/indicator-keyboard/gvfs |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Indicator Applet Developers | Pending | ||
Review via email:
|
Commit message
Kill running gvfs instance after tests finish.
Because the XDG_RUNTIME_DIR was changed to be in the build-tree, a running gvfs instance held a lock on a file in the directory, preventing it from being cleaned properly, and preventing the build from finishing. So we send a SIGTERM to the running gvfs-fused instance, allowing the build to finish.
Description of the change
Kill running gvfs instance after tests finish.
Because the XDG_RUNTIME_DIR was changed to be in the build-tree, a running gvfs instance held a lock on a file in the directory, preventing it from being cleaned properly, and preventing the build from finishing. So we send a SIGTERM to the running gvfs-fused instance, allowing the build to finish.
PASSED: Continuous integration, rev:105 jenkins. qa.ubuntu. com/job/ indicator- keyboard- ci/18/ jenkins. qa.ubuntu. com/job/ indicator- keyboard- saucy-amd64- ci/18 jenkins. qa.ubuntu. com/job/ indicator- keyboard- saucy-armhf- ci/18
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins: 8080/job/ indicator- keyboard- ci/18/rebuild
http://