Run a subset of the upstream regression test suite at package build time, and the rest of it under autopkgtest.

5 files changed, 41 insertions, 63 deletions

diff --git a/debian/tests/Makefile b/debian/tests/Makefile
deleted file mode 100644
index 666ed8227..000000000
--- a/debian/tests/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-test: getpid.so
-        chmod +x keygen-test
-        ./keygen-test
-
-getpid.o: getpid.c
-        gcc -fPIC -c $< -o $@
-
-getpid.so: getpid.o
-        gcc -shared -o $@ $<
-
-clean:
-        rm -f getpid.o getpid.so key1 key1.pub key2 key2.pub
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 000000000..77b515bf8
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,3 @@
+Tests: regress
+Restrictions: needs-root allow-stderr isolation-container
+Depends: @builddeps@, openssh-client, openssh-server, openssh-sftp-server, sudo, putty-tools, python-twisted-conch
diff --git a/debian/tests/getpid.c b/debian/tests/getpid.c
deleted file mode 100644
index c9e35b87e..000000000
--- a/debian/tests/getpid.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Compile:
-
-gcc -fPIC -c getpid.c -o getpid.o
-gcc -shared -o getpid.so getpid.o
-
- * Use:
- 
-FORCE_PID=1234 LD_PRELOAD=./getpid.so bash
-
-#
-# Copyright (C) 2001-2008 Kees Cook
-# kees@outflux.net, http://outflux.net/
-# 
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-# http://www.gnu.org/copyleft/gpl.html
-
-*/
-
-#include <sys/types.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-pid_t getpid(void)
-{
-    return atoi(getenv("FORCE_PID"));
-}
diff --git a/debian/tests/keygen-test b/debian/tests/keygen-test
deleted file mode 100755
index 02b7c761a..000000000
--- a/debian/tests/keygen-test
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-
-rm -f key1 key1.pub key2 key2.pub
-LD_PRELOAD="$(pwd)/getpid.so" FORCE_PID=1234 \
-        ../../build-deb/ssh-keygen -N '' -f key1 >/dev/null
-LD_PRELOAD="$(pwd)/getpid.so" FORCE_PID=1234 \
-        ../../build-deb/ssh-keygen -N '' -f key2 >/dev/null
-if cmp -s key1 key2; then
-        echo "Generated two identical keys!" >&2
-        exit 1
-fi
-exit 0
diff --git a/debian/tests/regress b/debian/tests/regress
new file mode 100644
index 000000000..0e3fbc4ae
--- /dev/null
+++ b/debian/tests/regress
@@ -0,0 +1,38 @@
+#! /bin/sh
+set -e
+
+# Don't use "make tests"; we want to test the installed version.
+
+cp -a . "$ADTTMP/tree"
+cd "$ADTTMP/tree"
+
+# We aren't actually going to use most of this build, but we need a basic
+# build tree in place in order to be able to build the regression tests.
+autoreconf -f -i
+cp -f /usr/share/misc/config.guess /usr/share/misc/config.sub ./
+./configure
+make
+
+# The defaults for TEST_SSH_* in regress/test-exec.sh use the system
+# versions, but the top-level Makefile sets things up to test the just-built
+# versions, so we must bypass the latter in order to work correctly under
+# autopkgtest.
+make regress-prep
+make regress/modpipe \
+     regress/setuid-allowed \
+     regress/unittests/sshbuf/test_sshbuf \
+     regress/unittests/sshkey/test_sshkey
+
+SRCDIR="$(pwd)"
+BUILDDIR="$SRCDIR"
+make -C regress \
+        .OBJDIR="$BUILDDIR/regress" \
+        .CURDIR="$SRCDIR/regress" \
+        BUILDDIR="$BUILDDIR" \
+        OBJ="$BUILDDIR/regress" \
+        SUDO=sudo \
+        TEST_SHELL=sh \
+        TEST_SSH_SFTPSERVER=/usr/lib/openssh/sftp-server \
+        TEST_SSH_IPV6=yes \
+        TEST_SSH_ECC=yes \
+        tests interop-tests