Don't run tests when cross-compiling.

2 files changed, 5 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 8d617adde..718ce3924 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ openssh (1:5.2p1-2) UNRELEASED; urgency=low
       re-execs itself. Prevents two HUPs in quick succession from resulting
       in sshd dying (LP: #497781).
   * Use host compiler for ssh-askpass-gnome when cross-compiling.
+  * Don't run tests when cross-compiling.
 
  -- Colin Watson <cjwatson@debian.org>  Sun, 10 Jan 2010 22:06:28 +0000
 
diff --git a/debian/rules b/debian/rules
index 8bba8f95e..618525636 100755
--- a/debian/rules
+++ b/debian/rules
@@ -128,7 +128,9 @@ endif
 
         $(MAKE) -C build-deb -j 2 ASKPASS_PROGRAM='/usr/bin/ssh-askpass'
         $(MAKE) -C contrib gnome-ssh-askpass2 CC='$(CC) $(OPTFLAGS) -g -Wall'
+ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
         $(MAKE) -C debian/tests
+endif
 
         touch build-deb-stamp
 
@@ -148,7 +150,9 @@ build-udeb-stamp:
 clean:
         dh_testdir
         rm -rf build-deb build-udeb
+ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
         $(MAKE) -C debian/tests clean
+endif
         $(MAKE) -C contrib clean
         (cat debian/copyright.head; iconv -f ISO-8859-1 -t UTF-8 LICENCE) \
                 > debian/copyright