Sat Jan 18 13:56:53 2020 UTC ()
Fix build. Three list.h files are required to generate .d files


(ryoon)
diff -r1.1 -r1.2 src/tests/lib/libarchive/Makefile
diff -r1.1 -r1.2 src/tests/usr.bin/cpio/Makefile
diff -r1.1 -r1.2 src/tests/usr.bin/tar/Makefile
cvs diff -r1.1 -r1.2 src/tests/lib/libarchive/Makefile (expand / switch to unified diff)

--- src/tests/lib/libarchive/Makefile 2020/01/17 16:24:03 1.1
+++ src/tests/lib/libarchive/Makefile 2020/01/18 13:56:53 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.1 2020/01/17 16:24:03 christos Exp $ 1# $NetBSD: Makefile,v 1.2 2020/01/18 13:56:53 ryoon Exp $
2 2
3NOMAN= 3NOMAN=
4 4
5.include <bsd.own.mk> 5.include <bsd.own.mk>
6LIBARCHIVE=${NETBSDSRCDIR}/external/bsd/libarchive/dist 6LIBARCHIVE=${NETBSDSRCDIR}/external/bsd/libarchive/dist
7 7
8TESTSDIR= ${TESTSBASE}/lib/libarchive 8TESTSDIR= ${TESTSBASE}/lib/libarchive
9 9
10BINDIR= ${TESTSDIR} 10BINDIR= ${TESTSDIR}
11PROGS+= h_libarchive 11PROGS+= h_libarchive
12TESTS_SH+= t_libarchive 12TESTS_SH+= t_libarchive
13 13
14CPPFLAGS+=-I${LIBARCHIVE}/test_utils -I${LIBARCHIVE}/libarchive -I. 14CPPFLAGS+=-I${LIBARCHIVE}/test_utils -I${LIBARCHIVE}/libarchive -I.
@@ -586,27 +586,27 @@ test_read_splitted_rar_ab.uu \ @@ -586,27 +586,27 @@ test_read_splitted_rar_ab.uu \
586test_read_splitted_rar_ac.uu \ 586test_read_splitted_rar_ac.uu \
587test_read_splitted_rar_ad.uu \ 587test_read_splitted_rar_ad.uu \
588test_read_too_many_filters.gz.uu \ 588test_read_too_many_filters.gz.uu \
589test_splitted_rar_seek_support_aa.uu \ 589test_splitted_rar_seek_support_aa.uu \
590test_splitted_rar_seek_support_ab.uu \ 590test_splitted_rar_seek_support_ab.uu \
591test_splitted_rar_seek_support_ac.uu \ 591test_splitted_rar_seek_support_ac.uu \
592test_write_disk_appledouble.cpio.gz.uu \ 592test_write_disk_appledouble.cpio.gz.uu \
593test_write_disk_hfs_compression.tgz.uu \ 593test_write_disk_hfs_compression.tgz.uu \
594test_write_disk_mac_metadata.tar.gz.uu \ 594test_write_disk_mac_metadata.tar.gz.uu \
595test_write_disk_no_hfs_compression.tgz.uu 595test_write_disk_no_hfs_compression.tgz.uu
596 596
597.include <bsd.test.mk> 597.include <bsd.test.mk>
598 598
599test_main.o: list.h 599test_main.d: list.h
600 600
601CLEANFILES+=list.h 601CLEANFILES+=list.h
602 602
603# XXX: We skip the truncated filter tests because they are broken 603# XXX: We skip the truncated filter tests because they are broken
604# for built-in decompressors. The reason is that the output buffer 604# for built-in decompressors. The reason is that the output buffer
605# size is 64K, the truncated files are < 64K and the built-in decompressors 605# size is 64K, the truncated files are < 64K and the built-in decompressors
606# bail out instead of returning incomplete results. 606# bail out instead of returning incomplete results.
607list.h: ${SRCS.h_libarchive} Makefile 607list.h: ${SRCS.h_libarchive} Makefile
608 ${TOOL_GREP} -h '^DEFINE_TEST(' ${.ALLSRC} | \ 608 ${TOOL_GREP} -h '^DEFINE_TEST(' ${.ALLSRC} | \
609 ${TOOL_GREP} -v _truncated_filter_ | \ 609 ${TOOL_GREP} -v _truncated_filter_ | \
610 ${TOOL_GREP} -v test_compat_pax_libarchive_2x > ${.TARGET} 610 ${TOOL_GREP} -v test_compat_pax_libarchive_2x > ${.TARGET}
611 611
612 612
cvs diff -r1.1 -r1.2 src/tests/usr.bin/cpio/Makefile (expand / switch to unified diff)

--- src/tests/usr.bin/cpio/Makefile 2020/01/17 16:25:37 1.1
+++ src/tests/usr.bin/cpio/Makefile 2020/01/18 13:56:53 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.1 2020/01/17 16:25:37 christos Exp $ 1# $NetBSD: Makefile,v 1.2 2020/01/18 13:56:53 ryoon Exp $
2 2
3NOMAN= 3NOMAN=
4 4
5.include <bsd.own.mk> 5.include <bsd.own.mk>
6LIBARCHIVE=${NETBSDSRCDIR}/external/bsd/libarchive/dist 6LIBARCHIVE=${NETBSDSRCDIR}/external/bsd/libarchive/dist
7 7
8TESTSDIR= ${TESTSBASE}/usr.bin/cpio 8TESTSDIR= ${TESTSBASE}/usr.bin/cpio
9 9
10BINDIR= ${TESTSDIR} 10BINDIR= ${TESTSDIR}
11PROGS+= h_cpio 11PROGS+= h_cpio
12TESTS_SH+= t_cpio 12TESTS_SH+= t_cpio
13 13
14CPPFLAGS+=-I${LIBARCHIVE}/test_utils -I${LIBARCHIVE}/cpio -I. 14CPPFLAGS+=-I${LIBARCHIVE}/test_utils -I${LIBARCHIVE}/cpio -I.
@@ -97,19 +97,19 @@ test_gcpio_compat_ref.ustar.uu \ @@ -97,19 +97,19 @@ test_gcpio_compat_ref.ustar.uu \
97test_gcpio_compat_ref_nosym.bin.uu \ 97test_gcpio_compat_ref_nosym.bin.uu \
98test_gcpio_compat_ref_nosym.crc.uu \ 98test_gcpio_compat_ref_nosym.crc.uu \
99test_gcpio_compat_ref_nosym.newc.uu \ 99test_gcpio_compat_ref_nosym.newc.uu \
100test_gcpio_compat_ref_nosym.ustar.uu \ 100test_gcpio_compat_ref_nosym.ustar.uu \
101test_option_f.cpio.uu \ 101test_option_f.cpio.uu \
102test_option_m.cpio.uu \ 102test_option_m.cpio.uu \
103test_option_passphrase.zip.uu \ 103test_option_passphrase.zip.uu \
104test_option_t.cpio.uu \ 104test_option_t.cpio.uu \
105test_option_t.stdout.uu \ 105test_option_t.stdout.uu \
106test_option_tv.stdout.uu 106test_option_tv.stdout.uu
107 107
108.include <bsd.test.mk> 108.include <bsd.test.mk>
109 109
110test_main.o: list.h 110test_main.d: list.h
111 111
112CLEANFILES+=list.h 112CLEANFILES+=list.h
113 113
114list.h: ${SRCS.h_cpio} Makefile 114list.h: ${SRCS.h_cpio} Makefile
115 ${TOOL_GREP} -h '^DEFINE_TEST(' ${.ALLSRC} > ${.TARGET} 115 ${TOOL_GREP} -h '^DEFINE_TEST(' ${.ALLSRC} > ${.TARGET}
cvs diff -r1.1 -r1.2 src/tests/usr.bin/tar/Makefile (expand / switch to unified diff)

--- src/tests/usr.bin/tar/Makefile 2020/01/17 16:25:37 1.1
+++ src/tests/usr.bin/tar/Makefile 2020/01/18 13:56:53 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.1 2020/01/17 16:25:37 christos Exp $ 1# $NetBSD: Makefile,v 1.2 2020/01/18 13:56:53 ryoon Exp $
2 2
3NOMAN= 3NOMAN=
4 4
5.include <bsd.own.mk> 5.include <bsd.own.mk>
6LIBARCHIVE=${NETBSDSRCDIR}/external/bsd/libarchive/dist 6LIBARCHIVE=${NETBSDSRCDIR}/external/bsd/libarchive/dist
7 7
8TESTSDIR= ${TESTSBASE}/usr.bin/tar 8TESTSDIR= ${TESTSBASE}/usr.bin/tar
9 9
10BINDIR= ${TESTSDIR} 10BINDIR= ${TESTSDIR}
11PROGS+= h_tar 11PROGS+= h_tar
12TESTS_SH+= t_tar 12TESTS_SH+= t_tar
13 13
14CPPFLAGS+=-I${LIBARCHIVE}/test_utils -I${LIBARCHIVE}/tar -I. 14CPPFLAGS+=-I${LIBARCHIVE}/test_utils -I${LIBARCHIVE}/tar -I.
@@ -103,19 +103,19 @@ test_extract.tar.lzo.uu \ @@ -103,19 +103,19 @@ test_extract.tar.lzo.uu \
103test_extract.tar.xz.uu \ 103test_extract.tar.xz.uu \
104test_extract.tar.zst.uu \ 104test_extract.tar.zst.uu \
105test_leading_slash.tar.uu \ 105test_leading_slash.tar.uu \
106test_option_keep_newer_files.tar.Z.uu \ 106test_option_keep_newer_files.tar.Z.uu \
107test_option_passphrase.zip.uu \ 107test_option_passphrase.zip.uu \
108test_option_s.tar.Z.uu \ 108test_option_s.tar.Z.uu \
109test_patterns_2.tar.uu \ 109test_patterns_2.tar.uu \
110test_patterns_3.tar.uu \ 110test_patterns_3.tar.uu \
111test_patterns_4.tar.uu \ 111test_patterns_4.tar.uu \
112test_print_longpath.tar.Z.uu 112test_print_longpath.tar.Z.uu
113 113
114.include <bsd.test.mk> 114.include <bsd.test.mk>
115 115
116test_main.o: list.h 116test_main.d: list.h
117 117
118CLEANFILES+=list.h 118CLEANFILES+=list.h
119 119
120list.h: ${SRCS.h_tar} Makefile 120list.h: ${SRCS.h_tar} Makefile
121 ${TOOL_GREP} -h '^DEFINE_TEST(' ${.ALLSRC} > ${.TARGET} 121 ${TOOL_GREP} -h '^DEFINE_TEST(' ${.ALLSRC} > ${.TARGET}