From aacfb59fe58cdcbda660c8348ce8fe12be120b96 Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Thu, 11 Jun 2015 22:19:48 +0200 Subject: [PATCH] Testsuite: Let modules.sh ignore the .git directory t/modules.t failed if a git commit message had a line starting with "use ". --- debian/changelog | 2 ++ t/modules.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5aa5173..3f61157 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ xen-tools (4.5+dev-1) UNRELEASED; urgency=medium lintian warning package-install-into-obsolete-dir) + Allows # within configuration file comments. (Closes: #783060; thanks Jean-Michel Nirgal Vourgère for the bug report and patch!) + + Testsuite: Let modules.sh ignore the .git directory. (t/modules.t + failed if a git commit message had a line starting with "use ".) * Update Vcs-* headers as Gitorious will close its doors in June. * Recommend debian-archive-keyring (for installing Debian DomUs on derivatives) and ubuntu-archive-keyring (for installing Ubuntu DomUs diff --git a/t/modules.sh b/t/modules.sh index faeacfa..2da1ca1 100755 --- a/t/modules.sh +++ b/t/modules.sh @@ -25,7 +25,7 @@ use Test::More qw( no_plan ); EOF -for i in `grep '^use ' -r .. | grep -v Expect | grep -v POSIX | grep -v Xen:: | awk '{print $2}' | tr -d \;\(\) | sort | uniq`; \ +for i in `grep '^use ' -r .. | egrep -v '^\./\.git/' | grep -v Expect | grep -v POSIX | grep -v Xen:: | awk '{print $2}' | tr -d \;\(\) | sort | uniq`; \ do \ echo "BEGIN{ use_ok( '$i' ); }"; \ echo "require_ok( '$i' );" ; \