Merge lp:~mzanetti/unity/phablet-make-check-hook into lp:unity/phablet
- phablet-make-check-hook
- Merge into phablet
Status: | Merged |
---|---|
Approved by: | Albert Astals Cid |
Approved revision: | no longer in the source branch. |
Merged at revision: | 548 |
Proposed branch: | lp:~mzanetti/unity/phablet-make-check-hook |
Merge into: | lp:unity/phablet |
Diff against target: |
51 lines (+40/-0) 2 files modified
.bazaar/Makefile (+6/-0) .bazaar/plugins/makecheck_unity_phablet.py (+34/-0) |
To merge this branch: | bzr merge lp:~mzanetti/unity/phablet-make-check-hook |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Michał Sawicz | Needs Fixing | ||
Albert Astals Cid (community) | Approve | ||
Review via email: mp+153868@code.launchpad.net |
Commit message
added a bzr hook to execute tests on comitting and pushing
to install:
cd .bazaar
make install
Description of the change
added a bzr hook to execute tests on comitting and pushing
to install:
cd .bazaar
make install
PS Jenkins bot (ps-jenkins) wrote : | # |
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:479
http://
Executed test runs:
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Albert Astals Cid (aacid) wrote : | # |
Is the extra verbosity there on purpose?
Maybe you want to add a "print "Execute 'make qmluitests'.."" too?
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:480
http://
Executed test runs:
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Albert Astals Cid (aacid) wrote : | # |
tsdgeos_
make: *** No rule to make target `install'. Stop.
Missing Makefile so that make install does anything?
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:481
http://
Executed test runs:
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Albert Astals Cid (aacid) wrote : | # |
Doesn't seem to working here, any idea?
tsdgeos_
/home/tsdgeos_
tsdgeos_
tsdgeos_
Committing to: /home/tsdgeos_
modified build
Committed revision 491.
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:482
http://
Executed test runs:
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Michał Sawicz (saviq) wrote : | # |
Doesn't work with colocated branches :/
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:483
http://
Executed test runs:
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:484
http://
Executed test runs:
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Albert Astals Cid (aacid) wrote : | # |
It works for me now, but to be honest even knowing something was going to happen i ended up finding it a bit weird to see all those windows starting to pop out after doing a bzr commit.
Albert Astals Cid (aacid) wrote : | # |
Actually, needs fixing.
The make uninstall ahs to remove the pyc file too, otherwise the thing keeps executing :D
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:485
http://
Executed test runs:
SUCCESS: http://
deb: http://
SUCCESS: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:485
http://
Executed test runs:
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:487
http://
Executed test runs:
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:487
http://
Executed test runs:
SUCCESS: http://
deb: http://
SUCCESS: http://
FAILURE: http://
FAILURE: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Albert Astals Cid (aacid) wrote : | # |
Ok, so approve with comments, as said in https:/
I'll leave to someone else to decided if we want it in or not
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:487
http://
Executed test runs:
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Michał Sawicz (saviq) wrote : | # |
This will conflict with lp:~saviq/unity/phablet.flexible-cmake-macro
Michał Sawicz (saviq) wrote : | # |
Please resolve conflicts.
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:487
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:488
http://
Executed test runs:
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Preview Diff
1 | === added directory '.bazaar' | |||
2 | === added file '.bazaar/Makefile' | |||
3 | --- .bazaar/Makefile 1970-01-01 00:00:00 +0000 | |||
4 | +++ .bazaar/Makefile 2013-04-05 08:27:22 +0000 | |||
5 | @@ -0,0 +1,6 @@ | |||
6 | 1 | install: | ||
7 | 2 | mkdir -p ~/.bazaar/plugins | ||
8 | 3 | cp plugins/* ~/.bazaar/plugins | ||
9 | 4 | |||
10 | 5 | uninstall: | ||
11 | 6 | rm ~/.bazaar/plugins/makecheck_unity_phablet.py* | ||
12 | 0 | 7 | ||
13 | === added directory '.bazaar/plugins' | |||
14 | === added file '.bazaar/plugins/makecheck_unity_phablet.py' | |||
15 | --- .bazaar/plugins/makecheck_unity_phablet.py 1970-01-01 00:00:00 +0000 | |||
16 | +++ .bazaar/plugins/makecheck_unity_phablet.py 2013-04-05 08:27:22 +0000 | |||
17 | @@ -0,0 +1,34 @@ | |||
18 | 1 | #!/usr/bin/python | ||
19 | 2 | # Copyright 2013 Canonical Ltd. | ||
20 | 3 | # | ||
21 | 4 | # This program is free software; you can redistribute it and/or modify | ||
22 | 5 | # it under the terms of the GNU Lesser General Public License as published by | ||
23 | 6 | # the Free Software Foundation; version 3. | ||
24 | 7 | # | ||
25 | 8 | # This program is distributed in the hope that it will be useful, | ||
26 | 9 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
27 | 10 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
28 | 11 | # GNU Lesser General Public License for more details. | ||
29 | 12 | # | ||
30 | 13 | # You should have received a copy of the GNU Lesser General Public License | ||
31 | 14 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
32 | 15 | |||
33 | 16 | import os, subprocess | ||
34 | 17 | from bzrlib import branch, errors | ||
35 | 18 | from bzrlib.urlutils import dirname, local_path_from_url | ||
36 | 19 | |||
37 | 20 | def execute_makecheck(local_branch, master_branch, old_revision_number, old_revision_id, future_revision_number, future_revision_id, tree_delta, future_tree): | ||
38 | 21 | if not master_branch.basis_tree().has_filename("Shell.qml"): | ||
39 | 22 | return | ||
40 | 23 | |||
41 | 24 | os.chdir(local_path_from_url(master_branch.base)) | ||
42 | 25 | |||
43 | 26 | print "Executing 'make check'.." | ||
44 | 27 | if (subprocess.call("make check", shell=True) != 0): | ||
45 | 28 | raise errors.BzrError("Unit tests failed, fix them before committing!") | ||
46 | 29 | |||
47 | 30 | print "Executing 'make qmluitests'.." | ||
48 | 31 | if (subprocess.call("make qmluitests", shell=True) != 0): | ||
49 | 32 | raise errors.BzrError("QML UI tests failed, fix them before committing!") | ||
50 | 33 | |||
51 | 34 | branch.Branch.hooks.install_named_hook('pre_commit', execute_makecheck, 'make check pre-commit') |
PASSED: Continuous integration, rev:477 jenkins. qa.ubuntu. com/job/ unity-phablet- ci/68/ jenkins. qa.ubuntu. com/job/ unity-phablet- quantal- armhf-ci/ 69/console jenkins. qa.ubuntu. com/job/ unity-phablet- quantal- armhf-ci/ 69/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ unity-phablet- quantal- i386-ci/ 68/console
http://
Executed test runs:
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: jenkins. qa.ubuntu. com/job/ unity-phablet- ci/68/rebuild
http://