From b100074e1fe1c80f57fe295b7f05d6186e279004 Mon Sep 17 00:00:00 2001 From: Felix Herrmann Date: Mon, 25 May 2020 15:30:41 +0200 Subject: execute unittests with cmake now you can do make test after make :) === Sample build and test: $ cmake -Bbuild -H. \ -DDLT_IPC=UNIX_SOCKET \ -DWITH_DLT_ADAPTOR=ON \ -DWITH_DLT_UNIT_TESTS=ON \ -DWITH_DLT_CXX11_EXT=ON \ -DWITH_DLT_MONITOR=OFF \ -DWITH_DLT_USE_IPv6=OFF $ cd build $ make $ make test Running tests... Test project /home/fherrmann/git/dlt-daemon/build Start 1: gtest_dlt_common 1/5 Test #1: gtest_dlt_common ................. Passed 0.02 sec Start 2: gtest_dlt_user 2/5 Test #2: gtest_dlt_user ................... Passed 1.01 sec Start 3: gtest_dlt_daemon_common 3/5 Test #3: gtest_dlt_daemon_common .......... Passed 0.01 sec Start 4: dlt_env_ll_unit_test 4/5 Test #4: dlt_env_ll_unit_test ............. Passed 0.04 sec Start 5: gtest_dlt_daemon_event_handler 5/5 Test #5: gtest_dlt_daemon_event_handler ... Passed 1.01 sec 100% tests passed, 0 tests failed out of 5 Total Test time (real) = 2.09 sec === Signed-off-by: Felix Herrmann Signed-off-by: KHANH LUONG HONG DUY --- util/create_dlt_version_h.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'util') diff --git a/util/create_dlt_version_h.py b/util/create_dlt_version_h.py index 2b685b7..767c789 100755 --- a/util/create_dlt_version_h.py +++ b/util/create_dlt_version_h.py @@ -53,6 +53,13 @@ def main(cmake_file, header_in_file, header_out_file): else: undetermined_vars[key] = val + m = re.match('project\(\s+ VERSION (?P\d+)\.(?P\d+)\.(?P\d+)\(.(?P\d+))?', src) + if m: + determined_vars['PROJECT_VERSION_MAJOR'] = m.group('major') + determined_vars['PROJECT_VERSION_MINOR'] = m.group('minor') + determined_vars['PROJECT_VERSION_PATCH'] = m.group('patch') + determined_vars['PROJECT_VERSION_TWEAK'] = m.groupdict.get('tweak', '') + # Try to resolve all variables referencing other vars e.g.: # set(DLT_VERSION ${DLT_MAJOR_VERSION}.${DLT_MINOR_VERSION}.${DLT_PATCH_LEVEL}) no_changes = 5 -- cgit v1.2.1