aboutsummaryrefslogtreecommitdiffstats
path: root/cpio/test/CMakeLists.txt
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2017-03-02 21:02:17 +0000
committerMartin Matuska <mm@FreeBSD.org>2017-03-02 21:02:17 +0000
commit4b729aff5b4c807ecf8795452187ca06d5eb042d (patch)
treefefc76886e467f8a662770c4f394a8b76ebaf606 /cpio/test/CMakeLists.txt
parentb2ee1181b4555230a015f1b8f27a1e7ec3c2bb6e (diff)
downloadsrc-4b729aff5b4c807ecf8795452187ca06d5eb042d.tar.gz
src-4b729aff5b4c807ecf8795452187ca06d5eb042d.zip
Update vendor/libarchive to git d6b1bb9f7ea7bc153b7356e8e345c9e48005821avendor/libarchive/3.3.1
Release 3.3.1 Notable vendor changes: PR #501: improvements in ACL path handling PR #724: fix hang when reading malformed cpio files PR #864: fix out of bounds read with malformed GNU tar archives Test suite improvements New options to bsdtar that enable or disable reading and/or writing of: Access Control Lists (--acls, --no-acls) Extended file flags (--fflags, --no-fflags) Extended attributes (--xattrs, --no-xattrs)
Notes
Notes: svn path=/vendor/libarchive/dist/; revision=314565 svn path=/vendor/libarchive/3.3.1/; revision=314566; tag=vendor/libarchive/3.3.1
Diffstat (limited to 'cpio/test/CMakeLists.txt')
-rw-r--r--cpio/test/CMakeLists.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/cpio/test/CMakeLists.txt b/cpio/test/CMakeLists.txt
index 8ffb54276967..ec9509be98fa 100644
--- a/cpio/test/CMakeLists.txt
+++ b/cpio/test/CMakeLists.txt
@@ -8,7 +8,7 @@ IF(ENABLE_CPIO AND ENABLE_TEST)
../cmdline.c
../../libarchive_fe/err.c
../../test_utils/test_utils.c
- main.c
+ ../../test_utils/test_main.c
test.h
test_0.c
test_basic.c
@@ -87,6 +87,7 @@ IF(ENABLE_CPIO AND ENABLE_TEST)
INCLUDE(${CMAKE_CURRENT_BINARY_DIR}/list.h)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/test_utils)
+ INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/cpio/test)
# Experimental new test handling
ADD_CUSTOM_TARGET(run_bsdcpio_test