aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-11-25 14:11:39 -0800
committerJunio C Hamano <gitster@pobox.com>2014-11-25 14:11:39 -0800
commitaca56064f4eebe2ba46a55908b5cfa3b4ffa6785 (patch)
tree307b88c981e453047f30c2a75b0f23cdcf9ca7b8
parent8d8140843501107c92e2f9a5acb60ee136352c1f (diff)
downloadgit-aca56064f4eebe2ba46a55908b5cfa3b4ffa6785.tar.gz
git-aca56064f4eebe2ba46a55908b5cfa3b4ffa6785.tar.xz
t9001: style modernisation phase #1
Don't chop test_expect_success line into pieces and concatenate with '\'. That's so 2005. Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t9001-send-email.sh34
1 files changed, 17 insertions, 17 deletions
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index e5016f457..bfe2339fd 100755
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -6,16 +6,15 @@ test_description='git send-email'
# May be altered later in the test
PREREQ="PERL"
-test_expect_success $PREREQ \
- 'prepare reference tree' \
- 'echo "1A quick brown fox jumps over the" >file &&
+test_expect_success $PREREQ 'prepare reference tree' '
+ echo "1A quick brown fox jumps over the" >file &&
echo "lazy dog" >>file &&
git add file &&
- GIT_AUTHOR_NAME="A" git commit -a -m "Initial."'
+ GIT_AUTHOR_NAME="A" git commit -a -m "Initial."
+'
-test_expect_success $PREREQ \
- 'Setup helper tool' \
- '(echo "#!$SHELL_PATH"
+test_expect_success $PREREQ 'Setup helper tool' '
+ (echo "#!$SHELL_PATH"
echo shift
echo output=1
echo "while test -f commandline\$output; do output=\$((\$output+1)); done"
@@ -27,7 +26,8 @@ test_expect_success $PREREQ \
) >fake.sendmail &&
chmod +x ./fake.sendmail &&
git add fake.sendmail &&
- GIT_AUTHOR_NAME="A" git commit -a -m "Second."'
+ GIT_AUTHOR_NAME="A" git commit -a -m "Second."
+'
clean_fake_sendmail() {
rm -f commandline* msgtxt*
@@ -94,9 +94,9 @@ cat >expected <<\EOF
EOF
'
-test_expect_success $PREREQ \
- 'Verify commandline' \
- 'test_cmp expected commandline1'
+test_expect_success $PREREQ 'Verify commandline' '
+ test_cmp expected commandline1
+'
test_expect_success $PREREQ 'Send patches with --envelope-sender' '
clean_fake_sendmail &&
@@ -114,9 +114,9 @@ cat >expected <<\EOF
EOF
'
-test_expect_success $PREREQ \
- 'Verify commandline' \
- 'test_cmp expected commandline1'
+test_expect_success $PREREQ 'Verify commandline' '
+ test_cmp expected commandline1
+'
test_expect_success $PREREQ 'Send patches with --envelope-sender=auto' '
clean_fake_sendmail &&
@@ -134,9 +134,9 @@ cat >expected <<\EOF
EOF
'
-test_expect_success $PREREQ \
- 'Verify commandline' \
- 'test_cmp expected commandline1'
+test_expect_success $PREREQ 'Verify commandline' '
+ test_cmp expected commandline1
+'
test_expect_success $PREREQ 'setup expect' "
cat >expected-show-all-headers <<\EOF