git: c68b38fae4fd - stable/15 - lib/libarchive/tests/Makefile: minor fixes

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Enji Cooper <ngie_at_FreeBSD.org>
Date: Tue, 22 Sep 2026 06:54:17 UTC
The branch stable/15 has been updated by ngie:

URL: https://cgit.FreeBSD.org/src/commit/?id=c68b38fae4fd3d52ac7512bdf3e29439d27c6947

commit c68b38fae4fd3d52ac7512bdf3e29439d27c6947
Author:     Enji Cooper <ngie@FreeBSD.org>
AuthorDate: 2026-09-01 19:02:06 +0000
Commit:     Enji Cooper <ngie@FreeBSD.org>
CommitDate: 2026-09-22 06:53:50 +0000

    lib/libarchive/tests/Makefile: minor fixes
    
    - Remove trailing whitespace
    - Fix typo with variable referenced adding sources for `test_fuzz`.
    
    MFC after:      2 weeks
    
    (cherry picked from commit edbb2e9d7a9aba7194dd0f37cede7aea51408f74)
---
 lib/libarchive/tests/Makefile | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/lib/libarchive/tests/Makefile b/lib/libarchive/tests/Makefile
index d805fa4536a3..b23962f68b19 100644
--- a/lib/libarchive/tests/Makefile
+++ b/lib/libarchive/tests/Makefile
@@ -394,13 +394,14 @@ BROKEN_TESTS+=		test_read_filter_lz4_raw_skip
 # test_fuzz.c is not a real test, but rather a simple fuzz-test using random().
 # Since this is not a regression/unit test, we don't include it by default.
 # If you would still like to include it, comment out the `.if 0`.
-TEST_SCRCS+=	test_fuzz.c
+TESTS_SRCS+=	\
+	test_fuzz.c
 ${PACKAGE}FILES+=	test_fuzz.cab.uu
 ${PACKAGE}FILES+=	test_fuzz.lzh.uu
 ${PACKAGE}FILES+=	test_fuzz_1.iso.Z.uu
 # Non-deterministic failures:
 # (Times out?) [and] crashes
-BROKEN_TESTS+=			test_fuzz_rar
+BROKEN_TESTS+=		test_fuzz_rar
 .endif
 
 # Build the test program.
@@ -485,7 +486,7 @@ ${PACKAGE}FILES+=	test_compat_zstd_2.tar.zst.uu
 ${PACKAGE}FILES+=	test_pax_filename_encoding.tar.uu
 ${PACKAGE}FILES+=	test_pax_xattr_header_all.tar.uu
 ${PACKAGE}FILES+=	test_pax_xattr_header_libarchive.tar.uu
-${PACKAGE}FILES+=	test_pax_xattr_header_schily.tar.uu	
+${PACKAGE}FILES+=	test_pax_xattr_header_schily.tar.uu
 ${PACKAGE}FILES+=	test_rar_multivolume_multiple_files.part1.rar.uu
 ${PACKAGE}FILES+=	test_rar_multivolume_multiple_files.part2.rar.uu
 ${PACKAGE}FILES+=	test_rar_multivolume_multiple_files.part3.rar.uu
@@ -506,7 +507,7 @@ ${PACKAGE}FILES+=	test_rar_multivolume_uncompressed_files.part08.rar.uu
 ${PACKAGE}FILES+=	test_rar_multivolume_uncompressed_files.part09.rar.uu
 ${PACKAGE}FILES+=	test_rar_multivolume_uncompressed_files.part10.rar.uu
 ${PACKAGE}FILES+=	test_read_data_into_fd_size_exceeds_declared_deflate.zip.uu
-${PACKAGE}FILES+=	test_read_data_into_fd_size_exceeds_declared_stored.zip.uu	
+${PACKAGE}FILES+=	test_read_data_into_fd_size_exceeds_declared_stored.zip.uu
 ${PACKAGE}FILES+=	test_read_files_compressed.part01.uu
 ${PACKAGE}FILES+=	test_read_files_compressed.part02.uu
 ${PACKAGE}FILES+=	test_read_filter_grzip.tar.grz.uu
@@ -541,7 +542,7 @@ ${PACKAGE}FILES+=	test_read_format_7zip_deflate.7z.uu
 ${PACKAGE}FILES+=	test_read_format_7zip_delta_lzma1.7z.uu
 ${PACKAGE}FILES+=	test_read_format_7zip_delta_lzma2.7z.uu
 ${PACKAGE}FILES+=	test_read_format_7zip_delta4_lzma1.7z.uu
-${PACKAGE}FILES+=	test_read_format_7zip_delta4_lzma2.7z.uu	
+${PACKAGE}FILES+=	test_read_format_7zip_delta4_lzma2.7z.uu
 ${PACKAGE}FILES+=	test_read_format_7zip_empty_archive.7z.uu
 ${PACKAGE}FILES+=	test_read_format_7zip_empty_file.7z.uu
 ${PACKAGE}FILES+=	test_read_format_7zip_archive_properties.7z.uu
@@ -564,12 +565,12 @@ ${PACKAGE}FILES+=	test_read_format_7zip_lzma2_sparc.7z.uu
 ${PACKAGE}FILES+=	test_read_format_7zip_malformed.7z.uu
 ${PACKAGE}FILES+=	test_read_format_7zip_malformed2.7z.uu
 ${PACKAGE}FILES+=	test_read_format_7zip_malformed3.7z.uu
-${PACKAGE}FILES+=	test_read_format_7zip_malformed4.7z.uu	
-${PACKAGE}FILES+=	test_read_format_7zip_malformed_numfiles_oom.7z.uu	
+${PACKAGE}FILES+=	test_read_format_7zip_malformed4.7z.uu
+${PACKAGE}FILES+=	test_read_format_7zip_malformed_numfiles_oom.7z.uu
 ${PACKAGE}FILES+=	test_read_format_7zip_packinfo_digests.7z.uu
 ${PACKAGE}FILES+=	test_read_format_7zip_ppmd.7z.uu
 ${PACKAGE}FILES+=	test_read_format_7zip_sfx_boundary_elf.elf.uu
-${PACKAGE}FILES+=	test_read_format_7zip_sfx_boundary_pe.exe.uu	
+${PACKAGE}FILES+=	test_read_format_7zip_sfx_boundary_pe.exe.uu
 ${PACKAGE}FILES+=	test_read_format_7zip_sfx_elf64trunc.elf.uu
 ${PACKAGE}FILES+=	test_read_format_7zip_sfx_elf.elf.uu
 ${PACKAGE}FILES+=	test_read_format_7zip_sfx_modified_pe.exe.uu
@@ -588,13 +589,13 @@ ${PACKAGE}FILES+=	test_read_format_cab_2.cab.uu
 ${PACKAGE}FILES+=	test_read_format_cab_3.cab.uu
 ${PACKAGE}FILES+=	test_read_format_cab_filename_cp932.cab.uu
 ${PACKAGE}FILES+=	test_read_format_cab_lzx_16bit.cab.uu
-${PACKAGE}FILES+=	test_read_format_cab_lzx_e8.cab.uu	
+${PACKAGE}FILES+=	test_read_format_cab_lzx_e8.cab.uu
 ${PACKAGE}FILES+=	test_read_format_cab_lzx_oob.cab.uu
-${PACKAGE}FILES+=	test_read_format_cab_multi.p1.cab.uu	
-${PACKAGE}FILES+=	test_read_format_cab_multi.p2.cab.uu	
+${PACKAGE}FILES+=	test_read_format_cab_multi.p1.cab.uu
+${PACKAGE}FILES+=	test_read_format_cab_multi.p2.cab.uu
 ${PACKAGE}FILES+=	test_read_format_cab_skip_malformed.cab.uu
-${PACKAGE}FILES+=	test_read_format_cpio_afio_header.part1.cpio.uu	
-${PACKAGE}FILES+=	test_read_format_cpio_afio_header.part2.cpio.uu	
+${PACKAGE}FILES+=	test_read_format_cpio_afio_header.part1.cpio.uu
+${PACKAGE}FILES+=	test_read_format_cpio_afio_header.part2.cpio.uu
 ${PACKAGE}FILES+=	test_read_format_cpio_bin_be.cpio.uu
 ${PACKAGE}FILES+=	test_read_format_cpio_bin_le.cpio.uu
 ${PACKAGE}FILES+=	test_read_format_cpio_filename_cp866.cpio.uu
@@ -765,7 +766,7 @@ ${PACKAGE}FILES+=	test_read_format_tar_pax_g_large.tar.uu
 ${PACKAGE}FILES+=	test_read_format_tar_pax_large_attr.tar.Z.uu
 ${PACKAGE}FILES+=	test_read_format_tar_pax_negative_time.tar.uu
 ${PACKAGE}FILES+=	test_read_format_tar_pax_sun_holesdata.tar.uu
-${PACKAGE}FILES+=	test_read_format_tar_pax_timestamps.tar.uu	
+${PACKAGE}FILES+=	test_read_format_tar_pax_timestamps.tar.uu
 ${PACKAGE}FILES+=	test_read_format_tar_timestamp_overflow.tar.uu
 ${PACKAGE}FILES+=	test_read_format_ustar_filename_cp866.tar.Z.uu
 ${PACKAGE}FILES+=	test_read_format_ustar_filename_eucjp.tar.Z.uu
@@ -832,9 +833,9 @@ ${PACKAGE}FILES+=	test_read_format_zip_winzip_aes256.zip.uu
 ${PACKAGE}FILES+=	test_read_format_zip_winzip_aes256_large.zip.uu
 ${PACKAGE}FILES+=	test_read_format_zip_winzip_aes256_large_bzip2.zip.uu
 ${PACKAGE}FILES+=	test_read_format_zip_winzip_aes256_large_lzma.zip.uu
-${PACKAGE}FILES+=	test_read_format_zip_winzip_aes256_large_ppmd.zip.uu	
-${PACKAGE}FILES+=	test_read_format_zip_winzip_aes256_large_xz.zip.uu	
-${PACKAGE}FILES+=	test_read_format_zip_winzip_aes256_large_zstd.zip.uu	
+${PACKAGE}FILES+=	test_read_format_zip_winzip_aes256_large_ppmd.zip.uu
+${PACKAGE}FILES+=	test_read_format_zip_winzip_aes256_large_xz.zip.uu
+${PACKAGE}FILES+=	test_read_format_zip_winzip_aes256_large_zstd.zip.uu
 ${PACKAGE}FILES+=	test_read_format_zip_winzip_aes256_stored.zip.uu
 ${PACKAGE}FILES+=	test_read_format_zip_xz_multi.zipx.uu
 ${PACKAGE}FILES+=	test_read_format_zip_zip64a.zip.uu