diff options
author | Colin Watson <cjwatson@debian.org> | 2020-06-07 11:06:14 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2020-06-07 11:06:16 +0100 |
commit | 58c1c4c51fb50edd0080d9483a1012fd2069c9cb (patch) | |
tree | e9a3ea9a897e3d2b407e73d6fe0a6c56a7a42008 /debian/tests/regress | |
parent | 30337f8b66c66af6b368d1e3c789e75f1247176c (diff) |
Use AUTOPKGTEST_TMP rather than the deprecated ADTTMP
Diffstat (limited to 'debian/tests/regress')
-rwxr-xr-x | debian/tests/regress | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/debian/tests/regress b/debian/tests/regress index 8bb73ee95..418bf55a6 100755 --- a/debian/tests/regress +++ b/debian/tests/regress | |||
@@ -2,7 +2,7 @@ | |||
2 | set -e | 2 | set -e |
3 | 3 | ||
4 | if [ "$(id -un)" != openssh-tests ]; then | 4 | if [ "$(id -un)" != openssh-tests ]; then |
5 | TMP="$ADTTMP/user" | 5 | TMP="$AUTOPKGTEST_TMP/user" |
6 | CREATED_RUN_SSHD=false | 6 | CREATED_RUN_SSHD=false |
7 | STARTED_HAVEGED=false | 7 | STARTED_HAVEGED=false |
8 | 8 | ||
@@ -15,7 +15,7 @@ if [ "$(id -un)" != openssh-tests ]; then | |||
15 | else | 15 | else |
16 | start-stop-daemon --stop --quiet \ | 16 | start-stop-daemon --stop --quiet \ |
17 | --retry=TERM/30/KILL/5 \ | 17 | --retry=TERM/30/KILL/5 \ |
18 | --pidfile "$ADTTMP/haveged.pid" \ | 18 | --pidfile "$AUTOPKGTEST_TMP/haveged.pid" \ |
19 | --name haveged | 19 | --name haveged |
20 | fi | 20 | fi |
21 | fi | 21 | fi |
@@ -54,8 +54,9 @@ EOF | |||
54 | STARTED_HAVEGED=: | 54 | STARTED_HAVEGED=: |
55 | elif ! pidof haveged >/dev/null; then | 55 | elif ! pidof haveged >/dev/null; then |
56 | start-stop-daemon --start --quiet \ | 56 | start-stop-daemon --start --quiet \ |
57 | --pidfile "$ADTTMP/haveged.pid" \ | 57 | --pidfile "$AUTOPKGTEST_TMP/haveged.pid" \ |
58 | --exec /usr/sbin/haveged -- -p "$ADTTMP/haveged.pid" | 58 | --exec /usr/sbin/haveged -- \ |
59 | -p "$AUTOPKGTEST_TMP/haveged.pid" | ||
59 | STARTED_HAVEGED=: | 60 | STARTED_HAVEGED=: |
60 | fi | 61 | fi |
61 | 62 | ||