summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2016-12-31 01:23:11 +0000
committerColin Watson <cjwatson@debian.org>2016-12-31 01:23:11 +0000
commit249a10987ea8a48f582c544767845a2e8c9f32c3 (patch)
treeec8a7cec5f3a3761b648daa13c4f234dc94afdf7
parent255b8554a50b5c75fca63f76b1ac837c0d4fb7aa (diff)
Revert attempted hack around regress/forwarding.sh test failure, since it doesn't seem to help.
-rw-r--r--debian/changelog7
-rwxr-xr-xdebian/tests/regress3
2 files changed, 7 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index afa1af616..532f90460 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
1openssh (1:7.4p1-3) UNRELEASED; urgency=medium
2
3 * Revert attempted hack around regress/forwarding.sh test failure, since
4 it doesn't seem to help.
5
6 -- Colin Watson <cjwatson@debian.org> Sat, 31 Dec 2016 01:22:48 +0000
7
1openssh (1:7.4p1-2) unstable; urgency=medium 8openssh (1:7.4p1-2) unstable; urgency=medium
2 9
3 * Attempt to hack around regress/forwarding.sh test failure in some 10 * Attempt to hack around regress/forwarding.sh test failure in some
diff --git a/debian/tests/regress b/debian/tests/regress
index 02b8658bd..846482d62 100755
--- a/debian/tests/regress
+++ b/debian/tests/regress
@@ -29,9 +29,6 @@ fi
29cp -a . "$TMP/tree" 29cp -a . "$TMP/tree"
30cd "$TMP/tree" 30cd "$TMP/tree"
31 31
32# Attempt to hack around test failure in some environments.
33sed -i 's/^base=33/base=34/' regress/forwarding.sh
34
35# We aren't actually going to use most of this build, but we need a basic 32# We aren't actually going to use most of this build, but we need a basic
36# build tree in place in order to be able to build the regression tests. 33# build tree in place in order to be able to build the regression tests.
37autoreconf -f -i 34autoreconf -f -i