diff options
Diffstat (limited to 't/color-tests.sh')
-rw-r--r-- | t/color-tests.sh | 34 |
1 files changed, 4 insertions, 30 deletions
diff --git a/t/color-tests.sh b/t/color-tests.sh index 68f963fcb..86ed9cbda 100644 --- a/t/color-tests.sh +++ b/t/color-tests.sh @@ -88,36 +88,10 @@ test_color () test_no_color () { - # With make implementations that, like Solaris make, in case of errors - # print the whole failing recipe on standard output, we should content - # ourselves with a laxer check, to avoid false positives. - # Keep this in sync with lib/am/check.am:$(am__color_tests). - if $FGREP '= Xalways; then' stdout; then - # Extra verbose make, resort to laxer checks. - # Note that we also want to check that the testsuite summary is - # not unduly colorized. - ( - set +e # In case some grepped regex below isn't matched. - # Not a useless use of cat; see above comments "grep-nonprinting" - # requirement in 'test-init.sh'. - cat stdout | grep "TOTAL.*:" - cat stdout | grep "PASS.*:" - cat stdout | grep "FAIL.*:" - cat stdout | grep "SKIP.*:" - cat stdout | grep "XFAIL.*:" - cat stdout | grep "XPASS.*:" - cat stdout | grep "ERROR.*:" - cat stdout | grep 'test.*expected' - cat stdout | grep 'test.*not run' - cat stdout | grep '====' - cat stdout | grep '[Ss]ee .*test-suite\.log' - cat stdout | grep '[Tt]estsuite summary' - ) | grep "$esc" && exit 1 - : For shells with broken 'set -e' - else - cat stdout | grep "$esc" && exit 1 - : For shells with broken 'set -e' - fi + # Not a useless use of cat; see above comments "grep-nonprinting" + # requirement in 'test-init.sh'. + cat stdout | grep "$esc" && exit 1 + : } for vpath in false :; do |