~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Jonathan Lange
  • Date: 2011-02-19 13:45:05 UTC
  • mto: This revision was merged to the branch mainline in revision 12417.
  • Revision ID: jml@canonical.com-20110219134505-luesyzoanm79qvqp
Move canonical.tests to lp.tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
79
79
check_merge: $(BUILDOUT_BIN)
80
80
        [ `PYTHONPATH= bzr status -S database/schema/ | \
81
81
                grep -v "\(^P\|pending\|security.cfg\|Makefile\|unautovacuumable\|_pythonpath.py\)" | wc -l` -eq 0 ]
82
 
        ${PY} lib/canonical/tests/test_no_conflict_marker.py
 
82
        ${PY} lib/lp/tests/test_no_conflict_marker.py
83
83
 
84
84
check_db_merge: $(PY)
85
 
        ${PY} lib/canonical/tests/test_no_conflict_marker.py
 
85
        ${PY} lib/lp/tests/test_no_conflict_marker.py
86
86
 
87
87
check_config: build
88
88
        bin/test -m canonical.config.tests -vvt test_config