ensure test/ files are created before running clamscan/clamd checks

git-svn: trunk@3957

unit_tests/Makefile.am

@@ -1,5 +1,5 @@
 programs = check_clamav
-scripts = check_clamd.sh check_freshclam.sh check_sigtool.sh check_clamscan.sh
+scripts = check_clamd_.sh check_freshclam.sh check_sigtool.sh check_clamscan.sh
 
 TESTS = $(programs) $(scripts)
 if ENABLE_UT_INSTALL 
@@ -13,12 +13,16 @@ check_clamav_SOURCES = check_clamav.c check_jsnorm.c check_str.c checks.h $(top_
 check_clamav_CFLAGS = @CHECK_CFLAGS@
 check_clamav_LDADD = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@ @CHECK_LIBS@
 
+check_clamd_.sh: check_clamd.sh
+	make -C $(top_builddir)/test
+	cp $< $@
+
 if ENABLE_COVERAGE
 LCOV_OUTPUT = lcov.out
 LCOV_HTML = lcov_html
 LCOV_LCOV = @LCOV@
 LCOV_GENHTML = @GENHTML@
-CLEANFILES=lcov.out *.gcno *.gcda *.log /tmp/clamd-test.log
+CLEANFILES=lcov.out *.gcno *.gcda *.log /tmp/clamd-test.log check_clamd_.sh
 EXTRA_DIST=test-clamd.conf test-freshclam.conf
 lcov: $(LCOV_HTML)
 

unit_tests/Makefile.in

@@ -61,7 +61,7 @@ check_clamav_DEPENDENCIES = $(top_builddir)/libclamav/libclamav.la
 check_clamav_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(check_clamav_CFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-am__dist_bin_SCRIPTS_DIST = check_clamd.sh check_freshclam.sh \
+am__dist_bin_SCRIPTS_DIST = check_clamd_.sh check_freshclam.sh \
 	check_sigtool.sh check_clamscan.sh
 dist_binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 SCRIPTS = $(dist_bin_SCRIPTS)
@@ -216,7 +216,7 @@ target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 programs = check_clamav
-scripts = check_clamd.sh check_freshclam.sh check_sigtool.sh check_clamscan.sh
+scripts = check_clamd_.sh check_freshclam.sh check_sigtool.sh check_clamscan.sh
 @ENABLE_UT_INSTALL_TRUE@dist_bin_SCRIPTS = $(scripts)
 @ENABLE_UT_INSTALL_FALSE@check_SCRIPTS = $(scripts)
 check_clamav_SOURCES = check_clamav.c check_jsnorm.c check_str.c checks.h $(top_builddir)/libclamav/clamav.h
@@ -226,7 +226,7 @@ check_clamav_LDADD = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@ @CHECK
 @ENABLE_COVERAGE_TRUE@LCOV_HTML = lcov_html
 @ENABLE_COVERAGE_TRUE@LCOV_LCOV = @LCOV@
 @ENABLE_COVERAGE_TRUE@LCOV_GENHTML = @GENHTML@
-@ENABLE_COVERAGE_TRUE@CLEANFILES = lcov.out *.gcno *.gcda *.log /tmp/clamd-test.log
+@ENABLE_COVERAGE_TRUE@CLEANFILES = lcov.out *.gcno *.gcda *.log /tmp/clamd-test.log check_clamd_.sh
 @ENABLE_COVERAGE_TRUE@EXTRA_DIST = test-clamd.conf test-freshclam.conf
 @ENABLE_COVERAGE_TRUE@DIRECTORIES = --directory . --directory ../libclamav --directory ../clamd --directory ../freshclam --directory ../sigtool --directory ../clamscan --directory ../clamdscan
 all: all-am
@@ -657,6 +657,10 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dist_binSCRIPTS
 	tags uninstall uninstall-am uninstall-binPROGRAMS \
 	uninstall-dist_binSCRIPTS
 
+
+check_clamd_.sh: check_clamd.sh
+	make -C $(top_builddir)/test
+	cp $< $@
 @ENABLE_COVERAGE_TRUE@lcov: $(LCOV_HTML)
 @ENABLE_COVERAGE_TRUE@.libs/check_clamav.gcda: $(TESTS)
 @ENABLE_COVERAGE_TRUE@	lcov $(DIRECTORIES) --zerocounters