Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
cbe58e70
Commit
cbe58e70
authored
Jun 19, 2012
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
ssh://git.varnish-cache.org/git/varnish-cache
parents
4f15e168
04fa5d74
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
7 deletions
+16
-7
Makefile.am
bin/varnishtest/Makefile.am
+11
-6
configure.ac
configure.ac
+5
-1
No files found.
bin/varnishtest/Makefile.am
View file @
cbe58e70
#
TESTS_PARALLELISM
=
3
check
:
varnishtest
./varnishtest
-i
-j
$(TESTS_PARALLELISM)
$(srcdir)
/tests/
*
.vtc
@
echo
"==================="
@
echo
"All tests succeeded"
@
echo
"==================="
VTC_LOG_COMPILER
=
./varnishtest
-v
-i
TEST_EXTENSIONS
=
.vtc
TESTS
=
@VTC_TESTS@
# Make sure we run check-local first
check
:
check-local check-am
# See if list of checks have changed, recheck
check-local
:
if
[
"
$$
(cd
$(srcdir)
&& echo tests/*.vtc)"
!=
"@VTC_TESTS@"
]
;
then
\
cd
$(top_builddir)
&&
./config.status
--recheck
;
\
fi
DISTCLEANFILES
=
_.ok
...
...
configure.ac
View file @
cbe58e70
...
...
@@ -12,7 +12,7 @@ OCFLAGS="$CFLAGS"
AC_CANONICAL_SYSTEM
AC_LANG(C)
AM_INIT_AUTOMAKE([foreign])
AM_INIT_AUTOMAKE([foreign
color-tests parallel-tests
])
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
...
...
@@ -526,6 +526,10 @@ fi
AC_DEFINE_UNQUOTED([VCC_CC],"$VCC_CC",[C compiler command line for VCL code])
# Stupid automake needs this
VTC_TESTS="$(cd $srcdir/bin/varnishtest && echo tests/*.vtc)"
AC_SUBST(VTC_TESTS)
# Generate output
AC_CONFIG_FILES([
Makefile
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment