deb_specific__test_zstd_s390x

# HG changeset patch
# User Julien Cristau <jcristau@debian.org>
# Date 1629904487 -7200
#      Wed Aug 25 17:14:47 2021 +0200
# Branch stable
# Node ID e11f903fd7a6e80b6168c7ef6e28f20349e681e2
# Parent  132819e1fa1565b45fc09093ebbfbe991b0a0f5d
tests: allow for variation in zstd output as seen on s390x and powerpc

Gbp-Pq: Name deb_specific__test_zstd_s390x.patch

diff --git a/tests/hghave.py b/tests/hghave.py
index 46d00739a077b7373b59341499a3451475d4ddb4..2693ffe233a1ac85ab8556d84cc59e39f423f7c3 100644 (file)
--- a/tests/hghave.py
+++ b/tests/hghave.py
@@ -1132,3 +1132,8 @@ def has_lzma():
 @check("bash", "bash shell")
 def has_bash():
     return matchoutput("bash -c 'echo hi'", b'^hi$')
+
+
+@check("bigendian", "big-endian CPU")
+def has_bigendian():
+    return sys.byteorder == 'big'

diff --git a/tests/test-clone-uncompressed.t b/tests/test-clone-uncompressed.t
index 910325c5d09f193ec5260edf53d648b9441adc2f..9bc888eaf68823f5ea56036561ae64bc8c60d446 100644 (file)
--- a/tests/test-clone-uncompressed.t
+++ b/tests/test-clone-uncompressed.t
@@ -389,11 +389,13 @@ getbundle requests with stream=1 are uncompressed
 #endif
 #if zstd no-rust
   $ f --size --hex --bytes 256 body
-  body: size=115921
+  body: size=115921 (no-bigendian !)
+  body: size=115917 (bigendian !)
   0000: 04 6e 6f 6e 65 48 47 32 30 00 00 00 00 00 00 00 |.noneHG20.......|
   0010: 9a 07 53 54 52 45 41 4d 32 00 00 00 00 03 00 09 |..STREAM2.......|
   0020: 06 09 04 0c 5e 62 79 74 65 63 6f 75 6e 74 31 30 |....^bytecount10|
-  0030: 30 39 39 32 66 69 6c 65 63 6f 75 6e 74 31 30 39 |0992filecount109|
+  0030: 30 39 39 32 66 69 6c 65 63 6f 75 6e 74 31 30 39 |0992filecount109| (no-bigendian !)
+  0030: 30 39 38 38 66 69 6c 65 63 6f 75 6e 74 31 30 39 |0988filecount109| (bigendian !)
   0040: 32 72 65 71 75 69 72 65 6d 65 6e 74 73 64 6f 74 |2requirementsdot|
   0050: 65 6e 63 6f 64 65 25 32 43 66 6e 63 61 63 68 65 |encode%2Cfncache|
   0060: 25 32 43 67 65 6e 65 72 61 6c 64 65 6c 74 61 25 |%2Cgeneraldelta%|
@@ -518,7 +520,8 @@ Clone with background file closing enabled
   transferred 101 KB in * seconds (* */sec) (glob) (no-zstd !)
   bundle2-input-part: total payload size 118568 (no-zstd !)
   transferred 98.6 KB in * seconds (* */sec) (glob) (zstd !)
-  bundle2-input-part: total payload size 115726 (zstd !)
+  bundle2-input-part: total payload size 115726 (zstd no-bigendian !)
+  bundle2-input-part: total payload size 115722 (zstd bigendian !)
   bundle2-input-part: "listkeys" (params: 1 mandatory) supported
   bundle2-input-bundle: 2 parts total
   checking for updated bookmarks

diff --git a/tests/test-generaldelta.t b/tests/test-generaldelta.t
index 872d0d37860f26a8cd3add1b317d184a6aceb97e..9dbf5aff0186df6a85323b20651b4104c2983d8d 100644 (file)
--- a/tests/test-generaldelta.t
+++ b/tests/test-generaldelta.t
@@ -290,11 +290,14 @@ test maxdeltachainspan
        52       4        4       51      p1         58        640        669   1.04531       669         0    0.00000 (no-zstd !)
        49       4        1       -1    base        205        316        205   0.64873       205         0    0.00000 (zstd !)
        50       4        2       49      p1         58        362        263   0.72652       263         0    0.00000 (zstd !)
-       51       4        3       50    prev        366        594        629   1.05892       629         0    0.00000 (zstd !)
-       52       4        4       51      p1         58        640        687   1.07344       687         0    0.00000 (zstd !)
+       51       4        3       50    prev        366        594        629   1.05892       629         0    0.00000 (zstd no-bigendian !)
+       52       4        4       51      p1         58        640        687   1.07344       687         0    0.00000 (zstd no-bigendian !)
+       51       4        3       50    prev        367        594        630   1.06061       630         0    0.00000 (zstd bigendian !)
+       52       4        4       51      p1         58        640        688   1.07500       688         0    0.00000 (zstd bigendian !)
        53       5        1       -1    base          0          0          0   0.00000         0         0    0.00000
        54       6        1       -1    base        369        640        369   0.57656       369         0    0.00000 (no-zstd !)
-       54       6        1       -1    base        375        640        375   0.58594       375         0    0.00000 (zstd !)
+       54       6        1       -1    base        375        640        375   0.58594       375         0    0.00000 (zstd no-bigendian !)
+       54       6        1       -1    base        376        640        376   0.58750       376         0    0.00000 (zstd bigendian !)
   $ hg clone --pull source-repo --config experimental.maxdeltachainspan=2800 relax-chain --config format.generaldelta=yes
   requesting all changes
   adding changesets
@@ -362,10 +365,12 @@ test maxdeltachainspan
        49       4        1       -1    base        205        316        205   0.64873       205         0    0.00000 (zstd !)
        50       4        2       49      p1         58        362        263   0.72652       263         0    0.00000 (zstd !)
        51       2       13       17      p1         58        594        739   1.24411      2789      2050    2.77402 (zstd !)
-       52       5        1       -1    base        375        640        375   0.58594       375         0    0.00000 (zstd !)
+       52       5        1       -1    base        375        640        375   0.58594       375         0    0.00000 (zstd no-bigendian !)
+       52       5        1       -1    base        376        640        376   0.58750       376         0    0.00000 (zstd bigendian !)
        53       6        1       -1    base          0          0          0   0.00000         0         0    0.00000
        54       7        1       -1    base        369        640        369   0.57656       369         0    0.00000 (no-zstd !)
-       54       7        1       -1    base        375        640        375   0.58594       375         0    0.00000 (zstd !)
+       54       7        1       -1    base        375        640        375   0.58594       375         0    0.00000 (zstd no-bigendian !)
+       54       7        1       -1    base        376        640        376   0.58750       376         0    0.00000 (zstd bigendian !)
   $ hg clone --pull source-repo --config experimental.maxdeltachainspan=0 noconst-chain --config format.usegeneraldelta=yes --config storage.revlog.reuse-external-delta-parent=no
   requesting all changes
   adding changesets
@@ -432,4 +437,5 @@ test maxdeltachainspan
        52       2       14       51      p1         58        640        797   1.24531      2700      1903    2.38770
        53       4        1       -1    base          0          0          0   0.00000         0         0    0.00000
        54       5        1       -1    base        369        640        369   0.57656       369         0    0.00000 (no-zstd !)
-       54       5        1       -1    base        375        640        375   0.58594       375         0    0.00000 (zstd !)
+       54       5        1       -1    base        375        640        375   0.58594       375         0    0.00000 (zstd no-bigendian !)
+       54       5        1       -1    base        376        640        376   0.58750       376         0    0.00000 (zstd bigendian !)

diff --git a/tests/test-persistent-nodemap.t b/tests/test-persistent-nodemap.t
index 83da9f86c9aec7225338fe4ebf214d37c0935f09..1b639dc6ebbd0d3db39b08fe69b6139aa421eb4a 100644 (file)
--- a/tests/test-persistent-nodemap.t
+++ b/tests/test-persistent-nodemap.t
@@ -874,7 +874,8 @@ No race condition
   adding [s] 00changelog.n (62 bytes)
   adding [s] 00changelog-*.nd (118 KB) (glob)
   adding [s] 00manifest.d (452 KB) (no-zstd !)
-  adding [s] 00manifest.d (491 KB) (zstd !)
+  adding [s] 00manifest.d (491 KB) (zstd no-bigendian !)
+  adding [s] 00manifest.d (492 KB) (zstd bigendian !)
   adding [s] 00changelog.d (360 KB) (no-zstd !)
   adding [s] 00changelog.d (368 KB) (zstd !)
   adding [s] 00manifest.i (313 KB)
@@ -914,7 +915,8 @@ Check and record file state beforehand
 
   $ f --size test-repo/.hg/store/00changelog*
   test-repo/.hg/store/00changelog-*.nd: size=121088 (glob)
-  test-repo/.hg/store/00changelog.d: size=376891 (zstd !)
+  test-repo/.hg/store/00changelog.d: size=376891 (zstd no-bigendian !)
+  test-repo/.hg/store/00changelog.d: size=376889 (zstd bigendian !)
   test-repo/.hg/store/00changelog.d: size=368890 (no-zstd !)
   test-repo/.hg/store/00changelog.i: size=320384
   test-repo/.hg/store/00changelog.n: size=62
@@ -944,7 +946,8 @@ Do a mix of clone and commit at the same time so that the file listed on disk di
   adding [s] 00changelog.n (62 bytes)
   adding [s] 00changelog-*.nd (118 KB) (glob)
   adding [s] 00manifest.d (452 KB) (no-zstd !)
-  adding [s] 00manifest.d (491 KB) (zstd !)
+  adding [s] 00manifest.d (491 KB) (zstd no-bigendian !)
+  adding [s] 00manifest.d (492 KB) (zstd bigendian !)
   adding [s] 00changelog.d (360 KB) (no-zstd !)
   adding [s] 00changelog.d (368 KB) (zstd !)
   adding [s] 00manifest.i (313 KB)
@@ -955,7 +958,8 @@ Check the result state
   $ f --size stream-clone-race-1/.hg/store/00changelog*
   stream-clone-race-1/.hg/store/00changelog-*.nd: size=121088 (glob)
   stream-clone-race-1/.hg/store/00changelog.d: size=368890 (no-zstd !)
-  stream-clone-race-1/.hg/store/00changelog.d: size=376891 (zstd !)
+  stream-clone-race-1/.hg/store/00changelog.d: size=376891 (zstd no-bigendian !)
+  stream-clone-race-1/.hg/store/00changelog.d: size=376889 (zstd bigendian !)
   stream-clone-race-1/.hg/store/00changelog.i: size=320384
   stream-clone-race-1/.hg/store/00changelog.n: size=62
 
@@ -1009,7 +1013,8 @@ Check the initial state
   test-repo/.hg/store/00changelog-*.nd: size=121344 (glob) (rust !)
   test-repo/.hg/store/00changelog-*.nd: size=121344 (glob) (pure !)
   test-repo/.hg/store/00changelog-*.nd: size=121152 (glob) (no-rust no-pure !)
-  test-repo/.hg/store/00changelog.d: size=376950 (zstd !)
+  test-repo/.hg/store/00changelog.d: size=376950 (zstd no-bigendian !)
+  test-repo/.hg/store/00changelog.d: size=376948 (zstd bigendian !)
   test-repo/.hg/store/00changelog.d: size=368949 (no-zstd !)
   test-repo/.hg/store/00changelog.i: size=320448
   test-repo/.hg/store/00changelog.n: size=62
@@ -1060,7 +1065,8 @@ Check the result.
   stream-clone-race-2/.hg/store/00changelog-*.nd: size=121344 (glob) (rust !)
   stream-clone-race-2/.hg/store/00changelog-*.nd: size=121344 (glob) (pure !)
   stream-clone-race-2/.hg/store/00changelog-*.nd: size=121152 (glob) (no-rust no-pure !)
-  stream-clone-race-2/.hg/store/00changelog.d: size=376950 (zstd !)
+  stream-clone-race-2/.hg/store/00changelog.d: size=376950 (zstd no-bigendian !)
+  stream-clone-race-2/.hg/store/00changelog.d: size=376948 (zstd bigendian !)
   stream-clone-race-2/.hg/store/00changelog.d: size=368949 (no-zstd !)
   stream-clone-race-2/.hg/store/00changelog.i: size=320448
   stream-clone-race-2/.hg/store/00changelog.n: size=62