[med-svn] [Git][med-team/python-ruffus][master] 2 commits: Try hard to find Makefile to run test suite for Python2

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / python-ruffus


Commits:
92474f76 by Andreas Tille at 2018-12-03T12:11:17Z
Try hard to find Makefile to run test suite for Python2

- - - - -
fe71d5eb by Andreas Tille at 2018-12-03T12:29:04Z
Upload to unstable

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+python-ruffus (2.8.1-2) unstable; urgency=medium
+
+  * Try hard to find Makefile to run test suite for Python2
+    Closes: #915382
+
+ -- Andreas Tille <tille at debian.org>  Mon, 03 Dec 2018 13:11:32 +0100
+
 python-ruffus (2.8.1-1) unstable; urgency=medium
 
   [ Jelmer Vernooij ]


=====================================
debian/rules
=====================================
@@ -25,7 +25,11 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 		--test-args='set -e; \
 			    cd {build_dir}/$(PYBUILD_NAME)/test ; \
 			    if [ "{version.major}" = 2 ] ; then \
-				ln -s /build/python-ruffus-*/ruffus/test/Makefile ; \
+			        if [ -e $(CURDIR)/ruffus/test/Makefile ] ; then ln -s $(CURDIR)/ruffus/test/Makefile ; else \
+			            echo "Expected file $(CURDIR)/ruffus/test/Makefile not found" ; \
+			            echo "Use `find $(CURDIR) -name Makefile | grep test` instead" ; \
+			            ln -s `find $(CURDIR) -name Makefile | grep test | head -n1` ; \
+			        fi ; \
 			        cp -a run_all_unit_tests.cmd /tmp/run_all_unit_tests.cmd ; \
 			    else \
 				sed "s/^python3/python{version}/" run_all_unit_tests3.cmd > /tmp/run_all_unit_tests.cmd ; \



View it on GitLab: https://salsa.debian.org/med-team/python-ruffus/compare/850085a0ad465fba971c35f46286a85d2fdd743c...fe71d5ebd673b6e502baca5271c066fe4c89a6d1

-- 
View it on GitLab: https://salsa.debian.org/med-team/python-ruffus/compare/850085a0ad465fba971c35f46286a85d2fdd743c...fe71d5ebd673b6e502baca5271c066fe4c89a6d1
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20181203/1c2bf7d5/attachment.html>