From c79b12abb7b9cb2adb95b6529061ed1593ae5ee3 Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Wed, 18 Jul 2018 11:36:42 +0200 Subject: Allow for field in library version getter test Signed-off-by: Szczepan Zalega --- unittest/test_offline.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/unittest/test_offline.cc b/unittest/test_offline.cc index 2ad6a0e..92af78c 100644 --- a/unittest/test_offline.cc +++ b/unittest/test_offline.cc @@ -169,13 +169,15 @@ TEST_CASE("Test version getter", "[fast]") { REQUIRE(nitrokey::get_minor_library_version() >= 3u); const char *library_version = nitrokey::get_library_version(); REQUIRE(library_version != nullptr); + CAPTURE(library_version); // The library version has to match the pattern returned by git describe: // v. or v.--g, where is the number // of commits since the last tag, and is the hash of the current - // commit. (This assumes that all tags have the name v..) + // commit. (This assumes that all tags have the name v..). + // Optional field is allowed as well. std::string s = library_version; - std::string version("v[0-9]+\\.[0-9]+"); + std::string version("v[0-9]+\\.[0-9]+(\\.[0-9]+)?"); std::string git_suffix("-[0-9]+-g[0-9a-z]+"); std::regex pattern(version + "(" + git_suffix + "|)"); REQUIRE(std::regex_match(s, pattern)); -- cgit v1.2.1