s/test_write_compress_/test_write_filter_/

So as to match the API names.

diff --git a/Makefile.am b/Makefile.am
index 4c408efbefd0d2f5cf7e40f4653c76e3163f49f9..70601fc6a71c48823f939c77e5b10f52d8de330b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -403,15 +403,6 @@ libarchive_test_SOURCES=                                   \
        libarchive/test/test_tar_large.c                        \
        libarchive/test/test_ustar_filenames.c                  \
        libarchive/test/test_ustar_filename_encoding.c          \
-       libarchive/test/test_write_compress.c                   \
-       libarchive/test/test_write_compress_bzip2.c             \
-       libarchive/test/test_write_compress_gzip.c              \
-       libarchive/test/test_write_compress_lrzip.c             \
-       libarchive/test/test_write_compress_lzip.c              \
-       libarchive/test/test_write_compress_lzma.c              \
-       libarchive/test/test_write_compress_lzop.c              \
-       libarchive/test/test_write_compress_program.c           \
-       libarchive/test/test_write_compress_xz.c                \
        libarchive/test/test_write_disk.c                       \
        libarchive/test/test_write_disk_failures.c              \
        libarchive/test/test_write_disk_hardlink.c              \
@@ -422,7 +413,16 @@ libarchive_test_SOURCES=                                   \
        libarchive/test/test_write_disk_symlink.c               \
        libarchive/test/test_write_disk_times.c                 \
        libarchive/test/test_write_filter_b64encode.c           \
+       libarchive/test/test_write_filter_bzip2.c               \
+       libarchive/test/test_write_filter_compress.c            \
+       libarchive/test/test_write_filter_gzip.c                \
+       libarchive/test/test_write_filter_lrzip.c               \
+       libarchive/test/test_write_filter_lzip.c                \
+       libarchive/test/test_write_filter_lzma.c                \
+       libarchive/test/test_write_filter_lzop.c                \
+       libarchive/test/test_write_filter_program.c             \
        libarchive/test/test_write_filter_uuencode.c            \
+       libarchive/test/test_write_filter_xz.c                  \
        libarchive/test/test_write_format_7zip.c                \
        libarchive/test/test_write_format_ar.c                  \
        libarchive/test/test_write_format_cpio.c                \

diff --git a/libarchive/test/CMakeLists.txt b/libarchive/test/CMakeLists.txt
index 5cd6bb2cd5eb841a20e31b5fb4026a31ff6cdd30..54e5bda7a2a99ed3ed527d6a54c34826612bab9a 100644 (file)
--- a/libarchive/test/CMakeLists.txt
+++ b/libarchive/test/CMakeLists.txt
@@ -144,15 +144,6 @@ IF(ENABLE_TEST)
     test_tar_large.c
     test_ustar_filenames.c
     test_ustar_filename_encoding.c
-    test_write_compress.c
-    test_write_compress_bzip2.c
-    test_write_compress_gzip.c
-    test_write_compress_lrzip.c
-    test_write_compress_lzip.c
-    test_write_compress_lzma.c
-    test_write_compress_lzop.c
-    test_write_compress_program.c
-    test_write_compress_xz.c
     test_write_disk.c
     test_write_disk_failures.c
     test_write_disk_hardlink.c
@@ -163,7 +154,16 @@ IF(ENABLE_TEST)
     test_write_disk_symlink.c
     test_write_disk_times.c
     test_write_filter_b64encode.c
+    test_write_filter_bzip2.c
+    test_write_filter_compress.c
+    test_write_filter_gzip.c
+    test_write_filter_lrzip.c
+    test_write_filter_lzip.c
+    test_write_filter_lzma.c
+    test_write_filter_lzop.c
+    test_write_filter_program.c
     test_write_filter_uuencode.c
+    test_write_filter_xz.c
     test_write_format_7zip.c
     test_write_format_ar.c
     test_write_format_cpio.c

diff --git a/libarchive/test/test_write_compress_bzip2.c b/libarchive/test/test_write_filter_bzip2.c
similarity index 99%
rename from libarchive/test/test_write_compress_bzip2.c
rename to libarchive/test/test_write_filter_bzip2.c
index c8f6846047ca180cfddbc0c4fe335a736144fb9b..27741ba78ede69253e7a0a473e4a208fdb78550e 100644 (file)
--- a/libarchive/test/test_write_compress_bzip2.c
+++ b/libarchive/test/test_write_filter_bzip2.c
@@ -33,7 +33,7 @@ __FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_compress_bzip2.c 191183
  * TODO: Add a reference file and make sure we can decompress that.
  */
 
-DEFINE_TEST(test_write_compress_bzip2)
+DEFINE_TEST(test_write_filter_bzip2)
 {
        struct archive_entry *ae;
        struct archive* a;

diff --git a/libarchive/test/test_write_compress.c b/libarchive/test/test_write_filter_compress.c
similarity index 98%
rename from libarchive/test/test_write_compress.c
rename to libarchive/test/test_write_filter_compress.c
index 7a398742edd0d6d381ac05990103deb0b01933cd..1b8910e51adb6ff13fe67e4e59a266754385f1e2 100644 (file)
--- a/libarchive/test/test_write_compress.c
+++ b/libarchive/test/test_write_filter_compress.c
@@ -33,7 +33,7 @@ __FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_compress.c 189308 2009-0
  * TODO: Add a reference file and make sure we can decompress that.
  */
 
-DEFINE_TEST(test_write_compress)
+DEFINE_TEST(test_write_filter_compress)
 {
        struct archive_entry *ae;
        struct archive* a;

diff --git a/libarchive/test/test_write_compress_gzip.c b/libarchive/test/test_write_filter_gzip.c
similarity index 99%
rename from libarchive/test/test_write_compress_gzip.c
rename to libarchive/test/test_write_filter_gzip.c
index 10afbb609ef23465a6682b85610dba056d4ecd3b..566834685d859166716d59bb3fb5ee925c665c28 100644 (file)
--- a/libarchive/test/test_write_compress_gzip.c
+++ b/libarchive/test/test_write_filter_gzip.c
@@ -33,7 +33,7 @@ __FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_compress_gzip.c 191183 2
  * TODO: Add a reference file and make sure we can decompress that.
  */
 
-DEFINE_TEST(test_write_compress_gzip)
+DEFINE_TEST(test_write_filter_gzip)
 {
        struct archive_entry *ae;
        struct archive* a;

diff --git a/libarchive/test/test_write_compress_lrzip.c b/libarchive/test/test_write_filter_lrzip.c
similarity index 99%
rename from libarchive/test/test_write_compress_lrzip.c
rename to libarchive/test/test_write_filter_lrzip.c
index 27c382b15fc0d8637423c317204022faa030d175..e04ddb02bb3cd7e02c59e4f609a3447d1bce36ec 100644 (file)
--- a/libarchive/test/test_write_compress_lrzip.c
+++ b/libarchive/test/test_write_filter_lrzip.c
@@ -30,7 +30,7 @@
  * A basic exercise of lrzip reading and writing.
  */
 
-DEFINE_TEST(test_write_compress_lrzip)
+DEFINE_TEST(test_write_filter_lrzip)
 {
        struct archive_entry *ae;
        struct archive* a;

diff --git a/libarchive/test/test_write_compress_lzip.c b/libarchive/test/test_write_filter_lzip.c
similarity index 99%
rename from libarchive/test/test_write_compress_lzip.c
rename to libarchive/test/test_write_filter_lzip.c
index 147761c5bfc9c173005636223d8122c92ffb91fe..ef874027cc8cbfa628507f6b43c942d498da3b5f 100644 (file)
--- a/libarchive/test/test_write_compress_lzip.c
+++ b/libarchive/test/test_write_filter_lzip.c
@@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$");
  *
  */
 
-DEFINE_TEST(test_write_compress_lzip)
+DEFINE_TEST(test_write_filter_lzip)
 {
        struct archive_entry *ae;
        struct archive* a;

diff --git a/libarchive/test/test_write_compress_lzma.c b/libarchive/test/test_write_filter_lzma.c
similarity index 99%
rename from libarchive/test/test_write_compress_lzma.c
rename to libarchive/test/test_write_filter_lzma.c
index 68d289764579e7165f541ab5ebea7373924ab92b..42d0ddccdb0e39516283fc165d5228428cc53492 100644 (file)
--- a/libarchive/test/test_write_compress_lzma.c
+++ b/libarchive/test/test_write_filter_lzma.c
@@ -32,7 +32,7 @@ __FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_compress_lzma.c 191183 2
  *
  */
 
-DEFINE_TEST(test_write_compress_lzma)
+DEFINE_TEST(test_write_filter_lzma)
 {
        struct archive_entry *ae;
        struct archive* a;

diff --git a/libarchive/test/test_write_compress_lzop.c b/libarchive/test/test_write_filter_lzop.c
similarity index 99%
rename from libarchive/test/test_write_compress_lzop.c
rename to libarchive/test/test_write_filter_lzop.c
index d984b8138f9ec7edf6b71e6d272cd9faf880598a..d16a8cacea77c7d6298fb5f0b8b1f53dd16ad865 100644 (file)
--- a/libarchive/test/test_write_compress_lzop.c
+++ b/libarchive/test/test_write_filter_lzop.c
@@ -30,7 +30,7 @@
  * A basic exercise of lzop reading and writing.
  */
 
-DEFINE_TEST(test_write_compress_lzop)
+DEFINE_TEST(test_write_filter_lzop)
 {
        struct archive_entry *ae;
        struct archive* a;

diff --git a/libarchive/test/test_write_compress_program.c b/libarchive/test/test_write_filter_program.c
similarity index 98%
rename from libarchive/test/test_write_compress_program.c
rename to libarchive/test/test_write_filter_program.c
index 36a650dd348c918bf15ae27dc157b681ae10b660..ad6261e8957bbaef1993ec8bebe742aa036b0023 100644 (file)
--- a/libarchive/test/test_write_compress_program.c
+++ b/libarchive/test/test_write_filter_program.c
@@ -29,7 +29,7 @@ __FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_compress_program.c 20124
 char buff[1000000];
 char buff2[64];
 
-DEFINE_TEST(test_write_compress_program)
+DEFINE_TEST(test_write_filter_program)
 {
        struct archive_entry *ae;
        struct archive *a;
@@ -123,7 +123,7 @@ DEFINE_TEST(test_write_compress_program)
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
-DEFINE_TEST(test_write_compress_programl)
+DEFINE_TEST(test_write_filter_programl)
 {
        struct archive_entry *ae;
        struct archive *a;
@@ -217,7 +217,7 @@ DEFINE_TEST(test_write_compress_programl)
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
-DEFINE_TEST(test_write_compress_programv)
+DEFINE_TEST(test_write_filter_programv)
 {
        struct archive_entry *ae;
        struct archive *a;

diff --git a/libarchive/test/test_write_compress_xz.c b/libarchive/test/test_write_filter_xz.c
similarity index 99%
rename from libarchive/test/test_write_compress_xz.c
rename to libarchive/test/test_write_filter_xz.c
index d19e33226fe7b2da5bc255eb9041fd5a434c4957..115883dcc9f915d56b4db4d4c17c1a79d0049d75 100644 (file)
--- a/libarchive/test/test_write_compress_xz.c
+++ b/libarchive/test/test_write_filter_xz.c
@@ -33,7 +33,7 @@ __FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_compress_xz.c 191183 200
  * TODO: Add a reference file and make sure we can decompress that.
  */
 
-DEFINE_TEST(test_write_compress_xz)
+DEFINE_TEST(test_write_filter_xz)
 {
        struct archive_entry *ae;
        struct archive* a;