[SCM] Git repository for devscripts branch, master, updated. v2.12.4-23-ge913048

Benjamin Drung bdrung at debian.org
Thu Oct 25 19:26:16 UTC 2012


The following commit has been merged in the master branch:
commit e913048373bcb92888aa0fa4ae85597b58d5eb63
Author: Benjamin Drung <bdrung at debian.org>
Date:   Thu Oct 25 21:26:06 2012 +0200

    Make checkbashisms tests consistent.

diff --git a/test/bashisms/source b/test/bashisms/source
index b6bd669..412f8bd 100644
--- a/test/bashisms/source
+++ b/test/bashisms/source
@@ -1,2 +1,2 @@
 #!/bin/sh
-source foo.sh
+source foo.sh # BASHISM
diff --git a/test/bashisms/source.out b/test/bashisms/source.out
index 8584a6b..d17fa5f 100644
--- a/test/bashisms/source.out
+++ b/test/bashisms/source.out
@@ -1,2 +1,2 @@
 possible bashism in bashisms/source line 2 (should be '.', not 'source'):
-source foo.sh
+source foo.sh # BASHISM
diff --git a/test/test_checkbashisms b/test/test_checkbashisms
index e510f08..46bb282 100755
--- a/test/test_checkbashisms
+++ b/test/test_checkbashisms
@@ -114,9 +114,7 @@ test_shell_vars() {
 }
 
 test_source() {
-    local result="possible bashism in bashisms/source line 2 (should be '.', not 'source'):
-source foo.sh"
-    found "bashisms/source" "$result"
+    found "bashisms/source" "$(cat bashisms/source.out)"
 }
 
 test_special_case() {

-- 
Git repository for devscripts



More information about the devscripts-devel mailing list