##// END OF EJS Templates
tests: allow for variation in zstd output as seen on s390x and powerpc
Julien Cristau -
r49353:f447b90a stable
parent child Browse files
Show More
@@ -1149,3 +1149,8 b' def has_lzma():'
1149 @check("bash", "bash shell")
1149 @check("bash", "bash shell")
1150 def has_bash():
1150 def has_bash():
1151 return matchoutput("bash -c 'echo hi'", b'^hi$')
1151 return matchoutput("bash -c 'echo hi'", b'^hi$')
1152
1153
1154 @check("bigendian", "big-endian CPU")
1155 def has_bigendian():
1156 return sys.byteorder == 'big'
@@ -404,11 +404,13 b' getbundle requests with stream=1 are unc'
404 #endif
404 #endif
405 #if zstd no-rust
405 #if zstd no-rust
406 $ f --size --hex --bytes 256 body
406 $ f --size --hex --bytes 256 body
407 body: size=116340
407 body: size=116340 (no-bigendian !)
408 body: size=116335 (bigendian !)
408 0000: 04 6e 6f 6e 65 48 47 32 30 00 00 00 00 00 00 00 |.noneHG20.......|
409 0000: 04 6e 6f 6e 65 48 47 32 30 00 00 00 00 00 00 00 |.noneHG20.......|
409 0010: 9a 07 53 54 52 45 41 4d 32 00 00 00 00 03 00 09 |..STREAM2.......|
410 0010: 9a 07 53 54 52 45 41 4d 32 00 00 00 00 03 00 09 |..STREAM2.......|
410 0020: 06 09 04 0c 5e 62 79 74 65 63 6f 75 6e 74 31 30 |....^bytecount10|
411 0020: 06 09 04 0c 5e 62 79 74 65 63 6f 75 6e 74 31 30 |....^bytecount10|
411 0030: 31 32 37 36 66 69 6c 65 63 6f 75 6e 74 31 30 39 |1276filecount109|
412 0030: 31 32 37 36 66 69 6c 65 63 6f 75 6e 74 31 30 39 |1276filecount109| (no-bigendian !)
413 0030: 31 32 37 31 66 69 6c 65 63 6f 75 6e 74 31 30 39 |1271filecount109| (bigendian !)
412 0040: 33 72 65 71 75 69 72 65 6d 65 6e 74 73 64 6f 74 |3requirementsdot|
414 0040: 33 72 65 71 75 69 72 65 6d 65 6e 74 73 64 6f 74 |3requirementsdot|
413 0050: 65 6e 63 6f 64 65 25 32 43 66 6e 63 61 63 68 65 |encode%2Cfncache|
415 0050: 65 6e 63 6f 64 65 25 32 43 66 6e 63 61 63 68 65 |encode%2Cfncache|
414 0060: 25 32 43 67 65 6e 65 72 61 6c 64 65 6c 74 61 25 |%2Cgeneraldelta%|
416 0060: 25 32 43 67 65 6e 65 72 61 6c 64 65 6c 74 61 25 |%2Cgeneraldelta%|
@@ -533,7 +535,8 b' Clone with background file closing enabl'
533 transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
535 transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
534 bundle2-input-part: total payload size 118984 (no-zstd !)
536 bundle2-input-part: total payload size 118984 (no-zstd !)
535 transferred 98.9 KB in * seconds (* */sec) (glob) (zstd !)
537 transferred 98.9 KB in * seconds (* */sec) (glob) (zstd !)
536 bundle2-input-part: total payload size 116145 (zstd !)
538 bundle2-input-part: total payload size 116145 (zstd no-bigendian !)
539 bundle2-input-part: total payload size 116140 (zstd bigendian !)
537 bundle2-input-part: "listkeys" (params: 1 mandatory) supported
540 bundle2-input-part: "listkeys" (params: 1 mandatory) supported
538 bundle2-input-bundle: 2 parts total
541 bundle2-input-bundle: 2 parts total
539 checking for updated bookmarks
542 checking for updated bookmarks
@@ -290,11 +290,14 b' test maxdeltachainspan'
290 52 4 4 51 p1 58 640 669 1.04531 669 0 0.00000 (no-zstd !)
290 52 4 4 51 p1 58 640 669 1.04531 669 0 0.00000 (no-zstd !)
291 49 4 1 -1 base 205 316 205 0.64873 205 0 0.00000 (zstd !)
291 49 4 1 -1 base 205 316 205 0.64873 205 0 0.00000 (zstd !)
292 50 4 2 49 p1 58 362 263 0.72652 263 0 0.00000 (zstd !)
292 50 4 2 49 p1 58 362 263 0.72652 263 0 0.00000 (zstd !)
293 51 4 3 50 prev 366 594 629 1.05892 629 0 0.00000 (zstd !)
293 51 4 3 50 prev 366 594 629 1.05892 629 0 0.00000 (zstd no-bigendian !)
294 52 4 4 51 p1 58 640 687 1.07344 687 0 0.00000 (zstd !)
294 52 4 4 51 p1 58 640 687 1.07344 687 0 0.00000 (zstd no-bigendian !)
295 51 4 3 50 prev 367 594 630 1.06061 630 0 0.00000 (zstd bigendian !)
296 52 4 4 51 p1 58 640 688 1.07500 688 0 0.00000 (zstd bigendian !)
295 53 5 1 -1 base 0 0 0 0.00000 0 0 0.00000
297 53 5 1 -1 base 0 0 0 0.00000 0 0 0.00000
296 54 6 1 -1 base 369 640 369 0.57656 369 0 0.00000 (no-zstd !)
298 54 6 1 -1 base 369 640 369 0.57656 369 0 0.00000 (no-zstd !)
297 54 6 1 -1 base 375 640 375 0.58594 375 0 0.00000 (zstd !)
299 54 6 1 -1 base 375 640 375 0.58594 375 0 0.00000 (zstd no-bigendian !)
300 54 6 1 -1 base 376 640 376 0.58750 376 0 0.00000 (zstd bigendian !)
298 $ hg clone --pull source-repo --config experimental.maxdeltachainspan=2800 relax-chain --config format.generaldelta=yes
301 $ hg clone --pull source-repo --config experimental.maxdeltachainspan=2800 relax-chain --config format.generaldelta=yes
299 requesting all changes
302 requesting all changes
300 adding changesets
303 adding changesets
@@ -362,10 +365,12 b' test maxdeltachainspan'
362 49 4 1 -1 base 205 316 205 0.64873 205 0 0.00000 (zstd !)
365 49 4 1 -1 base 205 316 205 0.64873 205 0 0.00000 (zstd !)
363 50 4 2 49 p1 58 362 263 0.72652 263 0 0.00000 (zstd !)
366 50 4 2 49 p1 58 362 263 0.72652 263 0 0.00000 (zstd !)
364 51 2 13 17 p1 58 594 739 1.24411 2789 2050 2.77402 (zstd !)
367 51 2 13 17 p1 58 594 739 1.24411 2789 2050 2.77402 (zstd !)
365 52 5 1 -1 base 375 640 375 0.58594 375 0 0.00000 (zstd !)
368 52 5 1 -1 base 375 640 375 0.58594 375 0 0.00000 (zstd no-bigendian !)
369 52 5 1 -1 base 376 640 376 0.58750 376 0 0.00000 (zstd bigendian !)
366 53 6 1 -1 base 0 0 0 0.00000 0 0 0.00000
370 53 6 1 -1 base 0 0 0 0.00000 0 0 0.00000
367 54 7 1 -1 base 369 640 369 0.57656 369 0 0.00000 (no-zstd !)
371 54 7 1 -1 base 369 640 369 0.57656 369 0 0.00000 (no-zstd !)
368 54 7 1 -1 base 375 640 375 0.58594 375 0 0.00000 (zstd !)
372 54 7 1 -1 base 375 640 375 0.58594 375 0 0.00000 (zstd no-bigendian !)
373 54 7 1 -1 base 376 640 376 0.58750 376 0 0.00000 (zstd bigendian !)
369 $ hg clone --pull source-repo --config experimental.maxdeltachainspan=0 noconst-chain --config format.usegeneraldelta=yes --config storage.revlog.reuse-external-delta-parent=no
374 $ hg clone --pull source-repo --config experimental.maxdeltachainspan=0 noconst-chain --config format.usegeneraldelta=yes --config storage.revlog.reuse-external-delta-parent=no
370 requesting all changes
375 requesting all changes
371 adding changesets
376 adding changesets
@@ -432,4 +437,5 b' test maxdeltachainspan'
432 52 2 14 51 p1 58 640 797 1.24531 2700 1903 2.38770
437 52 2 14 51 p1 58 640 797 1.24531 2700 1903 2.38770
433 53 4 1 -1 base 0 0 0 0.00000 0 0 0.00000
438 53 4 1 -1 base 0 0 0 0.00000 0 0 0.00000
434 54 5 1 -1 base 369 640 369 0.57656 369 0 0.00000 (no-zstd !)
439 54 5 1 -1 base 369 640 369 0.57656 369 0 0.00000 (no-zstd !)
435 54 5 1 -1 base 375 640 375 0.58594 375 0 0.00000 (zstd !)
440 54 5 1 -1 base 375 640 375 0.58594 375 0 0.00000 (zstd no-bigendian !)
441 54 5 1 -1 base 376 640 376 0.58750 376 0 0.00000 (zstd bigendian !)
@@ -1023,7 +1023,8 b' No race condition'
1023 adding [s] 00changelog.n (62 bytes)
1023 adding [s] 00changelog.n (62 bytes)
1024 adding [s] 00changelog-*.nd (118 KB) (glob)
1024 adding [s] 00changelog-*.nd (118 KB) (glob)
1025 adding [s] 00manifest.d (452 KB) (no-zstd !)
1025 adding [s] 00manifest.d (452 KB) (no-zstd !)
1026 adding [s] 00manifest.d (491 KB) (zstd !)
1026 adding [s] 00manifest.d (491 KB) (zstd no-bigendian !)
1027 adding [s] 00manifest.d (492 KB) (zstd bigendian !)
1027 adding [s] 00changelog.d (360 KB) (no-zstd !)
1028 adding [s] 00changelog.d (360 KB) (no-zstd !)
1028 adding [s] 00changelog.d (368 KB) (zstd !)
1029 adding [s] 00changelog.d (368 KB) (zstd !)
1029 adding [s] 00manifest.i (313 KB)
1030 adding [s] 00manifest.i (313 KB)
@@ -1063,7 +1064,8 b' Check and record file state beforehand'
1063
1064
1064 $ f --size test-repo/.hg/store/00changelog*
1065 $ f --size test-repo/.hg/store/00changelog*
1065 test-repo/.hg/store/00changelog-*.nd: size=121088 (glob)
1066 test-repo/.hg/store/00changelog-*.nd: size=121088 (glob)
1066 test-repo/.hg/store/00changelog.d: size=376891 (zstd !)
1067 test-repo/.hg/store/00changelog.d: size=376891 (zstd no-bigendian !)
1068 test-repo/.hg/store/00changelog.d: size=376889 (zstd bigendian !)
1067 test-repo/.hg/store/00changelog.d: size=368890 (no-zstd !)
1069 test-repo/.hg/store/00changelog.d: size=368890 (no-zstd !)
1068 test-repo/.hg/store/00changelog.i: size=320384
1070 test-repo/.hg/store/00changelog.i: size=320384
1069 test-repo/.hg/store/00changelog.n: size=62
1071 test-repo/.hg/store/00changelog.n: size=62
@@ -1093,7 +1095,8 b' Do a mix of clone and commit at the same'
1093 adding [s] 00changelog.n (62 bytes)
1095 adding [s] 00changelog.n (62 bytes)
1094 adding [s] 00changelog-*.nd (118 KB) (glob)
1096 adding [s] 00changelog-*.nd (118 KB) (glob)
1095 adding [s] 00manifest.d (452 KB) (no-zstd !)
1097 adding [s] 00manifest.d (452 KB) (no-zstd !)
1096 adding [s] 00manifest.d (491 KB) (zstd !)
1098 adding [s] 00manifest.d (491 KB) (zstd no-bigendian !)
1099 adding [s] 00manifest.d (492 KB) (zstd bigendian !)
1097 adding [s] 00changelog.d (360 KB) (no-zstd !)
1100 adding [s] 00changelog.d (360 KB) (no-zstd !)
1098 adding [s] 00changelog.d (368 KB) (zstd !)
1101 adding [s] 00changelog.d (368 KB) (zstd !)
1099 adding [s] 00manifest.i (313 KB)
1102 adding [s] 00manifest.i (313 KB)
@@ -1104,7 +1107,8 b' Check the result state'
1104 $ f --size stream-clone-race-1/.hg/store/00changelog*
1107 $ f --size stream-clone-race-1/.hg/store/00changelog*
1105 stream-clone-race-1/.hg/store/00changelog-*.nd: size=121088 (glob)
1108 stream-clone-race-1/.hg/store/00changelog-*.nd: size=121088 (glob)
1106 stream-clone-race-1/.hg/store/00changelog.d: size=368890 (no-zstd !)
1109 stream-clone-race-1/.hg/store/00changelog.d: size=368890 (no-zstd !)
1107 stream-clone-race-1/.hg/store/00changelog.d: size=376891 (zstd !)
1110 stream-clone-race-1/.hg/store/00changelog.d: size=376891 (zstd no-bigendian !)
1111 stream-clone-race-1/.hg/store/00changelog.d: size=376889 (zstd bigendian !)
1108 stream-clone-race-1/.hg/store/00changelog.i: size=320384
1112 stream-clone-race-1/.hg/store/00changelog.i: size=320384
1109 stream-clone-race-1/.hg/store/00changelog.n: size=62
1113 stream-clone-race-1/.hg/store/00changelog.n: size=62
1110
1114
@@ -1158,7 +1162,8 b' Check the initial state'
1158 test-repo/.hg/store/00changelog-*.nd: size=121344 (glob) (rust !)
1162 test-repo/.hg/store/00changelog-*.nd: size=121344 (glob) (rust !)
1159 test-repo/.hg/store/00changelog-*.nd: size=121344 (glob) (pure !)
1163 test-repo/.hg/store/00changelog-*.nd: size=121344 (glob) (pure !)
1160 test-repo/.hg/store/00changelog-*.nd: size=121152 (glob) (no-rust no-pure !)
1164 test-repo/.hg/store/00changelog-*.nd: size=121152 (glob) (no-rust no-pure !)
1161 test-repo/.hg/store/00changelog.d: size=376950 (zstd !)
1165 test-repo/.hg/store/00changelog.d: size=376950 (zstd no-bigendian !)
1166 test-repo/.hg/store/00changelog.d: size=376948 (zstd bigendian !)
1162 test-repo/.hg/store/00changelog.d: size=368949 (no-zstd !)
1167 test-repo/.hg/store/00changelog.d: size=368949 (no-zstd !)
1163 test-repo/.hg/store/00changelog.i: size=320448
1168 test-repo/.hg/store/00changelog.i: size=320448
1164 test-repo/.hg/store/00changelog.n: size=62
1169 test-repo/.hg/store/00changelog.n: size=62
@@ -1209,7 +1214,8 b' Check the result.'
1209 stream-clone-race-2/.hg/store/00changelog-*.nd: size=121344 (glob) (rust !)
1214 stream-clone-race-2/.hg/store/00changelog-*.nd: size=121344 (glob) (rust !)
1210 stream-clone-race-2/.hg/store/00changelog-*.nd: size=121344 (glob) (pure !)
1215 stream-clone-race-2/.hg/store/00changelog-*.nd: size=121344 (glob) (pure !)
1211 stream-clone-race-2/.hg/store/00changelog-*.nd: size=121152 (glob) (no-rust no-pure !)
1216 stream-clone-race-2/.hg/store/00changelog-*.nd: size=121152 (glob) (no-rust no-pure !)
1212 stream-clone-race-2/.hg/store/00changelog.d: size=376950 (zstd !)
1217 stream-clone-race-2/.hg/store/00changelog.d: size=376950 (zstd no-bigendian !)
1218 stream-clone-race-2/.hg/store/00changelog.d: size=376948 (zstd bigendian !)
1213 stream-clone-race-2/.hg/store/00changelog.d: size=368949 (no-zstd !)
1219 stream-clone-race-2/.hg/store/00changelog.d: size=368949 (no-zstd !)
1214 stream-clone-race-2/.hg/store/00changelog.i: size=320448
1220 stream-clone-race-2/.hg/store/00changelog.i: size=320448
1215 stream-clone-race-2/.hg/store/00changelog.n: size=62
1221 stream-clone-race-2/.hg/store/00changelog.n: size=62
General Comments 0
You need to be logged in to leave comments. Login now