← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Maris Fogels
  • Date: 2010-05-17 18:24:44 UTC
  • mto: This revision was merged to the branch mainline in revision 10873.
  • Revision ID: maris.fogels@canonical.com-20100517182444-jnb56kwj25b0vxp1
https://launchpad.net/bugs/570380
Added a new target for running the test suite in an ec2 image.  Removed the WindmillLayer from that target.  Fixed up the Makefile API a bit.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
67
67
 
68
68
apidoc: compile $(API_INDEX)
69
69
 
 
70
# Run by PQM.
70
71
check_merge: $(PY)
71
72
        [ `PYTHONPATH= bzr status -S database/schema/ | \
72
73
                grep -v "\(^P\|pending\|security.cfg\|Makefile\|unautovacuumable\|_pythonpath.py\)" | wc -l` -eq 0 ]
86
87
check: clean build
87
88
        # Run all tests. test_on_merge.py takes care of setting up the
88
89
        # database.
89
 
        ${PY} -t ./test_on_merge.py $(VERBOSITY)
 
90
        ${PY} -t ./test_on_merge.py $(VERBOSITY) $(TESTOPTS)
 
91
 
 
92
# A version of 'make check' that applies modifications specifically for the
 
93
# ec2 environment.
 
94
ec2_check: clean build
 
95
        # XXX mars 2010-05-17 bug=570380
 
96
        # Disable the windmill test suite to prevent the whole system from
 
97
        # hanging.  See bug 570380.
 
98
        #
 
99
        # Yes, this is code duplication.  If you conceive of a better
 
100
        # solution in a less heated moment, then please replace this!
 
101
        ${PY} -t ./test_on_merge.py $(VERBOSITY) $(TESTOPTS) \
 
102
                --layer='!WindmillLayer'
90
103
 
91
104
jscheck: build
92
105
        # Run all JavaScript integration tests.  The test runner takes care of
94
107
        @echo
95
108
        @echo "Running the JavaScript integration test suite"
96
109
        @echo
97
 
        bin/test $(VERBOSITY) --layer=WindmillLayer
 
110
        bin/test $(VERBOSITY) $(TESTOPTS) --layer=WindmillLayer
98
111
 
99
112
jscheck_functest: build
100
113
    # Run the old functest Windmill integration tests.  The test runner
107
120
check_mailman: build
108
121
        # Run all tests, including the Mailman integration
109
122
        # tests. test_on_merge.py takes care of setting up the database.
110
 
        ${PY} -t ./test_on_merge.py $(VERBOSITY) --layer=MailmanLayer
 
123
        ${PY} -t ./test_on_merge.py $(VERBOSITY) $(TESTOPTS) \
 
124
                --layer=MailmanLayer
111
125
 
112
126
lint: ${PY}
113
127
        @bash ./bin/lint.sh
437
451
        mv lp-clustered.svg.tmp lp-clustered.svg
438
452
 
439
453
PYDOCTOR = pydoctor
440
 
PYDOCTOR_OPTIONS = 
 
454
PYDOCTOR_OPTIONS =
441
455
 
442
456
pydoctor:
443
457
        $(PYDOCTOR) --make-html --html-output=apidocs --add-package=lib/lp \
447
461
 
448
462
.PHONY: apidoc check tags TAGS zcmldocs realclean clean debug stop\
449
463
        start run ftest_build ftest_inplace test_build test_inplace pagetests\
450
 
        check check_merge \
 
464
        check check_merge ec2_check \
451
465
        schema default launchpad.pot check_merge_ui pull scan sync_branches\
452
466
        reload-apache hosted_branches check_db_merge check_mailman check_config\
453
467
        jsbuild jsbuild_lazr clean_js buildonce_eggs \