mirrors/openvpn
0
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2024-11-23 17:53:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Only build and run cmocka unit tests if its submodule is initialized

Browse Source 
Commit 40cb4cfc5d added infrastructure to write unit tests using
cmocka.  This was implemented using a git submodule to fetch an
up-to-date cmocka test framework.

The issue which appeared was that 'make check' stopped working if
the cmocka submodule was not initialized and updated.  As we do not
want this to be a hard depenency, this patch makes running these
unit tests conditional.  If cmocka has not been initialized, skip
them or if it has been initialized all unit tests will be run.

 [v2 - Also check if cmake is available, as cmocka depends on that
       to be built ]

Signed-off-by: David Sommerseth <dazo@privateinternetaccess.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <1464703645-26640-1-git-send-email-openvpn@sf.lists.topphemmelig.net>
URL: http://article.gmane.org/gmane.network.openvpn.devel/11758
This commit is contained in:
David Sommerseth 2016-05-31 12:28:46 +02:00
parent 4a506b9ca2
commit 45f6e7991c
3 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
configure.ac
View File

@ -1211,6 +1211,22 @@ TEST_CFLAGS="-I\$(top_srcdir)/include -I\$(abs_top_builddir)/vendor/dist/include
AC_SUBST([TEST_LDFLAGS])
AC_SUBST([TEST_CFLAGS])
# Check if cmake is available and cmocka git submodule is initialized,
# needed for unit testing
AC_CHECK_PROGS([CMAKE], [cmake])
if test -n "${CMAKE}"; then
if test -f vendor/cmocka/CMakeLists.txt; then
AM_CONDITIONAL([CMOCKA_INITIALIZED], [true])
else
AM_CONDITIONAL([CMOCKA_INITIALIZED], [false])
AC_MSG_RESULT([!! WARNING !! The cmoka git submodule has not been initialized or updated. Unit testing cannot be performed.])
fi
else
AC_MSG_RESULT([!! WARNING !! CMake is NOT available. Unit testing cannot be performed.])
AM_CONDITIONAL([CMOCKA_INITIALIZED], [false])
fi
AC_CONFIG_FILES([
version.sh
Makefile

2
tests/unit_tests/Makefile.am
View File

@ -1,3 +1,5 @@
AUTOMAKE_OPTIONS = foreign
if CMOCKA_INITIALIZED
SUBDIRS = example_test plugins
endif

2
vendor/Makefile.am vendored
View File

@ -15,7 +15,9 @@ distdir:
libcmocka: distdir
mkdir -p $(cmockabuild)
if CMOCKA_INITIALIZED
(cd $(cmockabuild) && cmake -DCMAKE_INSTALL_PREFIX=$(cmockainstall) $(cmockasrc) && make && make install)
endif
check: libcmocka