From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Date: Wed, 23 Nov 2022 22:11:15 +0000 (+1300)
Subject: testdata: move compression examples to re-use with lzxpress plain
X-Git-Tag: talloc-2.4.0~430
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce7ea07d073ed7169073a1870b61533b7f6f769b;p=thirdparty%2Fsamba.git

testdata: move compression examples to re-use with lzxpress plain

Everything that is in testdata/compression/lzxpress-huffman/ can also
be used for lzxpress plain tests, which is something we really need.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Joseph Sutton <josephsutton@catalyst.net.nz>
---

diff --git a/lib/compression/tests/test_lzx_huffman.c b/lib/compression/tests/test_lzx_huffman.c
index 92e7222f431..2adbe68f799 100644
--- a/lib/compression/tests/test_lzx_huffman.c
+++ b/lib/compression/tests/test_lzx_huffman.c
@@ -88,9 +88,9 @@ struct lzx_file_pair {
 };
 
 
-#define DECOMP_DIR "testdata/compression/lzxpress-huffman/decompressed"
-#define COMP_DIR "testdata/compression/lzxpress-huffman/compressed"
-#define MORE_COMP_DIR "testdata/compression/lzxpress-huffman/more-compressed"
+#define DECOMP_DIR "testdata/compression/decompressed"
+#define COMP_DIR "testdata/compression/compressed-huffman"
+#define MORE_COMP_DIR "testdata/compression/compressed-more-huffman"
 
 
 #define VARRGH(...) __VA_ARGS__
diff --git a/testdata/compression/README b/testdata/compression/README
new file mode 100644
index 00000000000..24c4d4619c9
--- /dev/null
+++ b/testdata/compression/README
@@ -0,0 +1,47 @@
+# Test vectors for MS-XCA [de-]compression
+
+There are currently two supported varients of the Xpress Compression
+Algorithm, "Plain LZ77" and "LZ77 + Huffman". For each we two
+directories of files compressed on Windows, corresponding to the two
+compression levels that Windows offers.
+
+The subdirectories are
+
+./decompressed            - test files to compress with .decomp extension.
+./compressed-huffman      - LZ77+Huffman compressed, with .lzhuff extension.
+./compressed-more-huffman - LZ77+Huffman compressed, with .lzhuff extension.
+./compressed-plain        - Plain LZ77 compressed, with .lzplain extension.
+./compressed-more-plain   - Plain LZ77 compressed, with .lzplain extension.
+
+where the more-compressed-* versions have the files that Windows put
+more effort into compressing (largely in vain -- they are similar in
+size). Windows probably does not use this more effortful compression
+in network protocols, but these files must be decompressible.
+
+The compressed files were made using the Windows Compression API,
+which uses the same underlying code as MS-XCA, but which puts some
+annoying hurdles in the way. In particular, it won't perform
+LZ77+Huffman compression on any file smaller than 300 bytes. The
+relationship between the two is covered in various messages in
+
+https://lists.samba.org/archive/cifs-protocol/2022-October/
+https://lists.samba.org/archive/cifs-protocol/2022-November/
+
+To recreate these files or add more, use
+lib/compression/tests/scripts/generate-windows-test-vectors.c under
+Cygwin or MSYS2. This file is also in the decompressed directory.
+
+Some of the decompressed files were found via fuzzing, some are designed
+to test one aspect or another of the format, while others are public
+domain texts.
+
+These are used in compression and decompression tests.
+
+- For decompression tests, we need the decompressed versions to
+  compare against.
+
+- For compression tests, we do not assert that the compressed file is
+  identical to the Windows compressed file. Exact equality is not
+  expected by MS-XCA, which leaves room for implementation tricks, but
+  the size of the compressed file allows us to make ballpark
+  assertions about expected compression ratios.
diff --git a/testdata/compression/lzxpress-huffman/compressed/27826-8.txt.lzhuff b/testdata/compression/compressed-huffman/27826-8.txt.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/27826-8.txt.lzhuff
rename to testdata/compression/compressed-huffman/27826-8.txt.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/5d049b4cb1bd933f5e8ex19.lzhuff b/testdata/compression/compressed-huffman/5d049b4cb1bd933f5e8ex19.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/5d049b4cb1bd933f5e8ex19.lzhuff
rename to testdata/compression/compressed-huffman/5d049b4cb1bd933f5e8ex19.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/638e61e96d54279981c3x5.lzhuff b/testdata/compression/compressed-huffman/638e61e96d54279981c3x5.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/638e61e96d54279981c3x5.lzhuff
rename to testdata/compression/compressed-huffman/638e61e96d54279981c3x5.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/64k-minus-one-zeros.lzhuff b/testdata/compression/compressed-huffman/64k-minus-one-zeros.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/64k-minus-one-zeros.lzhuff
rename to testdata/compression/compressed-huffman/64k-minus-one-zeros.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/64k-plus-one-zeros.lzhuff b/testdata/compression/compressed-huffman/64k-plus-one-zeros.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/64k-plus-one-zeros.lzhuff
rename to testdata/compression/compressed-huffman/64k-plus-one-zeros.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/64k-zeros.lzhuff b/testdata/compression/compressed-huffman/64k-zeros.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/64k-zeros.lzhuff
rename to testdata/compression/compressed-huffman/64k-zeros.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/96f696a4e5ce56c61a3dx10.lzhuff b/testdata/compression/compressed-huffman/96f696a4e5ce56c61a3dx10.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/96f696a4e5ce56c61a3dx10.lzhuff
rename to testdata/compression/compressed-huffman/96f696a4e5ce56c61a3dx10.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/9e0b6a12febf38e98f13.lzhuff b/testdata/compression/compressed-huffman/9e0b6a12febf38e98f13.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/9e0b6a12febf38e98f13.lzhuff
rename to testdata/compression/compressed-huffman/9e0b6a12febf38e98f13.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/abc-times-101.lzhuff b/testdata/compression/compressed-huffman/abc-times-101.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/abc-times-101.lzhuff
rename to testdata/compression/compressed-huffman/abc-times-101.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/abc-times-105.lzhuff b/testdata/compression/compressed-huffman/abc-times-105.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/abc-times-105.lzhuff
rename to testdata/compression/compressed-huffman/abc-times-105.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/abc-times-200.lzhuff b/testdata/compression/compressed-huffman/abc-times-200.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/abc-times-200.lzhuff
rename to testdata/compression/compressed-huffman/abc-times-200.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/and_rand-128k+.lzhuff b/testdata/compression/compressed-huffman/and_rand-128k+.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/and_rand-128k+.lzhuff
rename to testdata/compression/compressed-huffman/and_rand-128k+.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/and_rand.lzhuff b/testdata/compression/compressed-huffman/and_rand.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/and_rand.lzhuff
rename to testdata/compression/compressed-huffman/and_rand.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/b63289ccc7f218c0d56b.lzhuff b/testdata/compression/compressed-huffman/b63289ccc7f218c0d56b.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/b63289ccc7f218c0d56b.lzhuff
rename to testdata/compression/compressed-huffman/b63289ccc7f218c0d56b.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/beta-variate1-128k+.lzhuff b/testdata/compression/compressed-huffman/beta-variate1-128k+.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/beta-variate1-128k+.lzhuff
rename to testdata/compression/compressed-huffman/beta-variate1-128k+.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/beta-variate2-128k+.lzhuff b/testdata/compression/compressed-huffman/beta-variate2-128k+.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/beta-variate2-128k+.lzhuff
rename to testdata/compression/compressed-huffman/beta-variate2-128k+.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/beta-variate3-128k+.lzhuff b/testdata/compression/compressed-huffman/beta-variate3-128k+.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/beta-variate3-128k+.lzhuff
rename to testdata/compression/compressed-huffman/beta-variate3-128k+.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/decayed_alphabet_128k+.lzhuff b/testdata/compression/compressed-huffman/decayed_alphabet_128k+.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/decayed_alphabet_128k+.lzhuff
rename to testdata/compression/compressed-huffman/decayed_alphabet_128k+.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/decayed_alphabet_64k.lzhuff b/testdata/compression/compressed-huffman/decayed_alphabet_64k.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/decayed_alphabet_64k.lzhuff
rename to testdata/compression/compressed-huffman/decayed_alphabet_64k.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/exp_shuffle-128k+.lzhuff b/testdata/compression/compressed-huffman/exp_shuffle-128k+.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/exp_shuffle-128k+.lzhuff
rename to testdata/compression/compressed-huffman/exp_shuffle-128k+.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/exp_shuffle.lzhuff b/testdata/compression/compressed-huffman/exp_shuffle.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/exp_shuffle.lzhuff
rename to testdata/compression/compressed-huffman/exp_shuffle.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/f00842317dc6d5695b02.lzhuff b/testdata/compression/compressed-huffman/f00842317dc6d5695b02.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/f00842317dc6d5695b02.lzhuff
rename to testdata/compression/compressed-huffman/f00842317dc6d5695b02.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/fib_shuffle-128k+.lzhuff b/testdata/compression/compressed-huffman/fib_shuffle-128k+.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/fib_shuffle-128k+.lzhuff
rename to testdata/compression/compressed-huffman/fib_shuffle-128k+.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/fib_shuffle.lzhuff b/testdata/compression/compressed-huffman/fib_shuffle.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/fib_shuffle.lzhuff
rename to testdata/compression/compressed-huffman/fib_shuffle.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/fuzzing-0fc2d461b56cd8103c91.lzhuff b/testdata/compression/compressed-huffman/fuzzing-0fc2d461b56cd8103c91.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/fuzzing-0fc2d461b56cd8103c91.lzhuff
rename to testdata/compression/compressed-huffman/fuzzing-0fc2d461b56cd8103c91.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/fuzzing-17c961778538cc10ab7c.lzhuff b/testdata/compression/compressed-huffman/fuzzing-17c961778538cc10ab7c.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/fuzzing-17c961778538cc10ab7c.lzhuff
rename to testdata/compression/compressed-huffman/fuzzing-17c961778538cc10ab7c.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/fuzzing-3591f9dc02bb00a54b60.lzhuff b/testdata/compression/compressed-huffman/fuzzing-3591f9dc02bb00a54b60.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/fuzzing-3591f9dc02bb00a54b60.lzhuff
rename to testdata/compression/compressed-huffman/fuzzing-3591f9dc02bb00a54b60.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/fuzzing-3ec3bca27bb9eb40c128.lzhuff b/testdata/compression/compressed-huffman/fuzzing-3ec3bca27bb9eb40c128.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/fuzzing-3ec3bca27bb9eb40c128.lzhuff
rename to testdata/compression/compressed-huffman/fuzzing-3ec3bca27bb9eb40c128.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/fuzzing-80b4fa18ff5f8dd04862.lzhuff b/testdata/compression/compressed-huffman/fuzzing-80b4fa18ff5f8dd04862.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/fuzzing-80b4fa18ff5f8dd04862.lzhuff
rename to testdata/compression/compressed-huffman/fuzzing-80b4fa18ff5f8dd04862.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/fuzzing-a3115a81d1ac500318f9.lzhuff b/testdata/compression/compressed-huffman/fuzzing-a3115a81d1ac500318f9.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/fuzzing-a3115a81d1ac500318f9.lzhuff
rename to testdata/compression/compressed-huffman/fuzzing-a3115a81d1ac500318f9.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/generate-windows-test-vectors.c.lzhuff b/testdata/compression/compressed-huffman/generate-windows-test-vectors.c.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/generate-windows-test-vectors.c.lzhuff
rename to testdata/compression/compressed-huffman/generate-windows-test-vectors.c.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/midsummer-nights-dream.txt.lzhuff b/testdata/compression/compressed-huffman/midsummer-nights-dream.txt.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/midsummer-nights-dream.txt.lzhuff
rename to testdata/compression/compressed-huffman/midsummer-nights-dream.txt.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/notes-on-the-underground.txt.lzhuff b/testdata/compression/compressed-huffman/notes-on-the-underground.txt.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/notes-on-the-underground.txt.lzhuff
rename to testdata/compression/compressed-huffman/notes-on-the-underground.txt.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/pg22009.txt.lzhuff b/testdata/compression/compressed-huffman/pg22009.txt.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/pg22009.txt.lzhuff
rename to testdata/compression/compressed-huffman/pg22009.txt.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/repeating-exactly-64k.lzhuff b/testdata/compression/compressed-huffman/repeating-exactly-64k.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/repeating-exactly-64k.lzhuff
rename to testdata/compression/compressed-huffman/repeating-exactly-64k.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/repeating.lzhuff b/testdata/compression/compressed-huffman/repeating.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/repeating.lzhuff
rename to testdata/compression/compressed-huffman/repeating.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/setup.log.lzhuff b/testdata/compression/compressed-huffman/setup.log.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/setup.log.lzhuff
rename to testdata/compression/compressed-huffman/setup.log.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/skewed_choices-128k+.lzhuff b/testdata/compression/compressed-huffman/skewed_choices-128k+.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/skewed_choices-128k+.lzhuff
rename to testdata/compression/compressed-huffman/skewed_choices-128k+.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/skewed_choices.lzhuff b/testdata/compression/compressed-huffman/skewed_choices.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/skewed_choices.lzhuff
rename to testdata/compression/compressed-huffman/skewed_choices.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/slow-015ddc36a71412ccc50d.lzhuff b/testdata/compression/compressed-huffman/slow-015ddc36a71412ccc50d.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/slow-015ddc36a71412ccc50d.lzhuff
rename to testdata/compression/compressed-huffman/slow-015ddc36a71412ccc50d.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/slow-100e9f966a7feb9ca40a.lzhuff b/testdata/compression/compressed-huffman/slow-100e9f966a7feb9ca40a.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/slow-100e9f966a7feb9ca40a.lzhuff
rename to testdata/compression/compressed-huffman/slow-100e9f966a7feb9ca40a.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/slow-2a671c3cff4f1574cbab.lzhuff b/testdata/compression/compressed-huffman/slow-2a671c3cff4f1574cbab.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/slow-2a671c3cff4f1574cbab.lzhuff
rename to testdata/compression/compressed-huffman/slow-2a671c3cff4f1574cbab.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/slow-33d90a24e70515b14cd0.lzhuff b/testdata/compression/compressed-huffman/slow-33d90a24e70515b14cd0.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/slow-33d90a24e70515b14cd0.lzhuff
rename to testdata/compression/compressed-huffman/slow-33d90a24e70515b14cd0.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/slow-49d8c05261e3f412fc72.lzhuff b/testdata/compression/compressed-huffman/slow-49d8c05261e3f412fc72.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/slow-49d8c05261e3f412fc72.lzhuff
rename to testdata/compression/compressed-huffman/slow-49d8c05261e3f412fc72.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/slow-50a249d2fe56873e56a0.lzhuff b/testdata/compression/compressed-huffman/slow-50a249d2fe56873e56a0.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/slow-50a249d2fe56873e56a0.lzhuff
rename to testdata/compression/compressed-huffman/slow-50a249d2fe56873e56a0.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/slow-63e9f0b52235fb0129fa.lzhuff b/testdata/compression/compressed-huffman/slow-63e9f0b52235fb0129fa.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/slow-63e9f0b52235fb0129fa.lzhuff
rename to testdata/compression/compressed-huffman/slow-63e9f0b52235fb0129fa.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/slow-73b7f971d65908ac0095.lzhuff b/testdata/compression/compressed-huffman/slow-73b7f971d65908ac0095.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/slow-73b7f971d65908ac0095.lzhuff
rename to testdata/compression/compressed-huffman/slow-73b7f971d65908ac0095.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/slow-8b61e3dd267908544531.lzhuff b/testdata/compression/compressed-huffman/slow-8b61e3dd267908544531.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/slow-8b61e3dd267908544531.lzhuff
rename to testdata/compression/compressed-huffman/slow-8b61e3dd267908544531.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/slow-9d1c5a079b0462986f1f.lzhuff b/testdata/compression/compressed-huffman/slow-9d1c5a079b0462986f1f.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/slow-9d1c5a079b0462986f1f.lzhuff
rename to testdata/compression/compressed-huffman/slow-9d1c5a079b0462986f1f.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/slow-aa7262a821dabdcf04a6.lzhuff b/testdata/compression/compressed-huffman/slow-aa7262a821dabdcf04a6.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/slow-aa7262a821dabdcf04a6.lzhuff
rename to testdata/compression/compressed-huffman/slow-aa7262a821dabdcf04a6.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/slow-b8a91d142b0d2af7f5ca.lzhuff b/testdata/compression/compressed-huffman/slow-b8a91d142b0d2af7f5ca.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/slow-b8a91d142b0d2af7f5ca.lzhuff
rename to testdata/compression/compressed-huffman/slow-b8a91d142b0d2af7f5ca.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/slow-c79142457734bbc8d575.lzhuff b/testdata/compression/compressed-huffman/slow-c79142457734bbc8d575.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/slow-c79142457734bbc8d575.lzhuff
rename to testdata/compression/compressed-huffman/slow-c79142457734bbc8d575.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/slow-d736544545b90d83fe75.lzhuff b/testdata/compression/compressed-huffman/slow-d736544545b90d83fe75.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/slow-d736544545b90d83fe75.lzhuff
rename to testdata/compression/compressed-huffman/slow-d736544545b90d83fe75.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/slow-e3b9bdfaed7d1a606fdb.lzhuff b/testdata/compression/compressed-huffman/slow-e3b9bdfaed7d1a606fdb.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/slow-e3b9bdfaed7d1a606fdb.lzhuff
rename to testdata/compression/compressed-huffman/slow-e3b9bdfaed7d1a606fdb.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/slow-f3f1c02a9d006e5e1703.lzhuff b/testdata/compression/compressed-huffman/slow-f3f1c02a9d006e5e1703.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/slow-f3f1c02a9d006e5e1703.lzhuff
rename to testdata/compression/compressed-huffman/slow-f3f1c02a9d006e5e1703.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/square_series-128k+.lzhuff b/testdata/compression/compressed-huffman/square_series-128k+.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/square_series-128k+.lzhuff
rename to testdata/compression/compressed-huffman/square_series-128k+.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/square_series.lzhuff b/testdata/compression/compressed-huffman/square_series.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/square_series.lzhuff
rename to testdata/compression/compressed-huffman/square_series.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/trigram_128k+.lzhuff b/testdata/compression/compressed-huffman/trigram_128k+.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/trigram_128k+.lzhuff
rename to testdata/compression/compressed-huffman/trigram_128k+.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/trigram_64k.lzhuff b/testdata/compression/compressed-huffman/trigram_64k.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/trigram_64k.lzhuff
rename to testdata/compression/compressed-huffman/trigram_64k.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/trigram_sum_128k+.lzhuff b/testdata/compression/compressed-huffman/trigram_sum_128k+.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/trigram_sum_128k+.lzhuff
rename to testdata/compression/compressed-huffman/trigram_sum_128k+.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/compressed/trigram_sum_64k.lzhuff b/testdata/compression/compressed-huffman/trigram_sum_64k.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/compressed/trigram_sum_64k.lzhuff
rename to testdata/compression/compressed-huffman/trigram_sum_64k.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/more-compressed/27826-8.txt.lzhuff b/testdata/compression/compressed-more-huffman/27826-8.txt.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/more-compressed/27826-8.txt.lzhuff
rename to testdata/compression/compressed-more-huffman/27826-8.txt.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/more-compressed/5d049b4cb1bd933f5e8ex19.lzhuff b/testdata/compression/compressed-more-huffman/5d049b4cb1bd933f5e8ex19.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/more-compressed/5d049b4cb1bd933f5e8ex19.lzhuff
rename to testdata/compression/compressed-more-huffman/5d049b4cb1bd933f5e8ex19.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/more-compressed/638e61e96d54279981c3x5.lzhuff b/testdata/compression/compressed-more-huffman/638e61e96d54279981c3x5.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/more-compressed/638e61e96d54279981c3x5.lzhuff
rename to testdata/compression/compressed-more-huffman/638e61e96d54279981c3x5.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/more-compressed/64k-minus-one-zeros.lzhuff b/testdata/compression/compressed-more-huffman/64k-minus-one-zeros.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/more-compressed/64k-minus-one-zeros.lzhuff
rename to testdata/compression/compressed-more-huffman/64k-minus-one-zeros.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/more-compressed/64k-plus-one-zeros.lzhuff b/testdata/compression/compressed-more-huffman/64k-plus-one-zeros.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/more-compressed/64k-plus-one-zeros.lzhuff
rename to testdata/compression/compressed-more-huffman/64k-plus-one-zeros.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/more-compressed/64k-zeros.lzhuff b/testdata/compression/compressed-more-huffman/64k-zeros.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/more-compressed/64k-zeros.lzhuff
rename to testdata/compression/compressed-more-huffman/64k-zeros.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/more-compressed/96f696a4e5ce56c61a3dx10.lzhuff b/testdata/compression/compressed-more-huffman/96f696a4e5ce56c61a3dx10.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/more-compressed/96f696a4e5ce56c61a3dx10.lzhuff
rename to testdata/compression/compressed-more-huffman/96f696a4e5ce56c61a3dx10.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/more-compressed/9e0b6a12febf38e98f13.lzhuff b/testdata/compression/compressed-more-huffman/9e0b6a12febf38e98f13.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/more-compressed/9e0b6a12febf38e98f13.lzhuff
rename to testdata/compression/compressed-more-huffman/9e0b6a12febf38e98f13.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/more-compressed/abc-times-101.lzhuff b/testdata/compression/compressed-more-huffman/abc-times-101.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/more-compressed/abc-times-101.lzhuff
rename to testdata/compression/compressed-more-huffman/abc-times-101.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/more-compressed/abc-times-105.lzhuff b/testdata/compression/compressed-more-huffman/abc-times-105.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/more-compressed/abc-times-105.lzhuff
rename to testdata/compression/compressed-more-huffman/abc-times-105.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/more-compressed/abc-times-200.lzhuff b/testdata/compression/compressed-more-huffman/abc-times-200.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/more-compressed/abc-times-200.lzhuff
rename to testdata/compression/compressed-more-huffman/abc-times-200.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/more-compressed/and_rand-128k+.lzhuff b/testdata/compression/compressed-more-huffman/and_rand-128k+.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/more-compressed/and_rand-128k+.lzhuff
rename to testdata/compression/compressed-more-huffman/and_rand-128k+.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/more-compressed/and_rand.lzhuff b/testdata/compression/compressed-more-huffman/and_rand.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/more-compressed/and_rand.lzhuff
rename to testdata/compression/compressed-more-huffman/and_rand.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/more-compressed/b63289ccc7f218c0d56b.lzhuff b/testdata/compression/compressed-more-huffman/b63289ccc7f218c0d56b.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/more-compressed/b63289ccc7f218c0d56b.lzhuff
rename to testdata/compression/compressed-more-huffman/b63289ccc7f218c0d56b.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/more-compressed/beta-variate1-128k+.lzhuff b/testdata/compression/compressed-more-huffman/beta-variate1-128k+.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/more-compressed/beta-variate1-128k+.lzhuff
rename to testdata/compression/compressed-more-huffman/beta-variate1-128k+.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/more-compressed/beta-variate2-128k+.lzhuff b/testdata/compression/compressed-more-huffman/beta-variate2-128k+.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/more-compressed/beta-variate2-128k+.lzhuff
rename to testdata/compression/compressed-more-huffman/beta-variate2-128k+.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/more-compressed/beta-variate3-128k+.lzhuff b/testdata/compression/compressed-more-huffman/beta-variate3-128k+.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/more-compressed/beta-variate3-128k+.lzhuff
rename to testdata/compression/compressed-more-huffman/beta-variate3-128k+.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/more-compressed/decayed_alphabet_128k+.lzhuff b/testdata/compression/compressed-more-huffman/decayed_alphabet_128k+.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/more-compressed/decayed_alphabet_128k+.lzhuff
rename to testdata/compression/compressed-more-huffman/decayed_alphabet_128k+.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/more-compressed/decayed_alphabet_64k.lzhuff b/testdata/compression/compressed-more-huffman/decayed_alphabet_64k.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/more-compressed/decayed_alphabet_64k.lzhuff
rename to testdata/compression/compressed-more-huffman/decayed_alphabet_64k.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/more-compressed/exp_shuffle-128k+.lzhuff b/testdata/compression/compressed-more-huffman/exp_shuffle-128k+.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/more-compressed/exp_shuffle-128k+.lzhuff
rename to testdata/compression/compressed-more-huffman/exp_shuffle-128k+.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/more-compressed/exp_shuffle.lzhuff b/testdata/compression/compressed-more-huffman/exp_shuffle.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/more-compressed/exp_shuffle.lzhuff
rename to testdata/compression/compressed-more-huffman/exp_shuffle.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/more-compressed/f00842317dc6d5695b02.lzhuff b/testdata/compression/compressed-more-huffman/f00842317dc6d5695b02.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/more-compressed/f00842317dc6d5695b02.lzhuff
rename to testdata/compression/compressed-more-huffman/f00842317dc6d5695b02.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/more-compressed/fib_shuffle-128k+.lzhuff b/testdata/compression/compressed-more-huffman/fib_shuffle-128k+.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/more-compressed/fib_shuffle-128k+.lzhuff
rename to testdata/compression/compressed-more-huffman/fib_shuffle-128k+.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/more-compressed/fib_shuffle.lzhuff b/testdata/compression/compressed-more-huffman/fib_shuffle.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/more-compressed/fib_shuffle.lzhuff
rename to testdata/compression/compressed-more-huffman/fib_shuffle.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/more-compressed/generate-windows-test-vectors.c.lzhuff b/testdata/compression/compressed-more-huffman/generate-windows-test-vectors.c.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/more-compressed/generate-windows-test-vectors.c.lzhuff
rename to testdata/compression/compressed-more-huffman/generate-windows-test-vectors.c.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/more-compressed/midsummer-nights-dream.txt.lzhuff b/testdata/compression/compressed-more-huffman/midsummer-nights-dream.txt.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/more-compressed/midsummer-nights-dream.txt.lzhuff
rename to testdata/compression/compressed-more-huffman/midsummer-nights-dream.txt.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/more-compressed/notes-on-the-underground.txt.lzhuff b/testdata/compression/compressed-more-huffman/notes-on-the-underground.txt.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/more-compressed/notes-on-the-underground.txt.lzhuff
rename to testdata/compression/compressed-more-huffman/notes-on-the-underground.txt.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/more-compressed/pg22009.txt.lzhuff b/testdata/compression/compressed-more-huffman/pg22009.txt.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/more-compressed/pg22009.txt.lzhuff
rename to testdata/compression/compressed-more-huffman/pg22009.txt.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/more-compressed/repeating-exactly-64k.lzhuff b/testdata/compression/compressed-more-huffman/repeating-exactly-64k.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/more-compressed/repeating-exactly-64k.lzhuff
rename to testdata/compression/compressed-more-huffman/repeating-exactly-64k.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/more-compressed/repeating.lzhuff b/testdata/compression/compressed-more-huffman/repeating.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/more-compressed/repeating.lzhuff
rename to testdata/compression/compressed-more-huffman/repeating.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/more-compressed/setup.log.lzhuff b/testdata/compression/compressed-more-huffman/setup.log.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/more-compressed/setup.log.lzhuff
rename to testdata/compression/compressed-more-huffman/setup.log.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/more-compressed/skewed_choices-128k+.lzhuff b/testdata/compression/compressed-more-huffman/skewed_choices-128k+.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/more-compressed/skewed_choices-128k+.lzhuff
rename to testdata/compression/compressed-more-huffman/skewed_choices-128k+.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/more-compressed/skewed_choices.lzhuff b/testdata/compression/compressed-more-huffman/skewed_choices.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/more-compressed/skewed_choices.lzhuff
rename to testdata/compression/compressed-more-huffman/skewed_choices.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/more-compressed/square_series-128k+.lzhuff b/testdata/compression/compressed-more-huffman/square_series-128k+.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/more-compressed/square_series-128k+.lzhuff
rename to testdata/compression/compressed-more-huffman/square_series-128k+.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/more-compressed/square_series.lzhuff b/testdata/compression/compressed-more-huffman/square_series.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/more-compressed/square_series.lzhuff
rename to testdata/compression/compressed-more-huffman/square_series.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/more-compressed/trigram_128k+.lzhuff b/testdata/compression/compressed-more-huffman/trigram_128k+.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/more-compressed/trigram_128k+.lzhuff
rename to testdata/compression/compressed-more-huffman/trigram_128k+.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/more-compressed/trigram_64k.lzhuff b/testdata/compression/compressed-more-huffman/trigram_64k.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/more-compressed/trigram_64k.lzhuff
rename to testdata/compression/compressed-more-huffman/trigram_64k.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/more-compressed/trigram_sum_128k+.lzhuff b/testdata/compression/compressed-more-huffman/trigram_sum_128k+.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/more-compressed/trigram_sum_128k+.lzhuff
rename to testdata/compression/compressed-more-huffman/trigram_sum_128k+.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/more-compressed/trigram_sum_64k.lzhuff b/testdata/compression/compressed-more-huffman/trigram_sum_64k.lzhuff
similarity index 100%
rename from testdata/compression/lzxpress-huffman/more-compressed/trigram_sum_64k.lzhuff
rename to testdata/compression/compressed-more-huffman/trigram_sum_64k.lzhuff
diff --git a/testdata/compression/lzxpress-huffman/decompressed/27826-8.txt.decomp b/testdata/compression/decompressed/27826-8.txt.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/27826-8.txt.decomp
rename to testdata/compression/decompressed/27826-8.txt.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/5d049b4cb1bd933f5e8ex19.decomp b/testdata/compression/decompressed/5d049b4cb1bd933f5e8ex19.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/5d049b4cb1bd933f5e8ex19.decomp
rename to testdata/compression/decompressed/5d049b4cb1bd933f5e8ex19.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/638e61e96d54279981c3x5.decomp b/testdata/compression/decompressed/638e61e96d54279981c3x5.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/638e61e96d54279981c3x5.decomp
rename to testdata/compression/decompressed/638e61e96d54279981c3x5.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/64k-minus-one-zeros.decomp b/testdata/compression/decompressed/64k-minus-one-zeros.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/64k-minus-one-zeros.decomp
rename to testdata/compression/decompressed/64k-minus-one-zeros.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/64k-plus-one-zeros.decomp b/testdata/compression/decompressed/64k-plus-one-zeros.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/64k-plus-one-zeros.decomp
rename to testdata/compression/decompressed/64k-plus-one-zeros.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/64k-zeros.decomp b/testdata/compression/decompressed/64k-zeros.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/64k-zeros.decomp
rename to testdata/compression/decompressed/64k-zeros.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/96f696a4e5ce56c61a3dx10.decomp b/testdata/compression/decompressed/96f696a4e5ce56c61a3dx10.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/96f696a4e5ce56c61a3dx10.decomp
rename to testdata/compression/decompressed/96f696a4e5ce56c61a3dx10.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/9e0b6a12febf38e98f13.decomp b/testdata/compression/decompressed/9e0b6a12febf38e98f13.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/9e0b6a12febf38e98f13.decomp
rename to testdata/compression/decompressed/9e0b6a12febf38e98f13.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/abc-times-101.decomp b/testdata/compression/decompressed/abc-times-101.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/abc-times-101.decomp
rename to testdata/compression/decompressed/abc-times-101.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/abc-times-105.decomp b/testdata/compression/decompressed/abc-times-105.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/abc-times-105.decomp
rename to testdata/compression/decompressed/abc-times-105.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/abc-times-200.decomp b/testdata/compression/decompressed/abc-times-200.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/abc-times-200.decomp
rename to testdata/compression/decompressed/abc-times-200.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/and_rand-128k+.decomp b/testdata/compression/decompressed/and_rand-128k+.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/and_rand-128k+.decomp
rename to testdata/compression/decompressed/and_rand-128k+.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/and_rand.decomp b/testdata/compression/decompressed/and_rand.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/and_rand.decomp
rename to testdata/compression/decompressed/and_rand.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/b63289ccc7f218c0d56b.decomp b/testdata/compression/decompressed/b63289ccc7f218c0d56b.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/b63289ccc7f218c0d56b.decomp
rename to testdata/compression/decompressed/b63289ccc7f218c0d56b.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/beta-variate1-128k+.decomp b/testdata/compression/decompressed/beta-variate1-128k+.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/beta-variate1-128k+.decomp
rename to testdata/compression/decompressed/beta-variate1-128k+.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/beta-variate2-128k+.decomp b/testdata/compression/decompressed/beta-variate2-128k+.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/beta-variate2-128k+.decomp
rename to testdata/compression/decompressed/beta-variate2-128k+.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/beta-variate3-128k+.decomp b/testdata/compression/decompressed/beta-variate3-128k+.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/beta-variate3-128k+.decomp
rename to testdata/compression/decompressed/beta-variate3-128k+.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/decayed_alphabet_128k+.decomp b/testdata/compression/decompressed/decayed_alphabet_128k+.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/decayed_alphabet_128k+.decomp
rename to testdata/compression/decompressed/decayed_alphabet_128k+.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/decayed_alphabet_64k.decomp b/testdata/compression/decompressed/decayed_alphabet_64k.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/decayed_alphabet_64k.decomp
rename to testdata/compression/decompressed/decayed_alphabet_64k.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/exp_shuffle-128k+.decomp b/testdata/compression/decompressed/exp_shuffle-128k+.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/exp_shuffle-128k+.decomp
rename to testdata/compression/decompressed/exp_shuffle-128k+.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/exp_shuffle.decomp b/testdata/compression/decompressed/exp_shuffle.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/exp_shuffle.decomp
rename to testdata/compression/decompressed/exp_shuffle.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/f00842317dc6d5695b02.decomp b/testdata/compression/decompressed/f00842317dc6d5695b02.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/f00842317dc6d5695b02.decomp
rename to testdata/compression/decompressed/f00842317dc6d5695b02.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/fib_shuffle-128k+.decomp b/testdata/compression/decompressed/fib_shuffle-128k+.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/fib_shuffle-128k+.decomp
rename to testdata/compression/decompressed/fib_shuffle-128k+.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/fib_shuffle.decomp b/testdata/compression/decompressed/fib_shuffle.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/fib_shuffle.decomp
rename to testdata/compression/decompressed/fib_shuffle.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/fuzzing-0fc2d461b56cd8103c91.decomp b/testdata/compression/decompressed/fuzzing-0fc2d461b56cd8103c91.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/fuzzing-0fc2d461b56cd8103c91.decomp
rename to testdata/compression/decompressed/fuzzing-0fc2d461b56cd8103c91.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/fuzzing-17c961778538cc10ab7c.decomp b/testdata/compression/decompressed/fuzzing-17c961778538cc10ab7c.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/fuzzing-17c961778538cc10ab7c.decomp
rename to testdata/compression/decompressed/fuzzing-17c961778538cc10ab7c.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/fuzzing-3591f9dc02bb00a54b60.decomp b/testdata/compression/decompressed/fuzzing-3591f9dc02bb00a54b60.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/fuzzing-3591f9dc02bb00a54b60.decomp
rename to testdata/compression/decompressed/fuzzing-3591f9dc02bb00a54b60.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/fuzzing-3ec3bca27bb9eb40c128.decomp b/testdata/compression/decompressed/fuzzing-3ec3bca27bb9eb40c128.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/fuzzing-3ec3bca27bb9eb40c128.decomp
rename to testdata/compression/decompressed/fuzzing-3ec3bca27bb9eb40c128.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/fuzzing-80b4fa18ff5f8dd04862.decomp b/testdata/compression/decompressed/fuzzing-80b4fa18ff5f8dd04862.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/fuzzing-80b4fa18ff5f8dd04862.decomp
rename to testdata/compression/decompressed/fuzzing-80b4fa18ff5f8dd04862.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/fuzzing-a3115a81d1ac500318f9.decomp b/testdata/compression/decompressed/fuzzing-a3115a81d1ac500318f9.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/fuzzing-a3115a81d1ac500318f9.decomp
rename to testdata/compression/decompressed/fuzzing-a3115a81d1ac500318f9.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/generate-windows-test-vectors.c.decomp b/testdata/compression/decompressed/generate-windows-test-vectors.c.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/generate-windows-test-vectors.c.decomp
rename to testdata/compression/decompressed/generate-windows-test-vectors.c.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/midsummer-nights-dream.txt.decomp b/testdata/compression/decompressed/midsummer-nights-dream.txt.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/midsummer-nights-dream.txt.decomp
rename to testdata/compression/decompressed/midsummer-nights-dream.txt.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/notes-on-the-underground.txt.decomp b/testdata/compression/decompressed/notes-on-the-underground.txt.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/notes-on-the-underground.txt.decomp
rename to testdata/compression/decompressed/notes-on-the-underground.txt.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/pg22009.txt.decomp b/testdata/compression/decompressed/pg22009.txt.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/pg22009.txt.decomp
rename to testdata/compression/decompressed/pg22009.txt.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/repeating-exactly-64k.decomp b/testdata/compression/decompressed/repeating-exactly-64k.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/repeating-exactly-64k.decomp
rename to testdata/compression/decompressed/repeating-exactly-64k.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/repeating.decomp b/testdata/compression/decompressed/repeating.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/repeating.decomp
rename to testdata/compression/decompressed/repeating.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/setup.log.decomp b/testdata/compression/decompressed/setup.log.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/setup.log.decomp
rename to testdata/compression/decompressed/setup.log.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/skewed_choices-128k+.decomp b/testdata/compression/decompressed/skewed_choices-128k+.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/skewed_choices-128k+.decomp
rename to testdata/compression/decompressed/skewed_choices-128k+.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/skewed_choices.decomp b/testdata/compression/decompressed/skewed_choices.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/skewed_choices.decomp
rename to testdata/compression/decompressed/skewed_choices.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/slow-015ddc36a71412ccc50d.decomp b/testdata/compression/decompressed/slow-015ddc36a71412ccc50d.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/slow-015ddc36a71412ccc50d.decomp
rename to testdata/compression/decompressed/slow-015ddc36a71412ccc50d.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/slow-100e9f966a7feb9ca40a.decomp b/testdata/compression/decompressed/slow-100e9f966a7feb9ca40a.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/slow-100e9f966a7feb9ca40a.decomp
rename to testdata/compression/decompressed/slow-100e9f966a7feb9ca40a.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/slow-2a671c3cff4f1574cbab.decomp b/testdata/compression/decompressed/slow-2a671c3cff4f1574cbab.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/slow-2a671c3cff4f1574cbab.decomp
rename to testdata/compression/decompressed/slow-2a671c3cff4f1574cbab.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/slow-33d90a24e70515b14cd0.decomp b/testdata/compression/decompressed/slow-33d90a24e70515b14cd0.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/slow-33d90a24e70515b14cd0.decomp
rename to testdata/compression/decompressed/slow-33d90a24e70515b14cd0.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/slow-49d8c05261e3f412fc72.decomp b/testdata/compression/decompressed/slow-49d8c05261e3f412fc72.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/slow-49d8c05261e3f412fc72.decomp
rename to testdata/compression/decompressed/slow-49d8c05261e3f412fc72.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/slow-50a249d2fe56873e56a0.decomp b/testdata/compression/decompressed/slow-50a249d2fe56873e56a0.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/slow-50a249d2fe56873e56a0.decomp
rename to testdata/compression/decompressed/slow-50a249d2fe56873e56a0.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/slow-63e9f0b52235fb0129fa.decomp b/testdata/compression/decompressed/slow-63e9f0b52235fb0129fa.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/slow-63e9f0b52235fb0129fa.decomp
rename to testdata/compression/decompressed/slow-63e9f0b52235fb0129fa.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/slow-73b7f971d65908ac0095.decomp b/testdata/compression/decompressed/slow-73b7f971d65908ac0095.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/slow-73b7f971d65908ac0095.decomp
rename to testdata/compression/decompressed/slow-73b7f971d65908ac0095.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/slow-8b61e3dd267908544531.decomp b/testdata/compression/decompressed/slow-8b61e3dd267908544531.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/slow-8b61e3dd267908544531.decomp
rename to testdata/compression/decompressed/slow-8b61e3dd267908544531.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/slow-9d1c5a079b0462986f1f.decomp b/testdata/compression/decompressed/slow-9d1c5a079b0462986f1f.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/slow-9d1c5a079b0462986f1f.decomp
rename to testdata/compression/decompressed/slow-9d1c5a079b0462986f1f.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/slow-aa7262a821dabdcf04a6.decomp b/testdata/compression/decompressed/slow-aa7262a821dabdcf04a6.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/slow-aa7262a821dabdcf04a6.decomp
rename to testdata/compression/decompressed/slow-aa7262a821dabdcf04a6.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/slow-b8a91d142b0d2af7f5ca.decomp b/testdata/compression/decompressed/slow-b8a91d142b0d2af7f5ca.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/slow-b8a91d142b0d2af7f5ca.decomp
rename to testdata/compression/decompressed/slow-b8a91d142b0d2af7f5ca.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/slow-c79142457734bbc8d575.decomp b/testdata/compression/decompressed/slow-c79142457734bbc8d575.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/slow-c79142457734bbc8d575.decomp
rename to testdata/compression/decompressed/slow-c79142457734bbc8d575.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/slow-d736544545b90d83fe75.decomp b/testdata/compression/decompressed/slow-d736544545b90d83fe75.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/slow-d736544545b90d83fe75.decomp
rename to testdata/compression/decompressed/slow-d736544545b90d83fe75.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/slow-e3b9bdfaed7d1a606fdb.decomp b/testdata/compression/decompressed/slow-e3b9bdfaed7d1a606fdb.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/slow-e3b9bdfaed7d1a606fdb.decomp
rename to testdata/compression/decompressed/slow-e3b9bdfaed7d1a606fdb.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/slow-f3f1c02a9d006e5e1703.decomp b/testdata/compression/decompressed/slow-f3f1c02a9d006e5e1703.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/slow-f3f1c02a9d006e5e1703.decomp
rename to testdata/compression/decompressed/slow-f3f1c02a9d006e5e1703.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/square_series-128k+.decomp b/testdata/compression/decompressed/square_series-128k+.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/square_series-128k+.decomp
rename to testdata/compression/decompressed/square_series-128k+.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/square_series.decomp b/testdata/compression/decompressed/square_series.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/square_series.decomp
rename to testdata/compression/decompressed/square_series.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/trigram_128k+.decomp b/testdata/compression/decompressed/trigram_128k+.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/trigram_128k+.decomp
rename to testdata/compression/decompressed/trigram_128k+.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/trigram_64k.decomp b/testdata/compression/decompressed/trigram_64k.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/trigram_64k.decomp
rename to testdata/compression/decompressed/trigram_64k.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/trigram_sum_128k+.decomp b/testdata/compression/decompressed/trigram_sum_128k+.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/trigram_sum_128k+.decomp
rename to testdata/compression/decompressed/trigram_sum_128k+.decomp
diff --git a/testdata/compression/lzxpress-huffman/decompressed/trigram_sum_64k.decomp b/testdata/compression/decompressed/trigram_sum_64k.decomp
similarity index 100%
rename from testdata/compression/lzxpress-huffman/decompressed/trigram_sum_64k.decomp
rename to testdata/compression/decompressed/trigram_sum_64k.decomp
diff --git a/testdata/compression/lzxpress-huffman/README b/testdata/compression/lzxpress-huffman/README
deleted file mode 100644
index 1f1eb210095..00000000000
--- a/testdata/compression/lzxpress-huffman/README
+++ /dev/null
@@ -1,35 +0,0 @@
-# Test vectors for LZ77+Huffman [de-]compression
-
-The three subdirectories contain files that correspond to each other
-
-./decompressed    - test files to compress with .decomp extension.
-./compressed      - files compressed as if for Windows SMB, with .lzhuff
-                    extension.
-./more-compressed - files compressed more thoroughly by Windows, using
-                    more effort than SMB does, with .lzhuff extension.
-                    Only some of the decompressed files have been
-                    compressed in this way.
-
-The compressed files were compressed on Windows, using the Compression
-API, which uses the same underlying code as MS-XCA, but which puts
-some annoying hurdles in the way. In particular, it won't compress any
-file smaller than 300 bytes. The relationship between the two is
-covered in various messages in
-
-https://lists.samba.org/archive/cifs-protocol/2022-October/
-https://lists.samba.org/archive/cifs-protocol/2022-November/
-
-Some of the decompressed files were found via fuzzing, some are designed
-to test one aspect or another of the format, while others are public
-domain texts.
-
-These are used in LZ77 + Huffman compression and decompression tests.
-
-- For decompression tests, we need the decompressed versions to
-  compare against.
-
-- For compression tests, we do not assert that the compressed file is
-  identical to the Windows compressed file. Exact equality is not
-  expected by MS-XCA, which leaves room for implementation tricks, but
-  the size of the compressed file allows us to make ballpark
-  assertions about expected compression ratios.