OLD | NEW |
1 #!/usr/bin/perl | 1 #!/usr/bin/perl |
2 # | 2 # |
3 # Copyright (C) 2010 Apple Inc. All rights reserved. | 3 # Copyright (C) 2010 Apple Inc. All rights reserved. |
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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
83 Rubber-stamped by Maciej Stachowiak. | 83 Rubber-stamped by Maciej Stachowiak. |
84 | 84 |
85 Fix the ARM build. | 85 Fix the ARM build. |
86 EOF | 86 EOF |
87 my $fileNewer = writeTempFile("file", "", $fileNewerContent); | 87 my $fileNewer = writeTempFile("file", "", $fileNewerContent); |
88 | 88 |
89 my $fileMineContent = <<'EOF'; | 89 my $fileMineContent = <<'EOF'; |
90 *************** | 90 *************** |
91 *** 1,3 **** | 91 *** 1,3 **** |
92 2010-01-29 Simon Hausmann <simon.hausmann@nokia.com> | 92 2010-01-29 Simon Hausmann <simon.hausmann@nokia.com> |
93 | 93 |
94 Rubber-stamped by Maciej Stachowiak. | 94 Rubber-stamped by Maciej Stachowiak. |
95 --- 1,9 ---- | 95 --- 1,9 ---- |
96 + 2010-01-29 Oliver Hunt <oliver@apple.com> | 96 + 2010-01-29 Oliver Hunt <oliver@apple.com> |
97 + | 97 + |
98 + Reviewed by Darin Adler. | 98 + Reviewed by Darin Adler. |
99 + | 99 + |
100 + JSC is failing to propagate anonymous slot count on some transitions | 100 + JSC is failing to propagate anonymous slot count on some transitions |
101 + | 101 + |
102 2010-01-29 Simon Hausmann <simon.hausmann@nokia.com> | 102 2010-01-29 Simon Hausmann <simon.hausmann@nokia.com> |
103 | 103 |
104 Rubber-stamped by Maciej Stachowiak. | 104 Rubber-stamped by Maciej Stachowiak. |
105 EOF | 105 EOF |
106 my $fileMine = writeTempFile("file", ".rej", $fileMineContent); | 106 my $fileMine = writeTempFile("file", ".rej", $fileMineContent); |
107 rename($fileMine, $fileNewer . ".rej"); | 107 rename($fileMine, $fileNewer . ".rej"); |
108 $fileMine = $fileNewer . ".rej"; | 108 $fileMine = $fileNewer . ".rej"; |
109 | 109 |
110 my $fileOlderContent = $fileNewerContent; | 110 my $fileOlderContent = $fileNewerContent; |
111 my $fileOlder = writeTempFile("file", ".orig", $fileOlderContent); | 111 my $fileOlder = writeTempFile("file", ".orig", $fileOlderContent); |
112 rename($fileOlder, $fileNewer . ".orig"); | 112 rename($fileOlder, $fileNewer . ".orig"); |
113 $fileOlder = $fileNewer . ".orig"; | 113 $fileOlder = $fileNewer . ".orig"; |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
152 Rubber-stamped by Maciej Stachowiak. | 152 Rubber-stamped by Maciej Stachowiak. |
153 | 153 |
154 Fix the ARM build. | 154 Fix the ARM build. |
155 EOF | 155 EOF |
156 my $fileNewer = writeTempFile("file", "", $fileNewerContent); | 156 my $fileNewer = writeTempFile("file", "", $fileNewerContent); |
157 | 157 |
158 my $fileMineContent = <<'EOF'; | 158 my $fileMineContent = <<'EOF'; |
159 *************** | 159 *************** |
160 *** 1,9 **** | 160 *** 1,9 **** |
161 - 2010-01-29 Oliver Hunt <oliver@apple.com> | 161 - 2010-01-29 Oliver Hunt <oliver@apple.com> |
162 - | 162 - |
163 - Reviewed by Darin Adler. | 163 - Reviewed by Darin Adler. |
164 - | 164 - |
165 - JSC is failing to propagate anonymous slot count on some transitions | 165 - JSC is failing to propagate anonymous slot count on some transitions |
166 - | 166 - |
167 2010-01-29 Simon Hausmann <simon.hausmann@nokia.com> | 167 2010-01-29 Simon Hausmann <simon.hausmann@nokia.com> |
168 | 168 |
169 Rubber-stamped by Maciej Stachowiak. | 169 Rubber-stamped by Maciej Stachowiak. |
170 --- 1,3 ---- | 170 --- 1,3 ---- |
171 2010-01-29 Simon Hausmann <simon.hausmann@nokia.com> | 171 2010-01-29 Simon Hausmann <simon.hausmann@nokia.com> |
172 | 172 |
173 Rubber-stamped by Maciej Stachowiak. | 173 Rubber-stamped by Maciej Stachowiak. |
174 EOF | 174 EOF |
175 my $fileMine = writeTempFile("file", ".rej", $fileMineContent); | 175 my $fileMine = writeTempFile("file", ".rej", $fileMineContent); |
176 rename($fileMine, $fileNewer . ".rej"); | 176 rename($fileMine, $fileNewer . ".rej"); |
177 $fileMine = $fileNewer . ".rej"; | 177 $fileMine = $fileNewer . ".rej"; |
178 | 178 |
179 my $fileOlderContent = $fileNewerContent; | 179 my $fileOlderContent = $fileNewerContent; |
180 my $fileOlder = writeTempFile("file", ".orig", $fileOlderContent); | 180 my $fileOlder = writeTempFile("file", ".orig", $fileOlderContent); |
181 rename($fileOlder, $fileNewer . ".orig"); | 181 rename($fileOlder, $fileNewer . ".orig"); |
182 $fileOlder = $fileNewer . ".orig"; | 182 $fileOlder = $fileNewer . ".orig"; |
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
327 ok(readFile($fileOlder) eq $fileOlderContent, "$title: \$fileOlder should be
unchanged"); | 327 ok(readFile($fileOlder) eq $fileOlderContent, "$title: \$fileOlder should be
unchanged"); |
328 | 328 |
329 # $fileNewer should still exist unchanged because the patch failed | 329 # $fileNewer should still exist unchanged because the patch failed |
330 ok(readFile($fileNewer) eq $fileNewerContent, "$title: \$fileNewer should be
unchanged"); | 330 ok(readFile($fileNewer) eq $fileNewerContent, "$title: \$fileNewer should be
unchanged"); |
331 | 331 |
332 unlink($fileMine, $fileOlder, $fileNewer); | 332 unlink($fileMine, $fileOlder, $fileNewer); |
333 } | 333 } |
334 | 334 |
335 # ------------------------------------------------------------------------------
-- | 335 # ------------------------------------------------------------------------------
-- |
336 | 336 |
OLD | NEW |