1 files changed, 65 insertions, 10 deletions
diff --git a/libarchive/test/CMakeLists.txt b/libarchive/test/CMakeLists.txt
index 07ee2e364b75..de98e6bdb85a 100644
--- a/libarchive/test/CMakeLists.txt
+++ b/libarchive/test/CMakeLists.txt
@@ -4,26 +4,46 @@
 #
 ############################################
 IF(ENABLE_TEST)
-  FOREACH (_src ${libarchive_SOURCES})
-    LIST(APPEND parent_libarchive_SOURCES "../${_src}")
-  ENDFOREACH(_src)
-
   SET(libarchive_test_SOURCES
-    ${parent_libarchive_SOURCES}
-    main.c
+   main.c
     read_open_memory.c
     test.h
-    test_acl_basic.c
     test_acl_freebsd.c
+    test_acl_nfs4.c
     test_acl_pax.c
+    test_acl_posix1e.c
     test_archive_api_feature.c
+    test_archive_clear_error.c
+    test_archive_crypto.c
+    test_archive_read_close_twice.c
+    test_archive_read_close_twice_open_fd.c
+    test_archive_read_close_twice_open_filename.c
+    test_archive_read_next_header_empty.c
+    test_archive_read_next_header_raw.c
+    test_archive_read_open2.c
+    test_archive_read_set_filter_option.c
+    test_archive_read_set_format_option.c
+    test_archive_read_set_option.c
+    test_archive_read_set_options.c
+    test_archive_read_support.c
+    test_archive_set_error.c
+    test_archive_string.c
+    test_archive_string_conversion.c
+    test_archive_write_set_filter_option.c
+    test_archive_write_set_format_option.c
+    test_archive_write_set_option.c
+    test_archive_write_set_options.c
     test_bad_fd.c
     test_compat_bzip2.c
     test_compat_cpio.c
     test_compat_gtar.c
     test_compat_gzip.c
+    test_compat_lzip.c
     test_compat_lzma.c
+    test_compat_mac.c
+    test_compat_pax_libarchive_2x.c
     test_compat_solaris_tar_acl.c
+    test_compat_solaris_pax_sparse.c
     test_compat_tar_hardlink.c
     test_compat_xz.c
     test_compat_zip.c
@@ -31,7 +51,9 @@ IF(ENABLE_TEST)
     test_entry.c
     test_entry_strmode.c
     test_extattr_freebsd.c
+    test_filter_count.c
     test_fuzz.c
+    test_gnutar_filename_encoding.c
     test_link_resolver.c
     test_open_failure.c
     test_open_fd.c
@@ -41,92 +63,125 @@ IF(ENABLE_TEST)
     test_read_compress_program.c
     test_read_data_large.c
     test_read_disk.c
+    test_read_disk_directory_traversals.c
     test_read_disk_entry_from_file.c
     test_read_extract.c
     test_read_file_nonexistent.c
+    test_read_format_7zip.c
     test_read_format_ar.c
+    test_read_format_cab.c
+    test_read_format_cab_filename.c
+    test_read_format_cpio_afio.c
     test_read_format_cpio_bin.c
     test_read_format_cpio_bin_Z.c
     test_read_format_cpio_bin_be.c
     test_read_format_cpio_bin_bz2.c
     test_read_format_cpio_bin_gz.c
+    test_read_format_cpio_bin_lzip.c
     test_read_format_cpio_bin_lzma.c
     test_read_format_cpio_bin_xz.c
+    test_read_format_cpio_filename.c
     test_read_format_cpio_odc.c
     test_read_format_cpio_svr4_bzip2_rpm.c
     test_read_format_cpio_svr4_gzip.c
     test_read_format_cpio_svr4_gzip_rpm.c
     test_read_format_cpio_svr4c_Z.c
     test_read_format_empty.c
+    test_read_format_gtar_filename.c
     test_read_format_gtar_gz.c
     test_read_format_gtar_lzma.c
     test_read_format_gtar_sparse.c
     test_read_format_iso_Z.c
     test_read_format_iso_multi_extent.c
+    test_read_format_iso_xorriso.c
     test_read_format_isojoliet_bz2.c
     test_read_format_isojoliet_long.c
     test_read_format_isojoliet_rr.c
+    test_read_format_isojoliet_versioned.c
     test_read_format_isorr_bz2.c
     test_read_format_isorr_ce.c
     test_read_format_isorr_new_bz2.c
     test_read_format_isorr_rr_moved.c
     test_read_format_isozisofs_bz2.c
+    test_read_format_lha.c
+    test_read_format_lha_filename.c
     test_read_format_mtree.c
     test_read_format_pax_bz2.c
+    test_read_format_rar.c
     test_read_format_raw.c
     test_read_format_tar.c
     test_read_format_tar_empty_filename.c
+    test_read_format_tar_filename.c
     test_read_format_tbz.c
     test_read_format_tgz.c
     test_read_format_tlz.c
     test_read_format_txz.c
     test_read_format_tz.c
+    test_read_format_ustar_filename.c
     test_read_format_xar.c
     test_read_format_zip.c
+    test_read_format_zip_filename.c
     test_read_large.c
     test_read_pax_truncated.c
     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
     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_lzip.c
     test_write_compress_lzma.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
+    test_write_disk_lookup.c
     test_write_disk_perms.c
     test_write_disk_secure.c
     test_write_disk_sparse.c
     test_write_disk_symlink.c
     test_write_disk_times.c
+    test_write_format_7zip.c
     test_write_format_ar.c
     test_write_format_cpio.c
     test_write_format_cpio_empty.c
-    test_write_format_cpio_odc.c
     test_write_format_cpio_newc.c
+    test_write_format_cpio_odc.c
+    test_write_format_gnutar.c
+    test_write_format_iso9660.c
+    test_write_format_iso9660_boot.c
+    test_write_format_iso9660_empty.c
+    test_write_format_iso9660_filename.c
+    test_write_format_iso9660_zisofs.c
     test_write_format_mtree.c
+    test_write_format_mtree_fflags.c
     test_write_format_pax.c
     test_write_format_shar_empty.c
     test_write_format_tar.c
     test_write_format_tar_empty.c
+    test_write_format_tar_sparse.c
     test_write_format_tar_ustar.c
+    test_write_format_xar.c
+    test_write_format_xar_empty.c
     test_write_format_zip.c
     test_write_format_zip_empty.c
     test_write_format_zip_no_compression.c
     test_write_open_memory.c
+    test_zip_filename_encoding.c
   )
 
   #
   # Register target
   #
   ADD_EXECUTABLE(libarchive_test ${libarchive_test_SOURCES})
-  TARGET_LINK_LIBRARIES(libarchive_test ${ADDITIONAL_LIBS})
+  TARGET_LINK_LIBRARIES(libarchive_test archive_static ${ADDITIONAL_LIBS})
   SET_PROPERTY(TARGET libarchive_test PROPERTY COMPILE_DEFINITIONS
     LIBARCHIVE_STATIC LIST_H)
 
@@ -142,7 +197,7 @@ IF(ENABLE_TEST)
   # test.  We can use that to define the tests for cmake by
   # defining a DEFINE_TEST macro and reading list.h in.
   MACRO (DEFINE_TEST _testname)
-    ADD_TEST_28(
+    ADD_TEST(
       NAME libarchive_${_testname}
       COMMAND libarchive_test -vv
                               -r ${CMAKE_CURRENT_SOURCE_DIR}