From 9f89d8925fd793803e4f6e20b1d4a41ad1e30d2e Mon Sep 17 00:00:00 2001 From: Guido Draheim Date: Sat, 15 Sep 2018 03:51:16 +0200 Subject: [PATCH] evaulate checks --- Makefile | 4 +++- bins/CMakeLists.txt | 5 ++++- test/CMakeLists.txt | 3 ++- test/test.zip | Bin 1361 -> 1361 bytes 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index bc6a674..c9c0703 100644 --- a/Makefile +++ b/Makefile @@ -13,12 +13,14 @@ install install/strip install/local list_install_components: cd build && $(MAKE) $@ VERBOSE=1 libzzip libzzipmmapped libzzipfseeko libzzipwrap zzipwrap: cd build && $(MAKE) $@ VERBOSE=1 -zzip unzzip unzzip-mix unzzip-mem unzzip-big zzdir zzcat zzcatsdl zzxorcat zzxordir zzobfuscated: +zzip unzzip unzzip-mix unzzip-mem unzzip-big zzdir zzcat zzcatsdl zzxorcat zzxordir zzxorcopy zzobfuscated: cd build && $(MAKE) $@ VERBOSE=1 sfx zzipself zzipsetstub doc htm man htmpages manpages site dbk pdf: cd build && $(MAKE) $@ VERBOSE=1 tests checks check: cd build && $(MAKE) $@ VERBOSE=1 +test_%: + cd build/test && python ../../test/zziptests.py $@ --topsrcdir=`pwd` -v builds: config build local static: conf build local diff --git a/bins/CMakeLists.txt b/bins/CMakeLists.txt index 6611802..b12524f 100644 --- a/bins/CMakeLists.txt +++ b/bins/CMakeLists.txt @@ -29,6 +29,7 @@ add_executable(zzcat zzcat.c) add_executable(zzdir zzdir.c) add_executable(zzxorcat zzxorcat.c) add_executable(zzxordir zzxordir.c) +add_executable(zzxorcopy zzxorcopy.c) add_executable(zzobfuscated zzobfuscated.c) add_executable(zziptest zziptest.c) add_executable(zzip zzip.c zzipmake-zip.c) @@ -41,6 +42,7 @@ target_link_libraries(zzcat libzzip ZLIB::ZLIB) target_link_libraries(zzdir libzzip ZLIB::ZLIB) target_link_libraries(zzxorcat libzzip ZLIB::ZLIB) target_link_libraries(zzxordir libzzip ZLIB::ZLIB) +target_link_libraries(zzxorcopy libzzip ZLIB::ZLIB) target_link_libraries(zzobfuscated libzzip ZLIB::ZLIB) target_link_libraries(zziptest libzzip ZLIB::ZLIB) target_link_libraries(zzip libzzip ZLIB::ZLIB) @@ -53,6 +55,7 @@ target_include_directories(zzcat PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_C target_include_directories(zzdir PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}") target_include_directories(zzxorcat PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}") target_include_directories(zzxordir PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}") +target_include_directories(zzxorcopy PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}") target_include_directories(zzobfuscated PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}") target_include_directories(zzip PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}") target_include_directories(unzzip PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}") @@ -61,6 +64,6 @@ target_include_directories(unzzip-mem PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_C target_include_directories(unzzip-big PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}") # install ######################################################## -install(TARGETS zzcat zzdir zzxorcat zzxordir +install(TARGETS zzcat zzdir zzxorcat zzxordir zzxorcopy unzzip unzzip-mix unzzip-mem unzzip-big DESTINATION "${CMAKE_INSTALL_BINDIR}") diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 4950256..b4effbe 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -57,11 +57,12 @@ endif() add_custom_target(tests COMMAND ${PY2} ${srcdir}/zziptests.py --exeext=${EXEEXT} --topsrcdir=${topdir} -v - DEPENDS ../bins/zzcat ../bins/zzdir ../bins/zziptest ../bins/zzxorcat) + DEPENDS ../bins/zzcat ../bins/zzdir ../bins/zziptest ../bins/zzxorcat ../bins/zzxorcopy) add_custom_command(OUTPUT ../bins/zzcat COMMMAND cd ../bins && $(MAKE) zzcat) add_custom_command(OUTPUT ../bins/zzdir COMMMAND cd ../bins && $(MAKE) zzdir) add_custom_command(OUTPUT ../bins/zziptest COMMMAND cd ../bins && $(MAKE) zziptest) add_custom_command(OUTPUT ../bins/zzxorcat COMMMAND cd ../bins && $(MAKE) zzxorcat) +add_custom_command(OUTPUT ../bins/zzxorcopy COMMMAND cd ../bins && $(MAKE) zzxorcopy) add_custom_command(OUTPUT test0.zip COMMAND ${BASH} -c "test -d tmp || mkdir tmp" diff --git a/test/test.zip b/test/test.zip index d7532b993c020053ed598c6c0ebe71625002304a..0e3e381c7b971517e005d3add403ea9802f39404 100644 GIT binary patch delta 42 ycmcb}b&-oZz?+#xgn@y9gW>8#ZaLPblsVCH8}-hzFkYSfhed~}DP^)2t2zMpb_`_z delta 42 ycmcb}b&-oZz?+#xgn@y9gTZnlw;XF+@|