diff options
author | Antti-Juhani Kaijanaho <ajk@debian.org> | 2012-06-08 23:22:15 +0300 |
---|---|---|
committer | Antti-Juhani Kaijanaho <ajk@debian.org> | 2012-06-08 23:30:01 +0300 |
commit | 29e0bb8ffd3648ce0760d2dfe4e10c7eafd9f76c (patch) | |
tree | 113ef56052875e286e275d280d6817dc0a995dc5 | |
parent | 20e6bff973a9d51c3dd5b5a1c67809b4d9001fc4 (diff) | |
download | dctrl-tools-29e0bb8ffd3648ce0760d2dfe4e10c7eafd9f76c.tar.gz |
tester.sh: Handle missing diffs gracefully.
Signed-off-by: Antti-Juhani Kaijanaho <ajk@debian.org>
-rw-r--r-- | debian/changelog | 3 | ||||
-rw-r--r-- | tester.sh | 18 |
2 files changed, 15 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index 3d79907..a89f952 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,8 +12,9 @@ dctrl-tools (2.23) UNRELEASED; urgency=low * lib/msg.c (msg_primitive): Write the period before the newline, not after! * tests/0022.{out,err,fails}: New test case, for grep-dctrl --ignore-parse-errors + * tester.sh: Handle missing diffs gracefully. - -- Antti-Juhani Kaijanaho <ajk@debian.org> Fri, 08 Jun 2012 22:39:44 +0300 + -- Antti-Juhani Kaijanaho <ajk@debian.org> Fri, 08 Jun 2012 23:21:58 +0300 dctrl-tools (2.22.2) unstable; urgency=low @@ -1,6 +1,6 @@ #!/bin/sh # dctrl-tools - Debian control file inspection tools -# Copyright (C) 2007, 2010, 2011 Antti-Juhani Kaijanaho +# Copyright (C) 2007, 2010, 2011, 2012 Antti-Juhani Kaijanaho # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -83,10 +83,18 @@ for tst in $tests ; do echo "ok." else echo "FAILED." - echo "stdout diff:" - cat .diffout - echo "stderr diff:" - cat .differr + if [ -r .diffout ] ; then + echo "stdout diff:" + cat .diffout + else + echo "no stdout diff" + fi + if [ -r .differr ] ; then + echo "stderr diff:" + cat .differr + else + echo "no stderr diff" + fi rv=1 fi done |