diff --git a/debian/changelog b/debian/changelog index c936714d..ed8b04ca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ llvm-toolchain-10 (1:10.0.1-7) UNRELEASED; urgency=medium + [ Samuel Thibault ] * debian/patches/hurd/hurd-cxx-paths.diff: Add missing GCC installation initialization. + [ Sylvestre Ledru ] + * Replace use of deprecated $ADTTMP with $AUTOPKGTEST_TMP. + -- Samuel Thibault Thu, 27 Aug 2020 17:06:44 +0200 llvm-toolchain-10 (1:10.0.1-6) unstable; urgency=medium diff --git a/debian/tests/cmake-test b/debian/tests/cmake-test index 97f8bb2c..68849661 100755 --- a/debian/tests/cmake-test +++ b/debian/tests/cmake-test @@ -3,18 +3,18 @@ set -e # this is taken from libjsoncpp package -# Presence of $ADTTMP implies that someone will handle cleanup for us, so we +# Presence of $AUTOPKGTEST_TMP implies that someone will handle cleanup for us, so we # can avoid duplicating the effort (signal handling, etc.) here. -if [ -z "$ADTTMP" ] +if [ -z "$AUTOPKGTEST_TMP" ] then - echo "Required envvar ADTTMP \"$ADTTMP\" is not set" >&2 + echo "Required envvar AUTOPKGTEST_TMP \"$AUTOPKGTEST_TMP\" is not set" >&2 exit 1 fi # the idea was taken from spirv-llvm-translator package -cd "$ADTTMP" +cd "$AUTOPKGTEST_TMP" cat < CMakeLists.txt cmake_minimum_required(VERSION 2.6.2) project(cmake-test) diff --git a/debian/tests/integration-test-suite-test b/debian/tests/integration-test-suite-test index 328c0edc..62fd2ac4 100755 --- a/debian/tests/integration-test-suite-test +++ b/debian/tests/integration-test-suite-test @@ -5,17 +5,17 @@ set -e LLVM_VERSION=10 # this is taken from libjsoncpp package -# Presence of $ADTTMP implies that someone will handle cleanup for us, so we +# Presence of $AUTOPKGTEST_TMP implies that someone will handle cleanup for us, so we # can avoid duplicating the effort (signal handling, etc.) here. -if [ -z "$ADTTMP" ] +if [ -z "$AUTOPKGTEST_TMP" ] then - echo "Required envvar ADTTMP \"$ADTTMP\" is not set" >&2 + echo "Required envvar AUTOPKGTEST_TMP \"$AUTOPKGTEST_TMP\" is not set" >&2 exit 1 fi # Copy the integration repo to the temp dir -cp -Rv integration-test-suite/* "$ADTTMP"/ -cd "$ADTTMP" +cp -Rv integration-test-suite/* "$AUTOPKGTEST_TMP"/ +cd "$AUTOPKGTEST_TMP" mkdir build cd build