Merge lp:~thumper/pqm/test-bzr-home into lp:pqm

Proposed by Tim Penhey on 2008-05-27
Status: Merged
Merge reported by: Robert Collins
Merged at revision: 178
Proposed branch: lp:~thumper/pqm/test-bzr-home
Merge into: lp:pqm
To merge this branch: bzr merge lp:~thumper/pqm/test-bzr-home
To post a comment you must log in.
Tim Penhey (thumper) wrote :

=== modified file '.bzrignore'
--- .bzrignore 2007-11-04 18:04:49 +0000
+++ .bzrignore 2008-05-27 09:37:37 +0000
@@ -10,3 +10,4 @@
 tests/.gnupg/*
 twistd.log*
 tests/workdir
+bzr

=== modified file 'Makefile.am'
--- Makefile.am 2007-05-21 01:00:47 +0000
+++ Makefile.am 2008-05-27 09:37:37 +0000
@@ -6,7 +6,7 @@

 SUBDIRS = tests
 PYTHONPATH:=$(shell pwd):$(shell pwd)/bzr:$(shell pwd)/bzrtools:$(shell pwd)/cm/lib:$(shell pwd)/pybaz
-
+BZR_HOME:=.

 docdir = $(prefix)/share/doc/@PACKAGE@

@@ -32,7 +32,7 @@
        rm -f manual.html

 check-local:
- PYTHONPATH=$(PYTHONPATH) trial pqm.tests pqm.ui.tests
+ PYTHONPATH=$(PYTHONPATH) BZR_HOME=$(BZR_HOME) trial pqm.tests pqm.ui.tests

 EXTRA_DIST = autogen.sh $(regulardocs_DATA) manual.xml $(bin_SCRIPTS)

Elliot Murphy (statik) wrote :

this looks simple and reasonable.

review: Approve
Joey Stanford (joey) :
review: Approve (pqm)
Christian Reis (kiko) :
review: Approve

Subscribers

People subscribed via source and target branches