Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(279)

Side by Side Diff: Tools/Scripts/webkitperl/VCSUtils_unittest/parseDiff.pl

Issue 20652002: Fix trailing whitespace in scripts and misc. files (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Don't change literal diff. Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 #!/usr/bin/perl -w 1 #!/usr/bin/perl -w
2 # 2 #
3 # Copyright (C) 2010 Chris Jerdonek (chris.jerdonek@gmail.com) 3 # Copyright (C) 2010 Chris Jerdonek (chris.jerdonek@gmail.com)
4 # 4 #
5 # Redistribution and use in source and binary forms, with or without 5 # Redistribution and use in source and binary forms, with or without
6 # modification, are permitted provided that the following conditions 6 # modification, are permitted provided that the following conditions
7 # are met: 7 # are met:
8 # 1. Redistributions of source code must retain the above copyright 8 # 1. Redistributions of source code must retain the above copyright
9 # notice, this list of conditions and the following disclaimer. 9 # notice, this list of conditions and the following disclaimer.
10 # 2. Redistributions in binary form must reproduce the above copyright 10 # 2. Redistributions in binary form must reproduce the above copyright
11 # notice, this list of conditions and the following disclaimer in the 11 # notice, this list of conditions and the following disclaimer in the
12 # documentation and/or other materials provided with the distribution. 12 # documentation and/or other materials provided with the distribution.
13 # 13 #
14 # THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY 14 # THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
15 # EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 15 # EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
16 # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 16 # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
17 # DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY 17 # DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
18 # DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 18 # DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
19 # (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 19 # (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
20 # LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 20 # LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
21 # ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 # ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 22 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
23 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
(...skipping 12 matching lines...) Expand all
36 # New test 36 # New test
37 diffName => "SVN: simple", 37 diffName => "SVN: simple",
38 inputText => <<'END', 38 inputText => <<'END',
39 Index: Makefile 39 Index: Makefile
40 =================================================================== 40 ===================================================================
41 --- Makefile (revision 53052) 41 --- Makefile (revision 53052)
42 +++ Makefile (working copy) 42 +++ Makefile (working copy)
43 @@ -1,3 +1,4 @@ 43 @@ -1,3 +1,4 @@
44 + 44 +
45 MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKitTools 45 MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKitTools
46 46
47 all: 47 all:
48 END 48 END
49 expectedReturn => [ 49 expectedReturn => [
50 [{ 50 [{
51 svnConvertedText => <<'END', # Same as input text 51 svnConvertedText => <<'END', # Same as input text
52 Index: Makefile 52 Index: Makefile
53 =================================================================== 53 ===================================================================
54 --- Makefile (revision 53052) 54 --- Makefile (revision 53052)
55 +++ Makefile (working copy) 55 +++ Makefile (working copy)
56 @@ -1,3 +1,4 @@ 56 @@ -1,3 +1,4 @@
57 + 57 +
58 MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKitTools 58 MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKitTools
59 59
60 all: 60 all:
61 END 61 END
62 indexPath => "Makefile", 62 indexPath => "Makefile",
63 isSvn => 1, 63 isSvn => 1,
64 numTextChunks => 1, 64 numTextChunks => 1,
65 sourceRevision => "53052", 65 sourceRevision => "53052",
66 }], 66 }],
67 undef], 67 undef],
68 expectedNextLine => undef, 68 expectedNextLine => undef,
69 }, 69 },
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 148
149 LEADING JUNK 149 LEADING JUNK
150 150
151 Index: Makefile 151 Index: Makefile
152 =================================================================== 152 ===================================================================
153 --- Makefile (revision 53052) 153 --- Makefile (revision 53052)
154 +++ Makefile (working copy) 154 +++ Makefile (working copy)
155 @@ -1,3 +1,4 @@ 155 @@ -1,3 +1,4 @@
156 + 156 +
157 MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKitTools 157 MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKitTools
158 158
159 all: 159 all:
160 END 160 END
161 expectedReturn => [ 161 expectedReturn => [
162 [{ 162 [{
163 svnConvertedText => <<'END', # Same as input text 163 svnConvertedText => <<'END', # Same as input text
164 164
165 LEADING JUNK 165 LEADING JUNK
166 166
167 Index: Makefile 167 Index: Makefile
168 =================================================================== 168 ===================================================================
169 --- Makefile (revision 53052) 169 --- Makefile (revision 53052)
170 +++ Makefile (working copy) 170 +++ Makefile (working copy)
171 @@ -1,3 +1,4 @@ 171 @@ -1,3 +1,4 @@
172 + 172 +
173 MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKitTools 173 MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKitTools
174 174
175 all: 175 all:
176 END 176 END
177 indexPath => "Makefile", 177 indexPath => "Makefile",
178 isSvn => 1, 178 isSvn => 1,
179 numTextChunks => 1, 179 numTextChunks => 1,
180 sourceRevision => "53052", 180 sourceRevision => "53052",
181 }], 181 }],
182 undef], 182 undef],
183 expectedNextLine => undef, 183 expectedNextLine => undef,
184 }, 184 },
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 { 279 {
280 # New test 280 # New test
281 diffName => "SVN: file change diff with property change diff", 281 diffName => "SVN: file change diff with property change diff",
282 inputText => <<'END', 282 inputText => <<'END',
283 Index: Makefile 283 Index: Makefile
284 =================================================================== 284 ===================================================================
285 --- Makefile (revision 60021) 285 --- Makefile (revision 60021)
286 +++ Makefile (working copy) 286 +++ Makefile (working copy)
287 @@ -1,3 +1,4 @@ 287 @@ -1,3 +1,4 @@
288 + 288 +
289 MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKit2 WebKitTools 289 MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKit2 WebKitTools
290 290
291 all: 291 all:
292 292
293 Property changes on: Makefile 293 Property changes on: Makefile
294 ___________________________________________________________________ 294 ___________________________________________________________________
295 Name: svn:executable 295 Name: svn:executable
296 + * 296 + *
297 END 297 END
298 expectedReturn => [ 298 expectedReturn => [
299 [{ 299 [{
300 svnConvertedText => <<'END', # Same as input text 300 svnConvertedText => <<'END', # Same as input text
301 Index: Makefile 301 Index: Makefile
302 =================================================================== 302 ===================================================================
303 --- Makefile (revision 60021) 303 --- Makefile (revision 60021)
304 +++ Makefile (working copy) 304 +++ Makefile (working copy)
305 @@ -1,3 +1,4 @@ 305 @@ -1,3 +1,4 @@
306 + 306 +
307 MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKit2 WebKitTools 307 MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKit2 WebKitTools
308 308
309 all: 309 all:
310 310
311 END 311 END
312 executableBitDelta => 1, 312 executableBitDelta => 1,
313 indexPath => "Makefile", 313 indexPath => "Makefile",
314 isSvn => 1, 314 isSvn => 1,
315 numTextChunks => 1, 315 numTextChunks => 1,
316 sourceRevision => "60021", 316 sourceRevision => "60021",
317 }], 317 }],
318 undef], 318 undef],
319 expectedNextLine => undef, 319 expectedNextLine => undef,
320 }, 320 },
321 { 321 {
322 # New test 322 # New test
323 diffName => "SVN: file change diff, followed by property change diff on diff erent file", 323 diffName => "SVN: file change diff, followed by property change diff on diff erent file",
324 inputText => <<'END', 324 inputText => <<'END',
325 Index: Makefile 325 Index: Makefile
326 =================================================================== 326 ===================================================================
327 --- Makefile (revision 60021) 327 --- Makefile (revision 60021)
328 +++ Makefile (working copy) 328 +++ Makefile (working copy)
329 @@ -1,3 +1,4 @@ 329 @@ -1,3 +1,4 @@
330 + 330 +
331 MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKit2 WebKitTools 331 MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKit2 WebKitTools
332 332
333 all: 333 all:
334 334
335 Property changes on: Makefile.shared 335 Property changes on: Makefile.shared
336 ___________________________________________________________________ 336 ___________________________________________________________________
337 Name: svn:executable 337 Name: svn:executable
338 + * 338 + *
339 END 339 END
340 expectedReturn => [ 340 expectedReturn => [
341 [{ 341 [{
342 svnConvertedText => <<'END', # Same as input text 342 svnConvertedText => <<'END', # Same as input text
343 Index: Makefile 343 Index: Makefile
344 =================================================================== 344 ===================================================================
345 --- Makefile (revision 60021) 345 --- Makefile (revision 60021)
346 +++ Makefile (working copy) 346 +++ Makefile (working copy)
347 @@ -1,3 +1,4 @@ 347 @@ -1,3 +1,4 @@
348 + 348 +
349 MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKit2 WebKitTools 349 MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKit2 WebKitTools
350 350
351 all: 351 all:
352 352
353 END 353 END
354 indexPath => "Makefile", 354 indexPath => "Makefile",
355 isSvn => 1, 355 isSvn => 1,
356 numTextChunks => 1, 356 numTextChunks => 1,
357 sourceRevision => "60021", 357 sourceRevision => "60021",
358 }], 358 }],
359 "Property changes on: Makefile.shared\n"], 359 "Property changes on: Makefile.shared\n"],
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
416 }, 416 },
417 { 417 {
418 # New test 418 # New test
419 diffName => "SVN: copied file with property change", 419 diffName => "SVN: copied file with property change",
420 inputText => <<'END', 420 inputText => <<'END',
421 Index: NMakefile 421 Index: NMakefile
422 =================================================================== 422 ===================================================================
423 --- NMakefile (revision 60021) (from Makefile:60021) 423 --- NMakefile (revision 60021) (from Makefile:60021)
424 +++ NMakefile (working copy) 424 +++ NMakefile (working copy)
425 @@ -0,0 +1,1 @@ 425 @@ -0,0 +1,1 @@
426 +MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKit2 WebKitTools 426 +MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKit2 WebKitTools
427 427
428 Property changes on: NMakefile 428 Property changes on: NMakefile
429 ___________________________________________________________________ 429 ___________________________________________________________________
430 Added: svn:executable 430 Added: svn:executable
431 + * 431 + *
432 END 432 END
433 expectedReturn => [ 433 expectedReturn => [
434 [{ 434 [{
435 copiedFromPath => "Makefile", 435 copiedFromPath => "Makefile",
436 executableBitDelta => 1, 436 executableBitDelta => 1,
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
674 674
675 675
676 Q1dTBx0AAAB42itg4GlgYJjGwMDDyODMxMDw34GBgQEAJPQDJA== 676 Q1dTBx0AAAB42itg4GlgYJjGwMDDyODMxMDw34GBgQEAJPQDJA==
677 677
678 Index: Makefile 678 Index: Makefile
679 =================================================================== 679 ===================================================================
680 --- Makefile (revision 60021) 680 --- Makefile (revision 60021)
681 +++ Makefile (working copy) 681 +++ Makefile (working copy)
682 @@ -1,3 +1,4 @@ 682 @@ -1,3 +1,4 @@
683 + 683 +
684 MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKit2 WebKitTools 684 MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKit2 WebKitTools
685 685
686 all: 686 all:
687 END 687 END
688 expectedReturn => [ 688 expectedReturn => [
689 [{ 689 [{
690 svnConvertedText => <<'END', # Same as input text 690 svnConvertedText => <<'END', # Same as input text
691 Index: test_file.swf 691 Index: test_file.swf
692 =================================================================== 692 ===================================================================
693 Cannot display: file marked as a binary type. 693 Cannot display: file marked as a binary type.
694 svn:mime-type = application/octet-stream 694 svn:mime-type = application/octet-stream
(...skipping 26 matching lines...) Expand all
721 721
722 722
723 Q1dTBx0AAAB42itg4GlgYJjGwMDDyODMxMDw34GBgQEAJPQDJA== 723 Q1dTBx0AAAB42itg4GlgYJjGwMDDyODMxMDw34GBgQEAJPQDJA==
724 724
725 Index: Makefile 725 Index: Makefile
726 =================================================================== 726 ===================================================================
727 --- Makefile (revision 60021) 727 --- Makefile (revision 60021)
728 +++ Makefile (working copy) 728 +++ Makefile (working copy)
729 @@ -1,3 +1,4 @@ 729 @@ -1,3 +1,4 @@
730 + 730 +
731 MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKit2 WebKitTools 731 MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKit2 WebKitTools
732 732
733 all: 733 all:
734 END 734 END
735 ), 735 ),
736 expectedReturn => [ 736 expectedReturn => [
737 [{ 737 [{
738 svnConvertedText => toWindowsLineEndings(<<'END', # Same as input text 738 svnConvertedText => toWindowsLineEndings(<<'END', # Same as input text
739 Index: test_file.swf 739 Index: test_file.swf
740 =================================================================== 740 ===================================================================
741 Cannot display: file marked as a binary type. 741 Cannot display: file marked as a binary type.
(...skipping 18 matching lines...) Expand all
760 { 760 {
761 # New test 761 # New test
762 diffName => "SVN: file change diff with property change, followed by propert y change diff", 762 diffName => "SVN: file change diff with property change, followed by propert y change diff",
763 inputText => <<'END', 763 inputText => <<'END',
764 Index: Makefile 764 Index: Makefile
765 =================================================================== 765 ===================================================================
766 --- Makefile (revision 60021) 766 --- Makefile (revision 60021)
767 +++ Makefile (working copy) 767 +++ Makefile (working copy)
768 @@ -1,3 +1,4 @@ 768 @@ -1,3 +1,4 @@
769 + 769 +
770 MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKit2 WebKitTools 770 MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKit2 WebKitTools
771 771
772 all: 772 all:
773 773
774 Property changes on: Makefile 774 Property changes on: Makefile
775 ___________________________________________________________________ 775 ___________________________________________________________________
776 Added: svn:executable 776 Added: svn:executable
777 + * 777 + *
778 778
779 779
780 Property changes on: Makefile.shared 780 Property changes on: Makefile.shared
781 ___________________________________________________________________ 781 ___________________________________________________________________
782 Deleted: svn:executable 782 Deleted: svn:executable
783 - * 783 - *
784 END 784 END
785 expectedReturn => [ 785 expectedReturn => [
786 [{ 786 [{
787 svnConvertedText => <<'END', # Same as input text 787 svnConvertedText => <<'END', # Same as input text
788 Index: Makefile 788 Index: Makefile
789 =================================================================== 789 ===================================================================
790 --- Makefile (revision 60021) 790 --- Makefile (revision 60021)
791 +++ Makefile (working copy) 791 +++ Makefile (working copy)
792 @@ -1,3 +1,4 @@ 792 @@ -1,3 +1,4 @@
793 + 793 +
794 MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKit2 WebKitTools 794 MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKit2 WebKitTools
795 795
796 all: 796 all:
797 797
798 798
799 799
800 END 800 END
801 executableBitDelta => 1, 801 executableBitDelta => 1,
802 indexPath => "Makefile", 802 indexPath => "Makefile",
803 isSvn => 1, 803 isSvn => 1,
804 numTextChunks => 1, 804 numTextChunks => 1,
805 sourceRevision => "60021", 805 sourceRevision => "60021",
806 }], 806 }],
807 "Property changes on: Makefile.shared\n"], 807 "Property changes on: Makefile.shared\n"],
808 expectedNextLine => "_______________________________________________________ ____________\n", 808 expectedNextLine => "_______________________________________________________ ____________\n",
809 }, 809 },
810 { 810 {
811 # New test 811 # New test
812 diffName => "SVN: file change diff with property change, followed by propert y change diff using Windows line endings", 812 diffName => "SVN: file change diff with property change, followed by propert y change diff using Windows line endings",
813 inputText => toWindowsLineEndings(<<'END', 813 inputText => toWindowsLineEndings(<<'END',
814 Index: Makefile 814 Index: Makefile
815 =================================================================== 815 ===================================================================
816 --- Makefile (revision 60021) 816 --- Makefile (revision 60021)
817 +++ Makefile (working copy) 817 +++ Makefile (working copy)
818 @@ -1,3 +1,4 @@ 818 @@ -1,3 +1,4 @@
819 + 819 +
820 MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKit2 WebKitTools 820 MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKit2 WebKitTools
821 821
822 all: 822 all:
823 823
824 Property changes on: Makefile 824 Property changes on: Makefile
825 ___________________________________________________________________ 825 ___________________________________________________________________
826 Added: svn:executable 826 Added: svn:executable
827 + * 827 + *
828 828
829 829
830 Property changes on: Makefile.shared 830 Property changes on: Makefile.shared
831 ___________________________________________________________________ 831 ___________________________________________________________________
832 Deleted: svn:executable 832 Deleted: svn:executable
833 - * 833 - *
834 END 834 END
835 ), 835 ),
836 expectedReturn => [ 836 expectedReturn => [
837 [{ 837 [{
838 svnConvertedText => toWindowsLineEndings(<<'END', # Same as input text 838 svnConvertedText => toWindowsLineEndings(<<'END', # Same as input text
839 Index: Makefile 839 Index: Makefile
840 =================================================================== 840 ===================================================================
841 --- Makefile (revision 60021) 841 --- Makefile (revision 60021)
842 +++ Makefile (working copy) 842 +++ Makefile (working copy)
843 @@ -1,3 +1,4 @@ 843 @@ -1,3 +1,4 @@
844 + 844 +
845 MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKit2 WebKitTools 845 MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKit2 WebKitTools
846 846
847 all: 847 all:
848 848
849 849
850 850
851 END 851 END
852 ), 852 ),
853 executableBitDelta => 1, 853 executableBitDelta => 1,
854 indexPath => "Makefile", 854 indexPath => "Makefile",
855 isSvn => 1, 855 isSvn => 1,
856 numTextChunks => 1, 856 numTextChunks => 1,
857 sourceRevision => "60021", 857 sourceRevision => "60021",
858 }], 858 }],
859 "Property changes on: Makefile.shared\r\n"], 859 "Property changes on: Makefile.shared\r\n"],
860 expectedNextLine => "_______________________________________________________ ____________\r\n", 860 expectedNextLine => "_______________________________________________________ ____________\r\n",
861 }, 861 },
862 { 862 {
863 # New test 863 # New test
864 diffName => "SVN: file change diff with property change, followed by file ch ange diff", 864 diffName => "SVN: file change diff with property change, followed by file ch ange diff",
865 inputText => <<'END', 865 inputText => <<'END',
866 Index: Makefile 866 Index: Makefile
867 =================================================================== 867 ===================================================================
868 --- Makefile (revision 60021) 868 --- Makefile (revision 60021)
869 +++ Makefile (working copy) 869 +++ Makefile (working copy)
870 @@ -1,3 +1,4 @@ 870 @@ -1,3 +1,4 @@
871 + 871 +
872 MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKit2 WebKitTools 872 MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKit2 WebKitTools
873 873
874 all: 874 all:
875 875
876 Property changes on: Makefile 876 Property changes on: Makefile
877 ___________________________________________________________________ 877 ___________________________________________________________________
878 Name: svn:executable 878 Name: svn:executable
879 - * 879 - *
880 880
881 Index: Makefile.shared 881 Index: Makefile.shared
882 =================================================================== 882 ===================================================================
883 --- Makefile.shared (revision 60021) 883 --- Makefile.shared (revision 60021)
884 +++ Makefile.shared (working copy) 884 +++ Makefile.shared (working copy)
885 @@ -1,3 +1,4 @@ 885 @@ -1,3 +1,4 @@
886 + 886 +
887 SCRIPTS_PATH ?= ../WebKitTools/Scripts 887 SCRIPTS_PATH ?= ../WebKitTools/Scripts
888 XCODE_OPTIONS = `perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString ()'` $(ARGS) 888 XCODE_OPTIONS = `perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString ()'` $(ARGS)
889 END 889 END
890 expectedReturn => [ 890 expectedReturn => [
891 [{ 891 [{
892 svnConvertedText => <<'END', # Same as input text 892 svnConvertedText => <<'END', # Same as input text
893 Index: Makefile 893 Index: Makefile
894 =================================================================== 894 ===================================================================
895 --- Makefile (revision 60021) 895 --- Makefile (revision 60021)
896 +++ Makefile (working copy) 896 +++ Makefile (working copy)
897 @@ -1,3 +1,4 @@ 897 @@ -1,3 +1,4 @@
898 + 898 +
899 MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKit2 WebKitTools 899 MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKit2 WebKitTools
900 900
901 all: 901 all:
902 902
903 903
904 END 904 END
905 executableBitDelta => -1, 905 executableBitDelta => -1,
906 indexPath => "Makefile", 906 indexPath => "Makefile",
907 isSvn => 1, 907 isSvn => 1,
908 numTextChunks => 1, 908 numTextChunks => 1,
909 sourceRevision => "60021", 909 sourceRevision => "60021",
910 }], 910 }],
911 "Index: Makefile.shared\n"], 911 "Index: Makefile.shared\n"],
912 expectedNextLine => "======================================================= ============\n", 912 expectedNextLine => "======================================================= ============\n",
913 }, 913 },
914 { 914 {
915 # New test 915 # New test
916 diffName => "SVN: file change diff with property change, followed by file ch ange diff using Windows line endings", 916 diffName => "SVN: file change diff with property change, followed by file ch ange diff using Windows line endings",
917 inputText => toWindowsLineEndings(<<'END', 917 inputText => toWindowsLineEndings(<<'END',
918 Index: Makefile 918 Index: Makefile
919 =================================================================== 919 ===================================================================
920 --- Makefile (revision 60021) 920 --- Makefile (revision 60021)
921 +++ Makefile (working copy) 921 +++ Makefile (working copy)
922 @@ -1,3 +1,4 @@ 922 @@ -1,3 +1,4 @@
923 + 923 +
924 MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKit2 WebKitTools 924 MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKit2 WebKitTools
925 925
926 all: 926 all:
927 927
928 Property changes on: Makefile 928 Property changes on: Makefile
929 ___________________________________________________________________ 929 ___________________________________________________________________
930 Name: svn:executable 930 Name: svn:executable
931 - * 931 - *
932 932
933 Index: Makefile.shared 933 Index: Makefile.shared
934 =================================================================== 934 ===================================================================
935 --- Makefile.shared (revision 60021) 935 --- Makefile.shared (revision 60021)
936 +++ Makefile.shared (working copy) 936 +++ Makefile.shared (working copy)
937 @@ -1,3 +1,4 @@ 937 @@ -1,3 +1,4 @@
938 + 938 +
939 SCRIPTS_PATH ?= ../WebKitTools/Scripts 939 SCRIPTS_PATH ?= ../WebKitTools/Scripts
940 XCODE_OPTIONS = `perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString ()'` $(ARGS) 940 XCODE_OPTIONS = `perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString ()'` $(ARGS)
941 END 941 END
942 ), 942 ),
943 expectedReturn => [ 943 expectedReturn => [
944 [{ 944 [{
945 svnConvertedText => toWindowsLineEndings(<<'END', # Same as input text 945 svnConvertedText => toWindowsLineEndings(<<'END', # Same as input text
946 Index: Makefile 946 Index: Makefile
947 =================================================================== 947 ===================================================================
948 --- Makefile (revision 60021) 948 --- Makefile (revision 60021)
949 +++ Makefile (working copy) 949 +++ Makefile (working copy)
950 @@ -1,3 +1,4 @@ 950 @@ -1,3 +1,4 @@
951 + 951 +
952 MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKit2 WebKitTools 952 MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKit2 WebKitTools
953 953
954 all: 954 all:
955 955
956 956
957 END 957 END
958 ), 958 ),
959 executableBitDelta => -1, 959 executableBitDelta => -1,
960 indexPath => "Makefile", 960 indexPath => "Makefile",
961 isSvn => 1, 961 isSvn => 1,
962 numTextChunks => 1, 962 numTextChunks => 1,
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
1268 my $line = <$fileHandle>; 1268 my $line = <$fileHandle>;
1269 1269
1270 my @got = VCSUtils::parseDiff($fileHandle, $line, {"shouldNotUseIndexPathEOL " => 1}); 1270 my @got = VCSUtils::parseDiff($fileHandle, $line, {"shouldNotUseIndexPathEOL " => 1});
1271 my $expectedReturn = $testCase->{expectedReturn}; 1271 my $expectedReturn = $testCase->{expectedReturn};
1272 1272
1273 is_deeply(\@got, $expectedReturn, "$testNameStart return value."); 1273 is_deeply(\@got, $expectedReturn, "$testNameStart return value.");
1274 1274
1275 my $gotNextLine = <$fileHandle>; 1275 my $gotNextLine = <$fileHandle>;
1276 is($gotNextLine, $testCase->{expectedNextLine}, "$testNameStart next read l ine."); 1276 is($gotNextLine, $testCase->{expectedNextLine}, "$testNameStart next read l ine.");
1277 } 1277 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698