test_output.sh: add tests for srunner_print()

There were no tests for srunner_print(). These tests, when run
with the STDOUT_DUMP output type, will output the normal
output to stdout, then call
   srunner_print()
on each output type, dumping that to stdout.

git-svn-id: svn+ssh://svn.code.sf.net/p/check/code/trunk@1027 64e312b2-a51f-0410-8e61-82d0ca0eb02a

diff --git a/tests/test_output.sh b/tests/test_output.sh
index 763327e34d55264c44ce6b96475f3e5a54bef6a0..8652ef89639728ab26a3ece7a55ec11eace22364 100755 (executable)
--- a/tests/test_output.sh
+++ b/tests/test_output.sh
@@ -115,21 +115,56 @@ ${SRCDIR}ex_output.c:58: fail \" ' < > & message
 ]"
 fi
 
+# When the ex_output program is run with the STDOUT_DUMP mode, it will
+# run with the normal output mode, then dump each output mode using
+# srunner_print() in this order:
+# CK_SILENT CK_MINIMAL CK_NORMAL CK_VERBOSE CK_ENV CK_SUBUNIT
+# note though that CK_SUBUNIT does not output anything, as it is
+# not fully considered an 'output mode'.
+exp_silent_dump="$exp_minimal_result
+$exp_normal_result
+$exp_verbose_result"
+exp_minimal_dump="$exp_minimal
+$exp_minimal_result
+$exp_normal_result
+$exp_verbose_result
+$exp_minimal_result"
+exp_normal_dump="$exp_normal
+$exp_minimal_result
+$exp_normal_result
+$exp_verbose_result
+$exp_normal_result"
+exp_verbose_dump="$exp_verbose
+$exp_minimal_result
+$exp_normal_result
+$exp_verbose_result
+$exp_verbose_result"
+exp_subunit_dump="$exp_subunit
+
+$exp_minimal_result
+$exp_normal_result
+$exp_verbose_result
+$exp_normal_result"
+
 act_silent=`./ex_output${EXEEXT} CK_SILENT STDOUT NORMAL  | tr -d "\r"`
 act_silent_env=`CK_VERBOSITY=silent ./ex_output${EXEEXT} CK_ENV STDOUT NORMAL  | tr -d "\r"`
+act_silent_dump_env=`CK_VERBOSITY=silent ./ex_output${EXEEXT} CK_ENV STDOUT_DUMP NORMAL  | tr -d "\r"`
 act_minimal=`./ex_output${EXEEXT} CK_MINIMAL STDOUT NORMAL | tr -d "\r"`
 act_minimal_env=`CK_VERBOSITY=minimal ./ex_output${EXEEXT} CK_ENV STDOUT NORMAL | tr -d "\r"`
+act_minimal_dump_env=`CK_VERBOSITY=minimal ./ex_output${EXEEXT} CK_ENV STDOUT_DUMP NORMAL | tr -d "\r"`
 act_normal=`./ex_output${EXEEXT} CK_NORMAL  STDOUT NORMAL | tr -d "\r"`
 act_normal_env=`CK_VERBOSITY=normal CK_VERBOSITY='' ./ex_output${EXEEXT} CK_ENV  STDOUT NORMAL | tr -d "\r"`
-act_normal_env_blank=`CK_VERBOSITY='' ./ex_output${EXEEXT} CK_ENV  STDOUT NORMAL | tr -d "\r"`
+act_normal_dump_env=`CK_VERBOSITY=normal CK_VERBOSITY='' ./ex_output${EXEEXT} CK_ENV  STDOUT_DUMP NORMAL | tr -d "\r"`
+act_normal_env_blank=`./ex_output${EXEEXT} CK_ENV  STDOUT NORMAL | tr -d "\r"`
 act_normal_env_invalid=`CK_VERBOSITY='BLARGS' ./ex_output${EXEEXT} CK_ENV  STDOUT NORMAL | tr -d "\r"`
 act_verbose=`./ex_output${EXEEXT} CK_VERBOSE STDOUT NORMAL | tr -d "\r"`
 act_verbose_env=`CK_VERBOSITY=verbose ./ex_output${EXEEXT} CK_ENV STDOUT NORMAL | tr -d "\r"`
+act_verbose_dump_env=`CK_VERBOSITY=verbose ./ex_output${EXEEXT} CK_ENV STDOUT_DUMP NORMAL | tr -d "\r"`
 if test 1 -eq $ENABLE_SUBUNIT; then
 act_subunit=`./ex_output${EXEEXT} CK_SUBUNIT STDOUT NORMAL | tr -d "\r"`
+act_subunit_dump_env=`CK_VERBOSITY=subunit ./ex_output${EXEEXT} CK_SUBUNIT STDOUT_DUMP NORMAL | tr -d "\r"`
 fi
 
-
 test_output ( ) {
     if [ "x${1}" != "x${2}" ]; then
        echo "Problem with ex_output${EXEEXT} ${3}";
@@ -139,7 +174,7 @@ test_output ( ) {
        echo "${2}";
        exit 1;
     fi
-    
+
 }
 
 test_output "$exp_silent"  "$act_silent"             "CK_SILENT STDOUT NORMAL";
@@ -153,7 +188,14 @@ test_output "$exp_normal"  "$act_normal_env_invalid" "CK_ENV STDOUT NORMAL";
 test_output "$exp_verbose" "$act_verbose"            "CK_VERBOSE STDOUT NORMAL";
 test_output "$exp_verbose" "$act_verbose_env"        "CK_ENV STDOUT NORMAL";
 
+test_output "$exp_silent_dump"  "$act_silent_dump_env"  "CK_ENV STDOUT_DUMP NORMAL (for silent)"
+test_output "$exp_minimal_dump" "$act_minimal_dump_env" "CK_ENV STDOUT_DUMP NORMAL (for minimal)"
+test_output "$exp_normal_dump"  "$act_normal_dump_env"  "CK_ENV STDOUT_DUMP NORMAL (for normal)"
+test_output "$exp_verbose_dump" "$act_verbose_dump_env" "CK_ENV STDOUT_DUMP NORMAL (for verbose)"
+
 if test 1 -eq $ENABLE_SUBUNIT; then
-    test_output "$exp_subunit" "$act_subunit" "CK_SUBUNIT STDOUT NORMAL";
+    test_output "$exp_subunit"      "$act_subunit"          "CK_SUBUNIT STDOUT NORMAL";
+    test_output "$exp_subunit_dump" "$act_subunit_dump_env" "CK_ENV STDOUT_DUMP NORMAL (for subunit)"
 fi
+
 exit 0