From afb879b000bc50b4449f6d97e64a66488a47210d Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Mon, 4 Dec 2017 10:49:11 +1100 Subject: [PATCH] Rename deflate-related testdata --- test/c/std/deflate.c | 8 ++--- test/testdata/README.md | 32 +++++++++--------- ...=> deflate-backref-crosses-blocks.deflate} | Bin ...ref-crosses-blocks.deflate.commentary.txt} | 0 ...ckref-crosses-blocks.deflate.decompressed} | 0 .../{romeo.txt.flate => romeo.txt.deflate} | Bin ...uff.flate => romeo.txt.fixed-huff.deflate} | Bin 7 files changed, 20 insertions(+), 20 deletions(-) rename test/testdata/artificial/{flate-backref-crosses-blocks.flate => deflate-backref-crosses-blocks.deflate} (100%) rename test/testdata/artificial/{flate-backref-crosses-blocks.flate.commentary.txt => deflate-backref-crosses-blocks.deflate.commentary.txt} (100%) rename test/testdata/artificial/{flate-backref-crosses-blocks.flate.decompressed => deflate-backref-crosses-blocks.deflate.decompressed} (100%) rename test/testdata/{romeo.txt.flate => romeo.txt.deflate} (100%) rename test/testdata/{romeo.txt.fixed-huff.flate => romeo.txt.fixed-huff.deflate} (100%) diff --git a/test/c/std/deflate.c b/test/c/std/deflate.c index 85990424..5e2f38ad 100644 --- a/test/c/std/deflate.c +++ b/test/c/std/deflate.c @@ -72,10 +72,10 @@ golden_test deflate_256_bytes_gt = { golden_test deflate_deflate_backref_crosses_blocks_gt = { .want_filename = "../../testdata/artificial/" - "flate-backref-crosses-blocks.flate.decompressed", + "deflate-backref-crosses-blocks.deflate.decompressed", .src_filename = "../../testdata/artificial/" - "flate-backref-crosses-blocks.flate", + "deflate-backref-crosses-blocks.deflate", }; golden_test deflate_midsummer_gt = { @@ -100,8 +100,8 @@ golden_test deflate_romeo_gt = { }; golden_test deflate_romeo_fixed_gt = { - .want_filename = "../../testdata/romeo.txt", // - .src_filename = "../../testdata/romeo.txt.fixed-huff.flate", // + .want_filename = "../../testdata/romeo.txt", // + .src_filename = "../../testdata/romeo.txt.fixed-huff.deflate", // }; golden_test gzip_midsummer_gt = { diff --git a/test/testdata/README.md b/test/testdata/README.md index 7793b021..b145892c 100644 --- a/test/testdata/README.md +++ b/test/testdata/README.md @@ -1,13 +1,13 @@ -Unless otherwise noted, the *.gz files were generated by the gzip command line -tool and the *.flate and *.zlib versions were then generated by -script/extract-flate-offsets.go. Similarly, the *.giflzw files were generated -by script/extract-giflzw.go and the *.palette and *.indexes files were -generated by script/extract-palette-indexes.go +Unless otherwise noted, the \*.gz files were generated by the gzip command line +tool and the \*.deflate and \*.zlib versions were then generated by +script/extract-deflate-offsets.go. Similarly, the \*.giflzw files were +generated by script/extract-giflzw.go and the \*.palette and \*.indexes files +were generated by script/extract-palette-indexes.go -The *.jpeg files are usually the canonical versions of the testdata images, and -other versions (*.bmp, *.gif, *.png, *.tiff) were generated by ImageMagick's -convert command line tool. The *.webp versions were generated by the cwebp -command line tool. +The \*.jpeg files are usually the canonical versions of the testdata images, +and other versions (\*.bmp, \*.gif, \*.png, \*.tiff) were generated by +ImageMagick's convert command line tool. The \*.webp versions were generated by +the cwebp command line tool. @@ -22,20 +22,20 @@ world examples of various file formats, or deriviations of them. -bricks-* are various encodings of an original photo by Nigel Tao +bricks-\* are various encodings of an original photo by Nigel Tao . -harvesters.* are various encodings of a photo of "The Harvesters" by Pieter +harvesters.\* are various encodings of a photo of "The Harvesters" by Pieter Bruegel the Elder, held by the Metropolitan Museum of Art. http://www.metmuseum.org/art/collection/search/435809 lists that image as in the public domain. -hat.* are various encodings of a photo of "Self-Portrait with a Straw Hat +hat.\* are various encodings of a photo of "Self-Portrait with a Straw Hat (obverse: The Potato Peeler)" by Vincent van Gogh, held by the Metropolitan Museum of art. http://www.metmuseum.org/art/collection/search/436532 lists that image as in the public domain. -hibiscus.* are various encodings of a photo of "Hibiscus and Parrots" by Louis +hibiscus.\* are various encodings of a photo of "Hibiscus and Parrots" by Louis Comfort Tiffany, held by the Metropolitan Museum of Art. http://www.metmuseum.org/art/collection/search/13503 lists that image as in the public domain. @@ -52,11 +52,11 @@ copied from http://shakespeare.mit.edu/midsummer/midsummer.1.1.html pi.txt contains the digits of pi. -pjw-thumbnail.* are various encodings of an image derived from an iconic, +pjw-thumbnail.\* are various encodings of an image derived from an iconic, original photo of Peter J. Weinberger by Rob Pike . romeo.txt is an excerpt of Shakespeare's "Romeo and Juliet", copied from http://shakespeare.mit.edu/romeo_juliet/romeo_juliet.2.2.html -romeo.txt.fixed-huff.flate was derived from romeo.txt by a custom program to -use fixed (not dynamic) Huffman tables for the flate encoding. +romeo.txt.fixed-huff.deflate was derived from romeo.txt by a custom program to +use fixed (not dynamic) Huffman tables for the deflate encoding. diff --git a/test/testdata/artificial/flate-backref-crosses-blocks.flate b/test/testdata/artificial/deflate-backref-crosses-blocks.deflate similarity index 100% rename from test/testdata/artificial/flate-backref-crosses-blocks.flate rename to test/testdata/artificial/deflate-backref-crosses-blocks.deflate diff --git a/test/testdata/artificial/flate-backref-crosses-blocks.flate.commentary.txt b/test/testdata/artificial/deflate-backref-crosses-blocks.deflate.commentary.txt similarity index 100% rename from test/testdata/artificial/flate-backref-crosses-blocks.flate.commentary.txt rename to test/testdata/artificial/deflate-backref-crosses-blocks.deflate.commentary.txt diff --git a/test/testdata/artificial/flate-backref-crosses-blocks.flate.decompressed b/test/testdata/artificial/deflate-backref-crosses-blocks.deflate.decompressed similarity index 100% rename from test/testdata/artificial/flate-backref-crosses-blocks.flate.decompressed rename to test/testdata/artificial/deflate-backref-crosses-blocks.deflate.decompressed diff --git a/test/testdata/romeo.txt.flate b/test/testdata/romeo.txt.deflate similarity index 100% rename from test/testdata/romeo.txt.flate rename to test/testdata/romeo.txt.deflate diff --git a/test/testdata/romeo.txt.fixed-huff.flate b/test/testdata/romeo.txt.fixed-huff.deflate similarity index 100% rename from test/testdata/romeo.txt.fixed-huff.flate rename to test/testdata/romeo.txt.fixed-huff.deflate