This is an automated email from the git hooks/post-receive script.

lunar pushed a commit to branch pu/reproducible_builds
in repository dh-python.

commit 0193677d9a0a6ebd4126c54941910335f7d2d373
Author: Piotr Ożarowski <pi...@debian.org>
Date:   Sun Jul 7 21:46:30 2013 +0200

    test203: hardcode mutliarch triplet via DEB_HOST_MULTIARCH
---
 tests/common.mk         |  1 +
 tests/t203/Makefile     | 12 ++++++++----
 tests/t203/debian/rules |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/tests/common.mk b/tests/common.mk
index 6467f76..c16aaec 100644
--- a/tests/common.mk
+++ b/tests/common.mk
@@ -6,6 +6,7 @@ export DEBPYTHON3_DEFAULT ?= $(shell python3 
../../dhpython/_defaults.py default
 export DEBPYTHON3_SUPPORTED ?= $(shell python3 ../../dhpython/_defaults.py 
supported cpython3)
 export DEBPYPY_DEFAULT ?= $(shell python3 ../../dhpython/_defaults.py default 
pypy)
 export DEBPYPY_SUPPORTED ?= $(shell python3 ../../dhpython/_defaults.py 
supported pypy)
+export DEB_HOST_MULTIARCH=my_multiarch-triplet
 
 all: run check
 
diff --git a/tests/t203/Makefile b/tests/t203/Makefile
index 21658b4..c032ca9 100644
--- a/tests/t203/Makefile
+++ b/tests/t203/Makefile
@@ -2,18 +2,22 @@
 
 include ../common.mk
 DPY=$(DEBPYTHON_DEFAULT)
+ifeq ($(DPY),2.7) 
+TRIPLET=.$(DEB_HOST_MULTIARCH)
+endif
 
 check:
        grep -q "pycompile -p python-foo /usr/lib/python-foo -V $(DPY)"\
                debian/python-foo/DEBIAN/postinst
-       test -f debian/python-foo/usr/lib/python${DPY}/dist-packages/foo/bar.so
+       test -f 
debian/python-foo/usr/lib/python${DPY}/dist-packages/foo/bar$(TRIPLET).so
        test ! -f debian/python-foo/usr/share/pyshared/foo/bar.so
-       test -f debian/python-foo/usr/lib/python${DPY}/dist-packages/foo/spam.so
+       test ! -f debian/python-foo/usr/share/pyshared/foo/bar$(TRIPLET).so
+       test -f 
debian/python-foo/usr/lib/python${DPY}/dist-packages/foo/spam$(TRIPLET).so
        test ! -f 
debian/python-foo/usr/lib/python${DPY}/dist-packages/foo/spam.so.0.1
-       test -f debian/python-foo/usr/lib/python${DPY}/dist-packages/foo/baz.so
+       test -f 
debian/python-foo/usr/lib/python${DPY}/dist-packages/foo/baz$(TRIPLET).so
        test ! -f 
debian/python-foo/usr/lib/python${DPY}/dist-packages/foo/baz.so.0.1
        test ! -f 
debian/python-foo/usr/lib/python${DPY}/dist-packages/foo/baz.so.0.1.2
-       test -f debian/python-foo/usr/lib/python${DPY}/dist-packages/foo/quux.so
+       test -f 
debian/python-foo/usr/lib/python${DPY}/dist-packages/foo/quux$(TRIPLET).so
        test ! -f 
debian/python-foo/usr/lib/python${DPY}/dist-packages/foo/quux.so.0
        test ! -L 
debian/python-foo/usr/lib/python${DPY}/dist-packages/foo/quux.so.0
        test ! -f 
debian/python-foo/usr/lib/python${DPY}/dist-packages/foo/quux.so.0.0.0
diff --git a/tests/t203/debian/rules b/tests/t203/debian/rules
index e3025aa..6fa28a5 100755
--- a/tests/t203/debian/rules
+++ b/tests/t203/debian/rules
@@ -27,7 +27,7 @@ override_dh_pysupport:
        dh_link /usr/lib/python${DPY}/dist-packages/foo/quux.so.0.0.0 \
                /usr/lib/python${DPY}/dist-packages/foo/quux.so
        # ... and complex multiple symlinks
-       DH_VERBOSE=1 ../../dh_python2
+       DH_VERBOSE=1 DEB_HOST_MULTIARCH=my_multiarch-triplet ../../dh_python2
 
 clean:
        dh_clean

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/reproducible/dh-python.git

_______________________________________________
Reproducible-builds mailing list
Reproducible-builds@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds

Reply via email to