[devscripts] 01/01: test_mk-origtargz: Export LANG=C
James McCoy
jamessan at debian.org
Sat Dec 5 01:56:01 UTC 2015
This is an automated email from the git hooks/post-receive script.
jamessan pushed a commit to branch master
in repository devscripts.
commit 1d7d7dd6e02c9bedd57c681d5560d2806f762d4f
Author: James McCoy <jamessan at debian.org>
Date: Fri Dec 4 20:53:45 2015 -0500
test_mk-origtargz: Export LANG=C
Testing was broken in non-en_US locales due to different languages in
the expected vs. actual output (seen in reproducible build
testing).
Forcing LANG=C ensures consistent output regardless of the environment.
Signed-off-by: James McCoy <jamessan at debian.org>
---
debian/changelog | 2 ++
test/test_mk-origtargz | 7 +++++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 96118b5..3d16340 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -103,6 +103,8 @@ devscripts (2.15.10) UNRELEASED; urgency=medium
+ Fix parsing of sources.list lines with options. (Closes: #674812)
* Add apt to Recommends, since various scripts use tools from apt. (Closes:
#807065)
+ * Export LANG=C in test_mk-origtargz so the test doesn't fail in non-English
+ locales.
[ Daniel Kahn Gillmor ]
* debuild:
diff --git a/test/test_mk-origtargz b/test/test_mk-origtargz
index 6da8022..a8efdc5 100755
--- a/test/test_mk-origtargz
+++ b/test/test_mk-origtargz
@@ -27,11 +27,14 @@ else
fi
cleanup(){
- rm -rf $TMPDIR
+ rm -rf $TMPDIR
+ unset LANG
}
setUp () {
TMPDIR=$(mktemp -d test_mk-origtargz.XXXX)
+ LANG=C
+ export LANG
}
tearDown () {
@@ -160,7 +163,7 @@ END
expected_stderr_after_removal="WARNING: Files-Excluded pattern (exclude-dir2/) should not have a trailing /"
-expected_files_after_removal=$(sort <<END
+expected_files_after_removal=$(LANG=C sort <<END
foo-0.1/
foo-0.1/a-dir/
foo-0.1/a-dir/exclude-this-subdir/
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git
More information about the devscripts-devel
mailing list