summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOndřej Nový <onovy@debian.org>2018-10-01 10:08:08 +0200
committerOndřej Nový <onovy@debian.org>2018-10-01 10:08:08 +0200
commitb402fc2e57ed55cac9e70fdf9f0086ae9fc0336d (patch)
tree6aaf1fc4328739e002756343b91b52844229ac66
parent19fed9e653206ac999c617d47c5414892ad9d3c3 (diff)
downloadzsh-b402fc2e57ed55cac9e70fdf9f0086ae9fc0336d.tar.gz
zsh-b402fc2e57ed55cac9e70fdf9f0086ae9fc0336d.zip
d/tests: Use AUTOPKGTEST_TMP instead of ADTTMP
-rw-r--r--debian/changelog6
-rwxr-xr-xdebian/tests/run-testsuite10
2 files changed, 11 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index c0ca7eaee..a28a18924 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+zsh (5.6.2-4) UNRELEASED; urgency=medium
+
+ * d/tests: Use AUTOPKGTEST_TMP instead of ADTTMP
+
+ -- Ondřej Nový <onovy@debian.org> Mon, 01 Oct 2018 10:08:08 +0200
+
zsh (5.6.2-3) unstable; urgency=medium
* [92175749] Revert "Switch from the deprecated libpcre3 to the newer
diff --git a/debian/tests/run-testsuite b/debian/tests/run-testsuite
index faa690cc9..64e3f2dce 100755
--- a/debian/tests/run-testsuite
+++ b/debian/tests/run-testsuite
@@ -10,17 +10,17 @@ set -e
# cd $(dir_top) && DESTDIR= $(MAKE) MODDIR=`pwd`/$(subdir)/Modules install.modules
#fi
-if [ -z "$ADTTMP" -o ! -d "$ADTTMP" ]; then
- echo '$ADTTMP ("'"$ADTTMP"'") is not set or not a directory' 1>&2
+if [ -z "$AUTOPKGTEST_TMP" -o ! -d "$AUTOPKGTEST_TMP" ]; then
+ echo '$AUTOPKGTEST_TMP ("'"$AUTOPKGTEST_TMP"'") is not set or not a directory' 1>&2
exit 2
fi
-ZTST_testdir="$ADTTMP/Test"
+ZTST_testdir="$AUTOPKGTEST_TMP/Test"
export ZTST_testdir
cp -pvr Test "$ZTST_testdir"
-cp -pvr Misc "$ADTTMP/Misc"
-cd "$ADTTMP"
+cp -pvr Misc "$AUTOPKGTEST_TMP/Misc"
+cd "$AUTOPKGTEST_TMP"
ln -vfs /usr/lib/*/zsh/[0-9]* "$ZTST_testdir/Modules"
ln -vfs /usr/share/zsh/functions Functions