[Openvpn-devel] Remove cmocka submodule, rely on system-wide installation instead.

Message ID 20190620200935.38042-1-gert@greenie.muc.de
State Changes Requested
Headers show
Series
  • [Openvpn-devel] Remove cmocka submodule, rely on system-wide installation instead.
Related show

Commit Message

Gert Doering June 20, 2019, 8:09 p.m.
We used to ship git submodule instructions to build a local copy of
cmocka in vendor/cmocka/ and use that (if cmake is installed) to build
unit tests.  With the network test driver this turns out to be a
LD_LIBRARY_PATH vs. SUDO complication which is really outweighing the
benefit of a local build today - so, use the system-wide installation
if available (querying pgk-config).  Do not build unit-tests otherwise.

Signed-off-by: Gert Doering <gert@greenie.muc.de>
---
 .gitmodules        |  4 ----
 INSTALL            | 14 ++++++++++++++
 Makefile.am        |  2 +-
 configure.ac       | 29 +++++++++++++----------------
 vendor/Makefile.am | 22 ----------------------
 vendor/cmocka      |  1 -
 6 files changed, 28 insertions(+), 44 deletions(-)
 delete mode 100644 .gitmodules
 delete mode 100644 vendor/Makefile.am
 delete mode 160000 vendor/cmocka

Patch

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index c1ff36e1..00000000
--- a/.gitmodules
+++ /dev/null
@@ -1,4 +0,0 @@ 
-[submodule "vendor/cmocka"]
-	path = vendor/cmocka
-	url = https://git.cryptomilk.org/projects/cmocka.git
-	branch = master
diff --git a/INSTALL b/INSTALL
index 0ba3bba6..50123e05 100644
--- a/INSTALL
+++ b/INSTALL
@@ -156,6 +156,20 @@  Test SSL/TLS negotiations (runs for 2 minutes):
 For more thorough client-server tests you can configure your own, private test
 environment. See tests/t_client.rc-sample for details.
 
+To do the C unit tests, you need to have the "cmocka" test framework
+installed on your system.  More recent distributions already ship this
+as part of their packages/ports.  If your system does not have it,
+you can install cmocka with these commands:
+
+  $ git clone https://git.cryptomilk.org/projects/cmocka.git
+  $ cd cmocka
+  $ mkdir build
+  $ cd build
+  $ cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_BUILD_TYPE=Debug ..
+  $ make
+  $ sudo make install
+
+
 *************************************************************************
 
 OPTIONS for ./configure:
diff --git a/Makefile.am b/Makefile.am
index a4dbb34b..439120e4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -53,7 +53,7 @@  BUILT_SOURCES = \
 	config-version.h
 endif
 
-SUBDIRS = build distro include src sample doc vendor tests
+SUBDIRS = build distro include src sample doc tests
 
 dist_doc_DATA = \
 	README \
diff --git a/configure.ac b/configure.ac
index 8c95e310..342db42c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1361,28 +1361,26 @@  AC_SUBST([sampledir])
 AC_SUBST([systemdunitdir])
 AC_SUBST([tmpfilesdir])
 
-TEST_LDFLAGS="${OPTIONAL_CRYPTO_LIBS} ${OPTIONAL_PKCS11_HELPER_LIBS} -lcmocka -L\$(top_builddir)/vendor/dist/lib -Wl,-rpath,\$(top_builddir)/vendor/dist/lib"
-TEST_CFLAGS="${OPTIONAL_CRYPTO_CFLAGS} ${OPTIONAL_PKCS11_HELPER_CFLAGS} -I\$(top_srcdir)/include -I\$(top_builddir)/vendor/dist/include"
+TEST_LDFLAGS="${OPTIONAL_CRYPTO_LIBS} ${OPTIONAL_PKCS11_HELPER_LIBS} -lcmocka"
+TEST_CFLAGS="${OPTIONAL_CRYPTO_CFLAGS} ${OPTIONAL_PKCS11_HELPER_CFLAGS} -I\$(top_srcdir)/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 "${srcdir}/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
+# Check if cmocka is available - needed for unit testing
+PKG_CHECK_MODULES(
+	[CMOCKA], [cmocka],
+	[have_cmocka="yes"],
+	[]
+)
+
+if test -n "${have_cmocka}"; then
+    AM_CONDITIONAL([CMOCKA_INITIALIZED], [true])
 else
-   AC_MSG_RESULT([!! WARNING !! CMake is NOT available.  Unit testing cannot be performed.])
-   AM_CONDITIONAL([CMOCKA_INITIALIZED], [false])
+    AM_CONDITIONAL([CMOCKA_INITIALIZED], [false])
+    AC_MSG_RESULT([!! WARNING !! cmocka not found in PATH.  Unit testing will not be performed.])
 fi
 
-
 AC_CONFIG_FILES([
 	version.sh
 	Makefile
@@ -1410,7 +1408,6 @@  AC_CONFIG_FILES([
         tests/unit_tests/openvpn/Makefile
         tests/unit_tests/plugins/Makefile
         tests/unit_tests/plugins/auth-pam/Makefile
-        vendor/Makefile
 	sample/Makefile
 ])
 AC_CONFIG_FILES([tests/t_client.sh], [chmod +x tests/t_client.sh])
diff --git a/vendor/Makefile.am b/vendor/Makefile.am
deleted file mode 100644
index 46072c3c..00000000
--- a/vendor/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@ 
-cmockasrc   = $(srcdir)/cmocka
-# Not just '$(builddir)/cmocka', because cmocka requires an out-of-source build
-cmockabuild = $(builddir)/cmocka_build
-cmockadist  = $(builddir)/dist
-
-MAINTAINERCLEANFILES = \
-	$(srcdir)/Makefile.in \
-	"$(cmockabuild)" \
-	"$(cmockadist)"
-
-libcmocka:
-if CMOCKA_INITIALIZED
-	mkdir -p $(cmockabuild) $(cmockadist)
-	## Compensate for the cd in the paths
-	(cd $(cmockabuild) && cmake -DCMAKE_INSTALL_PREFIX=../$(cmockadist) ../$(cmockasrc) && make && make install)
-endif
-
-check: libcmocka
-
-clean:
-	rm -rf $(cmockabuild)
-	rm -rf $(cmockainstall)
diff --git a/vendor/cmocka b/vendor/cmocka
deleted file mode 160000
index b2732b52..00000000
--- a/vendor/cmocka
+++ /dev/null
@@ -1 +0,0 @@ 
-Subproject commit b2732b52202ae48f866a024c633466efdbb8e85a