From 3ee8df10e01315348dec55a50d5db34df040ac07 Mon Sep 17 00:00:00 2001 From: Michihiro NAKAJIMA Date: Mon, 8 Oct 2012 15:36:57 +0900 Subject: [PATCH] s/test_write_compress_/test_write_filter_/ So as to match the API names. --- Makefile.am | 18 +++++++++--------- libarchive/test/CMakeLists.txt | 18 +++++++++--------- ...press_bzip2.c => test_write_filter_bzip2.c} | 2 +- ...compress.c => test_write_filter_compress.c} | 2 +- ...ompress_gzip.c => test_write_filter_gzip.c} | 2 +- ...press_lrzip.c => test_write_filter_lrzip.c} | 2 +- ...ompress_lzip.c => test_write_filter_lzip.c} | 2 +- ...ompress_lzma.c => test_write_filter_lzma.c} | 2 +- ...ompress_lzop.c => test_write_filter_lzop.c} | 2 +- ...s_program.c => test_write_filter_program.c} | 6 +++--- ...te_compress_xz.c => test_write_filter_xz.c} | 2 +- 11 files changed, 29 insertions(+), 29 deletions(-) rename libarchive/test/{test_write_compress_bzip2.c => test_write_filter_bzip2.c} (99%) rename libarchive/test/{test_write_compress.c => test_write_filter_compress.c} (98%) rename libarchive/test/{test_write_compress_gzip.c => test_write_filter_gzip.c} (99%) rename libarchive/test/{test_write_compress_lrzip.c => test_write_filter_lrzip.c} (99%) rename libarchive/test/{test_write_compress_lzip.c => test_write_filter_lzip.c} (99%) rename libarchive/test/{test_write_compress_lzma.c => test_write_filter_lzma.c} (99%) rename libarchive/test/{test_write_compress_lzop.c => test_write_filter_lzop.c} (99%) rename libarchive/test/{test_write_compress_program.c => test_write_filter_program.c} (98%) rename libarchive/test/{test_write_compress_xz.c => test_write_filter_xz.c} (99%) diff --git a/Makefile.am b/Makefile.am index 4c408efbe..70601fc6a 100644 --- 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 5cd6bb2cd..54e5bda7a 100644 --- 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 c8f684604..27741ba78 100644 --- 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 7a398742e..1b8910e51 100644 --- 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 10afbb609..566834685 100644 --- 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 27c382b15..e04ddb02b 100644 --- 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 147761c5b..ef874027c 100644 --- 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 68d289764..42d0ddccd 100644 --- 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 d984b8138..d16a8cace 100644 --- 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 36a650dd3..ad6261e89 100644 --- 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 d19e33226..115883dcc 100644 --- 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; -- 2.47.2