Commit ed2ff8b9f919f8d0e18e69b038e965924454da58
2022-07-02T19:30:36
augment test_patch_add_line Try to create a file with more than one line, it would have catched an issue with my wip diff for ignore whitespaces in got patch. While here rename the function to drop "simple".
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48
diff --git a/regress/cmdline/patch.sh b/regress/cmdline/patch.sh
index 40309e5..1dd9306 100755
--- a/regress/cmdline/patch.sh
+++ b/regress/cmdline/patch.sh
@@ -16,8 +16,8 @@
. ./common.sh
-test_patch_simple_add_file() {
- local testroot=`test_init patch_simple_add_file`
+test_patch_add_file() {
+ local testroot=`test_init patch_add_file`
got checkout $testroot/repo $testroot/wt > /dev/null
ret=$?
@@ -29,8 +29,12 @@ test_patch_simple_add_file() {
cat <<EOF > $testroot/wt/patch
--- /dev/null
+++ eta
-@@ -0,0 +1 @@
-+eta
+@@ -0,0 +5,5 @@
++1
++2
++3
++4
++5
EOF
(cd $testroot/wt && got patch patch) > $testroot/stdout
@@ -49,7 +53,7 @@ EOF
return 1
fi
- echo eta > $testroot/wt/eta.expected
+ jot 5 > $testroot/wt/eta.expected
cmp -s $testroot/wt/eta.expected $testroot/wt/eta
ret=$?
if [ $ret -ne 0 ]; then
@@ -1778,7 +1782,7 @@ EOF
}
test_parseargs "$@"
-run_test test_patch_simple_add_file
+run_test test_patch_add_file
run_test test_patch_simple_rm_file
run_test test_patch_simple_edit_file
run_test test_patch_prepend_line