Merge lp:~cjwatson/click/native-dpkg-architecture into lp:click/devel

[Colin Watson]

Fix DEB_BUILD_* environment variables when building on amd64 for i386 (LP: #1328486).

When we're building on amd64 for i386 using "click chroot run", we override the native architecture to i386, but at the moment we don't fix up DEB_BUILD_* to match. That causes various problems such as cmake trying to use the wrong path to moc.

It doesn't appear to be possible to tell dpkg-architecture to use a different build architecture, short of supplying a mock "dpkg --print-architecture", which seems rather fragile. However, since we read its output and export it ourselves anyway, and we only need to worry about the case where the build and host architectures are being forced to be equal, we can just substitute DEB_HOST_* as DEB_BUILD_*.

[Michael Vogt (mvo)]

Thanks Colin, this looks fine, I just have one inline comment about the tests.

review: Approve

[lp:~cjwatson/click/native-dpkg-architecture]

458. By Colin Watson on 2014-06-10

Mock "dpkg --print-architecture" so that we can select different native architectures in tests.

=== modified file 'click/chroot.py'
--- click/chroot.py	2014-05-22 09:56:13 +0000
+++ click/chroot.py	2014-06-10 17:42:09 +0000
@@ -212,6 +212,14 @@
             except ValueError:
                 continue
             dpkg_architecture[key] = value
+        if self.native_arch == self.target_arch:
+            # We may have overridden the native architecture (see
+            # _get_native_arch above), so we need to force DEB_BUILD_* to
+            # match.
+            for key in list(dpkg_architecture):
+                if key.startswith("DEB_HOST_"):
+                    new_key = "DEB_BUILD_" + key[len("DEB_HOST_"):]
+                    dpkg_architecture[new_key] = dpkg_architecture[key]
         return dpkg_architecture
 
     def _generate_sources(self, series, native_arch, target_arch, components):

=== modified file 'click/tests/test_chroot.py'
--- click/tests/test_chroot.py	2014-05-20 11:52:16 +0000
+++ click/tests/test_chroot.py	2014-06-10 17:42:09 +0000
@@ -23,6 +23,10 @@
     ]
 
 
+import os
+import subprocess
+from textwrap import dedent
+
 from click.tests.helpers import TestCase
 from click.chroot import (
     ClickChroot,
@@ -30,6 +34,18 @@
 
 
 class TestClickChroot(TestCase):
+    def set_dpkg_native_architecture(self, arch):
+        """Fool dpkg-architecture into selecting a given native arch."""
+        self.use_temp_dir()
+        dpkg_script_path = os.path.join(self.temp_dir, "dpkg")
+        with open(dpkg_script_path, "w") as dpkg_script:
+            print(dedent("""\
+                #! /bin/sh
+                echo %s
+                """) % arch, file=dpkg_script)
+        os.chmod(dpkg_script_path, 0o755)
+        os.environ["PATH"] = "%s:%s" % (self.temp_dir, os.environ["PATH"])
+
     def test_get_native_arch_amd64_to_amd64(self):
         chroot = ClickChroot("amd64", "ubuntu-sdk-14.04", series="trusty")
         self.assertEqual("amd64", chroot._get_native_arch("amd64", "amd64"))
@@ -42,6 +58,24 @@
         chroot = ClickChroot("i386", "ubuntu-sdk-14.04", series="trusty")
         self.assertEqual("i386", chroot._get_native_arch("amd64", "i386"))
 
+    def test_dpkg_architecture_amd64_to_armhf(self):
+        self.set_dpkg_native_architecture("amd64")
+        chroot = ClickChroot("armhf", "ubuntu-sdk-14.04", series="trusty")
+        self.assertEqual("amd64", chroot.dpkg_architecture["DEB_BUILD_ARCH"])
+        self.assertEqual("armhf", chroot.dpkg_architecture["DEB_HOST_ARCH"])
+
+    def test_dpkg_architecture_i386_to_armhf(self):
+        self.set_dpkg_native_architecture("i386")
+        chroot = ClickChroot("armhf", "ubuntu-sdk-14.04", series="trusty")
+        self.assertEqual("i386", chroot.dpkg_architecture["DEB_BUILD_ARCH"])
+        self.assertEqual("armhf", chroot.dpkg_architecture["DEB_HOST_ARCH"])
+
+    def test_dpkg_architecture_amd64_to_i386(self):
+        self.set_dpkg_native_architecture("amd64")
+        chroot = ClickChroot("i386", "ubuntu-sdk-14.04", series="trusty")
+        self.assertEqual("i386", chroot.dpkg_architecture["DEB_BUILD_ARCH"])
+        self.assertEqual("i386", chroot.dpkg_architecture["DEB_HOST_ARCH"])
+
     def test_gen_sources_archive_only(self):
         chroot = ClickChroot("amd64", "ubuntu-sdk-13.10", series="trusty")
         chroot.native_arch = "i386"

=== modified file 'debian/changelog'
--- debian/changelog	2014-06-10 17:18:00 +0000
+++ debian/changelog	2014-06-10 17:42:09 +0000
@@ -4,6 +4,10 @@
   * Add basic integration tests, run via autopkgtest.
   * Add coverage testing.
 
+  [ Colin Watson ]
+  * Fix DEB_BUILD_* environment variables when building on amd64 for i386
+    (LP: #1328486).
+
  -- Colin Watson <[e-mail]>  Mon, 09 Jun 2014 11:02:39 +0100
 
 click (0.4.25) utopic; urgency=medium