[SCM] Debian package checker branch, master, updated. 2.5.0-rc2-155-g492ca44
The following commit has been merged in the master branch:
commit 492ca4406cac73a598d02522b5f62fe37cf64f48
Author: Niels Thykier <niels@thykier.net>
Date: Wed Apr 20 19:43:47 2011 +0200
Made binaries-multiarch x86 and amd64 only
First of the test currently would fail if the path was not one of
the multiarch paths for x86 or amd64, secondly since dpkg in
stable (Squeeze) does not support multiarch, we cannot use
dpkg-architecture -qDEB_HOST_MULTIARCH.
diff --git a/t/tests/binaries-multiarch/debian/Makefile b/t/tests/binaries-multiarch/debian/Makefile
index ea0a4e8..46e8fd1 100644
--- a/t/tests/binaries-multiarch/debian/Makefile
+++ b/t/tests/binaries-multiarch/debian/Makefile
@@ -1,12 +1,19 @@
-TRIPLETT = $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+# Since dpkg in stable (Squeeze) does not support MULTIARCH we cannot use
+# dpkg-architecture -qDEB_HOST_MULTIARCH
+# Therefore this test is hardcoded to x86 and amd64
-ifeq (i386-linux-gnu,$(TRIPLETT))
+ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
+
+ifeq (i386,$(ARCH))
+ TRIPLETT = i386-linux-gnu
WRONG_TRIPLETT = x86_64-linux-gnu
else
+ TRIPLETT = x86_64-linux-gnu
WRONG_TRIPLETT = i386-linux-gnu
endif
+
all:
gcc -o basic basic.c
diff --git a/t/tests/binaries-multiarch/desc b/t/tests/binaries-multiarch/desc
index 296c568..ac6dfae 100644
--- a/t/tests/binaries-multiarch/desc
+++ b/t/tests/binaries-multiarch/desc
@@ -2,5 +2,5 @@ Testname: binaries-multiarch
Sequence: 6000
Version: 1.0
Description: Multiarch-related tests but not multiarch itself
-Architecture: any
+Architecture: i386 amd64
Test-For: triplet-dir-and-architecture-mismatch
--
Debian package checker
Reply to: