##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

dirstate: simplify the dirstate's read race testing...
marmoute -
r51135:3ddff85f stable
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -174,26 +174,22 b' The status process should return a consi'
174 R dir/nested/m
174 R dir/nested/m
175 ? p
175 ? p
176 ? q
176 ? q
177 $ cat $TESTTMP/status-race-lock.log
178 #else
177 #else
179 #if rhg
178 #if rhg pre-some-read dirstate-v2-append
180 #if pre-all-read
181 $ cat $TESTTMP/status-race-lock.out
182 A dir/n
183 A dir/o
184 R dir/nested/m
185 ? p
186 ? q
187 $ cat $TESTTMP/status-race-lock.log
188 #else
189 #if dirstate-v2-append
190 $ cat $TESTTMP/status-race-lock.out
179 $ cat $TESTTMP/status-race-lock.out
191 A dir/o
180 A dir/o
192 R dir/nested/m
181 R dir/nested/m
193 ? dir/n
182 ? dir/n
194 ? p
183 ? p
195 ? q
184 ? q
196 $ cat $TESTTMP/status-race-lock.log
185 #else
186 #if rust no-rhg dirstate-v2-append
187 $ cat $TESTTMP/status-race-lock.out
188 A dir/o
189 R dir/nested/m
190 ? dir/n
191 ? p
192 ? q
197 #else
193 #else
198 $ cat $TESTTMP/status-race-lock.out
194 $ cat $TESTTMP/status-race-lock.out
199 A dir/n
195 A dir/n
@@ -201,39 +197,10 b' The status process should return a consi'
201 R dir/nested/m
197 R dir/nested/m
202 ? p
198 ? p
203 ? q
199 ? q
204 $ cat $TESTTMP/status-race-lock.log
205 #endif
206 #endif
207 #else
208 #if rust
209 #if dirstate-v2-rewrite
210 $ cat $TESTTMP/status-race-lock.out
211 A dir/n
212 A dir/o
213 R dir/nested/m
214 ? p
215 ? q
216 $ cat $TESTTMP/status-race-lock.log
217 #else
218 $ cat $TESTTMP/status-race-lock.out
219 A dir/o
220 R dir/nested/m
221 ? dir/n
222 ? p
223 ? q
224 $ cat $TESTTMP/status-race-lock.log
225 #endif
226 #else
227 $ cat $TESTTMP/status-race-lock.out
228 A dir/n
229 A dir/o
230 R dir/nested/m
231 ? p
232 ? q
233 $ cat $TESTTMP/status-race-lock.log
234 #endif
200 #endif
235 #endif
201 #endif
236 #endif
202 #endif
203 $ cat $TESTTMP/status-race-lock.log
237
204
238 final cleanup
205 final cleanup
239
206
@@ -282,24 +249,16 b' commit was created, and status is now cl'
282
249
283 The status process should return a consistent result and not crash.
250 The status process should return a consistent result and not crash.
284
251
285 #if dirstate-v1
252 #if rust no-rhg dirstate-v2-append
286 $ cat $TESTTMP/status-race-lock.out
253 $ cat $TESTTMP/status-race-lock.out
287 M dir/o (no-rhg !)
254 A dir/o
288 ? dir/n
255 R dir/nested/m
289 ? p
290 ? q
291 $ cat $TESTTMP/status-race-lock.log
292 warning: ignoring unknown working parent 02a67a77ee9b! (no-rhg !)
293 #else
294 #if rhg
295 #if pre-all-read
296 $ cat $TESTTMP/status-race-lock.out
297 ? dir/n
256 ? dir/n
298 ? p
257 ? p
299 ? q
258 ? q
300 $ cat $TESTTMP/status-race-lock.log
259 $ cat $TESTTMP/status-race-lock.log
301 #else
260 #else
302 #if dirstate-v2-append
261 #if rhg pre-some-read dirstate-v2-append
303 $ cat $TESTTMP/status-race-lock.out
262 $ cat $TESTTMP/status-race-lock.out
304 A dir/o
263 A dir/o
305 R dir/nested/m
264 R dir/nested/m
@@ -309,40 +268,12 b' The status process should return a consi'
309 $ cat $TESTTMP/status-race-lock.log
268 $ cat $TESTTMP/status-race-lock.log
310 #else
269 #else
311 $ cat $TESTTMP/status-race-lock.out
270 $ cat $TESTTMP/status-race-lock.out
312 ? dir/n
271 M dir/o (no-rhg known-bad-output !)
313 ? p
314 ? q
315 $ cat $TESTTMP/status-race-lock.log
316 #endif
317 #endif
318 #else
319 #if rust
320 #if dirstate-v2-rewrite
321 $ cat $TESTTMP/status-race-lock.out
322 M dir/o
323 ? dir/n
272 ? dir/n
324 ? p
273 ? p
325 ? q
274 ? q
326 $ cat $TESTTMP/status-race-lock.log
275 $ cat $TESTTMP/status-race-lock.log
327 warning: ignoring unknown working parent 02a67a77ee9b!
276 warning: ignoring unknown working parent 02a67a77ee9b! (no-rhg !)
328 #else
329 $ cat $TESTTMP/status-race-lock.out
330 A dir/o
331 R dir/nested/m
332 ? dir/n
333 ? p
334 ? q
335 $ cat $TESTTMP/status-race-lock.log
336 #endif
337 #else
338 $ cat $TESTTMP/status-race-lock.out
339 M dir/o
340 ? dir/n
341 ? p
342 ? q
343 $ cat $TESTTMP/status-race-lock.log
344 warning: ignoring unknown working parent 02a67a77ee9b!
345 #endif
346 #endif
277 #endif
347 #endif
278 #endif
348
279
@@ -414,24 +345,7 b' do an update'
414
345
415 The status process should return a consistent result and not crash.
346 The status process should return a consistent result and not crash.
416
347
417 #if dirstate-v1
348 #if rhg dirstate-v2-append pre-some-read
418 $ cat $TESTTMP/status-race-lock.out
419 A dir/o
420 ? dir/n
421 ? p
422 ? q
423 $ cat $TESTTMP/status-race-lock.log
424 #else
425 #if rhg
426 #if pre-all-read
427 $ cat $TESTTMP/status-race-lock.out
428 A dir/o
429 ? dir/n
430 ? p
431 ? q
432 $ cat $TESTTMP/status-race-lock.log
433 #else
434 #if dirstate-v2-append
435 $ cat $TESTTMP/status-race-lock.out
349 $ cat $TESTTMP/status-race-lock.out
436 A dir/o
350 A dir/o
437 R dir/nested/m
351 R dir/nested/m
@@ -444,26 +358,8 b' The status process should return a consi'
444 ? dir/n
358 ? dir/n
445 ? p
359 ? p
446 ? q
360 ? q
447 $ cat $TESTTMP/status-race-lock.log
448 #else
361 #else
449 $ cat $TESTTMP/status-race-lock.out
362 #if rust no-rhg dirstate-v2-append
450 A dir/o
451 ? dir/n
452 ? p
453 ? q
454 $ cat $TESTTMP/status-race-lock.log
455 #endif
456 #endif
457 #else
458 #if rust
459 #if dirstate-v2-rewrite
460 $ cat $TESTTMP/status-race-lock.out
461 A dir/o
462 ? dir/n
463 ? p
464 ? q
465 $ cat $TESTTMP/status-race-lock.log
466 #else
467 $ cat $TESTTMP/status-race-lock.out
363 $ cat $TESTTMP/status-race-lock.out
468 A dir/o
364 A dir/o
469 R dir/nested/m
365 R dir/nested/m
@@ -476,18 +372,15 b' The status process should return a consi'
476 ? dir/n
372 ? dir/n
477 ? p
373 ? p
478 ? q
374 ? q
479 $ cat $TESTTMP/status-race-lock.log
480 #endif
481 #else
375 #else
482 $ cat $TESTTMP/status-race-lock.out
376 $ cat $TESTTMP/status-race-lock.out
483 A dir/o
377 A dir/o
484 ? dir/n
378 ? dir/n
485 ? p
379 ? p
486 ? q
380 ? q
487 $ cat $TESTTMP/status-race-lock.log
488 #endif
381 #endif
489 #endif
382 #endif
490 #endif
383 $ cat $TESTTMP/status-race-lock.log
491
384
492 final cleanup
385 final cleanup
493
386
@@ -523,34 +416,6 b' do an update'
523
416
524 The status process should return a consistent result and not crash.
417 The status process should return a consistent result and not crash.
525
418
526 #if dirstate-v1
527 $ cat $TESTTMP/status-race-lock.out
528 A dir/o
529 R dir/nested/m
530 ? dir/n
531 ? p
532 ? q
533 $ cat $TESTTMP/status-race-lock.log
534 #else
535 #if rhg
536 #if pre-all-read
537 $ cat $TESTTMP/status-race-lock.out
538 A dir/o
539 R dir/nested/m
540 ? dir/n
541 ? p
542 ? q
543 $ cat $TESTTMP/status-race-lock.log
544 #else
545 #if dirstate-v2-append
546 $ cat $TESTTMP/status-race-lock.out
547 A dir/o
548 R dir/nested/m
549 ? dir/n
550 ? p
551 ? q
552 $ cat $TESTTMP/status-race-lock.log
553 #else
554 $ cat $TESTTMP/status-race-lock.out
419 $ cat $TESTTMP/status-race-lock.out
555 A dir/o
420 A dir/o
556 R dir/nested/m
421 R dir/nested/m
@@ -558,38 +423,6 b' The status process should return a consi'
558 ? p
423 ? p
559 ? q
424 ? q
560 $ cat $TESTTMP/status-race-lock.log
425 $ cat $TESTTMP/status-race-lock.log
561 #endif
562 #endif
563 #else
564 #if rust
565 #if dirstate-v2-rewrite
566 $ cat $TESTTMP/status-race-lock.out
567 A dir/o
568 R dir/nested/m
569 ? dir/n
570 ? p
571 ? q
572 $ cat $TESTTMP/status-race-lock.log
573 #else
574 $ cat $TESTTMP/status-race-lock.out
575 A dir/o
576 R dir/nested/m
577 ? dir/n
578 ? p
579 ? q
580 $ cat $TESTTMP/status-race-lock.log
581 #endif
582 #else
583 $ cat $TESTTMP/status-race-lock.out
584 A dir/o
585 R dir/nested/m
586 ? dir/n
587 ? p
588 ? q
589 $ cat $TESTTMP/status-race-lock.log
590 #endif
591 #endif
592 #endif
593
426
594 final cleanup
427 final cleanup
595
428
General Comments 0
You need to be logged in to leave comments. Login now