From a6c3db22355401f279babb79f255d1e95c89dac3 Mon Sep 17 00:00:00 2001 From: ngie Date: Tue, 6 Oct 2015 21:43:37 +0000 Subject: MFhead @ r288954 --- lib/libarchive/Makefile | 9 +- lib/libarchive/test/Makefile | 256 ------------------------------------------ lib/libarchive/tests/Makefile | 256 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 259 insertions(+), 262 deletions(-) delete mode 100644 lib/libarchive/test/Makefile create mode 100644 lib/libarchive/tests/Makefile (limited to 'lib/libarchive') diff --git a/lib/libarchive/Makefile b/lib/libarchive/Makefile index 3870de2..23675eb 100644 --- a/lib/libarchive/Makefile +++ b/lib/libarchive/Makefile @@ -398,11 +398,8 @@ 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 diff --git a/lib/libarchive/test/Makefile b/lib/libarchive/test/Makefile deleted file mode 100644 index e57c5ff..0000000 --- a/lib/libarchive/test/Makefile +++ /dev/null @@ -1,256 +0,0 @@ -# $FreeBSD$ - -LIBARCHIVEDIR= ${.CURDIR}/../../../contrib/libarchive - -MAN= - -PROG=libarchive_test -INTERNALPROG=yes # Don't install this; it's just for testing -LDADD= -L ${.OBJDIR}/.. -larchive -LIBADD= z bz2 lzma md crypto bsdxml -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 diff --git a/lib/libarchive/tests/Makefile b/lib/libarchive/tests/Makefile new file mode 100644 index 0000000..fa710e3 --- /dev/null +++ b/lib/libarchive/tests/Makefile @@ -0,0 +1,256 @@ +# $FreeBSD$ + +LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive + +MAN= + +PROG=libarchive_test +INTERNALPROG=yes # Don't install this; it's just for testing +LDADD= -L ${.OBJDIR}/.. -larchive +LIBADD= z bz2 lzma md crypto bsdxml +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 -- cgit v1.1 From b3e8d0ae9c98d4dbe06a34c16f8476c3e159db53 Mon Sep 17 00:00:00 2001 From: ngie Date: Tue, 6 Oct 2015 21:44:48 +0000 Subject: Forced commit to note that I was playing around with libarchive test integration that accidentally got committed with r288955 --- lib/libarchive/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/libarchive') diff --git a/lib/libarchive/Makefile b/lib/libarchive/Makefile index 23675eb..55c4408 100644 --- a/lib/libarchive/Makefile +++ b/lib/libarchive/Makefile @@ -399,7 +399,7 @@ MLINKS+= archive_write_set_options.3 archive_write_set_option.3 MLINKS+= libarchive.3 archive.3 .if ${MK_TESTS} != "no" -#SUBDIR+= tests +SUBDIR+= tests .endif .include -- cgit v1.1 From 98b68926cb4c20ae4604847bb5d420de8f4e035c Mon Sep 17 00:00:00 2001 From: ngie Date: Wed, 7 Oct 2015 05:20:44 +0000 Subject: Integrate the testcases into the FreeBSD test suite There are a handful of broken testcases that need to be investigated (see BROKEN_TESTS for more details) --- lib/libarchive/tests/Makefile | 255 ++++++++++++++++++++++++++++---- lib/libarchive/tests/functional_test.sh | 50 +++++++ 2 files changed, 278 insertions(+), 27 deletions(-) create mode 100755 lib/libarchive/tests/functional_test.sh (limited to 'lib/libarchive') diff --git a/lib/libarchive/tests/Makefile b/lib/libarchive/tests/Makefile index fa710e3..52fa1f8 100644 --- a/lib/libarchive/tests/Makefile +++ b/lib/libarchive/tests/Makefile @@ -2,23 +2,26 @@ LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive -MAN= +ATF_TESTS_SH+= functional_test -PROG=libarchive_test -INTERNALPROG=yes # Don't install this; it's just for testing -LDADD= -L ${.OBJDIR}/.. -larchive -LIBADD= z bz2 lzma md crypto bsdxml -CFLAGS+= -g -CFLAGS+= -I${.CURDIR}/.. -I${.OBJDIR} +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 +DEBUG_CFLAGS+= -g + +LIBADD.libarchive_test= archive + # Uncomment to link against dmalloc #LDADD+= -L/usr/local/lib -ldmalloc #CFLAGS+= -I/usr/local/include -DUSE_DMALLOC -.PATH: ${LIBARCHIVEDIR}/libarchive/test -TESTS= \ +.PATH: ${LIBARCHIVEDIR}/libarchive/test +TESTS_SRCS= \ test_acl_freebsd_nfs4.c \ test_acl_freebsd_posix1e.c \ test_acl_nfs4.c \ @@ -227,30 +230,228 @@ TESTS= \ 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= \ - ${TESTS} \ - list.h \ - main.c \ +SRCS.libarchive_test= \ + ${TESTS_SRCS} \ + main.c \ read_open_memory.c -.PATH: ${LIBARCHIVEDIR}/test_utils -SRCS+= test_utils.c +DPSRCS.libarchive_test= \ + list.h -# Build libarchive_test and run it. -check test: libarchive_test - ./libarchive_test -r ${LIBARCHIVEDIR}/libarchive/test +.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} Makefile - (cd ${LIBARCHIVEDIR}/libarchive/test; cat test_*.c) | \ - grep DEFINE_TEST > ${.OBJDIR}/list.h +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 += *.out *.o *.core *~ list.h .dirstamp .depend -CLEANDIRS += .deps .libs +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 -cleantest: - -chmod -R +w /tmp/libarchive_test.* - rm -rf /tmp/libarchive_test.* +CLEANFILES+= list.h list.h.tmp -.include +.include diff --git a/lib/libarchive/tests/functional_test.sh b/lib/libarchive/tests/functional_test.sh new file mode 100755 index 0000000..cc66b3e --- /dev/null +++ b/lib/libarchive/tests/functional_test.sh @@ -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 +} -- cgit v1.1 From 33c7bf8e7b5beff5a1eb3e2ccf6a661c52360ec6 Mon Sep 17 00:00:00 2001 From: ngie Date: Sun, 11 Oct 2015 08:21:49 +0000 Subject: MFhead @ r289132 --- lib/libarchive/tests/Makefile | 457 -------------------------------- lib/libarchive/tests/functional_test.sh | 50 ---- 2 files changed, 507 deletions(-) delete mode 100644 lib/libarchive/tests/Makefile delete mode 100755 lib/libarchive/tests/functional_test.sh (limited to 'lib/libarchive') diff --git a/lib/libarchive/tests/Makefile b/lib/libarchive/tests/Makefile deleted file mode 100644 index 52fa1f8..0000000 --- a/lib/libarchive/tests/Makefile +++ /dev/null @@ -1,457 +0,0 @@ -# $FreeBSD$ - -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 - -DEBUG_CFLAGS+= -g - -LIBADD.libarchive_test= archive - -# 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 - -.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} - -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 - -CLEANFILES+= list.h list.h.tmp - -.include diff --git a/lib/libarchive/tests/functional_test.sh b/lib/libarchive/tests/functional_test.sh deleted file mode 100755 index cc66b3e..0000000 --- a/lib/libarchive/tests/functional_test.sh +++ /dev/null @@ -1,50 +0,0 @@ -# -# 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 -} -- cgit v1.1 From f5532a14fee5732f99496a00146658ec19c0fa63 Mon Sep 17 00:00:00 2001 From: ngie Date: Sun, 11 Oct 2015 08:26:48 +0000 Subject: Revert r289133; retry the merge --- lib/libarchive/tests/Makefile | 457 ++++++++++++++++++++++++++++++++ lib/libarchive/tests/functional_test.sh | 50 ++++ 2 files changed, 507 insertions(+) create mode 100644 lib/libarchive/tests/Makefile create mode 100755 lib/libarchive/tests/functional_test.sh (limited to 'lib/libarchive') diff --git a/lib/libarchive/tests/Makefile b/lib/libarchive/tests/Makefile new file mode 100644 index 0000000..52fa1f8 --- /dev/null +++ b/lib/libarchive/tests/Makefile @@ -0,0 +1,457 @@ +# $FreeBSD$ + +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 + +DEBUG_CFLAGS+= -g + +LIBADD.libarchive_test= archive + +# 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 + +.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} + +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 + +CLEANFILES+= list.h list.h.tmp + +.include diff --git a/lib/libarchive/tests/functional_test.sh b/lib/libarchive/tests/functional_test.sh new file mode 100755 index 0000000..cc66b3e --- /dev/null +++ b/lib/libarchive/tests/functional_test.sh @@ -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 +} -- cgit v1.1