build: Package missing mock_msg.h
The mock_msg.h file was not enlisted in the _SOURCES lists in
Makefile.am for the unit tests. This caused the mock_msg.h file to not
be present in the .tar.gz file created by 'make dist'.
This was not noticed earlier as we haven't really tried much to run git
clone of the cmocka project manually in vendor/ from an unpacked
tarball.
With this fix the cmocka unit tests can also run from tarballs, with
manually extracting/fetching the cmocka source code in vendor/cmocka.
Signed-off-by: David Sommerseth <davids@openvpn.net>
----8<----8<----8<----8<----8<----8<----8<----8<----8<----8<----8<----
How to test:
- Create a tarball: make distcheck (or just 'dist')
- Extract openvpn-2.5_git.tar.gz in a clean directory
- cd openvpn-2.5_git/vendor
- git clone https://git.cryptomilk.org/projects/cmocka.git
- ./configure
- make check
- Observe that the cmocka unit tests ran as expected
Depending on the CMake version, you might want to check out cmocka git
commit b2732b52202ae48f; which is the one we use in the git submodule.
Acked-by: Steffan Karger <steffan.karger@fox-it.com>
Message-Id: <20190417203015.1903-1-davids@openvpn.net>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg18380.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
David Sommerseth authored on 2019/04/18 05:30:15Showing 1 changed files
| ... | ... |
@@ -19,7 +19,7 @@ compat_srcdir = $(top_srcdir)/src/compat |
| 19 | 19 |
|
| 20 | 20 |
argv_testdriver_CFLAGS = @TEST_CFLAGS@ -I$(openvpn_srcdir) -I$(compat_srcdir) |
| 21 | 21 |
argv_testdriver_LDFLAGS = @TEST_LDFLAGS@ -L$(openvpn_srcdir) -Wl,--wrap=parse_line |
| 22 |
-argv_testdriver_SOURCES = test_argv.c mock_msg.c \ |
|
| 22 |
+argv_testdriver_SOURCES = test_argv.c mock_msg.c mock_msg.h \ |
|
| 23 | 23 |
mock_get_random.c \ |
| 24 | 24 |
$(openvpn_srcdir)/platform.c \ |
| 25 | 25 |
$(openvpn_srcdir)/buffer.c \ |
| ... | ... |
@@ -27,14 +27,14 @@ argv_testdriver_SOURCES = test_argv.c mock_msg.c \ |
| 27 | 27 |
|
| 28 | 28 |
buffer_testdriver_CFLAGS = @TEST_CFLAGS@ -I$(openvpn_srcdir) -I$(compat_srcdir) |
| 29 | 29 |
buffer_testdriver_LDFLAGS = @TEST_LDFLAGS@ -L$(openvpn_srcdir) -Wl,--wrap=parse_line |
| 30 |
-buffer_testdriver_SOURCES = test_buffer.c mock_msg.c \ |
|
| 30 |
+buffer_testdriver_SOURCES = test_buffer.c mock_msg.c mock_msg.h \ |
|
| 31 | 31 |
mock_get_random.c \ |
| 32 | 32 |
$(openvpn_srcdir)/platform.c |
| 33 | 33 |
|
| 34 | 34 |
crypto_testdriver_CFLAGS = @TEST_CFLAGS@ \ |
| 35 | 35 |
-I$(openvpn_includedir) -I$(compat_srcdir) -I$(openvpn_srcdir) |
| 36 | 36 |
crypto_testdriver_LDFLAGS = @TEST_LDFLAGS@ |
| 37 |
-crypto_testdriver_SOURCES = test_crypto.c mock_msg.c \ |
|
| 37 |
+crypto_testdriver_SOURCES = test_crypto.c mock_msg.c mock_msg.h \ |
|
| 38 | 38 |
$(openvpn_srcdir)/buffer.c \ |
| 39 | 39 |
$(openvpn_srcdir)/crypto.c \ |
| 40 | 40 |
$(openvpn_srcdir)/crypto_mbedtls.c \ |
| ... | ... |
@@ -46,7 +46,7 @@ crypto_testdriver_SOURCES = test_crypto.c mock_msg.c \ |
| 46 | 46 |
packet_id_testdriver_CFLAGS = @TEST_CFLAGS@ \ |
| 47 | 47 |
-I$(openvpn_includedir) -I$(compat_srcdir) -I$(openvpn_srcdir) |
| 48 | 48 |
packet_id_testdriver_LDFLAGS = @TEST_LDFLAGS@ |
| 49 |
-packet_id_testdriver_SOURCES = test_packet_id.c mock_msg.c \ |
|
| 49 |
+packet_id_testdriver_SOURCES = test_packet_id.c mock_msg.c mock_msg.h \ |
|
| 50 | 50 |
mock_get_random.c \ |
| 51 | 51 |
$(openvpn_srcdir)/buffer.c \ |
| 52 | 52 |
$(openvpn_srcdir)/otime.c \ |
| ... | ... |
@@ -60,7 +60,7 @@ tls_crypt_testdriver_LDFLAGS = @TEST_LDFLAGS@ \ |
| 60 | 60 |
-Wl,--wrap=buffer_write_file \ |
| 61 | 61 |
-Wl,--wrap=parse_line \ |
| 62 | 62 |
-Wl,--wrap=rand_bytes |
| 63 |
-tls_crypt_testdriver_SOURCES = test_tls_crypt.c mock_msg.c \ |
|
| 63 |
+tls_crypt_testdriver_SOURCES = test_tls_crypt.c mock_msg.c mock_msg.h \ |
|
| 64 | 64 |
$(openvpn_srcdir)/argv.c \ |
| 65 | 65 |
$(openvpn_srcdir)/base64.c \ |
| 66 | 66 |
$(openvpn_srcdir)/buffer.c \ |