Merge lp:~mzanetti/unity8/improve-bzr-hook into lp:unity8

[Michael Zanetti]

improve the bzr commit hook

- don't run qmltests in here, it takes too long
- don't abort commit on failed tests, its too annoying
- instead, print a fat warning and backup the commit message to be reused after uncommitting and fixing the tests

to install, run:

cd .bazaar && make install

[lp:~mzanetti/unity8/improve-bzr-hook]

61. By Michael Zanetti on 2013-06-28

adjust old print

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:60
http://jenkins.qa.ubuntu.com/job/unity8-ci/30/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/495
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/281
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/29
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/29/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/29
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/497
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/497/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/447

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/30/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:61
http://jenkins.qa.ubuntu.com/job/unity8-ci/33/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/500
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/285
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/33
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/33/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/33
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/502
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/502/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/452

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/33/rebuild

review: Approve (continuous-integration)

[Mirco Müller (macslow)]

Very handy tool.

review: Approve

=== modified file '.bazaar/plugins/makecheck_unity_phablet.py'
--- .bazaar/plugins/makecheck_unity_phablet.py	2013-06-05 22:03:08 +0000
+++ .bazaar/plugins/makecheck_unity_phablet.py	2013-06-28 21:08:23 +0000
@@ -23,12 +23,21 @@
 
     os.chdir(local_path_from_url(master_branch.base))
 
-    print "Executing 'make check'.."
-    if (subprocess.call("make check", shell=True) != 0):
-        raise errors.BzrError("Unit tests failed, fix them before committing!")
-
-    print "Executing 'make qmluitests'.."
-    if (subprocess.call("make qmluitests", shell=True) != 0):
-        raise errors.BzrError("QML UI tests failed, fix them before committing!")
+    print "Executing 'make -C builddir test'.."
+    os.environ['CTEST_OUTPUT_ON_FAILURE'] = "1"
+    if (subprocess.call("make -C builddir test", shell=True) != 0):
+
+        print("\n\n*** Warning ***\n\nBasic tests failed. This commit will not pass continuous integration.")
+
+        branch = local_branch or master_branch
+        revision = branch.repository.get_revision(future_revision_id)
+        msg_file = open('message.txt', 'w')
+        msg_file.write(revision.message)
+        msg_file.close()
+
+        print("\n\nSaved commit message to $SRC_DIR/message.txt.")
+        print("You can uncommit this revision, fix the tests and reuse your message running:\n\nbzr commit -F message.txt\n\n")
+    elif os.path.isfile("message.txt"):
+        os.remove("message.txt")
 
 branch.Branch.hooks.install_named_hook('pre_commit', execute_makecheck, 'make check pre-commit')

=== modified file '.bzrignore'
--- .bzrignore	2013-06-05 22:03:08 +0000
+++ .bzrignore	2013-06-28 21:08:23 +0000
@@ -7,3 +7,4 @@
 /.cproject
 /.settings
 /.pydevproject
+message.txt