diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-02-18 00:22:18 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-02-18 00:22:18 +0300 |
| commit | 636505860586ac018f2a197fc40adb4bfcfed8b0 (patch) | |
| tree | 09d4854f2805d07b942ddd7461ab3b6b5b2cea7d /t | |
| parent | 966b69f02f3e6016303f3cf6fcd5e741d376caf6 (diff) | |
| parent | de26f02db1b3296fc48e04755301171cf23062a0 (diff) | |
Merge branch 'js/test-avoid-pipe'
Test clean-up.
* js/test-avoid-pipe:
t9001, t9116: avoid pipes
Diffstat (limited to 't')
| -rwxr-xr-x | t/t9001-send-email.sh | 4 | ||||
| -rwxr-xr-x | t/t9116-git-svn-log.sh | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index a834afab4d..90f61c3400 100755 --- a/t/t9001-send-email.sh +++ b/t/t9001-send-email.sh @@ -1194,8 +1194,8 @@ test_expect_success $PREREQ 'in-reply-to but no threading' ' --to=nobody@example.com \ --in-reply-to="<in-reply-id@example.com>" \ --no-thread \ - $patches | - grep "In-Reply-To: <in-reply-id@example.com>" + $patches >out && + grep "In-Reply-To: <in-reply-id@example.com>" out ' test_expect_success $PREREQ 'no in-reply-to and no threading' ' diff --git a/t/t9116-git-svn-log.sh b/t/t9116-git-svn-log.sh index 45773ee560..0a9f1ef366 100755 --- a/t/t9116-git-svn-log.sh +++ b/t/t9116-git-svn-log.sh @@ -43,14 +43,18 @@ test_expect_success 'setup repository and import' ' test_expect_success 'run log' " git reset --hard origin/a && - git svn log -r2 origin/trunk | grep ^r2 && - git svn log -r4 origin/trunk | grep ^r4 && - git svn log -r3 | grep ^r3 + git svn log -r2 origin/trunk >out && + grep ^r2 out && + git svn log -r4 origin/trunk >out && + grep ^r4 out && + git svn log -r3 >out && + grep ^r3 out " test_expect_success 'run log against a from trunk' " git reset --hard origin/trunk && - git svn log -r3 origin/a | grep ^r3 + git svn log -r3 origin/a >out && + grep ^r3 out " printf 'r1 \nr2 \nr4 \n' > expected-range-r1-r2-r4 |