[SCM] Git repository for devscripts branch, master, updated. v2.12.4-111-g9e31d5c

[James McCoy]

The following commit has been merged in the master branch:
commit 87c6f694e4b0dff801b136ee0b9bb1e128662eea
Author: James McCoy <jamessan at debian.org>
Date:   Mon Dec 10 19:54:28 2012 -0500

    annotate-output: Handle an incomplete line of output.
    
    Closes: #695609
    Signed-off-by: James McCoy <jamessan at debian.org>

diff --git a/debian/changelog b/debian/changelog
index a8a14ec..0096337 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ devscripts (2.12.6+exp1) UNRELEASED; urgency=low
       modules (Dpkg::Changelog::Parse, Dpkg::Vendor::Ubuntu,
       Dpkg::Changelog::Entry::Debian).
     + Add changelog info support for hg and bzr.
+  * annotate-output:
+    + Handle an incomplete line of output.  (Closes: #695609)
 
   [ Dmitry Smirnov ]
   * licensecheck: Remove any regular comments pattern. (Closes: #526698)
diff --git a/debian/tests/shunit2 b/debian/tests/shunit2
index b5ef7c3..c577fef 100755
--- a/debian/tests/shunit2
+++ b/debian/tests/shunit2
@@ -1,6 +1,7 @@
 #!/bin/sh
 set -e
 
+test/test_annotate-output --installed
 test/test_checkbashisms --installed
 test/test_dd-list --installed
 test/test_debchange --installed
diff --git a/scripts/annotate-output.sh b/scripts/annotate-output.sh
index a1e1a31..c91961d 100755
--- a/scripts/annotate-output.sh
+++ b/scripts/annotate-output.sh
@@ -27,6 +27,9 @@ addtime ()
 	while read line; do
 		echo "`date ${FMT}` $1: $line"
 	done
+	if [ ! -z "$line" ]; then
+		echo -n "`date ${FMT}` $1: $line"
+	fi
 }
 
 usage ()
diff --git a/test/Makefile b/test/Makefile
index 2e827dc..8aea6fe 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,4 +1,5 @@
 test:
+	./test_annotate-output
 	./test_checkbashisms
 	./test_dd-list
 	./test_debchange
diff --git a/test/test_dd-list b/test/test_annotate-output
similarity index 75%
copy from test/test_dd-list
copy to test/test_annotate-output
index e9619ac..928010c 100755
--- a/test/test_dd-list
+++ b/test/test_annotate-output
@@ -16,18 +16,18 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 if test "$1" = --installed; then
-    COMMAND=dd-list
+    COMMAND=annotate-output
     shift
 else
-    COMMAND="../scripts/dd-list.pl"
+    COMMAND="../scripts/annotate-output.sh"
 fi
 
 WORKDIR="$(readlink -f "${0%/*}")"
 
-testBinariesFromSameSource() {
-  $COMMAND -s ${WORKDIR}/dd-list/sources vim-gtk vim-nox 2>&1 >/dev/null
-  rc=$?
-  assertEquals 'packages found' 0 $rc
+testSwallowedNewline() {
+  expected="% O: foo% I: Finished with exitcode 0"
+  actual="$($COMMAND +%% echo -n foo | grep O:)"
+  assertEquals 'incomplete line found' "${expected}" "${actual}"
 }
 
 . shunit2

-- 
Git repository for devscripts