← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Bjorn Tillenius
  • Date: 2010-01-05 09:57:47 UTC
  • mto: This revision was merged to the branch mainline in revision 10132.
  • Revision ID: bjorn@canonical.com-20100105095747-kuv90xvkpxgprlyc
Run xvfb-run inside test_on_merge.py.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
8
8
PYTHONPATH:=$(WD)/lib:$(WD)/lib/mailman:${PYTHONPATH}
9
9
BUILDOUT_CFG=buildout.cfg
10
10
VERBOSITY=-vv
11
 
XVFB_RUN=xvfb-run -s '-screen 0 1024x768x24'
12
11
 
13
12
TESTFLAGS=-p $(VERBOSITY)
14
13
TESTOPTS=
70
69
check: clean build
71
70
        # Run all tests. test_on_merge.py takes care of setting up the
72
71
        # database.
73
 
        ${XVFB_RUN} ${PY} -t ./test_on_merge.py $(VERBOSITY)
 
72
        ${PY} -t ./test_on_merge.py $(VERBOSITY)
74
73
 
75
74
jscheck: build
76
75
        # Run all JavaScript integration tests.  The test runner takes care of