~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Martin Packman
  • Date: 2011-12-08 18:58:27 UTC
  • mto: This revision was merged to the branch mainline in revision 6359.
  • Revision ID: martin.packman@canonical.com-20111208185827-rnav0jtrbp1none0
Add export-pot --include-duplicates option for permitting multiple entries with the same msgid

Show diffs side-by-side

added added

removed removed

Lines of Context:
43
43
        # Generate a stream for PQM to watch.
44
44
        -$(RM) -f selftest.log
45
45
        echo `date` ": selftest starts" 1>&2
46
 
        $(PYTHON) -Werror -Wignore::ImportWarning -O ./bzr selftest --subunit $(tests) | tee selftest.log
 
46
        $(PYTHON) -Werror -Wignore::ImportWarning -O ./bzr selftest -Oselftest.timeout=120 \
 
47
          --subunit $(tests) | tee selftest.log
47
48
        echo `date` ": selftest ends" 1>&2
48
49
        # An empty log file should catch errors in the $(PYTHON)
49
50
        # command above (the '|' swallow any errors since 'make'