launchpad-reviewers team mailing list archive

[Colin Watson <mp+428731@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:remove-make-check into launchpad:master.

Commit message:
Remove "make check" target

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/428731

This isn't what our buildbot actually uses these days (see lp:lpbuildbot-worker), and it obviously hadn't been used for some time since it relied on running `bzr` in the Launchpad code tree.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:remove-make-check into launchpad:master.

diff --git a/Makefile b/Makefile
index af03cce..15157c3 100644
--- a/Makefile
+++ b/Makefile
@@ -154,15 +154,6 @@ doc:
 check_config: build
 	bin/test -m lp.services.config.tests -vvt test_config
 
-# Clean before running the test suite, since the build might fail depending
-# what source changes happened. (e.g. apidoc depends on interfaces)
-.PHONY: check
-check: clean build
-	# Run all tests. test_on_merge.py takes care of setting up the
-	# database.
-	${PY} -t ./test_on_merge.py $(VERBOSITY) $(TESTOPTS)
-	bzr status --no-pending
-
 logs:
 	mkdir logs
 
diff --git a/database/sampledata/README b/database/sampledata/README
index 9da23c2..f8be779 100644
--- a/database/sampledata/README
+++ b/database/sampledata/README
@@ -68,7 +68,7 @@ To update the sample data:
     6.  Ensure the tests still pass:
 
             cd ../..
-            make check  # Yeah, yeah, we all know our machines can stand that.
+            bin/test -vvc  # Yeah, we all know our machines can stand that.
 
     7.  Commit your changes and submit for review: