diff options
author | Colin Watson <cjwatson@debian.org> | 2016-12-31 02:36:28 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2016-12-31 02:36:28 +0000 |
commit | 529a0d03ec7a9c7dc3a7b13773563ab30049612d (patch) | |
tree | b264082c42a63f51e1c10c76a7f65f687eb21b25 /debian | |
parent | 7a2c3e36d11fcd6f97953c636e2ddf14dd73fc5d (diff) |
Tweak regression test setup to cope with the case where some of the source directory is unreadable by the openssh-tests user.
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 2 | ||||
-rwxr-xr-x | debian/tests/regress | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 571ff3ccc..8d7ca8f6a 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -5,6 +5,8 @@ openssh (1:7.4p1-3) UNRELEASED; urgency=medium | |||
5 | * Run regression tests using 'sh -x' to try to get more information about | 5 | * Run regression tests using 'sh -x' to try to get more information about |
6 | failures. | 6 | failures. |
7 | * Dump some useful log files if regression tests fail. | 7 | * Dump some useful log files if regression tests fail. |
8 | * Tweak regression test setup to cope with the case where some of the | ||
9 | source directory is unreadable by the openssh-tests user. | ||
8 | 10 | ||
9 | -- Colin Watson <cjwatson@debian.org> Sat, 31 Dec 2016 01:22:48 +0000 | 11 | -- Colin Watson <cjwatson@debian.org> Sat, 31 Dec 2016 01:22:48 +0000 |
10 | 12 | ||
diff --git a/debian/tests/regress b/debian/tests/regress index f3352e3d2..1576da97b 100755 --- a/debian/tests/regress +++ b/debian/tests/regress | |||
@@ -19,14 +19,14 @@ openssh-tests ALL = (ALL:ALL) NOPASSWD: ALL | |||
19 | EOF | 19 | EOF |
20 | chmod 440 /etc/sudoers.d/openssh-tests | 20 | chmod 440 /etc/sudoers.d/openssh-tests |
21 | mkdir -p "$TMP" | 21 | mkdir -p "$TMP" |
22 | chown openssh-tests:openssh-tests "$TMP" | 22 | cp -a . "$TMP/tree" |
23 | chown -R openssh-tests:openssh-tests "$TMP" | ||
23 | sudo -u openssh-tests env TMP="$TMP" "$0" "$@" | 24 | sudo -u openssh-tests env TMP="$TMP" "$0" "$@" |
24 | exit "$?" | 25 | exit "$?" |
25 | fi | 26 | fi |
26 | 27 | ||
27 | # Don't use "make tests"; we want to test the installed version. | 28 | # Don't use "make tests"; we want to test the installed version. |
28 | 29 | ||
29 | cp -a . "$TMP/tree" | ||
30 | cd "$TMP/tree" | 30 | cd "$TMP/tree" |
31 | 31 | ||
32 | # 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 |