From 91fd0a78017085bea3a3b498789a0d6196f2bf85 Mon Sep 17 00:00:00 2001
From: Andrew Bettison <andrewb@zip.com.au>
Date: Tue, 31 Jul 2012 17:47:09 +0930
Subject: [PATCH] Improve test framework: always log stderr on some assertions

---
 testframework.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/testframework.sh b/testframework.sh
index 052a7faf..6633673e 100644
--- a/testframework.sh
+++ b/testframework.sh
@@ -931,8 +931,8 @@ _tfw_assertExpr() {
 _tfw_assert_stdxxx_is() {
    local qual="$1"
    shift
-   _tfw_getopts assertfilecontent --$qual "$@"
-   shift $((_tfw_getopts_shift - 1))
+   _tfw_getopts assertfilecontent --$qual --stderr "$@"
+   shift $((_tfw_getopts_shift - 2))
    if [ $# -lt 1 ]; then
       _tfw_error "incorrect arguments"
       return 254
@@ -955,8 +955,8 @@ _tfw_assert_stdxxx_is() {
 _tfw_assert_stdxxx_linecount() {
    local qual="$1"
    shift
-   _tfw_getopts assertfilecontent --$qual "$@"
-   shift $((_tfw_getopts_shift - 1))
+   _tfw_getopts assertfilecontent --$qual --stderr "$@"
+   shift $((_tfw_getopts_shift - 2))
    if [ $# -lt 1 ]; then
       _tfw_error "incorrect arguments"
       return 254
@@ -971,8 +971,8 @@ _tfw_assert_stdxxx_linecount() {
 _tfw_assert_stdxxx_grep() {
    local qual="$1"
    shift
-   _tfw_getopts assertgrep --$qual "$@"
-   shift $((_tfw_getopts_shift - 1))
+   _tfw_getopts assertgrep --$qual --stderr "$@"
+   shift $((_tfw_getopts_shift - 2))
    if [ $# -ne 1 ]; then
       _tfw_error "incorrect arguments"
       return 254