{"thread":{"id":"1683","subject":"[PATCH 9/9] New git-apply test cases for scanning forwards and backwards.","startedAt":"2005-08-28T15:25:06Z","lastAt":"2005-08-28T15:25:10Z","messageCount":2,"participants":["Robert Fitzsimons"],"isPatch":true,"patchVersion":1,"patchTotal":9},"messages":[{"id":"7873","messageId":"11252427062184-git-send-email-robfitz@273k.net","threadId":"1683","inReplyTo":"11252426961236-git-send-email-robfitz@273k.net","subject":"[PATCH 8/9] New git-apply test cases for patches with mulitple fragments.","fromName":"Robert Fitzsimons","fromEmail":"robfitz@273k.net","sentAt":"2005-08-28T15:25:06Z","receivedAt":"2005-08-28T15:25:06Z","isPatch":true,"sender":{"key":"robfitz@273k.net","avatar":null},"body":"Added a test case for patches with multiple fragments.\n\nSigned-off-by: Robert Fitzsimons <robfitz@273k.net>\n\n---\n\n t/t4109-apply-multifrag.sh |  176 ++++++++++++++++++++++++++++++++++++++++++++\n 1 files changed, 176 insertions(+), 0 deletions(-)\n create mode 100644 t/t4109-apply-multifrag.sh\n\n28b46271270ad79ba8720a3fde1f40724493fdfe\ndiff --git a/t/t4109-apply-multifrag.sh b/t/t4109-apply-multifrag.sh\nnew file mode 100644\n--- /dev/null\n+++ b/t/t4109-apply-multifrag.sh\n@@ -0,0 +1,176 @@\n+#!/bin/sh\n+#\n+# Copyright (c) 2005 Junio C Hamano\n+# Copyright (c) 2005 Robert Fitzsimons\n+#\n+\n+test_description='git-apply test patches with multiple fragments.\n+\n+'\n+. ./test-lib.sh\n+\n+# setup\n+\n+cat > patch1.patch <<\\EOF\n+diff --git a/main.c b/main.c\n+new file mode 100644\n+--- /dev/null\n++++ b/main.c\n+@@ -0,0 +1,23 @@\n++#include <stdio.h>\n++\n++int func(int num);\n++void print_int(int num);\n++\n++int main() {\n++\tint i;\n++\n++\tfor (i = 0; i < 10; i++) {\n++\t\tprint_int(func(i));\n++\t}\n++\n++\treturn 0;\n++}\n++\n++int func(int num) {\n++\treturn num * num;\n++}\n++\n++void print_int(int num) {\n++\tprintf(\"%d\", num);\n++}\n++\n+EOF\n+cat > patch2.patch <<\\EOF\n+diff --git a/main.c b/main.c\n+--- a/main.c\n++++ b/main.c\n+@@ -1,7 +1,9 @@\n++#include <stdlib.h>\n+ #include <stdio.h>\n+ \n+ int func(int num);\n+ void print_int(int num);\n++void print_ln();\n+ \n+ int main() {\n+ \tint i;\n+@@ -10,6 +12,8 @@\n+ \t\tprint_int(func(i));\n+ \t}\n+ \n++\tprint_ln();\n++\n+ \treturn 0;\n+ }\n+ \n+@@ -21,3 +25,7 @@\n+ \tprintf(\"%d\", num);\n+ }\n+ \n++void print_ln() {\n++\tprintf(\"\\n\");\n++}\n++\n+EOF\n+cat > patch3.patch <<\\EOF\n+diff --git a/main.c b/main.c\n+--- a/main.c\n++++ b/main.c\n+@@ -1,9 +1,7 @@\n+-#include <stdlib.h>\n+ #include <stdio.h>\n+ \n+ int func(int num);\n+ void print_int(int num);\n+-void print_ln();\n+ \n+ int main() {\n+ \tint i;\n+@@ -12,8 +10,6 @@\n+ \t\tprint_int(func(i));\n+ \t}\n+ \n+-\tprint_ln();\n+-\n+ \treturn 0;\n+ }\n+ \n+@@ -25,7 +21,3 @@\n+ \tprintf(\"%d\", num);\n+ }\n+ \n+-void print_ln() {\n+-\tprintf(\"\\n\");\n+-}\n+-\n+EOF\n+cat > patch4.patch <<\\EOF\n+diff --git a/main.c b/main.c\n+--- a/main.c\n++++ b/main.c\n+@@ -1,13 +1,14 @@\n+ #include <stdio.h>\n+ \n+ int func(int num);\n+-void print_int(int num);\n++int func2(int num);\n+ \n+ int main() {\n+ \tint i;\n+ \n+ \tfor (i = 0; i < 10; i++) {\n+-\t\tprint_int(func(i));\n++\t\tprintf(\"%d\", func(i));\n++\t\tprintf(\"%d\", func3(i));\n+ \t}\n+ \n+ \treturn 0;\n+@@ -17,7 +18,7 @@\n+ \treturn num * num;\n+ }\n+ \n+-void print_int(int num) {\n+-\tprintf(\"%d\", num);\n++int func2(int num) {\n++\treturn num * num * num;\n+ }\n+ \n+EOF\n+\n+test_expect_success \"S = git-apply (1)\" \\\n+    'git-apply patch1.patch patch2.patch'\n+mv main.c main.c.git\n+\n+test_expect_success \"S = patch (1)\" \\\n+    'cat patch1.patch patch2.patch | patch -p1'\n+\n+test_expect_success \"S = cmp (1)\" \\\n+    'cmp main.c.git main.c'\n+\n+rm -f main.c main.c.git\n+\n+test_expect_success \"S = git-apply (2)\" \\\n+    'git-apply patch1.patch patch2.patch patch3.patch'\n+mv main.c main.c.git\n+\n+test_expect_success \"S = patch (2)\" \\\n+    'cat patch1.patch patch2.patch patch3.patch | patch -p1'\n+\n+test_expect_success \"S = cmp (2)\" \\\n+    'cmp main.c.git main.c'\n+\n+rm -f main.c main.c.git\n+\n+test_expect_success \"S = git-apply (3)\" \\\n+    'git-apply patch1.patch patch4.patch'\n+mv main.c main.c.git\n+\n+test_expect_success \"S = patch (3)\" \\\n+    'cat patch1.patch patch4.patch | patch -p1'\n+\n+test_expect_success \"S = cmp (3)\" \\\n+    'cmp main.c.git main.c'\n+\n+test_done\n+\n"},{"id":"7871","messageId":"1125242710834-git-send-email-robfitz@273k.net","threadId":"1683","inReplyTo":"11252427062184-git-send-email-robfitz@273k.net","subject":"[PATCH 9/9] New git-apply test cases for scanning forwards and backwards.","fromName":"Robert Fitzsimons","fromEmail":"robfitz@273k.net","sentAt":"2005-08-28T15:25:10Z","receivedAt":"2005-08-28T15:25:10Z","isPatch":true,"sender":{"key":"robfitz@273k.net","avatar":null},"body":"Added a new test case for the scanning forwards and backwards for the\ncorrect location to apply a patch fragment.\n\nSigned-off-by: Robert Fitzsimons <robfitz@273k.net>\n\n---\n\n t/t4110-apply-scan.sh |  101 +++++++++++++++++++++++++++++++++++++++++++++++++\n 1 files changed, 101 insertions(+), 0 deletions(-)\n create mode 100644 t/t4110-apply-scan.sh\n\n51e9797ee16edc9d6164f2c7afaf1f8245538255\ndiff --git a/t/t4110-apply-scan.sh b/t/t4110-apply-scan.sh\nnew file mode 100644\n--- /dev/null\n+++ b/t/t4110-apply-scan.sh\n@@ -0,0 +1,101 @@\n+#!/bin/sh\n+#\n+# Copyright (c) 2005 Junio C Hamano\n+# Copyright (c) 2005 Robert Fitzsimons\n+#\n+\n+test_description='git-apply test for patches which require scanning forwards and backwards.\n+\n+'\n+. ./test-lib.sh\n+\n+# setup\n+\n+cat > patch1.patch <<\\EOF\n+diff --git a/new.txt b/new.txt\n+new file mode 100644\n+--- /dev/null\n++++ b/new.txt\n+@@ -0,0 +1,12 @@\n++a1\n++a11\n++a111\n++a1111\n++b1\n++b11\n++b111\n++b1111\n++c1\n++c11\n++c111\n++c1111\n+EOF\n+cat > patch2.patch <<\\EOF\n+diff --git a/new.txt b/new.txt\n+--- a/new.txt\n++++ b/new.txt\n+@@ -1,7 +1,3 @@\n+-a1\n+-a11\n+-a111\n+-a1111\n+ b1\n+ b11\n+ b111\n+EOF\n+cat > patch3.patch <<\\EOF\n+diff --git a/new.txt b/new.txt\n+--- a/new.txt\n++++ b/new.txt\n+@@ -6,6 +6,10 @@\n+ b11\n+ b111\n+ b1111\n++b2\n++b22\n++b222\n++b2222\n+ c1\n+ c11\n+ c111\n+EOF\n+cat > patch4.patch <<\\EOF\n+diff --git a/new.txt b/new.txt\n+--- a/new.txt\n++++ b/new.txt\n+@@ -1,3 +1,7 @@\n++a1\n++a11\n++a111\n++a1111\n+ b1\n+ b11\n+ b111\n+EOF\n+cat > patch5.patch <<\\EOF\n+diff --git a/new.txt b/new.txt\n+--- a/new.txt\n++++ b/new.txt\n+@@ -10,3 +10,7 @@\n+ c11\n+ c111\n+ c1111\n++c2\n++c22\n++c222\n++c2222\n+EOF\n+\n+test_expect_success \"S = git-apply scan\" \\\n+    'git-apply patch1.patch patch2.patch patch3.patch patch4.patch patch5.patch'\n+mv new.txt apply.txt\n+\n+test_expect_success \"S = patch scan\" \\\n+    'cat patch1.patch patch2.patch patch3.patch patch4.patch patch5.patch | patch'\n+mv new.txt patch.txt\n+\n+test_expect_success \"S = cmp\" \\\n+    'cmp apply.txt patch.txt'\n+\n+test_done\n+\n"}]}