fix: generated .xz files with xz-utils>=5.5.1alpha

moreati · Rogdham · commit 20231fe3efe8 · 2025-09-18T21:22:47.000+02:00
Since xz-utils 5.5.1alpha, the default is not -T1 anymore
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@ adheres to [Semantic Versioning](https://semver.org/).
 
 ### :house: Internal
 
+- Fix test xz files generation for xz-utils 5.5.1+
 - Freeze dev dependencies versions
 - Update GitHub actions dependencies
 - Add tests for PyPy 3.10 and 3.11
diff --git a/tests/integration/files/check-crc32.json b/tests/integration/files/check-crc32.json
@@ -1,7 +1,7 @@
 {
   "generate": [
     {
-      "cmd": "xz -C crc32",
+      "cmd": "xz -T1 -C crc32",
       "length": 20280
     }
   ],
diff --git a/tests/integration/files/check-crc64.json b/tests/integration/files/check-crc64.json
@@ -1,7 +1,7 @@
 {
   "generate": [
     {
-      "cmd": "xz -C crc64",
+      "cmd": "xz -T1 -C crc64",
       "length": 20280
     }
   ],
diff --git a/tests/integration/files/check-none.json b/tests/integration/files/check-none.json
@@ -1,7 +1,7 @@
 {
   "generate": [
     {
-      "cmd": "xz -C none",
+      "cmd": "xz -T1 -C none",
       "length": 20280
     }
   ],
diff --git a/tests/integration/files/check-sha256.json b/tests/integration/files/check-sha256.json
@@ -1,7 +1,7 @@
 {
   "generate": [
     {
-      "cmd": "xz -C sha256",
+      "cmd": "xz -T1 -C sha256",
       "length": 20280
     }
   ],
diff --git a/tests/integration/files/few-blocks.json b/tests/integration/files/few-blocks.json
@@ -1,7 +1,7 @@
 {
   "generate": [
     {
-      "cmd": "xz --block-size 10000",
+      "cmd": "xz -T1 --block-size 10000",
       "length": 20280
     }
   ],
diff --git a/tests/integration/files/many-blocks.json b/tests/integration/files/many-blocks.json
@@ -1,7 +1,7 @@
 {
   "generate": [
     {
-      "cmd": "xz --block-size 100",
+      "cmd": "xz -T1 --block-size 100",
       "length": 20280
     }
   ],
diff --git a/tests/integration/files/one-stream-with-padding.json b/tests/integration/files/one-stream-with-padding.json
@@ -1,7 +1,7 @@
 {
   "generate": [
     {
-      "cmd": "xz --block-size 15000",
+      "cmd": "xz -T1 --block-size 15000",
       "length": 20280
     },
     {
diff --git a/tests/integration/files/several-filters.json b/tests/integration/files/several-filters.json
@@ -1,7 +1,7 @@
 {
   "generate": [
     {
-      "cmd": "xz --x86=start=42 --delta=dist=3 --powerpc --lzma2",
+      "cmd": "xz -T1 --x86=start=42 --delta=dist=3 --powerpc --lzma2",
       "length": 20280
     }
   ],
diff --git a/tests/integration/files/several-streams-with-padding.json b/tests/integration/files/several-streams-with-padding.json
@@ -1,21 +1,21 @@
 {
   "generate": [
     {
-      "cmd": "xz --block-size 1000",
+      "cmd": "xz -T1 --block-size 1000",
       "length": 1500
     },
     {
       "cmd": "head -c 100 /dev/zero"
     },
     {
-      "cmd": "xz",
+      "cmd": "xz -T1",
       "length": 2000
     },
     {
       "cmd": "head -c 200 /dev/zero"
     },
     {
-      "cmd": "xz --block-size 4000",
+      "cmd": "xz -T1 --block-size 4000",
       "length": 16780
     },
     {
diff --git a/tests/integration/files/several-streams.json b/tests/integration/files/several-streams.json
@@ -1,15 +1,15 @@
 {
   "generate": [
     {
-      "cmd": "xz --block-size 5000",
+      "cmd": "xz -T1 --block-size 5000",
       "length": 17000
     },
     {
-      "cmd": "xz --block-size 1000",
+      "cmd": "xz -T1 --block-size 1000",
       "length": 2100
     },
     {
-      "cmd": "xz",
+      "cmd": "xz -T1",
       "length": 1180
     }
   ],
diff --git a/tests/integration/files/various-block-sizes.json b/tests/integration/files/various-block-sizes.json
@@ -1,7 +1,7 @@
 {
   "generate": [
     {
-      "cmd": "xz --block-list 1234,567,8901,234,5678,90,0",
+      "cmd": "xz -T1 --block-list 1234,567,8901,234,5678,90,0",
       "length": 20280
     }
   ],
diff --git a/tests/integration/files/various-stream-checks-stream-padding-and-block-sizes.json b/tests/integration/files/various-stream-checks-stream-padding-and-block-sizes.json
@@ -1,25 +1,25 @@
 {
   "generate": [
     {
-      "cmd": "xz -C none --block-list 100,1000,200,2000,0",
+      "cmd": "xz -T1 -C none --block-list 100,1000,200,2000,0",
       "length": 3600
     },
     {
       "cmd": "head -c 100 /dev/zero"
     },
     {
-      "cmd": "xz -C crc32",
+      "cmd": "xz -T1 -C crc32",
       "length": 10000
     },
     {
       "cmd": "head -c 800 /dev/zero"
     },
     {
-      "cmd": "xz -C crc64 --block-list 3000,300,0",
+      "cmd": "xz -T1 -C crc64 --block-list 3000,300,0",
       "length": 3333
     },
     {
-      "cmd": "xz -C sha256 --block-size 600",
+      "cmd": "xz -T1 -C sha256 --block-size 600",
       "length": 3347
     },
     {
diff --git a/tests/integration/files/various-stream-checks.json b/tests/integration/files/various-stream-checks.json
@@ -1,19 +1,19 @@
 {
   "generate": [
     {
-      "cmd": "xz -C none",
+      "cmd": "xz -T1 -C none",
       "length": 5070
     },
     {
-      "cmd": "xz -C crc32",
+      "cmd": "xz -T1 -C crc32",
       "length": 5070
     },
     {
-      "cmd": "xz -C crc64",
+      "cmd": "xz -T1 -C crc64",
       "length": 5070
     },
     {
-      "cmd": "xz -C sha256",
+      "cmd": "xz -T1 -C sha256",
       "length": 5070
     }
   ],

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"generate": [`
`3`	`3`	`{`
`4`		`- "cmd": "xz -C crc32",`
	`4`	`+ "cmd": "xz -T1 -C crc32",`
`5`	`5`	`"length": 20280`
`6`	`6`	`}`
`7`	`7`	`],`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"generate": [`
`3`	`3`	`{`
`4`		`- "cmd": "xz -C crc64",`
	`4`	`+ "cmd": "xz -T1 -C crc64",`
`5`	`5`	`"length": 20280`
`6`	`6`	`}`
`7`	`7`	`],`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"generate": [`
`3`	`3`	`{`
`4`		`- "cmd": "xz -C none",`
	`4`	`+ "cmd": "xz -T1 -C none",`
`5`	`5`	`"length": 20280`
`6`	`6`	`}`
`7`	`7`	`],`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"generate": [`
`3`	`3`	`{`
`4`		`- "cmd": "xz -C sha256",`
	`4`	`+ "cmd": "xz -T1 -C sha256",`
`5`	`5`	`"length": 20280`
`6`	`6`	`}`
`7`	`7`	`],`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"generate": [`
`3`	`3`	`{`
`4`		`- "cmd": "xz --block-size 10000",`
	`4`	`+ "cmd": "xz -T1 --block-size 10000",`
`5`	`5`	`"length": 20280`
`6`	`6`	`}`
`7`	`7`	`],`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"generate": [`
`3`	`3`	`{`
`4`		`- "cmd": "xz --block-size 100",`
	`4`	`+ "cmd": "xz -T1 --block-size 100",`
`5`	`5`	`"length": 20280`
`6`	`6`	`}`
`7`	`7`	`],`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"generate": [`
`3`	`3`	`{`
`4`		`- "cmd": "xz --block-size 15000",`
	`4`	`+ "cmd": "xz -T1 --block-size 15000",`
`5`	`5`	`"length": 20280`
`6`	`6`	`},`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"generate": [`
`3`	`3`	`{`
`4`		`- "cmd": "xz --x86=start=42 --delta=dist=3 --powerpc --lzma2",`
	`4`	`+ "cmd": "xz -T1 --x86=start=42 --delta=dist=3 --powerpc --lzma2",`
`5`	`5`	`"length": 20280`
`6`	`6`	`}`
`7`	`7`	`],`
Original file line number	Diff line number	Diff line change
`@@ -1,21 +1,21 @@`
`1`	`1`	`{`
`2`	`2`	`"generate": [`
`3`	`3`	`{`
`4`		`- "cmd": "xz --block-size 1000",`
	`4`	`+ "cmd": "xz -T1 --block-size 1000",`
`5`	`5`	`"length": 1500`
`6`	`6`	`},`
`7`	`7`	`{`
`8`	`8`	`"cmd": "head -c 100 /dev/zero"`
`9`	`9`	`},`
`10`	`10`	`{`
`11`		`- "cmd": "xz",`
	`11`	`+ "cmd": "xz -T1",`
`12`	`12`	`"length": 2000`
`13`	`13`	`},`
`14`	`14`	`{`
`15`	`15`	`"cmd": "head -c 200 /dev/zero"`
`16`	`16`	`},`
`17`	`17`	`{`
`18`		`- "cmd": "xz --block-size 4000",`
	`18`	`+ "cmd": "xz -T1 --block-size 4000",`
`19`	`19`	`"length": 16780`
`20`	`20`	`},`
`21`	`21`	`{`