Rename test_read_uu.c to test_read_filter_uudecode.c, and

divide test_read_uu to test_read_filter_uudecode and
test_read_filter_uudecode_base64.

diff --git a/Makefile.am b/Makefile.am
index c0f0ff4abe556427b6754cb75c8d77c6f0e1b2e3..43e6180cb30bb41d10e1659feabc43b784149e6c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -332,6 +332,7 @@ libarchive_test_SOURCES=                                    \
        libarchive/test/test_read_file_nonexistent.c            \
        libarchive/test/test_read_filter_program.c              \
        libarchive/test/test_read_filter_program_signature.c    \
+       libarchive/test/test_read_filter_uudecode.c             \
        libarchive/test/test_read_format_7zip.c                 \
        libarchive/test/test_read_format_ar.c                   \
        libarchive/test/test_read_format_cab.c                  \
@@ -391,7 +392,6 @@ libarchive_test_SOURCES=                                    \
        libarchive/test/test_read_position.c                    \
        libarchive/test/test_read_truncated.c                   \
        libarchive/test/test_read_truncated_filter.c            \
-       libarchive/test/test_read_uu.c                          \
        libarchive/test/test_sparse_basic.c                     \
        libarchive/test/test_tar_filenames.c                    \
        libarchive/test/test_tar_large.c                        \

diff --git a/libarchive/test/CMakeLists.txt b/libarchive/test/CMakeLists.txt
index 4c78c8f6985f36c01222f18fe9593f01a8ad634a..f13adc9f3853fcb251e7ceb4f8ec5668c6dce046 100644 (file)
--- a/libarchive/test/CMakeLists.txt
+++ b/libarchive/test/CMakeLists.txt
@@ -77,6 +77,7 @@ IF(ENABLE_TEST)
     test_read_file_nonexistent.c
     test_read_filter_program.c
     test_read_filter_program_signature.c
+    test_read_filter_uudecode.c
     test_read_format_7zip.c
     test_read_format_ar.c
     test_read_format_cab.c
@@ -136,7 +137,6 @@ IF(ENABLE_TEST)
     test_read_position.c
     test_read_truncated.c
     test_read_truncated_filter.c
-    test_read_uu.c
     test_sparse_basic.c
     test_tar_filenames.c
     test_tar_large.c

diff --git a/libarchive/test/test_read_uu.c b/libarchive/test/test_read_filter_uudecode.c
similarity index 98%
rename from libarchive/test/test_read_uu.c
rename to libarchive/test/test_read_filter_uudecode.c
index 648dbf01ee1ac3af9a0e739cd1157de157264e6e..3fbe2f22fbcb384c3bf03e70bbf5c82bf401f123 100644 (file)
--- a/libarchive/test/test_read_uu.c
+++ b/libarchive/test/test_read_filter_uudecode.c
@@ -159,17 +159,20 @@ test_read_uu_sub(const char *uudata, size_t uusize, int no_nl)
        free(buff);
 }
 
-DEFINE_TEST(test_read_uu)
+DEFINE_TEST(test_read_filter_uudecode)
 {
        /* Read the traditional uuencoded data. */
        test_read_uu_sub(archive, sizeof(archive)-1, 0);
-       /* Read the Base64 uuencoded data. */
-       test_read_uu_sub(archive64, sizeof(archive64)-1, 0);
        /* Read the traditional uuencoded data with very long line extra
         * data in front of it. */
        test_read_uu_sub(archive, sizeof(archive)-1, 1);
+}
+
+DEFINE_TEST(test_read_filter_uudecode_base64)
+{
+       /* Read the Base64 uuencoded data. */
+       test_read_uu_sub(archive64, sizeof(archive64)-1, 0);
        /* Read the Base64 uuencoded data with very long line extra data
         * in front of it. */
        test_read_uu_sub(archive64, sizeof(archive64)-1, 1);
 }
-