Index: stable/10/etc/mtree/BSD.tests.dist =================================================================== --- stable/10/etc/mtree/BSD.tests.dist (revision 290891) +++ stable/10/etc/mtree/BSD.tests.dist (revision 290892) @@ -1,418 +1,424 @@ # $FreeBSD$ # # Please see the file src/etc/mtree/README before making changes to this file. # /set type=dir uname=root gname=wheel mode=0755 . bin chown .. date .. dd .. expr .. ls .. mv .. pax .. pkill .. sh builtins .. errors .. execution .. expansion .. parameters .. parser .. set-e .. .. sleep .. test .. .. cddl lib .. sbin .. usr.bin .. usr.sbin .. .. etc rc.d .. .. games .. gnu lib .. usr.bin diff .. .. .. lib atf libatf-c detail .. .. libatf-c++ detail .. .. test-programs .. .. + libarchive + .. libc c063 .. db .. gen execve .. posix_spawn .. .. hash data .. .. inet .. locale .. net getaddrinfo data .. .. .. regex data .. .. rpc .. ssp .. stdio .. stdlib .. string .. sys .. time .. tls dso .. .. termios .. ttyio .. .. libcrypt .. libmp .. librt .. libthr dlopen .. .. libutil .. msun .. .. libexec atf atf-check .. atf-sh .. .. .. sbin dhclient .. devd .. growfs .. mdconfig .. .. secure lib .. libexec .. usr.bin .. usr.sbin .. .. share examples tests atf .. plain .. .. .. .. sys aio .. fifo .. file .. kern execve .. .. kqueue .. mqueue .. netinet .. pjdfstest chflags .. chmod .. chown .. ftruncate .. granular .. link .. mkdir .. mkfifo .. mknod .. open .. rename .. rmdir .. symlink .. truncate .. unlink .. .. posixshm .. vfs .. vm .. .. usr.bin apply .. basename .. bmake archives fmt_44bsd .. fmt_44bsd_mod .. fmt_oldbsd .. .. basic t0 .. t1 .. t2 .. t3 .. .. execution ellipsis .. empty .. joberr .. plus .. .. shell builtin .. meta .. path .. path_select .. replace .. select .. .. suffixes basic .. src_wild1 .. src_wild2 .. .. syntax directive-t0 .. enl .. funny-targets .. semi .. .. sysmk t0 2 1 .. .. mk .. .. t1 2 1 .. .. mk .. .. t2 2 1 .. .. mk .. .. .. variables modifier_M .. modifier_t .. opt_V .. t0 .. .. .. calendar .. cmp .. + cpio + .. col .. comm .. cut .. dirname .. file2c .. grep .. gzip .. join .. jot .. lastcomm .. m4 .. ncal .. opensm .. printf .. sed regress.multitest.out .. + .. + tar .. timeout .. tr .. truncate .. uudecode .. uuencode .. xargs .. yacc yacc .. .. .. usr.sbin etcupdate .. fstyp .. makefs .. newsyslog .. nmtree .. pw .. sa .. .. .. # vim: set expandtab ts=4 sw=4: Index: stable/10/lib/libarchive/test/Makefile =================================================================== --- stable/10/lib/libarchive/test/Makefile (revision 290891) +++ stable/10/lib/libarchive/test/Makefile (nonexistent) @@ -1,257 +0,0 @@ -# $FreeBSD$ - -LIBARCHIVEDIR= ${.CURDIR}/../../../contrib/libarchive - -MAN= - -PROG=libarchive_test -INTERNALPROG=yes # Don't install this; it's just for testing -DPADD=${LIBBZ2} ${LIBZ} ${LIBMD} ${LIBCRYPTO} ${LIBBSDXML} -LDADD= -L ${.OBJDIR}/.. -larchive -LDADD+= -lz -lbz2 -llzma -lmd -lcrypto -lbsdxml -CFLAGS+= -g -CFLAGS+= -I${.CURDIR}/.. -I${.OBJDIR} -CFLAGS+= -I${LIBARCHIVEDIR}/libarchive -I${LIBARCHIVEDIR}/test_utils -CFLAGS+= -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1 - -# Uncomment to link against dmalloc -#LDADD+= -L/usr/local/lib -ldmalloc -#CFLAGS+= -I/usr/local/include -DUSE_DMALLOC - -.PATH: ${LIBARCHIVEDIR}/libarchive/test -TESTS= \ - test_acl_freebsd_nfs4.c \ - test_acl_freebsd_posix1e.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_cmdline.c \ - test_archive_crypto.c \ - test_archive_getdate.c \ - test_archive_match_time.c \ - test_archive_match_owner.c \ - test_archive_match_path.c \ - test_archive_pathmatch.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_multiple_data_objects.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_add_filter_by_name.c \ - test_archive_write_set_filter_option.c \ - test_archive_write_set_format_by_name.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_lzop.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_uudecode.c \ - test_compat_xz.c \ - test_compat_zip.c \ - test_empty_write.c \ - 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_fd.c \ - test_open_failure.c \ - test_open_file.c \ - test_open_filename.c \ - test_pax_filename_encoding.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_filter_grzip.c \ - test_read_filter_lrzip.c \ - test_read_filter_lzop.c \ - test_read_filter_lzop_multiple_parts.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 \ - 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_gzip.c \ - test_read_format_cpio_svr4c_Z.c \ - test_read_format_cpio_svr4_bzip2_rpm.c \ - test_read_format_cpio_svr4_gzip_rpm.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_gtar_sparse_skip_entry.c \ - test_read_format_iso_Z.c \ - test_read_format_iso_multi_extent.c \ - test_read_format_iso_xorriso.c \ - test_read_format_isorr_rr_moved.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_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_comment_stored.c \ - test_read_format_zip_filename.c \ - test_read_format_zip_mac_metadata.c \ - test_read_format_zip_sfx.c \ - test_read_large.c \ - test_read_pax_truncated.c \ - test_read_position.c \ - test_read_set_format.c \ - test_read_truncated.c \ - test_read_truncated_filter.c \ - test_sparse_basic.c \ - test_tar_filenames.c \ - test_tar_large.c \ - test_ustar_filenames.c \ - test_ustar_filename_encoding.c \ - test_write_disk.c \ - test_write_disk_appledouble.c \ - test_write_disk_failures.c \ - test_write_disk_hardlink.c \ - test_write_disk_hfs_compression.c \ - test_write_disk_lookup.c \ - test_write_disk_mac_metadata.c \ - test_write_disk_no_hfs_compression.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_filter_b64encode.c \ - test_write_filter_bzip2.c \ - test_write_filter_compress.c \ - test_write_filter_gzip.c \ - test_write_filter_gzip_timestamp.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_7zip_empty.c \ - test_write_format_7zip_large.c \ - test_write_format_ar.c \ - test_write_format_cpio.c \ - test_write_format_cpio_empty.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_absolute_path.c \ - test_write_format_mtree_classic.c \ - test_write_format_mtree_classic_indent.c \ - test_write_format_mtree_fflags.c \ - test_write_format_mtree_no_separator.c \ - test_write_format_mtree_quoted_filename.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_tar_v7tar.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_zip_set_compression_store.c \ - test_write_open_memory.c \ - test_zip_filename_encoding.c - -# Build the test program. -SRCS= \ - ${TESTS} \ - list.h \ - main.c \ - read_open_memory.c - -.PATH: ${LIBARCHIVEDIR}/test_utils -SRCS+= test_utils.c - -# Build libarchive_test and run it. -check test: libarchive_test - ./libarchive_test -r ${LIBARCHIVEDIR}/libarchive/test - -# list.h is just a list of all tests, as indicated by DEFINE_TEST macro lines -list.h: ${TESTS} Makefile - (cd ${LIBARCHIVEDIR}/libarchive/test; cat test_*.c) | \ - grep DEFINE_TEST > ${.OBJDIR}/list.h - -CLEANFILES += *.out *.o *.core *~ list.h .dirstamp .depend -CLEANDIRS += .deps .libs - -cleantest: - -chmod -R +w /tmp/libarchive_test.* - rm -rf /tmp/libarchive_test.* - -.include Property changes on: stable/10/lib/libarchive/test/Makefile ___________________________________________________________________ Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: stable/10/lib/libarchive/test =================================================================== --- stable/10/lib/libarchive/test (revision 290891) +++ stable/10/lib/libarchive/test (nonexistent) Property changes on: stable/10/lib/libarchive/test ___________________________________________________________________ Deleted: svn:ignore ## -1,3 +0,0 ## -.depend -libarchive_test -list.h Index: stable/10/lib/libarchive/Makefile =================================================================== --- stable/10/lib/libarchive/Makefile (revision 290891) +++ stable/10/lib/libarchive/Makefile (revision 290892) @@ -1,420 +1,417 @@ # $FreeBSD$ .include LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive LIB= archive DPADD= ${LIBZ} LDADD= -lz DPADD+= ${LIBBZ2} LDADD+= -lbz2 CFLAGS+= -DHAVE_BZLIB_H=1 DPADD+= ${LIBLZMA} LDADD+= -llzma CFLAGS+= -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1 DPADD+= ${LIBBSDXML} LDADD+= -lbsdxml # FreeBSD SHLIB_MAJOR value is managed as part of the FreeBSD system. # It has no real relation to the libarchive version number. SHLIB_MAJOR= 6 CFLAGS+= -DPLATFORM_CONFIG_H=\"${.CURDIR}/config_freebsd.h\" CFLAGS+= -I${.OBJDIR} .if ${MK_OPENSSL} != "no" CFLAGS+= -DWITH_OPENSSL DPADD+= ${LIBCRYPTO} LDADD+= -lcrypto .else DPADD+= ${LIBMD} LDADD+= -lmd .endif .if ${MK_ICONV} != "no" # TODO: This can be changed back to CFLAGS once iconv works correctly # with statically linked binaries. SHARED_CFLAGS+= -DHAVE_ICONV=1 -DHAVE_ICONV_H=1 -DICONV_CONST= .endif .if ${MACHINE_ARCH:Marm*} != "" || ${MACHINE_ARCH:Mmips*} != "" || \ ${MACHINE_ARCH:Msparc64*} != "" || ${MACHINE_ARCH:Mia64*} != "" NO_WCAST_ALIGN= yes .if ${MACHINE_ARCH:M*64*} == "" CFLAGS+= -DPPMD_32BIT .endif .endif NO_WCAST_ALIGN.clang= .PATH: ${LIBARCHIVEDIR}/libarchive # Headers to be installed in /usr/include INCS= archive.h archive_entry.h # Sources to be compiled. SRCS= archive_acl.c \ archive_check_magic.c \ archive_cmdline.c \ archive_crypto.c \ archive_entry.c \ archive_entry_copy_stat.c \ archive_entry_link_resolver.c \ archive_entry_sparse.c \ archive_entry_stat.c \ archive_entry_strmode.c \ archive_entry_xattr.c \ archive_getdate.c \ archive_match.c \ archive_options.c \ archive_pathmatch.c \ archive_ppmd7.c \ archive_rb.c \ archive_read.c \ archive_read_append_filter.c \ archive_read_data_into_fd.c \ archive_read_disk_entry_from_file.c \ archive_read_disk_posix.c \ archive_read_disk_set_standard_lookup.c \ archive_read_extract.c \ archive_read_open_fd.c \ archive_read_open_file.c \ archive_read_open_filename.c \ archive_read_open_memory.c \ archive_read_set_format.c \ archive_read_set_options.c \ archive_read_support_filter_all.c \ archive_read_support_filter_bzip2.c \ archive_read_support_filter_compress.c \ archive_read_support_filter_gzip.c \ archive_read_support_filter_grzip.c \ archive_read_support_filter_lrzip.c \ archive_read_support_filter_lzop.c \ archive_read_support_filter_none.c \ archive_read_support_filter_program.c \ archive_read_support_filter_rpm.c \ archive_read_support_filter_uu.c \ archive_read_support_filter_xz.c \ archive_read_support_format_7zip.c \ archive_read_support_format_all.c \ archive_read_support_format_ar.c \ archive_read_support_format_by_code.c \ archive_read_support_format_cab.c \ archive_read_support_format_cpio.c \ archive_read_support_format_empty.c \ archive_read_support_format_iso9660.c \ archive_read_support_format_lha.c \ archive_read_support_format_mtree.c \ archive_read_support_format_rar.c \ archive_read_support_format_raw.c \ archive_read_support_format_tar.c \ archive_read_support_format_xar.c \ archive_read_support_format_zip.c \ archive_string.c \ archive_string_sprintf.c \ archive_util.c \ archive_virtual.c \ archive_write.c \ archive_write_add_filter.c \ archive_write_disk_acl.c \ archive_write_disk_set_standard_lookup.c \ archive_write_disk_posix.c \ archive_write_open_fd.c \ archive_write_open_file.c \ archive_write_open_filename.c \ archive_write_open_memory.c \ archive_write_add_filter_b64encode.c \ archive_write_add_filter_by_name.c \ archive_write_add_filter_bzip2.c \ archive_write_add_filter_compress.c \ archive_write_add_filter_grzip.c \ archive_write_add_filter_gzip.c \ archive_write_add_filter_lrzip.c \ archive_write_add_filter_lzop.c \ archive_write_add_filter_none.c \ archive_write_add_filter_program.c \ archive_write_add_filter_uuencode.c \ archive_write_add_filter_xz.c \ archive_write_set_format.c \ archive_write_set_format_7zip.c \ archive_write_set_format_ar.c \ archive_write_set_format_by_name.c \ archive_write_set_format_cpio.c \ archive_write_set_format_cpio_newc.c \ archive_write_set_format_gnutar.c \ archive_write_set_format_iso9660.c \ archive_write_set_format_mtree.c \ archive_write_set_format_pax.c \ archive_write_set_format_shar.c \ archive_write_set_format_ustar.c \ archive_write_set_format_v7tar.c \ archive_write_set_format_xar.c \ archive_write_set_format_zip.c \ archive_write_set_options.c \ filter_fork_posix.c # Man pages to be installed. MAN= archive_entry.3 \ archive_entry_acl.3 \ archive_entry_linkify.3 \ archive_entry_paths.3 \ archive_entry_perms.3 \ archive_entry_stat.3 \ archive_entry_time.3 \ archive_read.3 \ archive_read_data.3 \ archive_read_disk.3 \ archive_read_extract.3 \ archive_read_filter.3 \ archive_read_format.3 \ archive_read_free.3 \ archive_read_header.3 \ archive_read_new.3 \ archive_read_open.3 \ archive_read_set_options.3 \ archive_util.3 \ archive_write.3 \ archive_write_blocksize.3 \ archive_write_data.3 \ archive_write_disk.3 \ archive_write_filter.3 \ archive_write_finish_entry.3 \ archive_write_format.3 \ archive_write_free.3 \ archive_write_header.3 \ archive_write_new.3 \ archive_write_open.3 \ archive_write_set_options.3 \ cpio.5 \ libarchive.3 \ libarchive_changes.3 \ libarchive_internals.3 \ libarchive-formats.5 \ tar.5 # Symlink the man pages under each function name. MLINKS+= archive_entry.3 archive_entry_clear.3 MLINKS+= archive_entry.3 archive_entry_clone.3 MLINKS+= archive_entry.3 archive_entry_free.3 MLINKS+= archive_entry.3 archive_entry_new.3 MLINKS+= archive_entry_acl.3 archive_entry_acl_add_entry.3 MLINKS+= archive_entry_acl.3 archive_entry_acl_add_entry_w.3 MLINKS+= archive_entry_acl.3 archive_entry_acl_clear.3 MLINKS+= archive_entry_acl.3 archive_entry_acl_count.3 MLINKS+= archive_entry_acl.3 archive_entry_acl_next.3 MLINKS+= archive_entry_acl.3 archive_entry_acl_next_w.3 MLINKS+= archive_entry_acl.3 archive_entry_acl_reset.3 MLINKS+= archive_entry_acl.3 archive_entry_acl_text_w.3 MLINKS+= archive_entry_linkify.3 archive_entry_linkresolver.3 MLINKS+= archive_entry_linkify.3 archive_entry_linkresolver_new.3 MLINKS+= archive_entry_linkify.3 archive_entry_linkresolver_set_strategy.3 MLINKS+= archive_entry_linkify.3 archive_entry_linkresolver_free.3 MLINKS+= archive_entry_paths.3 archive_entry_copy_hardlink.3 MLINKS+= archive_entry_paths.3 archive_entry_copy_hardlink_w.3 MLINKS+= archive_entry_paths.3 archive_entry_copy_link.3 MLINKS+= archive_entry_paths.3 archive_entry_copy_link_w.3 MLINKS+= archive_entry_paths.3 archive_entry_copy_pathname.3 MLINKS+= archive_entry_paths.3 archive_entry_copy_pathname_w.3 MLINKS+= archive_entry_paths.3 archive_entry_copy_sourcepath.3 MLINKS+= archive_entry_paths.3 archive_entry_copy_symlink.3 MLINKS+= archive_entry_paths.3 archive_entry_copy_symlink_w.3 MLINKS+= archive_entry_paths.3 archive_entry_hardlink.3 MLINKS+= archive_entry_paths.3 archive_entry_hardlink_w.3 MLINKS+= archive_entry_paths.3 archive_entry_pathname.3 MLINKS+= archive_entry_paths.3 archive_entry_pathname_w.3 MLINKS+= archive_entry_paths.3 archive_entry_set_hardlink.3 MLINKS+= archive_entry_paths.3 archive_entry_set_link.3 MLINKS+= archive_entry_paths.3 archive_entry_set_pathname.3 MLINKS+= archive_entry_paths.3 archive_entry_set_symlink.3 MLINKS+= archive_entry_paths.3 archive_entry_symlink.3 MLINKS+= archive_entry_paths.3 archive_entry_symlink_w.3 MLINKS+= archive_entry_paths.3 archive_entry_update_symlink_utf8.3 MLINKS+= archive_entry_paths.3 archive_entry_update_hardlink_utf8.3 MLINKS+= archive_entry_perms.3 archive_entry_copy_fflags_text.3 MLINKS+= archive_entry_perms.3 archive_entry_copy_fflags_text_w.3 MLINKS+= archive_entry_perms.3 archive_entry_copy_gname.3 MLINKS+= archive_entry_perms.3 archive_entry_copy_gname_w.3 MLINKS+= archive_entry_perms.3 archive_entry_copy_uname.3 MLINKS+= archive_entry_perms.3 archive_entry_copy_uname_w.3 MLINKS+= archive_entry_perms.3 archive_entry_fflags.3 MLINKS+= archive_entry_perms.3 archive_entry_fflags_text.3 MLINKS+= archive_entry_perms.3 archive_entry_gid.3 MLINKS+= archive_entry_perms.3 archive_entry_gname.3 MLINKS+= archive_entry_perms.3 archive_entry_gname_w.3 MLINKS+= archive_entry_perms.3 archive_entry_set_fflags.3 MLINKS+= archive_entry_perms.3 archive_entry_set_gid.3 MLINKS+= archive_entry_perms.3 archive_entry_set_gname.3 MLINKS+= archive_entry_perms.3 archive_entry_perm.3 MLINKS+= archive_entry_perms.3 archive_entry_set_perm.3 MLINKS+= archive_entry_perms.3 archive_entry_set_uid.3 MLINKS+= archive_entry_perms.3 archive_entry_set_uname.3 MLINKS+= archive_entry_perms.3 archive_entry_strmode.3 MLINKS+= archive_entry_perms.3 archive_entry_uid.3 MLINKS+= archive_entry_perms.3 archive_entry_uname.3 MLINKS+= archive_entry_perms.3 archive_entry_uname_w.3 MLINKS+= archive_entry_perms.3 archive_entry_update_gname_utf8.3 MLINKS+= archive_entry_perms.3 archive_entry_update_uname_utf8.3 MLINKS+= archive_entry_stat.3 archive_entry_copy_stat.3 MLINKS+= archive_entry_stat.3 archive_entry_dev.3 MLINKS+= archive_entry_stat.3 archive_entry_dev_is_set.3 MLINKS+= archive_entry_stat.3 archive_entry_devmajor.3 MLINKS+= archive_entry_stat.3 archive_entry_devminor.3 MLINKS+= archive_entry_stat.3 archive_entry_filetype.3 MLINKS+= archive_entry_stat.3 archive_entry_ino.3 MLINKS+= archive_entry_stat.3 archive_entry_ino64.3 MLINKS+= archive_entry_stat.3 archive_entry_ino_is_set.3 MLINKS+= archive_entry_stat.3 archive_entry_mode.3 MLINKS+= archive_entry_stat.3 archive_entry_nlink.3 MLINKS+= archive_entry_stat.3 archive_entry_rdev.3 MLINKS+= archive_entry_stat.3 archive_entry_rdevmajor.3 MLINKS+= archive_entry_stat.3 archive_entry_rdevminor.3 MLINKS+= archive_entry_stat.3 archive_entry_set_dev.3 MLINKS+= archive_entry_stat.3 archive_entry_set_devmajor.3 MLINKS+= archive_entry_stat.3 archive_entry_set_devminor.3 MLINKS+= archive_entry_stat.3 archive_entry_set_filetype.3 MLINKS+= archive_entry_stat.3 archive_entry_set_ino.3 MLINKS+= archive_entry_stat.3 archive_entry_set_ino64.3 MLINKS+= archive_entry_stat.3 archive_entry_set_mode.3 MLINKS+= archive_entry_stat.3 archive_entry_set_nlink.3 MLINKS+= archive_entry_stat.3 archive_entry_set_rdev.3 MLINKS+= archive_entry_stat.3 archive_entry_set_rdevmajor.3 MLINKS+= archive_entry_stat.3 archive_entry_set_rdevminor.3 MLINKS+= archive_entry_stat.3 archive_entry_set_size.3 MLINKS+= archive_entry_stat.3 archive_entry_size.3 MLINKS+= archive_entry_stat.3 archive_entry_size_is_set.3 MLINKS+= archive_entry_stat.3 archive_entry_unset_size.3 MLINKS+= archive_entry_time.3 archive_entry_atime.3 MLINKS+= archive_entry_time.3 archive_entry_atime_is_set.3 MLINKS+= archive_entry_time.3 archive_entry_atime_nsec.3 MLINKS+= archive_entry_time.3 archive_entry_birthtime.3 MLINKS+= archive_entry_time.3 archive_entry_birthtime_is_set.3 MLINKS+= archive_entry_time.3 archive_entry_birthtime_nsec.3 MLINKS+= archive_entry_time.3 archive_entry_ctime.3 MLINKS+= archive_entry_time.3 archive_entry_ctime_is_set.3 MLINKS+= archive_entry_time.3 archive_entry_ctime_nsec.3 MLINKS+= archive_entry_time.3 archive_entry_mtime.3 MLINKS+= archive_entry_time.3 archive_entry_mtime_is_set.3 MLINKS+= archive_entry_time.3 archive_entry_mtime_nsec.3 MLINKS+= archive_entry_time.3 archive_entry_set_atime.3 MLINKS+= archive_entry_time.3 archive_entry_set_birthtime.3 MLINKS+= archive_entry_time.3 archive_entry_set_ctime.3 MLINKS+= archive_entry_time.3 archive_entry_set_mtime.3 MLINKS+= archive_entry_time.3 archive_entry_unset_atime.3 MLINKS+= archive_entry_time.3 archive_entry_unset_birthtime.3 MLINKS+= archive_entry_time.3 archive_entry_unset_ctime.3 MLINKS+= archive_entry_time.3 archive_entry_unset_mtime.3 MLINKS+= archive_read_data.3 archive_read_data_block.3 MLINKS+= archive_read_data.3 archive_read_data_into_fd.3 MLINKS+= archive_read_data.3 archive_read_data_skip.3 MLINKS+= archive_read_header.3 archive_read_next_header.3 MLINKS+= archive_read_header.3 archive_read_next_header2.3 MLINKS+= archive_read_extract.3 archive_read_extract2.3 MLINKS+= archive_read_extract.3 archive_read_extract_set_progress_callback.3 MLINKS+= archive_read_extract.3 archive_read_extract_set_skip_file.3 MLINKS+= archive_read_open.3 archive_read_open2.3 MLINKS+= archive_read_open.3 archive_read_open_FILE.3 MLINKS+= archive_read_open.3 archive_read_open_fd.3 MLINKS+= archive_read_open.3 archive_read_open_file.3 MLINKS+= archive_read_open.3 archive_read_open_filename.3 MLINKS+= archive_read_open.3 archive_read_open_memory.3 MLINKS+= archive_read_free.3 archive_read_close.3 MLINKS+= archive_read_free.3 archive_read_finish.3 MLINKS+= archive_read_filter.3 archive_read_support_filter_all.3 MLINKS+= archive_read_filter.3 archive_read_support_filter_bzip2.3 MLINKS+= archive_read_filter.3 archive_read_support_filter_compress.3 MLINKS+= archive_read_filter.3 archive_read_support_filter_gzip.3 MLINKS+= archive_read_filter.3 archive_read_support_filter_lzma.3 MLINKS+= archive_read_filter.3 archive_read_support_filter_none.3 MLINKS+= archive_read_filter.3 archive_read_support_filter_xz.3 MLINKS+= archive_read_filter.3 archive_read_support_filter_program.3 MLINKS+= archive_read_filter.3 archive_read_support_filter_program_signature.3 MLINKS+= archive_read_format.3 archive_read_support_format_7zip.3 MLINKS+= archive_read_format.3 archive_read_support_format_all.3 MLINKS+= archive_read_format.3 archive_read_support_format_ar.3 MLINKS+= archive_read_format.3 archive_read_support_format_by_code.3 MLINKS+= archive_read_format.3 archive_read_support_format_cab.3 MLINKS+= archive_read_format.3 archive_read_support_format_cpio.3 MLINKS+= archive_read_format.3 archive_read_support_format_empty.3 MLINKS+= archive_read_format.3 archive_read_support_format_iso9660.3 MLINKS+= archive_read_format.3 archive_read_support_format_lha.3 MLINKS+= archive_read_format.3 archive_read_support_format_mtree.3 MLINKS+= archive_read_format.3 archive_read_support_format_rar.3 MLINKS+= archive_read_format.3 archive_read_support_format_raw.3 MLINKS+= archive_read_format.3 archive_read_support_format_tar.3 MLINKS+= archive_read_format.3 archive_read_support_format_xar.3 MLINKS+= archive_read_format.3 archive_read_support_format_zip.3 MLINKS+= archive_read_disk.3 archive_read_disk_entry_from_file.3 MLINKS+= archive_read_disk.3 archive_read_disk_gname.3 MLINKS+= archive_read_disk.3 archive_read_disk_new.3 MLINKS+= archive_read_disk.3 archive_read_disk_set_gname_lookup.3 MLINKS+= archive_read_disk.3 archive_read_disk_set_standard_lookup.3 MLINKS+= archive_read_disk.3 archive_read_disk_set_symlink_hybrid.3 MLINKS+= archive_read_disk.3 archive_read_disk_set_symlink_logical.3 MLINKS+= archive_read_disk.3 archive_read_disk_set_symlink_physical.3 MLINKS+= archive_read_disk.3 archive_read_disk_set_uname_lookup.3 MLINKS+= archive_read_disk.3 archive_read_disk_uname.3 MLINKS+= archive_read_set_options.3 archive_read_set_filter_option.3 MLINKS+= archive_read_set_options.3 archive_read_set_format_option.3 MLINKS+= archive_read_set_options.3 archive_read_set_option.3 MLINKS+= archive_util.3 archive_clear_error.3 MLINKS+= archive_util.3 archive_compression.3 MLINKS+= archive_util.3 archive_compression_name.3 MLINKS+= archive_util.3 archive_copy_error.3 MLINKS+= archive_util.3 archive_errno.3 MLINKS+= archive_util.3 archive_error_string.3 MLINKS+= archive_util.3 archive_file_count.3 MLINKS+= archive_util.3 archive_filter_code.3 MLINKS+= archive_util.3 archive_filter_count.3 MLINKS+= archive_util.3 archive_filter_name.3 MLINKS+= archive_util.3 archive_format.3 MLINKS+= archive_util.3 archive_format_name.3 MLINKS+= archive_util.3 archive_position.3 MLINKS+= archive_util.3 archive_set_error.3 MLINKS+= archive_write_blocksize.3 archive_write_get_bytes_in_last_block.3 MLINKS+= archive_write_blocksize.3 archive_write_get_bytes_per_block.3 MLINKS+= archive_write_blocksize.3 archive_write_set_bytes_in_last_block.3 MLINKS+= archive_write_blocksize.3 archive_write_set_bytes_per_block.3 MLINKS+= archive_write_disk.3 archive_write_data_block.3 MLINKS+= archive_write_disk.3 archive_write_disk_new.3 MLINKS+= archive_write_disk.3 archive_write_disk_set_group_lookup.3 MLINKS+= archive_write_disk.3 archive_write_disk_set_options.3 MLINKS+= archive_write_disk.3 archive_write_disk_set_skip_file.3 MLINKS+= archive_write_disk.3 archive_write_disk_set_standard_lookup.3 MLINKS+= archive_write_disk.3 archive_write_disk_set_user_lookup.3 MLINKS+= archive_write_filter.3 archive_write_add_filter_bzip2.3 MLINKS+= archive_write_filter.3 archive_write_add_filter_compress.3 MLINKS+= archive_write_filter.3 archive_write_add_filter_gzip.3 MLINKS+= archive_write_filter.3 archive_write_add_filter_lzip.3 MLINKS+= archive_write_filter.3 archive_write_add_filter_lzma.3 MLINKS+= archive_write_filter.3 archive_write_add_filter_none.3 MLINKS+= archive_write_filter.3 archive_write_add_filter_program.3 MLINKS+= archive_write_filter.3 archive_write_add_filter_xz.3 MLINKS+= archive_write_format.3 archive_write_set_format_cpio.3 MLINKS+= archive_write_format.3 archive_write_set_format_pax.3 MLINKS+= archive_write_format.3 archive_write_set_format_pax_restricted.3 MLINKS+= archive_write_format.3 archive_write_set_format_shar.3 MLINKS+= archive_write_format.3 archive_write_set_format_shar_dump.3 MLINKS+= archive_write_format.3 archive_write_set_format_ustar.3 MLINKS+= archive_write_free.3 archive_write_close.3 MLINKS+= archive_write_free.3 archive_write_fail.3 MLINKS+= archive_write_free.3 archive_write_finish.3 MLINKS+= archive_write_open.3 archive_write_open_FILE.3 MLINKS+= archive_write_open.3 archive_write_open_fd.3 MLINKS+= archive_write_open.3 archive_write_open_file.3 MLINKS+= archive_write_open.3 archive_write_open_filename.3 MLINKS+= archive_write_open.3 archive_write_open_memory.3 MLINKS+= archive_write_set_options.3 archive_write_set_filter_option.3 MLINKS+= archive_write_set_options.3 archive_write_set_format_option.3 MLINKS+= archive_write_set_options.3 archive_write_set_option.3 MLINKS+= libarchive.3 archive.3 -.PHONY: check test clean-test -check test: - cd ${.CURDIR}/test && make obj && make test - -clean-test: - cd ${.CURDIR}/test && make clean +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif .include Index: stable/10/lib/libarchive/tests/Makefile =================================================================== --- stable/10/lib/libarchive/tests/Makefile (nonexistent) +++ stable/10/lib/libarchive/tests/Makefile (revision 290892) @@ -0,0 +1,459 @@ +# $FreeBSD$ + +SRCTOP= ${.CURDIR:H:H:H} +TESTSDIR= ${TESTSBASE}/lib/libarchive + +LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive + +ATF_TESTS_SH+= functional_test + +BINDIR= ${TESTSDIR} + +PROGS+= libarchive_test + +CFLAGS+= -I${.CURDIR:H} -I${.OBJDIR} +CFLAGS+= -I${LIBARCHIVEDIR}/libarchive -I${LIBARCHIVEDIR}/test_utils +CFLAGS+= -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1 + +# Uncomment to link against dmalloc +#LDADD+= -L/usr/local/lib -ldmalloc +#CFLAGS+= -I/usr/local/include -DUSE_DMALLOC + +.PATH: ${LIBARCHIVEDIR}/libarchive/test +TESTS_SRCS= \ + test_acl_freebsd_nfs4.c \ + test_acl_freebsd_posix1e.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_cmdline.c \ + test_archive_crypto.c \ + test_archive_getdate.c \ + test_archive_match_time.c \ + test_archive_match_owner.c \ + test_archive_match_path.c \ + test_archive_pathmatch.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_multiple_data_objects.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_add_filter_by_name.c \ + test_archive_write_set_filter_option.c \ + test_archive_write_set_format_by_name.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_lzop.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_uudecode.c \ + test_compat_xz.c \ + test_compat_zip.c \ + test_empty_write.c \ + 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_fd.c \ + test_open_failure.c \ + test_open_file.c \ + test_open_filename.c \ + test_pax_filename_encoding.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_filter_grzip.c \ + test_read_filter_lrzip.c \ + test_read_filter_lzop.c \ + test_read_filter_lzop_multiple_parts.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 \ + 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_gzip.c \ + test_read_format_cpio_svr4c_Z.c \ + test_read_format_cpio_svr4_bzip2_rpm.c \ + test_read_format_cpio_svr4_gzip_rpm.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_gtar_sparse_skip_entry.c \ + test_read_format_iso_Z.c \ + test_read_format_iso_multi_extent.c \ + test_read_format_iso_xorriso.c \ + test_read_format_isorr_rr_moved.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_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_comment_stored.c \ + test_read_format_zip_filename.c \ + test_read_format_zip_mac_metadata.c \ + test_read_format_zip_sfx.c \ + test_read_large.c \ + test_read_pax_truncated.c \ + test_read_position.c \ + test_read_set_format.c \ + test_read_truncated.c \ + test_read_truncated_filter.c \ + test_sparse_basic.c \ + test_tar_filenames.c \ + test_tar_large.c \ + test_ustar_filenames.c \ + test_ustar_filename_encoding.c \ + test_write_disk.c \ + test_write_disk_appledouble.c \ + test_write_disk_failures.c \ + test_write_disk_hardlink.c \ + test_write_disk_hfs_compression.c \ + test_write_disk_lookup.c \ + test_write_disk_mac_metadata.c \ + test_write_disk_no_hfs_compression.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_filter_b64encode.c \ + test_write_filter_bzip2.c \ + test_write_filter_compress.c \ + test_write_filter_gzip.c \ + test_write_filter_gzip_timestamp.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_7zip_empty.c \ + test_write_format_7zip_large.c \ + test_write_format_ar.c \ + test_write_format_cpio.c \ + test_write_format_cpio_empty.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_absolute_path.c \ + test_write_format_mtree_classic.c \ + test_write_format_mtree_classic_indent.c \ + test_write_format_mtree_fflags.c \ + test_write_format_mtree_no_separator.c \ + test_write_format_mtree_quoted_filename.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_tar_v7tar.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_zip_set_compression_store.c \ + test_write_open_memory.c \ + test_zip_filename_encoding.c + +# Deterministic failures: +# Crashes with SIGBUS +BROKEN_TESTS+= test_archive_rmd160 +# Fails with `libarchive/test/test_archive_crypto.c:121: md != actualmd` +BROKEN_TESTS+= test_archive_sha384 +# Fails with `test_compat_pax_libarchive_2x.c:122: ARCHIVE_WARN != archive_read_next_header(a, &ae)` +BROKEN_TESTS+= test_compat_pax_libarchive_2x +# Fails with `test_read_disk_directory_traversals.c:1094: File at has atime 886622, 1443306049 seconds ago` +BROKEN_TESTS+= test_read_disk_directory_traversals + +# Non-deterministic failures: +# (Times out?) [and] crashes +BROKEN_TESTS+= test_fuzz_rar + +# Build the test program. +SRCS.libarchive_test= \ + ${TESTS_SRCS} \ + main.c \ + read_open_memory.c + +DPSRCS.libarchive_test= \ + list.h + +DPADD.libarchive_test= ${LIBARCHIVE} +LDADD.libarchive_test= -larchive + +.PATH: ${LIBARCHIVEDIR}/test_utils +SRCS.libarchive_test+= test_utils.c + +# list.h is just a list of all tests, as indicated by DEFINE_TEST macro lines +list.h: ${TESTS_SRCS} Makefile + @(cd ${LIBARCHIVEDIR}/libarchive/test && \ + grep -h DEFINE_TEST ${.ALLSRC:N*Makefile} | \ + egrep -v '${BROKEN_TESTS:tW:C/ /|/g}') > ${.TARGET}.tmp + @mv ${.TARGET}.tmp ${.TARGET} + +CLEANFILES+= list.h list.h.tmp + +FILES+= README +FILES+= test_acl_pax.tar.uu +FILES+= test_archive_string_conversion.txt.Z.uu +FILES+= test_compat_bzip2_1.tbz.uu +FILES+= test_compat_bzip2_2.tbz.uu +FILES+= test_compat_cpio_1.cpio.uu +FILES+= test_compat_gtar_1.tar.uu +FILES+= test_compat_gzip_1.tgz.uu +FILES+= test_compat_gzip_2.tgz.uu +FILES+= test_compat_lzip_1.tlz.uu +FILES+= test_compat_lzip_2.tlz.uu +FILES+= test_compat_lzma_1.tlz.uu +FILES+= test_compat_lzma_2.tlz.uu +FILES+= test_compat_lzma_3.tlz.uu +FILES+= test_compat_lzop_1.tar.lzo.uu +FILES+= test_compat_lzop_2.tar.lzo.uu +FILES+= test_compat_lzop_3.tar.lzo.uu +FILES+= test_compat_mac-1.tar.Z.uu +FILES+= test_compat_mac-2.tar.Z.uu +FILES+= test_compat_pax_libarchive_2x.tar.Z.uu +FILES+= test_compat_solaris_pax_sparse_1.pax.Z.uu +FILES+= test_compat_solaris_pax_sparse_2.pax.Z.uu +FILES+= test_compat_solaris_tar_acl.tar.uu +FILES+= test_compat_tar_hardlink_1.tar.uu +FILES+= test_compat_xz_1.txz.uu +FILES+= test_compat_zip_1.zip.uu +FILES+= test_compat_zip_2.zip.uu +FILES+= test_compat_zip_3.zip.uu +FILES+= test_compat_zip_4.zip.uu +FILES+= test_compat_zip_5.zip.uu +FILES+= test_compat_zip_6.zip.uu +FILES+= test_compat_zip_7.xps.uu +FILES+= test_fuzz.cab.uu +FILES+= test_fuzz.lzh.uu +FILES+= test_fuzz_1.iso.Z.uu +FILES+= test_pax_filename_encoding.tar.uu +FILES+= test_rar_multivolume_multiple_files.part1.rar.uu +FILES+= test_rar_multivolume_multiple_files.part2.rar.uu +FILES+= test_rar_multivolume_multiple_files.part3.rar.uu +FILES+= test_rar_multivolume_multiple_files.part4.rar.uu +FILES+= test_rar_multivolume_multiple_files.part5.rar.uu +FILES+= test_rar_multivolume_multiple_files.part6.rar.uu +FILES+= test_rar_multivolume_single_file.part1.rar.uu +FILES+= test_rar_multivolume_single_file.part2.rar.uu +FILES+= test_rar_multivolume_single_file.part3.rar.uu +FILES+= test_rar_multivolume_uncompressed_files.part01.rar.uu +FILES+= test_rar_multivolume_uncompressed_files.part02.rar.uu +FILES+= test_rar_multivolume_uncompressed_files.part03.rar.uu +FILES+= test_rar_multivolume_uncompressed_files.part04.rar.uu +FILES+= test_rar_multivolume_uncompressed_files.part05.rar.uu +FILES+= test_rar_multivolume_uncompressed_files.part06.rar.uu +FILES+= test_rar_multivolume_uncompressed_files.part07.rar.uu +FILES+= test_rar_multivolume_uncompressed_files.part08.rar.uu +FILES+= test_rar_multivolume_uncompressed_files.part09.rar.uu +FILES+= test_rar_multivolume_uncompressed_files.part10.rar.uu +FILES+= test_read_filter_grzip.tar.grz.uu +FILES+= test_read_filter_lrzip.tar.lrz.uu +FILES+= test_read_filter_lzop.tar.lzo.uu +FILES+= test_read_filter_lzop_multiple_parts.tar.lzo.uu +FILES+= test_read_format_7zip_bcj2_bzip2.7z.uu +FILES+= test_read_format_7zip_bcj2_copy_1.7z.uu +FILES+= test_read_format_7zip_bcj2_copy_2.7z.uu +FILES+= test_read_format_7zip_bcj2_copy_lzma.7z.uu +FILES+= test_read_format_7zip_bcj2_deflate.7z.uu +FILES+= test_read_format_7zip_bcj2_lzma1_1.7z.uu +FILES+= test_read_format_7zip_bcj2_lzma1_2.7z.uu +FILES+= test_read_format_7zip_bcj2_lzma2_1.7z.uu +FILES+= test_read_format_7zip_bcj2_lzma2_2.7z.uu +FILES+= test_read_format_7zip_bcj_bzip2.7z.uu +FILES+= test_read_format_7zip_bcj_copy.7z.uu +FILES+= test_read_format_7zip_bcj_deflate.7z.uu +FILES+= test_read_format_7zip_bcj_lzma1.7z.uu +FILES+= test_read_format_7zip_bcj_lzma2.7z.uu +FILES+= test_read_format_7zip_bzip2.7z.uu +FILES+= test_read_format_7zip_copy.7z.uu +FILES+= test_read_format_7zip_copy_2.7z.uu +FILES+= test_read_format_7zip_deflate.7z.uu +FILES+= test_read_format_7zip_delta_lzma1.7z.uu +FILES+= test_read_format_7zip_delta_lzma2.7z.uu +FILES+= test_read_format_7zip_empty_archive.7z.uu +FILES+= test_read_format_7zip_empty_file.7z.uu +FILES+= test_read_format_7zip_lzma1.7z.uu +FILES+= test_read_format_7zip_lzma1_2.7z.uu +FILES+= test_read_format_7zip_lzma1_lzma2.7z.uu +FILES+= test_read_format_7zip_lzma2.7z.uu +FILES+= test_read_format_7zip_ppmd.7z.uu +FILES+= test_read_format_7zip_symbolic_name.7z.uu +FILES+= test_read_format_ar.ar.uu +FILES+= test_read_format_cab_1.cab.uu +FILES+= test_read_format_cab_2.cab.uu +FILES+= test_read_format_cab_3.cab.uu +FILES+= test_read_format_cab_filename_cp932.cab.uu +FILES+= test_read_format_cpio_bin_be.cpio.uu +FILES+= test_read_format_cpio_filename_cp866.cpio.uu +FILES+= test_read_format_cpio_filename_eucjp.cpio.uu +FILES+= test_read_format_cpio_filename_koi8r.cpio.uu +FILES+= test_read_format_cpio_filename_utf8_jp.cpio.uu +FILES+= test_read_format_cpio_filename_utf8_ru.cpio.uu +FILES+= test_read_format_cpio_svr4_bzip2_rpm.rpm.uu +FILES+= test_read_format_cpio_svr4_gzip_rpm.rpm.uu +FILES+= test_read_format_gtar_filename_cp866.tar.Z.uu +FILES+= test_read_format_gtar_filename_eucjp.tar.Z.uu +FILES+= test_read_format_gtar_filename_koi8r.tar.Z.uu +FILES+= test_read_format_gtar_sparse_1_13.tar.uu +FILES+= test_read_format_gtar_sparse_1_17.tar.uu +FILES+= test_read_format_gtar_sparse_1_17_posix00.tar.uu +FILES+= test_read_format_gtar_sparse_1_17_posix01.tar.uu +FILES+= test_read_format_gtar_sparse_1_17_posix10.tar.uu +FILES+= test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu +FILES+= test_read_format_gtar_sparse_skip_entry.tar.Z.uu +FILES+= test_read_format_iso.iso.Z.uu +FILES+= test_read_format_iso_2.iso.Z.uu +FILES+= test_read_format_iso_joliet.iso.Z.uu +FILES+= test_read_format_iso_joliet_by_nero.iso.Z.uu +FILES+= test_read_format_iso_joliet_long.iso.Z.uu +FILES+= test_read_format_iso_joliet_rockridge.iso.Z.uu +FILES+= test_read_format_iso_multi_extent.iso.Z.uu +FILES+= test_read_format_iso_rockridge.iso.Z.uu +FILES+= test_read_format_iso_rockridge_ce.iso.Z.uu +FILES+= test_read_format_iso_rockridge_new.iso.Z.uu +FILES+= test_read_format_iso_rockridge_rr_moved.iso.Z.uu +FILES+= test_read_format_iso_xorriso.iso.Z.uu +FILES+= test_read_format_iso_zisofs.iso.Z.uu +FILES+= test_read_format_lha_filename_cp932.lzh.uu +FILES+= test_read_format_lha_header0.lzh.uu +FILES+= test_read_format_lha_header1.lzh.uu +FILES+= test_read_format_lha_header2.lzh.uu +FILES+= test_read_format_lha_header3.lzh.uu +FILES+= test_read_format_lha_lh0.lzh.uu +FILES+= test_read_format_lha_lh6.lzh.uu +FILES+= test_read_format_lha_lh7.lzh.uu +FILES+= test_read_format_lha_withjunk.lzh.uu +FILES+= test_read_format_mtree.mtree.uu +FILES+= test_read_format_mtree_nomagic.mtree.uu +FILES+= test_read_format_mtree_nomagic2.mtree.uu +FILES+= test_read_format_mtree_nomagic3.mtree.uu +FILES+= test_read_format_rar.rar.uu +FILES+= test_read_format_rar_binary_data.rar.uu +FILES+= test_read_format_rar_compress_best.rar.uu +FILES+= test_read_format_rar_compress_normal.rar.uu +FILES+= test_read_format_rar_multi_lzss_blocks.rar.uu +FILES+= test_read_format_rar_multivolume.part0001.rar.uu +FILES+= test_read_format_rar_multivolume.part0002.rar.uu +FILES+= test_read_format_rar_multivolume.part0003.rar.uu +FILES+= test_read_format_rar_multivolume.part0004.rar.uu +FILES+= test_read_format_rar_noeof.rar.uu +FILES+= test_read_format_rar_ppmd_lzss_conversion.rar.uu +FILES+= test_read_format_rar_sfx.exe.uu +FILES+= test_read_format_rar_subblock.rar.uu +FILES+= test_read_format_rar_unicode.rar.uu +FILES+= test_read_format_rar_windows.rar.uu +FILES+= test_read_format_raw.data.Z.uu +FILES+= test_read_format_raw.data.uu +FILES+= test_read_format_tar_empty_filename.tar.uu +FILES+= test_read_format_tar_filename_koi8r.tar.Z.uu +FILES+= test_read_format_ustar_filename_cp866.tar.Z.uu +FILES+= test_read_format_ustar_filename_eucjp.tar.Z.uu +FILES+= test_read_format_ustar_filename_koi8r.tar.Z.uu +FILES+= test_read_format_zip.zip.uu +FILES+= test_read_format_zip_comment_stored_1.zip.uu +FILES+= test_read_format_zip_comment_stored_2.zip.uu +FILES+= test_read_format_zip_filename_cp866.zip.uu +FILES+= test_read_format_zip_filename_cp932.zip.uu +FILES+= test_read_format_zip_filename_koi8r.zip.uu +FILES+= test_read_format_zip_filename_utf8_jp.zip.uu +FILES+= test_read_format_zip_filename_utf8_ru.zip.uu +FILES+= test_read_format_zip_filename_utf8_ru2.zip.uu +FILES+= test_read_format_zip_length_at_end.zip.uu +FILES+= test_read_format_zip_mac_metadata.zip.uu +FILES+= test_read_format_zip_sfx.uu +FILES+= test_read_format_zip_symlink.zip.uu +FILES+= test_read_format_zip_ux.zip.uu +FILES+= test_read_large_splitted_rar_aa.uu +FILES+= test_read_large_splitted_rar_ab.uu +FILES+= test_read_large_splitted_rar_ac.uu +FILES+= test_read_large_splitted_rar_ad.uu +FILES+= test_read_large_splitted_rar_ae.uu +FILES+= test_read_splitted_rar_aa.uu +FILES+= test_read_splitted_rar_ab.uu +FILES+= test_read_splitted_rar_ac.uu +FILES+= test_read_splitted_rar_ad.uu +FILES+= test_splitted_rar_seek_support_aa.uu +FILES+= test_splitted_rar_seek_support_ab.uu +FILES+= test_splitted_rar_seek_support_ac.uu +FILES+= test_write_disk_appledouble.cpio.gz.uu +FILES+= test_write_disk_hfs_compression.tgz.uu +FILES+= test_write_disk_mac_metadata.tar.gz.uu +FILES+= test_write_disk_no_hfs_compression.tgz.uu + +.include Property changes on: stable/10/lib/libarchive/tests/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Index: stable/10/lib/libarchive/tests/functional_test.sh =================================================================== --- stable/10/lib/libarchive/tests/functional_test.sh (nonexistent) +++ stable/10/lib/libarchive/tests/functional_test.sh (revision 290892) @@ -0,0 +1,50 @@ +# +# Copyright 2015 EMC Corp. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# $FreeBSD$ + +SRCDIR=$(atf_get_srcdir) +TESTER="${SRCDIR}/libarchive_test" + +check() +{ + local testcase=${1}; shift + + atf_check -o ignore -s exit:0 ${TESTER} -d -r "${SRCDIR}" -v "${testcase}" +} + +atf_init_test_cases() +{ + # Redirect stderr to stdout for the usage message because if you don't + # kyua list/kyua test will break: + # https://github.com/jmmv/kyua/issues/149 + testcases=$(${TESTER} -h 2>&1 | awk 'p != 0 && $1 ~ /^[0-9]+:/ { print $NF } /Available tests:/ { p=1 }') + for testcase in ${testcases}; do + atf_test_case ${testcase} + eval "${testcase}_body() { check ${testcase}; }" + atf_add_test_case ${testcase} + done +} Property changes on: stable/10/lib/libarchive/tests/functional_test.sh ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: stable/10/lib/libarchive/tests =================================================================== --- stable/10/lib/libarchive/tests (nonexistent) +++ stable/10/lib/libarchive/tests (revision 290892) Property changes on: stable/10/lib/libarchive/tests ___________________________________________________________________ Added: svn:ignore ## -0,0 +1,3 ## +.depend +libarchive_test +list.h Index: stable/10/usr.bin/cpio/test/Makefile =================================================================== --- stable/10/usr.bin/cpio/test/Makefile (revision 290891) +++ stable/10/usr.bin/cpio/test/Makefile (nonexistent) @@ -1,98 +0,0 @@ -# $FreeBSD$ - -LIBARCHIVEDIR= ${.CURDIR}/../../../contrib/libarchive - -.PATH: ${LIBARCHIVEDIR}/cpio -CPIO_SRCS= cmdline.c - -.PATH: ${LIBARCHIVEDIR}/libarchive_fe -CPIO_SRCS+= err.c - -.PATH: ${LIBARCHIVEDIR}/cpio/test -TESTS= \ - test_0.c \ - test_basic.c \ - test_cmdline.c \ - test_extract_cpio_Z.c \ - test_extract_cpio_bz2.c \ - test_extract_cpio_grz.c \ - test_extract_cpio_gz.c \ - test_extract_cpio_lrz.c \ - test_extract_cpio_lz.c \ - test_extract_cpio_lzma.c \ - test_extract_cpio_lzo.c \ - test_extract_cpio_xz.c \ - test_format_newc.c \ - test_gcpio_compat.c \ - test_option_0.c \ - test_option_B_upper.c \ - test_option_C_upper.c \ - test_option_J_upper.c \ - test_option_L_upper.c \ - test_option_Z_upper.c \ - test_option_a.c \ - test_option_b64encode.c \ - test_option_c.c \ - test_option_d.c \ - test_option_f.c \ - test_option_grzip.c \ - test_option_help.c \ - test_option_l.c \ - test_option_lrzip.c \ - test_option_lzma.c \ - test_option_lzop.c \ - test_option_m.c \ - test_option_t.c \ - test_option_u.c \ - test_option_uuencode.c \ - test_option_version.c \ - test_option_xz.c \ - test_option_y.c \ - test_option_z.c \ - test_owner_parse.c \ - test_passthrough_dotdot.c \ - test_passthrough_reverse.c - -# Build the test program -SRCS= list.h \ - ${CPIO_SRCS} \ - ${TESTS} \ - main.c - -.PATH: ${LIBARCHIVEDIR}/test_utils -SRCS+= test_utils.c - -CLEANFILES+= list.h bsdcpio_test - -MAN= - -PROG=bsdcpio_test -DPADD=${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBLZMA} -CFLAGS+= -DPLATFORM_CONFIG_H=\"${.CURDIR}/../../../lib/libarchive/config_freebsd.h\" -CFLAGS+= -I${.CURDIR}/../../../lib/libarchive -I${.OBJDIR} -LDADD= -larchive -lz -lbz2 -llzma -#CFLAGS+= -static -g -O2 -Wall -CFLAGS+= -g -O2 -Wall -CFLAGS+= -I${.OBJDIR} -CFLAGS+= -I${LIBARCHIVEDIR}/cpio -I${LIBARCHIVEDIR}/libarchive_fe -CFLAGS+= -I${LIBARCHIVEDIR}/test_utils - -# Uncomment to link against dmalloc -#LDADD+= -L/usr/local/lib -ldmalloc -#CFLAGS+= -I/usr/local/include -DUSE_DMALLOC - -check test: bsdcpio_test - ${.OBJDIR}/bsdcpio_test -p ${.OBJDIR}/../bsdcpio \ - -r ${LIBARCHIVEDIR}/cpio/test - -${.OBJDIR}/list.h list.h: ${TESTS} Makefile - (cd ${LIBARCHIVEDIR}/cpio/test; cat ${TESTS}) | \ - grep DEFINE_TEST > ${.OBJDIR}/list.h - -clean: - rm -f ${CLEANFILES} - rm -f *~ - -chmod -R +w /tmp/bsdcpio_test.* - rm -rf /tmp/bsdcpio_test.* - -.include Property changes on: stable/10/usr.bin/cpio/test/Makefile ___________________________________________________________________ Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: stable/10/usr.bin/cpio/test =================================================================== --- stable/10/usr.bin/cpio/test (revision 290891) +++ stable/10/usr.bin/cpio/test (nonexistent) Property changes on: stable/10/usr.bin/cpio/test ___________________________________________________________________ Deleted: svn:ignore ## -1,3 +0,0 ## -.depend -list.h -bsdcpio_test Index: stable/10/usr.bin/cpio/Makefile =================================================================== --- stable/10/usr.bin/cpio/Makefile (revision 290891) +++ stable/10/usr.bin/cpio/Makefile (revision 290892) @@ -1,51 +1,47 @@ # $FreeBSD$ .include LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive LIBARCHIVECONFDIR= ${.CURDIR}/../../lib/libarchive PROG= bsdcpio BSDCPIO_VERSION_STRING= 3.1.2 .PATH: ${LIBARCHIVEDIR}/cpio SRCS= cpio.c cmdline.c .PATH: ${LIBARCHIVEDIR}/libarchive_fe SRCS+= err.c line_reader.c CFLAGS+= -DBSDCPIO_VERSION_STRING=\"${BSDCPIO_VERSION_STRING}\" CFLAGS+= -DPLATFORM_CONFIG_H=\"${LIBARCHIVECONFDIR}/config_freebsd.h\" CFLAGS+= -I${LIBARCHIVEDIR}/cpio -I${LIBARCHIVEDIR}/libarchive_fe .ifdef RELEASE_CRUNCH # FreeBSD's installer uses cpio in crunched binaries that are # statically linked, cannot use -lcrypto, and are size sensitive. CFLAGS+= -DSMALLER .endif DPADD= ${LIBARCHIVE} ${LIBZ} ${LIBBZ2} ${LIBLZMA} ${LIBBSDXML} LDADD= -larchive -lz -lbz2 -llzma -lbsdxml .if ${MK_OPENSSL} != "no" DPADD+= ${LIBCRYPTO} LDADD+= -lcrypto .else DPADD+= ${LIBMD} LDADD+= -lmd .endif .if ${MK_ICONV} != "no" CFLAGS+= -DHAVE_ICONV=1 -DHAVE_ICONV_H=1 -DICONV_CONST=const .endif SYMLINKS=bsdcpio ${BINDIR}/cpio MLINKS= bsdcpio.1 cpio.1 -.PHONY: check test clean-test - -check test: $(PROG) bsdcpio.1.gz - cd ${.CURDIR}/test && make obj && make test - -clean-test: - cd ${.CURDIR}/test && make clean +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif .include Index: stable/10/usr.bin/cpio/tests/Makefile =================================================================== --- stable/10/usr.bin/cpio/tests/Makefile (nonexistent) +++ stable/10/usr.bin/cpio/tests/Makefile (revision 290892) @@ -0,0 +1,120 @@ +# $FreeBSD$ + +SRCTOP= ${.CURDIR:H:H:H} +TESTSDIR= ${TESTSBASE}/usr.bin/cpio + +LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive + +ATF_TESTS_SH+= functional_test + +BINDIR= ${TESTSDIR} + +PROGS+= bsdcpio_test + +CFLAGS+= -DPLATFORM_CONFIG_H=\"${SRCTOP}/lib/libarchive/config_freebsd.h\" +CFLAGS+= -I${SRCTOP}/lib/libarchive -I${.OBJDIR} + +CFLAGS+= -I${.OBJDIR} +CFLAGS+= -I${LIBARCHIVEDIR}/cpio -I${LIBARCHIVEDIR}/libarchive_fe +CFLAGS+= -I${LIBARCHIVEDIR}/test_utils + +# Uncomment to link against dmalloc +#LDADD+= -L/usr/local/lib -ldmalloc +#CFLAGS+= -I/usr/local/include -DUSE_DMALLOC + +.PATH: ${LIBARCHIVEDIR}/cpio +CPIO_SRCS= cmdline.c + +.PATH: ${LIBARCHIVEDIR}/libarchive_fe +CPIO_SRCS+= err.c + +.PATH: ${LIBARCHIVEDIR}/cpio/test +TESTS_SRCS= \ + test_0.c \ + test_basic.c \ + test_cmdline.c \ + test_extract_cpio_Z.c \ + test_extract_cpio_bz2.c \ + test_extract_cpio_grz.c \ + test_extract_cpio_gz.c \ + test_extract_cpio_lrz.c \ + test_extract_cpio_lz.c \ + test_extract_cpio_lzma.c \ + test_extract_cpio_lzo.c \ + test_extract_cpio_xz.c \ + test_format_newc.c \ + test_gcpio_compat.c \ + test_option_0.c \ + test_option_B_upper.c \ + test_option_C_upper.c \ + test_option_J_upper.c \ + test_option_L_upper.c \ + test_option_Z_upper.c \ + test_option_a.c \ + test_option_b64encode.c \ + test_option_c.c \ + test_option_d.c \ + test_option_f.c \ + test_option_grzip.c \ + test_option_help.c \ + test_option_l.c \ + test_option_lrzip.c \ + test_option_lzma.c \ + test_option_lzop.c \ + test_option_m.c \ + test_option_t.c \ + test_option_u.c \ + test_option_uuencode.c \ + test_option_version.c \ + test_option_xz.c \ + test_option_y.c \ + test_option_z.c \ + test_owner_parse.c \ + test_passthrough_dotdot.c \ + test_passthrough_reverse.c + +SRCS.bsdcpio_test= list.h \ + ${CPIO_SRCS} \ + ${TESTS_SRCS} \ + main.c + +DPSRCS.bsdcpio_test= \ + list.h + +.PATH: ${LIBARCHIVEDIR}/test_utils +SRCS.bsdcpio_test+= test_utils.c + +DPADD.bsdcpio_test= ${LIBARCHIVE} +LDADD.bsdcpio_test= -larchive + +list.h: ${TESTS_SRCS} Makefile + @(cd ${LIBARCHIVEDIR}/tar/test && \ + grep -h DEFINE_TEST ${.ALLSRC:N*Makefile}) > ${.TARGET}.tmp + @mv ${.TARGET}.tmp ${.TARGET} + +CLEANFILES+= list.h list.h.tmp + +FILES+= test_extract.cpio.Z.uu +FILES+= test_extract.cpio.bz2.uu +FILES+= test_extract.cpio.grz.uu +FILES+= test_extract.cpio.gz.uu +FILES+= test_extract.cpio.lrz.uu +FILES+= test_extract.cpio.lz.uu +FILES+= test_extract.cpio.lzma.uu +FILES+= test_extract.cpio.lzo.uu +FILES+= test_extract.cpio.xz.uu +FILES+= test_gcpio_compat_ref.bin.uu +FILES+= test_gcpio_compat_ref.crc.uu +FILES+= test_gcpio_compat_ref.newc.uu +FILES+= test_gcpio_compat_ref.ustar.uu +FILES+= test_gcpio_compat_ref_nosym.bin.uu +FILES+= test_gcpio_compat_ref_nosym.crc.uu +FILES+= test_gcpio_compat_ref_nosym.newc.uu +FILES+= test_gcpio_compat_ref_nosym.ustar.uu +FILES+= test_option_f.cpio.uu +FILES+= test_option_m.cpio.uu +FILES+= test_option_t.cpio.uu +FILES+= test_option_t.stdout.uu +FILES+= test_option_tv.stdout.uu + +.include Property changes on: stable/10/usr.bin/cpio/tests/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Index: stable/10/usr.bin/cpio/tests/functional_test.sh =================================================================== --- stable/10/usr.bin/cpio/tests/functional_test.sh (nonexistent) +++ stable/10/usr.bin/cpio/tests/functional_test.sh (revision 290892) @@ -0,0 +1,56 @@ +# +# Copyright 2015 EMC Corp. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# $FreeBSD$ + +SRCDIR=$(atf_get_srcdir) +TESTER="${SRCDIR}/bsdcpio_test" +export BSDCPIO=$(which cpio) + +check() +{ + local testcase=${1}; shift + + # For some odd reason /bin/sh spuriously writes + # "write error on stdout" with some of the testcases + # + # Probably an issue with how they're written as it calls system(3) to + # clean up directories.. + atf_check -e ignore -o ignore -s exit:0 ${TESTER} -d -r "${SRCDIR}" -v "${testcase}" +} + +atf_init_test_cases() +{ + # Redirect stderr to stdout for the usage message because if you don't + # kyua list/kyua test will break: + # https://github.com/jmmv/kyua/issues/149 + testcases=$(${TESTER} -h 2>&1 | awk 'p != 0 && $1 ~ /^[0-9]+:/ { print $NF } /Available tests:/ { p=1 }') + for testcase in ${testcases}; do + atf_test_case ${testcase} + eval "${testcase}_body() { check ${testcase}; }" + atf_add_test_case ${testcase} + done +} Property changes on: stable/10/usr.bin/cpio/tests/functional_test.sh ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: stable/10/usr.bin/cpio/tests =================================================================== --- stable/10/usr.bin/cpio/tests (nonexistent) +++ stable/10/usr.bin/cpio/tests (revision 290892) Property changes on: stable/10/usr.bin/cpio/tests ___________________________________________________________________ Added: svn:ignore ## -0,0 +1,3 ## +.depend +list.h +bsdcpio_test Index: stable/10/usr.bin/tar/test/Makefile =================================================================== --- stable/10/usr.bin/tar/test/Makefile (revision 290891) +++ stable/10/usr.bin/tar/test/Makefile (nonexistent) @@ -1,101 +0,0 @@ -# $FreeBSD$ - -LIBARCHIVEDIR= ${.CURDIR}/../../../contrib/libarchive - -.PATH: ${LIBARCHIVEDIR}/tar/test -TESTS= \ - test_0.c \ - test_basic.c \ - test_copy.c \ - test_empty_mtree.c \ - test_extract_tar_bz2.c \ - test_extract_tar_grz.c \ - test_extract_tar_gz.c \ - test_extract_tar_lrz.c \ - test_extract_tar_lz.c \ - test_extract_tar_lzma.c \ - test_extract_tar_lzo.c \ - test_extract_tar_xz.c \ - test_format_newc.c \ - test_help.c \ - test_option_C_upper.c \ - test_option_H_upper.c \ - test_option_L_upper.c \ - test_option_O_upper.c \ - test_option_T_upper.c \ - test_option_U_upper.c \ - test_option_X_upper.c \ - test_option_a.c \ - test_option_b.c \ - test_option_b64encode.c \ - test_option_exclude.c \ - test_option_gid_gname.c \ - test_option_grzip.c \ - test_option_j.c \ - test_option_k.c \ - test_option_keep_newer_files.c \ - test_option_lrzip.c \ - test_option_lzma.c \ - test_option_lzop.c \ - test_option_n.c \ - test_option_newer_than.c \ - test_option_nodump.c \ - test_option_older_than.c \ - test_option_q.c \ - test_option_r.c \ - test_option_s.c \ - test_option_uid_uname.c \ - test_option_uuencode.c \ - test_option_xz.c \ - test_option_z.c \ - test_patterns.c \ - test_print_longpath.c \ - test_stdio.c \ - test_strip_components.c \ - test_symlink_dir.c \ - test_version.c - -# Build the test program -SRCS= ${TAR_SRCS} \ - ${TESTS} \ - list.h \ - main.c - -.PATH: ${LIBARCHIVEDIR}/test_utils -SRCS+= test_utils.c - -CLEANFILES+= list.h - -MAN= - -PROG=bsdtar_test -DPADD=${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBLZMA} -CFLAGS+= -DPLATFORM_CONFIG_H=\"${.CURDIR}/../../../lib/libarchive/config_freebsd.h\" -LDADD= -larchive -lz -lbz2 -llzma -CFLAGS+= -static -g -O2 -Wall -CFLAGS+= -I${.CURDIR}/../../../lib/libarchive -I${.OBJDIR} -CFLAGS+= -I${LIBARCHIVEDIR}/tar -I${LIBARCHIVEDIR}/test_utils - -# Uncomment to link against dmalloc -#LDADD+= -L/usr/local/lib -ldmalloc -#CFLAGS+= -I/usr/local/include -DUSE_DMALLOC - -check test: bsdtar_test - ./bsdtar_test -p ${.OBJDIR}/../bsdtar -r ${LIBARCHIVEDIR}/tar/test - -list.h: ${TESTS} Makefile - (cd ${LIBARCHIVEDIR}/tar/test; cat ${TESTS}) | \ - grep DEFINE_TEST > ${.OBJDIR}/list.h - -clean: - rm -f ${CLEANFILES} - rm -f *.out - rm -f *.o - rm -f *.core - rm -f *~ - rm -f list.h - rm -f archive.h ../archive.h - -chmod -R +w /tmp/bsdtar_test.* - rm -rf /tmp/bsdtar_test.* - -.include Property changes on: stable/10/usr.bin/tar/test/Makefile ___________________________________________________________________ Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: stable/10/usr.bin/tar/Makefile =================================================================== --- stable/10/usr.bin/tar/Makefile (revision 290891) +++ stable/10/usr.bin/tar/Makefile (revision 290892) @@ -1,50 +1,47 @@ # $FreeBSD$ .include LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive PROG= bsdtar BSDTAR_VERSION_STRING= 3.1.2 .PATH: ${LIBARCHIVEDIR}/tar SRCS= bsdtar.c \ cmdline.c \ creation_set.c \ read.c \ subst.c \ util.c \ write.c .PATH: ${LIBARCHIVEDIR}/libarchive_fe SRCS+= err.c \ line_reader.c DPADD= ${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBLZMA} ${LIBBSDXML} LDADD= -larchive -lbz2 -lz -llzma -lbsdxml .if ${MK_OPENSSL} != "no" DPADD+= ${LIBCRYPTO} LDADD+= -lcrypto .else DPADD+= ${LIBMD} LDADD+= -lmd .endif .if ${MK_ICONV} != "no" CFLAGS+= -DHAVE_ICONV=1 -DHAVE_ICONV_H=1 -DICONV_CONST=const .endif CFLAGS+= -DBSDTAR_VERSION_STRING=\"${BSDTAR_VERSION_STRING}\" CFLAGS+= -DPLATFORM_CONFIG_H=\"${.CURDIR}/../../lib/libarchive/config_freebsd.h\" CFLAGS+= -I${LIBARCHIVEDIR}/tar -I${LIBARCHIVEDIR}/libarchive CFLAGS+= -I${LIBARCHIVEDIR}/libarchive_fe SYMLINKS= bsdtar ${BINDIR}/tar MLINKS= bsdtar.1 tar.1 -.PHONY: check test clean-test -check test: $(PROG) bsdtar.1.gz - cd ${.CURDIR}/test && make obj && make test - -clean-test: - cd ${.CURDIR}/test && make clean +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif .include Index: stable/10/usr.bin/tar/tests/Makefile =================================================================== --- stable/10/usr.bin/tar/tests/Makefile (nonexistent) +++ stable/10/usr.bin/tar/tests/Makefile (revision 290892) @@ -0,0 +1,112 @@ +# $FreeBSD$ + +SRCTOP= ${.CURDIR:H:H:H} +TESTSDIR= ${TESTSBASE}/usr.bin/tar + +LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive + +ATF_TESTS_SH+= functional_test + +BINDIR= ${TESTSDIR} + +CFLAGS+= -DPLATFORM_CONFIG_H=\"${SRCTOP}/lib/libarchive/config_freebsd.h\" +CFLAGS+= -static +CFLAGS+= -I${SRCTOP}/lib/libarchive -I${.OBJDIR} +CFLAGS+= -I${LIBARCHIVEDIR}/tar -I${LIBARCHIVEDIR}/test_utils + +# Uncomment to link against dmalloc +#LDADD+= -L/usr/local/lib -ldmalloc +#CFLAGS+= -I/usr/local/include -DUSE_DMALLOC + +PROGS+= bsdtar_test + +.PATH: ${LIBARCHIVEDIR}/tar/test +TESTS_SRCS= \ + test_0.c \ + test_basic.c \ + test_copy.c \ + test_empty_mtree.c \ + test_extract_tar_bz2.c \ + test_extract_tar_grz.c \ + test_extract_tar_gz.c \ + test_extract_tar_lrz.c \ + test_extract_tar_lz.c \ + test_extract_tar_lzma.c \ + test_extract_tar_lzo.c \ + test_extract_tar_xz.c \ + test_format_newc.c \ + test_help.c \ + test_option_C_upper.c \ + test_option_H_upper.c \ + test_option_L_upper.c \ + test_option_O_upper.c \ + test_option_T_upper.c \ + test_option_U_upper.c \ + test_option_X_upper.c \ + test_option_a.c \ + test_option_b.c \ + test_option_b64encode.c \ + test_option_exclude.c \ + test_option_gid_gname.c \ + test_option_grzip.c \ + test_option_j.c \ + test_option_k.c \ + test_option_keep_newer_files.c \ + test_option_lrzip.c \ + test_option_lzma.c \ + test_option_lzop.c \ + test_option_n.c \ + test_option_newer_than.c \ + test_option_nodump.c \ + test_option_older_than.c \ + test_option_q.c \ + test_option_r.c \ + test_option_s.c \ + test_option_uid_uname.c \ + test_option_uuencode.c \ + test_option_xz.c \ + test_option_z.c \ + test_patterns.c \ + test_print_longpath.c \ + test_stdio.c \ + test_strip_components.c \ + test_symlink_dir.c \ + test_version.c + +SRCS.bsdtar_test= \ + ${TESTS_SRCS} \ + list.h \ + main.c + +DPSRCS.bsdtar_test+= list.h + +.PATH: ${LIBARCHIVEDIR}/test_utils +SRCS.bsdtar_test+= test_utils.c + +DPADD.bsdtar_test= ${LIBARCHIVE} +LDADD.bsdtar_test= -larchive + +list.h: ${TESTS_SRCS} Makefile + @(cd ${LIBARCHIVEDIR}/tar/test && \ + grep -h DEFINE_TEST ${.ALLSRC:N*Makefile}) > ${.TARGET}.tmp + @mv ${.TARGET}.tmp ${.TARGET} + +CLEANFILES+= list.h list.h.tmp + +FILES+= test_extract.tar.Z.uu +FILES+= test_extract.tar.bz2.uu +FILES+= test_extract.tar.grz.uu +FILES+= test_extract.tar.gz.uu +FILES+= test_extract.tar.lrz.uu +FILES+= test_extract.tar.lz.uu +FILES+= test_extract.tar.lzma.uu +FILES+= test_extract.tar.lzo.uu +FILES+= test_extract.tar.xz.uu +FILES+= test_option_keep_newer_files.tar.Z.uu +FILES+= test_option_s.tar.Z.uu +FILES+= test_patterns_2.tar.uu +FILES+= test_patterns_3.tar.uu +FILES+= test_patterns_4.tar.uu +FILES+= test_print_longpath.tar.Z.uu + +.include Property changes on: stable/10/usr.bin/tar/tests/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Index: stable/10/usr.bin/tar/tests/functional_test.sh =================================================================== --- stable/10/usr.bin/tar/tests/functional_test.sh (nonexistent) +++ stable/10/usr.bin/tar/tests/functional_test.sh (revision 290892) @@ -0,0 +1,51 @@ +# +# Copyright 2015 EMC Corp. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# $FreeBSD$ + +export BSDTAR=$(which tar) +SRCDIR=$(atf_get_srcdir) +TESTER="${SRCDIR}/bsdtar_test" + +check() +{ + local testcase=${1}; shift + + atf_check -o ignore -s exit:0 ${TESTER} -d -r "${SRCDIR}" -v "${testcase}" +} + +atf_init_test_cases() +{ + # Redirect stderr to stdout for the usage message because if you don't + # kyua list/kyua test will break: + # https://github.com/jmmv/kyua/issues/149 + testcases=$(${TESTER} -h 2>&1 | awk 'p != 0 && $1 ~ /^[0-9]+:/ { print $NF } /Available tests:/ { p=1 }') + for testcase in ${testcases}; do + atf_test_case ${testcase} + eval "${testcase}_body() { check ${testcase}; }" + atf_add_test_case ${testcase} + done +} Property changes on: stable/10/usr.bin/tar/tests/functional_test.sh ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: stable/10 =================================================================== --- stable/10 (revision 290891) +++ stable/10 (revision 290892) Property changes on: stable/10 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,2 ## Merged /user/ngie/more-tests2:r288935-288938,288942-288981,288983-289130,289133-289179 Merged /head:r289195