##// END OF EJS Templates
fix test-bisect error (because of set -e)
Benoit Boissinot -
r6990:ca6103c5 default
parent child Browse files
Show More
@@ -1,74 +1,74 b''
1 1 #!/bin/sh
2 2
3 3 set -e
4 4
5 5 echo % init
6 6 hg init
7 7
8 8 echo % committing changes
9 9 count=0
10 10 echo > a
11 11 while test $count -lt 32 ; do
12 12 echo 'a' >> a
13 13 test $count -eq 0 && hg add
14 14 hg ci -m "msg $count" -d "$count 0"
15 15 echo % committed changeset $count
16 16 count=`expr $count + 1`
17 17 done
18 18
19 19 echo % log
20 20 hg log
21 21
22 22 echo % hg up -C
23 23 hg up -C
24 24
25 25 echo % bisect test
26 26 hg bisect -r
27 27 hg bisect -b
28 28 hg bisect -g 1
29 29 hg bisect -g
30 30 echo skip
31 31 hg bisect -s
32 32 hg bisect -g
33 33 hg bisect -g
34 34 hg bisect -b
35 35 hg bisect -g
36 36
37 37 echo % bisect reverse test
38 38 hg bisect -r
39 39 hg bisect -b null
40 40 hg bisect -g tip
41 41 hg bisect -g
42 42 echo skip
43 43 hg bisect -s
44 44 hg bisect -g
45 45 hg bisect -g
46 46 hg bisect -b
47 47 hg bisect -g
48 48
49 49 hg bisect -r
50 50 hg bisect -g tip
51 51 hg bisect -b tip || echo error
52 52
53 53 hg bisect -r
54 54 hg bisect -g null
55 55 hg bisect -bU tip
56 56 hg id
57 57
58 58 echo % reproduce AssertionError, issue1228 and issue1182
59 59 hg bisect -r
60 60 hg bisect -b 4
61 61 hg bisect -g 0
62 62 hg bisect -s
63 63 hg bisect -s
64 64 hg bisect -s
65 65
66 66 echo % reproduce non converging bisect, issue1182
67 67 hg bisect -r
68 68 hg bisect -g 0
69 69 hg bisect -b 2
70 70 hg bisect -s
71 71
72 72 echo % test no action
73 73 hg bisect -r
74 hg bisect
74 hg bisect || echo failure
@@ -1,287 +1,288 b''
1 1 % init
2 2 % committing changes
3 3 adding a
4 4 % committed changeset 0
5 5 % committed changeset 1
6 6 % committed changeset 2
7 7 % committed changeset 3
8 8 % committed changeset 4
9 9 % committed changeset 5
10 10 % committed changeset 6
11 11 % committed changeset 7
12 12 % committed changeset 8
13 13 % committed changeset 9
14 14 % committed changeset 10
15 15 % committed changeset 11
16 16 % committed changeset 12
17 17 % committed changeset 13
18 18 % committed changeset 14
19 19 % committed changeset 15
20 20 % committed changeset 16
21 21 % committed changeset 17
22 22 % committed changeset 18
23 23 % committed changeset 19
24 24 % committed changeset 20
25 25 % committed changeset 21
26 26 % committed changeset 22
27 27 % committed changeset 23
28 28 % committed changeset 24
29 29 % committed changeset 25
30 30 % committed changeset 26
31 31 % committed changeset 27
32 32 % committed changeset 28
33 33 % committed changeset 29
34 34 % committed changeset 30
35 35 % committed changeset 31
36 36 % log
37 37 changeset: 31:58c80a7c8a40
38 38 tag: tip
39 39 user: test
40 40 date: Thu Jan 01 00:00:31 1970 +0000
41 41 summary: msg 31
42 42
43 43 changeset: 30:ed2d2f24b11c
44 44 user: test
45 45 date: Thu Jan 01 00:00:30 1970 +0000
46 46 summary: msg 30
47 47
48 48 changeset: 29:b5bd63375ab9
49 49 user: test
50 50 date: Thu Jan 01 00:00:29 1970 +0000
51 51 summary: msg 29
52 52
53 53 changeset: 28:8e0c2264c8af
54 54 user: test
55 55 date: Thu Jan 01 00:00:28 1970 +0000
56 56 summary: msg 28
57 57
58 58 changeset: 27:288867a866e9
59 59 user: test
60 60 date: Thu Jan 01 00:00:27 1970 +0000
61 61 summary: msg 27
62 62
63 63 changeset: 26:3efc6fd51aeb
64 64 user: test
65 65 date: Thu Jan 01 00:00:26 1970 +0000
66 66 summary: msg 26
67 67
68 68 changeset: 25:02a84173a97a
69 69 user: test
70 70 date: Thu Jan 01 00:00:25 1970 +0000
71 71 summary: msg 25
72 72
73 73 changeset: 24:10e0acd3809e
74 74 user: test
75 75 date: Thu Jan 01 00:00:24 1970 +0000
76 76 summary: msg 24
77 77
78 78 changeset: 23:5ec79163bff4
79 79 user: test
80 80 date: Thu Jan 01 00:00:23 1970 +0000
81 81 summary: msg 23
82 82
83 83 changeset: 22:06c7993750ce
84 84 user: test
85 85 date: Thu Jan 01 00:00:22 1970 +0000
86 86 summary: msg 22
87 87
88 88 changeset: 21:e5db6aa3fe2a
89 89 user: test
90 90 date: Thu Jan 01 00:00:21 1970 +0000
91 91 summary: msg 21
92 92
93 93 changeset: 20:7128fb4fdbc9
94 94 user: test
95 95 date: Thu Jan 01 00:00:20 1970 +0000
96 96 summary: msg 20
97 97
98 98 changeset: 19:52798545b482
99 99 user: test
100 100 date: Thu Jan 01 00:00:19 1970 +0000
101 101 summary: msg 19
102 102
103 103 changeset: 18:86977a90077e
104 104 user: test
105 105 date: Thu Jan 01 00:00:18 1970 +0000
106 106 summary: msg 18
107 107
108 108 changeset: 17:03515f4a9080
109 109 user: test
110 110 date: Thu Jan 01 00:00:17 1970 +0000
111 111 summary: msg 17
112 112
113 113 changeset: 16:a2e6ea4973e9
114 114 user: test
115 115 date: Thu Jan 01 00:00:16 1970 +0000
116 116 summary: msg 16
117 117
118 118 changeset: 15:e7fa0811edb0
119 119 user: test
120 120 date: Thu Jan 01 00:00:15 1970 +0000
121 121 summary: msg 15
122 122
123 123 changeset: 14:ce8f0998e922
124 124 user: test
125 125 date: Thu Jan 01 00:00:14 1970 +0000
126 126 summary: msg 14
127 127
128 128 changeset: 13:9d7d07bc967c
129 129 user: test
130 130 date: Thu Jan 01 00:00:13 1970 +0000
131 131 summary: msg 13
132 132
133 133 changeset: 12:1941b52820a5
134 134 user: test
135 135 date: Thu Jan 01 00:00:12 1970 +0000
136 136 summary: msg 12
137 137
138 138 changeset: 11:7b4cd9578619
139 139 user: test
140 140 date: Thu Jan 01 00:00:11 1970 +0000
141 141 summary: msg 11
142 142
143 143 changeset: 10:7c5eff49a6b6
144 144 user: test
145 145 date: Thu Jan 01 00:00:10 1970 +0000
146 146 summary: msg 10
147 147
148 148 changeset: 9:eb44510ef29a
149 149 user: test
150 150 date: Thu Jan 01 00:00:09 1970 +0000
151 151 summary: msg 9
152 152
153 153 changeset: 8:453eb4dba229
154 154 user: test
155 155 date: Thu Jan 01 00:00:08 1970 +0000
156 156 summary: msg 8
157 157
158 158 changeset: 7:03750880c6b5
159 159 user: test
160 160 date: Thu Jan 01 00:00:07 1970 +0000
161 161 summary: msg 7
162 162
163 163 changeset: 6:a3d5c6fdf0d3
164 164 user: test
165 165 date: Thu Jan 01 00:00:06 1970 +0000
166 166 summary: msg 6
167 167
168 168 changeset: 5:7874a09ea728
169 169 user: test
170 170 date: Thu Jan 01 00:00:05 1970 +0000
171 171 summary: msg 5
172 172
173 173 changeset: 4:9b2ba8336a65
174 174 user: test
175 175 date: Thu Jan 01 00:00:04 1970 +0000
176 176 summary: msg 4
177 177
178 178 changeset: 3:b53bea5e2fcb
179 179 user: test
180 180 date: Thu Jan 01 00:00:03 1970 +0000
181 181 summary: msg 3
182 182
183 183 changeset: 2:db07c04beaca
184 184 user: test
185 185 date: Thu Jan 01 00:00:02 1970 +0000
186 186 summary: msg 2
187 187
188 188 changeset: 1:5cd978ea5149
189 189 user: test
190 190 date: Thu Jan 01 00:00:01 1970 +0000
191 191 summary: msg 1
192 192
193 193 changeset: 0:b99c7b9c8e11
194 194 user: test
195 195 date: Thu Jan 01 00:00:00 1970 +0000
196 196 summary: msg 0
197 197
198 198 % hg up -C
199 199 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
200 200 % bisect test
201 201 Testing changeset 16:a2e6ea4973e9 (30 changesets remaining, ~4 tests)
202 202 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
203 203 Testing changeset 23:5ec79163bff4 (15 changesets remaining, ~3 tests)
204 204 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
205 205 skip
206 206 Testing changeset 24:10e0acd3809e (15 changesets remaining, ~3 tests)
207 207 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
208 208 Testing changeset 27:288867a866e9 (7 changesets remaining, ~2 tests)
209 209 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
210 210 Testing changeset 29:b5bd63375ab9 (4 changesets remaining, ~2 tests)
211 211 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
212 212 Testing changeset 28:8e0c2264c8af (2 changesets remaining, ~1 tests)
213 213 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
214 214 The first bad revision is:
215 215 changeset: 29:b5bd63375ab9
216 216 user: test
217 217 date: Thu Jan 01 00:00:29 1970 +0000
218 218 summary: msg 29
219 219
220 220 % bisect reverse test
221 221 Testing changeset 15:e7fa0811edb0 (32 changesets remaining, ~5 tests)
222 222 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
223 223 Testing changeset 7:03750880c6b5 (16 changesets remaining, ~4 tests)
224 224 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
225 225 skip
226 226 Testing changeset 6:a3d5c6fdf0d3 (16 changesets remaining, ~4 tests)
227 227 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
228 228 Testing changeset 2:db07c04beaca (7 changesets remaining, ~2 tests)
229 229 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
230 230 Testing changeset 0:b99c7b9c8e11 (3 changesets remaining, ~1 tests)
231 231 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
232 232 Testing changeset 1:5cd978ea5149 (2 changesets remaining, ~1 tests)
233 233 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
234 234 The first good revision is:
235 235 changeset: 1:5cd978ea5149
236 236 user: test
237 237 date: Thu Jan 01 00:00:01 1970 +0000
238 238 summary: msg 1
239 239
240 240 abort: Inconsistent state, 31:58c80a7c8a40 is good and bad
241 241 error
242 242 Testing changeset 15:e7fa0811edb0 (32 changesets remaining, ~5 tests)
243 243 5cd978ea5149
244 244 % reproduce AssertionError, issue1228 and issue1182
245 245 Testing changeset 2:db07c04beaca (4 changesets remaining, ~2 tests)
246 246 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
247 247 Testing changeset 1:5cd978ea5149 (4 changesets remaining, ~2 tests)
248 248 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
249 249 Testing changeset 3:b53bea5e2fcb (4 changesets remaining, ~2 tests)
250 250 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
251 251 Due to skipped revisions, the first bad revision could be any of:
252 252 changeset: 1:5cd978ea5149
253 253 user: test
254 254 date: Thu Jan 01 00:00:01 1970 +0000
255 255 summary: msg 1
256 256
257 257 changeset: 2:db07c04beaca
258 258 user: test
259 259 date: Thu Jan 01 00:00:02 1970 +0000
260 260 summary: msg 2
261 261
262 262 changeset: 3:b53bea5e2fcb
263 263 user: test
264 264 date: Thu Jan 01 00:00:03 1970 +0000
265 265 summary: msg 3
266 266
267 267 changeset: 4:9b2ba8336a65
268 268 user: test
269 269 date: Thu Jan 01 00:00:04 1970 +0000
270 270 summary: msg 4
271 271
272 272 % reproduce non converging bisect, issue1182
273 273 Testing changeset 1:5cd978ea5149 (2 changesets remaining, ~1 tests)
274 274 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
275 275 Due to skipped revisions, the first bad revision could be any of:
276 276 changeset: 1:5cd978ea5149
277 277 user: test
278 278 date: Thu Jan 01 00:00:01 1970 +0000
279 279 summary: msg 1
280 280
281 281 changeset: 2:db07c04beaca
282 282 user: test
283 283 date: Thu Jan 01 00:00:02 1970 +0000
284 284 summary: msg 2
285 285
286 286 % test no action
287 287 abort: cannot bisect (no known good revisions)
288 failure
General Comments 0
You need to be logged in to leave comments. Login now