Bazaar

Merge lp:~vila/bzr/837926-log-make-check-trunk into lp:bzr

  1. 837926-log-make-check-trunk
  2. Merge into bzr.dev
Proposed by Vincent Ladeuil
Status: Merged
Approved by: Vincent Ladeuil
Approved revision: not available
Merged at revision: 6120
Proposed branch: lp:~vila/bzr/837926-log-make-check-trunk
Merge into: lp:bzr
Diff against target: 27 lines (+5/-0)
2 files modified
Makefile (+2/-0)
doc/en/release-notes/bzr-2.5.txt (+3/-0)
To merge this branch: bzr merge lp:~vila/bzr/837926-log-make-check-trunk
Reviewer Review Type Date Requested Status
bzr-core Pending
Review via email: mp+73500@code.launchpad.net

Commit message

Output time stamps while running ``make check`` to get better timings from pqm

Description of the change

Targeted to trunk to minimize risks after discussing with poolie.

To post a comment you must log in.
Revision history for this message
Vincent Ladeuil (vila) wrote :

sent to pqm by email

Revision history for this message
Vincent Ladeuil (vila) wrote :

sent to pqm by email

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Makefile'
--- Makefile 2011-05-18 15:45:07 +0000
+++ Makefile 2011-08-31 09:40:10 +0000
@@ -42,7 +42,9 @@
42 set -e42 set -e
43 # Generate a stream for PQM to watch.43 # Generate a stream for PQM to watch.
44 -$(RM) -f selftest.log44 -$(RM) -f selftest.log
45 echo `date` ": selftest starts" 1>&2
45 $(PYTHON) -Werror -Wignore::ImportWarning -O ./bzr selftest --subunit $(tests) | tee selftest.log46 $(PYTHON) -Werror -Wignore::ImportWarning -O ./bzr selftest --subunit $(tests) | tee selftest.log
47 echo `date` ": selftest ends" 1>&2
46 # An empty log file should catch errors in the $(PYTHON)48 # An empty log file should catch errors in the $(PYTHON)
47 # command above (the '|' swallow any errors since 'make'49 # command above (the '|' swallow any errors since 'make'
48 # sees the 'tee' exit code for the whole line50 # sees the 'tee' exit code for the whole line
4951
=== modified file 'doc/en/release-notes/bzr-2.5.txt'
--- doc/en/release-notes/bzr-2.5.txt 2011-08-27 19:08:54 +0000
+++ doc/en/release-notes/bzr-2.5.txt 2011-08-31 09:40:10 +0000
@@ -254,6 +254,9 @@
254 allowing it to be used for modules with side-effects.254 allowing it to be used for modules with side-effects.
255 (Vincent Ladeuil, #712474)255 (Vincent Ladeuil, #712474)
256256
257* Output time stamps while running ``make check`` to get better timings from
258 pqm. (Vincent Ladeuil, #837926)
259
257* `TestCaseWithMemoryTransport` is faster now: `_check_safety_net` now260* `TestCaseWithMemoryTransport` is faster now: `_check_safety_net` now
258 just compares the bytes in the dirstate file to its pristine state,261 just compares the bytes in the dirstate file to its pristine state,
259 rather than opening the WorkingTree and calling ``last_revision()``.262 rather than opening the WorkingTree and calling ``last_revision()``.