collabvm/r3
8
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Check is not running, fix check

Browse source 
Also update .travis.yml
This commit is contained in:
Yo-An Lin 2016-03-12 12:19:49 +08:00 committed by c9s
parent 5a644ee046
commit 0ba956159c
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -29,7 +29,7 @@ script:
- ./configure --enable-check $CONFIGURE_OPTION - ./configure --enable-check $CONFIGURE_OPTION
- make V=1 - make V=1
- sudo make install - sudo make install
- if [ "x$VALGRIND" == xyes ]; then make check > /dev/null 2>&1; else make check V=1; fi - if [ "x$VALGRIND" == xyes ]; then make check ; else make check V=1; fi
# XXX: tracing memory leak, disabled for some mystery reason for automake... # XXX: tracing memory leak, disabled for some mystery reason for automake...
# - if [ "x$VALGRIND" == xyes && "x$DEBUG" == xyes ]; then valgrind ./tests/check_* -v --trace-children=yes --show-leak-kinds=full --leak-check=full; fi # - if [ "x$VALGRIND" == xyes && "x$DEBUG" == xyes ]; then valgrind ./tests/check_* -v --trace-children=yes --show-leak-kinds=full --leak-check=full; fi

2
Makefile.am
View file

@ -1,6 +1,6 @@
SUBDIRS=3rdparty src . examples SUBDIRS=3rdparty src . examples
if HAVE_CHECK if ENABLE_CHECK
SUBDIRS += tests SUBDIRS += tests
endif endif

9
configure.ac
View file

@ -118,15 +118,16 @@ AC_ARG_ENABLE(check,
AS_HELP_STRING([--enable-check], AS_HELP_STRING([--enable-check],
[enable unit testing]), [enable unit testing]),
, enable_check=unset) , enable_check=unset)
if test "x$enable_check" != "xunset" ; then if test "x$enable_check" != "xunset" ; then
PKG_CHECK_MODULES(CHECK,[check >= 0.9.4],:,[ PKG_CHECK_MODULES(CHECK,[check >= 0.9.4],:,[
ifdef([AM_PATH_CHECK], ifdef([AM_PATH_CHECK],
[AM_PATH_CHECK(,[have_check="yes"])], [AM_PATH_CHECK(,[have_check="yes"])],
AC_MSG_WARN([Check not found; cannot run unit tests!]) AC_MSG_WARN([Check not found; cannot run unit tests!]) [have_check="no"]
[have_check="no"])] )]
]) ])
fi fi
AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes") AM_CONDITIONAL(ENABLE_CHECK, test "x$enable_check" = "xyes")
AC_CONFIG_FILES([ AC_CONFIG_FILES([
r3.pc r3.pc