diff options
| author | sjg <sjg@FreeBSD.org> | 2013-04-12 20:48:55 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2013-04-12 20:48:55 +0000 |
| commit | 97d8b9495668afa398ab17c8c5f7e223b5fd2e89 (patch) | |
| tree | 54038c9ac32a45f8741dcc23fb9a8ffc0e15ff89 /usr.bin/cpio | |
| parent | 5ee3bfdb338e7c80af29a67f4425c4be24c7b866 (diff) | |
| parent | 086d73aef6d0ab7d21daa2076fdc8d25961f9b05 (diff) | |
| download | FreeBSD-src-97d8b9495668afa398ab17c8c5f7e223b5fd2e89.zip FreeBSD-src-97d8b9495668afa398ab17c8c5f7e223b5fd2e89.tar.gz | |
sync from head
Diffstat (limited to 'usr.bin/cpio')
| -rw-r--r-- | usr.bin/cpio/Makefile | 2 | ||||
| -rw-r--r-- | usr.bin/cpio/test/Makefile | 20 |
2 files changed, 21 insertions, 1 deletions
diff --git a/usr.bin/cpio/Makefile b/usr.bin/cpio/Makefile index d1a3cca..635f4bc 100644 --- a/usr.bin/cpio/Makefile +++ b/usr.bin/cpio/Makefile @@ -6,7 +6,7 @@ LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive LIBARCHIVECONFDIR= ${.CURDIR}/../../lib/libarchive PROG= bsdcpio -BSDCPIO_VERSION_STRING= 3.0.4 +BSDCPIO_VERSION_STRING= 3.1.2 .PATH: ${LIBARCHIVEDIR}/cpio SRCS= cpio.c cmdline.c diff --git a/usr.bin/cpio/test/Makefile b/usr.bin/cpio/test/Makefile index 3a17f8e..4c8a6e5 100644 --- a/usr.bin/cpio/test/Makefile +++ b/usr.bin/cpio/test/Makefile @@ -12,6 +12,16 @@ CPIO_SRCS+= err.c 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 \ @@ -21,16 +31,22 @@ TESTS= \ 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 \ @@ -43,6 +59,9 @@ SRCS= list.h \ ${TESTS} \ main.c +.PATH: ${LIBARCHIVEDIR}/test_utils +SRCS+= test_utils.c + CLEANFILES+= list.h bsdcpio_test NO_MAN=yes @@ -56,6 +75,7 @@ LDADD= -larchive -lz -lbz2 -llzma 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 |
