[SCM] Debian package checker branch, master, updated. 2.5.0-rc2-139-g8c0206d
The following commit has been merged in the master branch:
commit 8c0206d6b9af9265b009defac3a02822ccd32488
Author: Benjamin Drung <bdrung@debian.org>
Date: Sat Apr 16 20:32:03 2011 +0200
Correctly handle i686-linux-gnu as i386 triplet on Ubuntu in test
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/debian/changelog b/debian/changelog
index efbbb86..1dd0b90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -120,6 +120,10 @@ lintian (2.5.0~rc3) UNRELEASED; urgency=low
(Closes: #621658)
+ [NT] Disabled pkgbinarymangler during tests. (Closes: #621681)
+ * t/tests/binaries-from-other-arch:
+ + [NT] Accepted patch from Benjamin Drung to accept i686-linux-gnu
+ as a valid triplet. This fixes test failure in Ubuntu.
+ (Closes: #622974)
* unpack/unpack-{binpkg,changes}-l1:
+ [NT] Removed unpack scripts for binpkg and changes as these have
been replaced by collections.
diff --git a/t/tests/binaries-from-other-arch/debian/debian/dumpobj b/t/tests/binaries-from-other-arch/debian/debian/dumpobj
index e622de4..b23554d 100644
--- a/t/tests/binaries-from-other-arch/debian/debian/dumpobj
+++ b/t/tests/binaries-from-other-arch/debian/debian/dumpobj
@@ -4,7 +4,7 @@ set -e
DEB_BUILD_GNU_TYPE="$(dpkg-architecture -qDEB_BUILD_GNU_TYPE)"
case $DEB_BUILD_GNU_TYPE in
-i486-linux-gnu|x86_64-linux-gnu)
+i486-linux-gnu|i686-linux-gnu|x86_64-linux-gnu)
base64 -d <<DATA
f0VMRgEBAQAAAAAAAAAAAAIAKAABAAAAMIEAADQAAAA4bwkAAgAABDQAIAAGACgAGwAaAAEAAHDY
WgkA2NoJANjaCQBQCgAAUAoAAAQAAAAEAAAAAQAAAAAAAAAAgAAAAIAAAKhlCQCoZQkABQAAAACA
diff --git a/t/tests/binaries-multiarch/debian/Makefile b/t/tests/binaries-multiarch/debian/Makefile
index 61aab6a..4ed23c4 100644
--- a/t/tests/binaries-multiarch/debian/Makefile
+++ b/t/tests/binaries-multiarch/debian/Makefile
@@ -1,7 +1,7 @@
TRIPLETT = $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-ifeq (i486-linux-gnu,$(TRIPLETT))
+ifeq (,$(filter-out i486-linux-gnu i686-linux-gnu,$(TRIPLETT)))
WRONG_TRIPLETT = x86_64-linux-gnu
else
WRONG_TRIPLETT = i486-linux-gnu
diff --git a/t/tests/binaries-multiarch/post_test b/t/tests/binaries-multiarch/post_test
index bef12aa..0c650e8 100644
--- a/t/tests/binaries-multiarch/post_test
+++ b/t/tests/binaries-multiarch/post_test
@@ -1,2 +1,2 @@
-s/i486-linux-gnu/x86_64-linux-gnu/
+s/i[46]86-linux-gnu/x86_64-linux-gnu/
s/is for i386/is for amd64/
--
Debian package checker
Reply to: