From fdda1ac62d7b2adba3d443ab8051a6accfe160df Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Wed, 19 Jun 2019 14:05:57 -0700 Subject: 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 0276d14..1f759b0 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 -- cgit v0.10.2-6-g49f6