# HG changeset patch # User Martin von Zweigbergk # Date 1450139395 28800 # Node ID 9590332b26c854bbaaddbeed2f45af758647e0f5 # Parent 42c30774e63d3aeace07687740b76c43c6fc37ad debian: don't refer to deleted tests/run-tests.py in debian/rules tests/run-tests.py was deleted in 25a0c31882df (tests: remove the custom run-tests.py, 2015-11-02), but we still refer to it in debian/rules. Fix by having the user define a HGSRC variable when calling 'debuild' (with e.g '-e HGSRC=~/hg'). diff -r 42c30774e63d -r 9590332b26c8 debian/rules --- a/debian/rules Fri Dec 11 12:27:37 2015 -0800 +++ b/debian/rules Mon Dec 14 16:29:55 2015 -0800 @@ -8,9 +8,13 @@ dh_auto_build $(MAKE) -C docs +hgsrc_defined: + # Use "! -z" instead of "-n", because "-n" without arguments is true + test ! -z $(HGSRC) && test -d $(HGSRC) || (echo "$(HGSRC) is not a directory"; false) + ifeq (,$(filter nocheck, $(DEB_BUILD_OPTIONS))) -override_dh_auto_test: - cd tests && python run-tests.py --with-hg=`which hg` --blacklist=$(CURDIR)/debian/test-blacklist +override_dh_auto_test: hgsrc_defined + cd tests && python $(HGSRC)/tests/run-tests.py --with-hg=$(HGSRC)/hg --blacklist=$(CURDIR)/debian/test-blacklist endif override_dh_python2: