From 7edff88448214373231814795479b384930a5fd5 Mon Sep 17 00:00:00 2001 From: Guido Draheim Date: Sun, 16 Sep 2018 20:27:28 +0200 Subject: [PATCH] need to ensure that test0.zip is built --- Makefile | 4 ++-- test/CMakeLists.txt | 4 +++- test/test.zip | Bin 1361 -> 1361 bytes 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 672db9f..31ad26a 100644 --- a/Makefile +++ b/Makefile @@ -17,10 +17,10 @@ zzip unzzip unzzip-mix unzzip-mem unzzip-big zzdir zzcat zzcatsdl zzxorcat zzxor cd build && $(MAKE) $@ VERBOSE=1 sfx zzipself zzipsetstub doc htm man htmpages manpages site dbk pdf pkgconfig: cd build && $(MAKE) $@ VERBOSE=1 -tests checks check: +tests checks check testzips: cd build && $(MAKE) $@ VERBOSE=1 test_%: - cd build/test && python ../../test/zziptests.py $@ --topsrcdir=`pwd` -v + p=`pwd`; cd build/test && python ../../test/zziptests.py $@ --topsrcdir="$$p" -vv builds: config build local static: conf build local diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 4d271df..3c7a3a5 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -64,10 +64,12 @@ add_custom_command(OUTPUT test0.zip COMMAND ${BASH} -c "test -d tmp || mkdir tmp" COMMAND ${CP} ${README} tmp/README COMMAND ${BASH} -c "cd tmp && ${MKZIP} ../test0.zip README" + COMMAND ${CP} test0.zip test.zip COMMAND ${CP} test0.zip ${srcdir}/test.zip - COMMAND ${MV} test0.zip test.zip BYPRODUCTS test.zip VERBATIM) +add_custom_target(testzips ALL DEPENDS test0.zip) + add_custom_target(checks COMMAND ${BASH} -c "../bins/zzcat test/README > test.out" COMMAND ${BASH} -c "if diff test.out ${README} >/dev/null \ diff --git a/test/test.zip b/test/test.zip index 0e3e381c7b971517e005d3add403ea9802f39404..d0ba98d07868397ad1fa1b51eab06c970061d8f4 100644 GIT binary patch delta 49 zcmcb}b&-oVz?+#xgn@y9gF$?;!9-pe_P6urMFa6hgVQX`K%vS1ShSdd{K?v^Y5;2u B5KaI9 delta 49 zcmcb}b&-oVz?+#xgn@y9gW;;I{zP6G_NJ6M(Q(OhHX58}VFn6K{>P%l3>2HJ&8h|f DPNxo^ -- 2.40.0