[master] 6cd97d1 Introduce a `vtest-clean` make target
Dridi Boukelmoune
dridi.boukelmoune at gmail.com
Tue Jan 10 13:56:05 CET 2017
commit 6cd97d1167353a5129ee39f9524fa39eb195a9f4
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date: Fri Dec 23 11:07:28 2016 +0100
Introduce a `vtest-clean` make target
When a `distcheck` fails, the $(distdir) is not removed and this is how
we can collect test results. This directory is also left untouched by
the `distclean` target run from `autogen.des`.
So if the next commit checked by vtest fails before running inside the
$(distdir), it will report failures from the previous run. To avoid that
we can use $(am__remove_distdir) that deals with permissions but may not
be stable API.
diff --git a/Makefile.am b/Makefile.am
index 0488281..f018bc8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,6 +32,9 @@ distcleancheck_listfiles = \
find . -type f -exec sh -c 'test -f $(srcdir)/$$1 || echo $$1' \
sh '{}' ';'
+vtest-clean:
+ $(am__remove_distdir)
+
# XXX: This is a hack to ensure we have a built source tree when
# running make dist If we had used non-recursive make we could have
# solved it better, but we don't, so use this at least for now.
diff --git a/tools/vtest.sh b/tools/vtest.sh
index 4f732cb..a4e9fa6 100755
--- a/tools/vtest.sh
+++ b/tools/vtest.sh
@@ -76,6 +76,7 @@ autogen () (
makedistcheck () (
set -e
cd "${BUILDDIR}"
+ nice make vtest-clean
nice make distcheck
)
More information about the varnish-commit
mailing list