[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#989581:



Tags: patch

I humbly propose this change:

>From 4de312af857234e20b5e01b5b2fa61fa50496995 Mon Sep 17 00:00:00 2001
From: Fabrice Bauzac <noon@mykolab.com>
Date: Tue, 8 Jun 2021 00:00:38 +0200
Subject: [PATCH] autopkgtest: mark ADTTMP as obsolete, replaced with
 AUTOPKGTEST_TMP

Closes: #989581.
---
 autopkgtest.md   | 19 ++++++++++---------
 debian/changelog |  4 ++++
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/autopkgtest.md b/autopkgtest.md
index c984a23..1480ba7 100644
--- a/autopkgtest.md
+++ b/autopkgtest.md
@@ -30,10 +30,11 @@ If the file to be executed has no execute bits set, `chmod a+x` is
 applied to it (this means that tests can be added in patches without the
 need for additional chmod; contrast this with debian/rules).
 
-During execution of the test, the environment variable `$ADTTMP` will
+During execution of the test, the environment variable
+`$AUTOPKGTEST_TMP` (previously named `$ADTTMP`, now obsolete) will
 point to a directory for the execution of this particular test, which
-starts empty and will be deleted afterwards (so there is no need for the
-test to clean up files left there).
+starts empty and will be deleted afterwards (so there is no need for
+the test to clean up files left there).
 
 If tests want to create artifacts which are useful to attach to test
 results, such as additional log files or screenshots, they can put them
@@ -166,13 +167,13 @@ Defined restrictions
   running the tests. However, the tests are *not* entitled to assume that the
   source package's build dependencies will be installed when the test is run.
 
-  Please use this considerately, as for large builds it unnecessarily builds
-  the entire project when you only need a tiny subset (like the tests/
+  Please use this considerately, as for large builds it unnecessarily builds the
+  entire project when you only need a tiny subset (like the tests/
   subdirectory). It is often possible to run `make -C tests` instead, or copy
-  the test code to `$ADTTMP` and build it there with some custom commands. This
-  cuts down the load on the Continuous Integration servers and also makes tests
-  more robust as it prevents accidentally running them against the built source
-  tree instead of the installed packages.
+  the test code to `$AUTOPKGTEST_TMP` and build it there with some custom
+  commands. This cuts down the load on the Continuous Integration servers and
+  also makes tests more robust as it prevents accidentally running them against
+  the built source tree instead of the installed packages.
 
 - **allow-stderr**
 
diff --git a/debian/changelog b/debian/changelog
index c4cc189..426a931 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
 debian-policy (4.5.1.1) UNRELEASED; urgency=medium
 
+  [ Sean Whitton ]
   * 4.4: Fix changelog format: needs an extra space before sign-off
     (Closes: #976301).
     Thanks to Anatoli Babenia for reporting the problem.
 
+  [ Fabrice Bauzac-Stehly ]
+  * autopkgtest: mark ADTTMP as obsolete, replaced with AUTOPKGTEST_TMP.
+    Closes: #989581.
 
  -- Sean Whitton <spwhitton@spwhitton.name>  Tue, 19 Jan 2021 13:47:45 -0700
 
-- 
2.30.2


Reply to: