1 files changed, 49 insertions, 9 deletions
diff --git a/archivers/libarchive/files/tar/test/CMakeLists.txt b/archivers/libarchive/files/tar/test/CMakeLists.txt
index 6064e142407..f19a5f69c50 100644
--- a/archivers/libarchive/files/tar/test/CMakeLists.txt
+++ b/archivers/libarchive/files/tar/test/CMakeLists.txt
@@ -5,30 +5,67 @@
 ############################################
 IF(ENABLE_TAR AND ENABLE_TEST)
   SET(bsdtar_test_SOURCES
-    ../getdate.c
+    ../../test_utils/test_utils.c
     main.c
     test.h
     test_0.c
     test_basic.c
     test_copy.c
     test_empty_mtree.c
-    test_getdate.c
+    test_extract_tar_Z.c
+    test_extract_tar_bz2.c
+    test_extract_tar_grz.c
+    test_extract_tar_gz.c
+    test_extract_tar_lrz.c
+    test_extract_tar_lz.c
+    test_extract_tar_lz4.c
+    test_extract_tar_lzma.c
+    test_extract_tar_lzo.c
+    test_extract_tar_xz.c
+    test_format_newc.c
     test_help.c
+    test_leading_slash.c
+    test_missing_file.c
+    test_option_C_upper.c
+    test_option_H_upper.c
+    test_option_L_upper.c
+    test_option_O_upper.c
     test_option_T_upper.c
+    test_option_U_upper.c
+    test_option_X_upper.c
+    test_option_a.c
+    test_option_b.c
+    test_option_b64encode.c
+    test_option_exclude.c
+    test_option_gid_gname.c
+    test_option_grzip.c
+    test_option_j.c
+    test_option_k.c
+    test_option_keep_newer_files.c
+    test_option_lrzip.c
+    test_option_lz4.c
+    test_option_lzma.c
+    test_option_lzop.c
+    test_option_n.c
+    test_option_newer_than.c
+    test_option_nodump.c
+    test_option_older_than.c
+    test_option_passphrase.c
     test_option_q.c
     test_option_r.c
     test_option_s.c
+    test_option_uid_uname.c
+    test_option_uuencode.c
+    test_option_xz.c
+    test_option_z.c
     test_patterns.c
+    test_print_longpath.c
     test_stdio.c
     test_strip_components.c
     test_symlink_dir.c
     test_version.c
     test_windows.c
   )
-  IF(WIN32 AND NOT CYGWIN)
-    LIST(APPEND bsdtar_test_SOURCES ../bsdtar_windows.c)
-    LIST(APPEND bsdtar_test_SOURCES ../bsdtar_windows.h)
-  ENDIF(WIN32 AND NOT CYGWIN)
 
   #
   # Register target
@@ -48,7 +85,7 @@ IF(ENABLE_TAR AND ENABLE_TEST)
   # test.  We can use that to define the tests for cmake by
   # defining a DEFINE_TEST macro and reading list.h in.
   MACRO (DEFINE_TEST _testname)
-    ADD_TEST_28(
+    ADD_TEST(
       NAME bsdtar_${_testname}
       COMMAND bsdtar_test -vv
                           -p $<TARGET_FILE:bsdtar>
@@ -57,11 +94,14 @@ IF(ENABLE_TAR AND ENABLE_TEST)
   ENDMACRO (DEFINE_TEST _testname)
 
   INCLUDE(${CMAKE_CURRENT_BINARY_DIR}/list.h)
+  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+  INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/test_utils)
 
   # Experimental new test handling
   ADD_CUSTOM_TARGET(run_bsdtar_test
-	COMMAND	bsdtar_test -p ${BSDTAR} -r ${CMAKE_CURRENT_SOURCE_DIR})
+	COMMAND	bsdtar_test -p $<TARGET_FILE:bsdtar>
+			    -r ${CMAKE_CURRENT_SOURCE_DIR})
   ADD_DEPENDENCIES(run_bsdtar_test bsdtar)
   ADD_DEPENDENCIES(run_all_tests run_bsdtar_test)
 
-ENDIF (ENABLE_TAR AND ENABLE_TEST)
+ENDIF(ENABLE_TAR AND ENABLE_TEST)