Merge r3605: Rename the iso_gz test to iso_Z to match the

fact that we're using Compress here instead of gzip.

SVN-Revision: 3650

diff --git a/Makefile.am b/Makefile.am
index 4f5414d5b665af562bf0a5d8514bd2d9cd70812b..100ce9f346652a819e631d96f7b2c64956c146b5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -269,7 +269,7 @@ libarchive_test_SOURCES=                                    \
        libarchive/test/test_read_format_gtar_gz.c              \
        libarchive/test/test_read_format_gtar_lzma.c            \
        libarchive/test/test_read_format_gtar_sparse.c          \
-       libarchive/test/test_read_format_iso_gz.c               \
+       libarchive/test/test_read_format_iso_Z.c                \
        libarchive/test/test_read_format_iso_multi_extent.c     \
        libarchive/test/test_read_format_isojoliet_bz2.c        \
        libarchive/test/test_read_format_isojoliet_long.c       \

diff --git a/libarchive/test/CMakeLists.txt b/libarchive/test/CMakeLists.txt
index 4384eea654dc85e24b04f48e8ab0598de483c441..07ee2e364b757c1704271a2d1ec55f9d719a2a72 100644 (file)
--- a/libarchive/test/CMakeLists.txt
+++ b/libarchive/test/CMakeLists.txt
@@ -61,7 +61,7 @@ IF(ENABLE_TEST)
     test_read_format_gtar_gz.c
     test_read_format_gtar_lzma.c
     test_read_format_gtar_sparse.c
-    test_read_format_iso_gz.c
+    test_read_format_iso_Z.c
     test_read_format_iso_multi_extent.c
     test_read_format_isojoliet_bz2.c
     test_read_format_isojoliet_long.c

diff --git a/libarchive/test/test_read_format_iso_gz.c b/libarchive/test/test_read_format_iso_Z.c
similarity index 98%
rename from libarchive/test/test_read_format_iso_gz.c
rename to libarchive/test/test_read_format_iso_Z.c
index e0d3fb02819e6d88425626acb05f47f5e64b782e..3037527a362527ede86dd5736cabe7d5fd0d46ad 100644 (file)
--- a/libarchive/test/test_read_format_iso_gz.c
+++ b/libarchive/test/test_read_format_iso_Z.c
@@ -90,7 +90,7 @@ void test2(void)
        assertEqualInt(ARCHIVE_OK, archive_read_finish(a));
 }
 
-DEFINE_TEST(test_read_format_iso_gz)
+DEFINE_TEST(test_read_format_iso_Z)
 {
        test1();
        test2();