summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillem Jover <guillem@debian.org>2015-08-04 19:45:27 +0200
committerGuillem Jover <guillem@debian.org>2015-08-04 20:30:58 +0200
commitc40e5458b70df36767f11828bb51cbba8ae4ebc8 (patch)
tree6c1f2a688200129833f52f30007a572ab5516e15
parentf9d80776cbb11fe6f07366ce0836df1d5f911456 (diff)
downloaddpkg-c40e5458b70df36767f11828bb51cbba8ae4ebc8.tar.gz
scripts/t: Delete DEB_VENDOR from the environment to get reliable results
-rw-r--r--debian/changelog1
-rw-r--r--scripts/t/Dpkg_Vendor.t3
2 files changed, 4 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 17ce831e2..5ea0cd578 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -72,6 +72,7 @@ dpkg (1.18.2) UNRELEASED; urgency=low
- Set SIGINT, SIGTERM and SIGPIPE to their default actions to get
deterministic behavior.
- Add test cases for the makefile snippets.
+ - Delete DEB_VENDOR from the environment to get reliable results.
* Packaging:
- Make the libdpkg-dev package Multi-Arch:same.
- Mark libio-string-perl as <!nocheck>.
diff --git a/scripts/t/Dpkg_Vendor.t b/scripts/t/Dpkg_Vendor.t
index aac460edd..effc86510 100644
--- a/scripts/t/Dpkg_Vendor.t
+++ b/scripts/t/Dpkg_Vendor.t
@@ -18,6 +18,9 @@ use warnings;
use Test::More tests => 6;
+# Delete variables that can affect the tests.
+delete $ENV{DEB_VENDOR};
+
use_ok('Dpkg::Vendor', qw(get_vendor_dir get_current_vendor get_vendor_object));
is(get_vendor_dir(), $ENV{DPKG_ORIGINS_DIR}, 'Check vendor dir');