diff options
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 2 | ||||
-rw-r--r-- | debian/control | 1 | ||||
-rw-r--r-- | debian/keygen-test/Makefile (renamed from debian/tests/Makefile) | 0 | ||||
-rw-r--r-- | debian/keygen-test/getpid.c (renamed from debian/tests/getpid.c) | 0 | ||||
-rwxr-xr-x | debian/keygen-test/keygen-test (renamed from debian/tests/keygen-test) | 0 | ||||
-rwxr-xr-x | debian/rules | 13 | ||||
-rw-r--r-- | debian/tests/control | 3 | ||||
-rw-r--r-- | debian/tests/regress | 38 |
8 files changed, 55 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index e89bee3b7..9842e0f7e 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -46,6 +46,8 @@ openssh (1:6.7p1-1) UNRELEASED; urgency=medium | |||
46 | * Simplify debian/rules using /usr/share/dpkg/buildflags.mk. | 46 | * Simplify debian/rules using /usr/share/dpkg/buildflags.mk. |
47 | * Use Package-Type rather than XC-Package-Type, now that it is an official | 47 | * Use Package-Type rather than XC-Package-Type, now that it is an official |
48 | field. | 48 | field. |
49 | * Run a subset of the upstream regression test suite at package build | ||
50 | time, and the rest of it under autopkgtest. | ||
49 | 51 | ||
50 | -- Colin Watson <cjwatson@debian.org> Mon, 06 Oct 2014 13:42:36 +0100 | 52 | -- Colin Watson <cjwatson@debian.org> Mon, 06 Oct 2014 13:42:36 +0100 |
51 | 53 | ||
diff --git a/debian/control b/debian/control index bafe4307d..c513f4ee4 100644 --- a/debian/control +++ b/debian/control | |||
@@ -3,6 +3,7 @@ Section: net | |||
3 | Priority: standard | 3 | Priority: standard |
4 | Maintainer: Debian OpenSSH Maintainers <debian-ssh@lists.debian.org> | 4 | Maintainer: Debian OpenSSH Maintainers <debian-ssh@lists.debian.org> |
5 | Build-Depends: libwrap0-dev | libwrap-dev, zlib1g-dev (>= 1:1.2.3), libssl-dev (>= 0.9.8g), libpam0g-dev | libpam-dev, libgtk2.0-dev, libedit-dev, debhelper (>= 9~), dh-exec, libselinux1-dev [linux-any], libkrb5-dev | heimdal-dev, dpkg-dev (>= 1.16.1~), libck-connector-dev, dh-autoreconf, autotools-dev, dh-systemd (>= 1.4) | 5 | Build-Depends: libwrap0-dev | libwrap-dev, zlib1g-dev (>= 1:1.2.3), libssl-dev (>= 0.9.8g), libpam0g-dev | libpam-dev, libgtk2.0-dev, libedit-dev, debhelper (>= 9~), dh-exec, libselinux1-dev [linux-any], libkrb5-dev | heimdal-dev, dpkg-dev (>= 1.16.1~), libck-connector-dev, dh-autoreconf, autotools-dev, dh-systemd (>= 1.4) |
6 | XS-Testsuite: autopkgtest | ||
6 | Standards-Version: 3.9.6 | 7 | Standards-Version: 3.9.6 |
7 | Uploaders: Colin Watson <cjwatson@debian.org>, Matthew Vernon <matthew@debian.org> | 8 | Uploaders: Colin Watson <cjwatson@debian.org>, Matthew Vernon <matthew@debian.org> |
8 | Homepage: http://www.openssh.org/ | 9 | Homepage: http://www.openssh.org/ |
diff --git a/debian/tests/Makefile b/debian/keygen-test/Makefile index 666ed8227..666ed8227 100644 --- a/debian/tests/Makefile +++ b/debian/keygen-test/Makefile | |||
diff --git a/debian/tests/getpid.c b/debian/keygen-test/getpid.c index c9e35b87e..c9e35b87e 100644 --- a/debian/tests/getpid.c +++ b/debian/keygen-test/getpid.c | |||
diff --git a/debian/tests/keygen-test b/debian/keygen-test/keygen-test index 02b7c761a..02b7c761a 100755 --- a/debian/tests/keygen-test +++ b/debian/keygen-test/keygen-test | |||
diff --git a/debian/rules b/debian/rules index bf4115fc4..570e6519f 100755 --- a/debian/rules +++ b/debian/rules | |||
@@ -145,13 +145,22 @@ override_dh_auto_build: | |||
145 | 145 | ||
146 | override_dh_auto_test: | 146 | override_dh_auto_test: |
147 | ifeq ($(RUN_TESTS),yes) | 147 | ifeq ($(RUN_TESTS),yes) |
148 | $(MAKE) -C debian/tests | 148 | $(MAKE) -C build-deb regress-prep |
149 | $(MAKE) -C build-deb $(PARALLEL) \ | ||
150 | regress/unittests/sshbuf/test_sshbuf \ | ||
151 | regress/unittests/sshkey/test_sshkey | ||
152 | $(MAKE) -C build-deb/regress \ | ||
153 | .OBJDIR="$(CURDIR)/build-deb/regress" \ | ||
154 | .CURDIR="$(CURDIR)/regress" \ | ||
155 | unit | ||
156 | $(MAKE) -C build-deb compat-tests | ||
157 | $(MAKE) -C debian/keygen-test | ||
149 | endif | 158 | endif |
150 | 159 | ||
151 | override_dh_auto_clean: | 160 | override_dh_auto_clean: |
152 | rm -rf build-deb build-udeb | 161 | rm -rf build-deb build-udeb |
153 | ifeq ($(RUN_TESTS),yes) | 162 | ifeq ($(RUN_TESTS),yes) |
154 | $(MAKE) -C debian/tests clean | 163 | $(MAKE) -C debian/keygen-test clean |
155 | endif | 164 | endif |
156 | $(MAKE) -C contrib clean | 165 | $(MAKE) -C contrib clean |
157 | (cat debian/copyright.head; iconv -f ISO-8859-1 -t UTF-8 LICENCE) \ | 166 | (cat debian/copyright.head; iconv -f ISO-8859-1 -t UTF-8 LICENCE) \ |
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 @@ | |||
1 | Tests: regress | ||
2 | Restrictions: needs-root allow-stderr isolation-container | ||
3 | Depends: @builddeps@, openssh-client, openssh-server, openssh-sftp-server, sudo, putty-tools, python-twisted-conch | ||
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 @@ | |||
1 | #! /bin/sh | ||
2 | set -e | ||
3 | |||
4 | # Don't use "make tests"; we want to test the installed version. | ||
5 | |||
6 | cp -a . "$ADTTMP/tree" | ||
7 | cd "$ADTTMP/tree" | ||
8 | |||
9 | # We aren't actually going to use most of this build, but we need a basic | ||
10 | # build tree in place in order to be able to build the regression tests. | ||
11 | autoreconf -f -i | ||
12 | cp -f /usr/share/misc/config.guess /usr/share/misc/config.sub ./ | ||
13 | ./configure | ||
14 | make | ||
15 | |||
16 | # The defaults for TEST_SSH_* in regress/test-exec.sh use the system | ||
17 | # versions, but the top-level Makefile sets things up to test the just-built | ||
18 | # versions, so we must bypass the latter in order to work correctly under | ||
19 | # autopkgtest. | ||
20 | make regress-prep | ||
21 | make regress/modpipe \ | ||
22 | regress/setuid-allowed \ | ||
23 | regress/unittests/sshbuf/test_sshbuf \ | ||
24 | regress/unittests/sshkey/test_sshkey | ||
25 | |||
26 | SRCDIR="$(pwd)" | ||
27 | BUILDDIR="$SRCDIR" | ||
28 | make -C regress \ | ||
29 | .OBJDIR="$BUILDDIR/regress" \ | ||
30 | .CURDIR="$SRCDIR/regress" \ | ||
31 | BUILDDIR="$BUILDDIR" \ | ||
32 | OBJ="$BUILDDIR/regress" \ | ||
33 | SUDO=sudo \ | ||
34 | TEST_SHELL=sh \ | ||
35 | TEST_SSH_SFTPSERVER=/usr/lib/openssh/sftp-server \ | ||
36 | TEST_SSH_IPV6=yes \ | ||
37 | TEST_SSH_ECC=yes \ | ||
38 | tests interop-tests | ||