As t/README says, put all code inside test_expect_success and
other assertions. This script is written in old style,where there are
some executable lines outside test_expect_success. Put the executable
lines inside the test_expect_success.
As t/README says,use "<<-" instead of "<<"
to strip leading TABs used for indentation. Change the "<<" to "<<-"
for example:
-cat >test-patch <<\EOF
-diff a/file b/file
test_expect_success 'apply at the beginning' '
+ cat >test-patch <<-\EOF
+ diff a/file b/file
+ --- a/file
As t/README says,chain test assertions.Chain this test assertions
with &&.
For example:
-cat >test-patch <<\EOF
-diff --git a/file b/file
+ cat >test-patch <<-\EOF &&
+ diff --git a/file b/file
This script is written in old style,where there are something like
echo x >file &&
echo y >>file &&
echo z >>file
Change it to this stlye :
{
echo x &&
echo y &&
echo z
} >file
In order to escape for executable lines inside the test_expect_success.
Change ' in executable lines to '\'' in order to escape.
Signed-off-by: Shuqi Liang <cheskaqiqi@xxxxxxxxx>
---
t/t4113-apply-ending.sh | 61 ++++++++++++++++++++---------------------
1 file changed, 30 insertions(+), 31 deletions(-)
diff --git a/t/t4113-apply-ending.sh b/t/t4113-apply-ending.sh
index a470c9ce7b..c70429bd07 100755
--- a/t/t4113-apply-ending.sh
+++ b/t/t4113-apply-ending.sh
@@ -8,46 +8,45 @@ test_description='git apply trying to add an ending line.
'
. ./test-lib.sh
-# setup
-
-cat >test-patch <<\EOF
-diff --git a/file b/file
---- a/file
-+++ b/file
-@@ -1,2 +1,3 @@
- a
- b
-+c
-EOF
-
-echo 'a' >file
-echo 'b' >>file
-echo 'c' >>file
-
test_expect_success setup '
+ cat >test-patch <<-\EOF &&
+ diff --git a/file b/file
+ --- a/file
+ +++ b/file
+ @@ -1,2 +1,3 @@
+ a
+ b
+ +c
+ EOF
+
+ {
+ echo '\''a'\'' &&
+ echo '\''b'\'' &&
+ echo '\''c'\''
+ } >file &&
git update-index --add file
'
-# test
test_expect_success 'apply at the end' '
test_must_fail git apply --index test-patch
'
-cat >test-patch <<\EOF
-diff a/file b/file
---- a/file
-+++ b/file
-@@ -1,2 +1,3 @@
-+a
- b
- c
-EOF
-
-echo >file 'a
-b
-c'
-git update-index file
test_expect_success 'apply at the beginning' '
+ cat >test-patch <<-\EOF &&
+ diff a/file b/file
+ --- a/file
+ +++ b/file
+ @@ -1,2 +1,3 @@
+ +a
+ b
+ c
+ EOF
+
+ echo >file '\''a
+ b
+ c'\'' &&
+ git update-index file &&
test_must_fail git apply --index test-patch
'
+
test_done
--
2.39.0
