From: Johannes Schindelin Date: Wed, 19 Jun 2019 21:05:57 +0000 (-0700) Subject: t0001 (mingw): do not expect a specific order of stdout/stderr X-Git-Tag: v2.23.0-rc0~58^2~17 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fdda1ac62d7b2adba3d443ab8051a6accfe160df;p=thirdparty%2Fgit.git t0001 (mingw): do not expect a specific order of stdout/stderr When redirecting stdout/stderr to the same file, we cannot guarantee that stdout will come first. In fact, in this test case, it seems that an MSVC build always prints stderr first. In any case, this test case does not want to verify the *order* but the *presence* of both outputs, so let's test exactly that. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- diff --git a/t/t0001-init.sh b/t/t0001-init.sh index 0276d14a0b..1f759b08f2 100755 --- a/t/t0001-init.sh +++ b/t/t0001-init.sh @@ -473,8 +473,8 @@ test_expect_success MINGW 'redirect std handles' ' GIT_REDIRECT_STDOUT=output.txt \ GIT_REDIRECT_STDERR="2>&1" \ git rev-parse --git-dir --verify refs/invalid && - printf ".git\nfatal: Needed a single revision\n" >expect && - test_cmp expect output.txt + grep "^\\.git\$" output.txt && + grep "Needed a single revision" output.txt ' test_done