From: Johannes Sixt Date: Thu, 22 Jul 2010 08:13:33 +0000 (+0200) Subject: t3700-add: fix dependence on stdout and stderr buffering X-Git-Tag: v1.7.2.1~11 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c1e02b2b383a6cd29353067c942384028745314c;p=git.git t3700-add: fix dependence on stdout and stderr buffering One test case checked the stdout and stderr of 'git add' by constructing a single 'expect' file that contained both streams. But when the command runs, the order of stdout and stderr output is unpredictable because it depends on how the streams are buffered. At least on Windows, the buffering is different from what the test case expected. Hence, check the two output texts separately. Signed-off-by: Johannes Sixt Acked-by: Jens Lehmann Signed-off-by: Junio C Hamano --- diff --git a/t/t3700-add.sh b/t/t3700-add.sh index d03495dc7..7d7140db3 100755 --- a/t/t3700-add.sh +++ b/t/t3700-add.sh @@ -272,17 +272,20 @@ test_expect_success 'git add --dry-run of non-existing file' " echo \"fatal: pathspec 'ignored-file' did not match any files\" | test_cmp - actual " -cat >expect <expect.err <<\EOF The following paths are ignored by one of your .gitignore files: ignored-file Use -f if you really want to add them. fatal: no files added +EOF +cat >expect.out <<\EOF add 'track-this' EOF test_expect_success 'git add --dry-run --ignore-missing of non-existing file' ' - test_must_fail git add --dry-run --ignore-missing track-this ignored-file >actual 2>&1 && - test_cmp expect actual + test_must_fail git add --dry-run --ignore-missing track-this ignored-file >actual.out 2>actual.err && + test_cmp expect.out actual.out && + test_cmp expect.err actual.err ' test_done