cmake: running unit tests #1802

furiel · 2017-12-07T10:16:44Z

Execute in parallel: make test ARGS=-j4

kira-syslogng · 2017-12-07T10:38:29Z

Build SUCCESS, the tests were executed on test branch: master and test suite: functions

kira-syslogng · 2017-12-07T11:59:44Z

Build SUCCESS, the tests were executed on test branch: master and test suite: functions

Kokan · 2017-12-07T13:20:20Z

cmake/add_tests.cmake

+  cmake_parse_arguments(ADD_UNIT_TEST "CRITERION;LIBTEST" "TARGET" "SOURCES;DEPENDS;INCLUDES" ${ARGN})
+
+  if (${ADD_UNIT_TEST_CRITERION} AND NOT ${CRITERION_FOUND})
+    MESSAGE(WARNING "Criterion not found, ${ADD_UNIT_TEST_TARGET}" will not be compiled)


This is going to create a lot of warning message, if there is no Criterion.
You could write a warning next to the find_package(Criterion) instead.

Kokan · 2017-12-07T13:27:15Z

cmake/add_tests.cmake

+
+  if (${ADD_UNIT_TEST_CRITERION})
+    target_link_libraries(${ADD_UNIT_TEST_TARGET} criterion)
+    set_property(TARGET test_filters_statistics PROPERTY POSITION_INDEPENDENT_CODE FALSE)


The target should be ${ADD_UNIT_TEST_TARGET}.

Kokan · 2017-12-07T13:30:08Z

lib/eventlog/CMakeLists.txt

@@ -10,4 +10,7 @@ add_library(eventlog SHARED
   ${CMAKE_CURRENT_SOURCE_DIR}/src/evttags.c
 )

+set(EVENTLOG_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src")


There is already an ${Eventlog_INCLUDE_DIR} variable for that. (You could convert it into uppercase if you want.)
Maybe that is not in the best place.

Kokan · 2017-12-07T13:46:18Z

lib/logproto/tests/CMakeLists.txt

+  test-dgram-server.c
+  test-framed-server.c
+  test-indented-multiline-server.c
+  test-regexp-multiline-server.c)


New line here would be nice.

Kokan · 2017-12-07T13:56:19Z

modules/dbparser/tests/CMakeLists.txt

+add_unit_test(LIBTEST TARGET test_patterndb INCLUDES ${PATTERNDB_INCLUDE_DIR}
+  DEPENDS patterndb basicfuncs syslogformat)
+add_unit_test(TARGET test_radix INCLUDES ${PATTERNDB_INCLUDE_DIR} DEPENDS patterndb)
+target_compile_options(test_radix PRIVATE "-Wno-pointer-sign")


It would be a nicer way to not hide this error, just change it back to warning with: -Wno-error=no-pointer-sign.

Kokan · 2017-12-07T14:03:51Z

tests/CMakeLists.txt

 add_subdirectory(loggen)
-
+# add_subdirectory(functional)


Should be removed.

Kokan · 2017-12-07T14:05:35Z

lib/filter/tests/test_filters_in_list.c

@@ -157,7 +157,11 @@ run_testcases(const char *top_srcdir)
 int
 main(int argc G_GNUC_UNUSED, char *argv[] G_GNUC_UNUSED)
 {
+#ifdef TOP_SRCDIR


I like your approach, but I think it would be better, if the autotools based build would use the same approach.
Could you please update the autotools compile also ?

kira-syslogng · 2017-12-07T15:46:45Z

Build SUCCESS, the tests were executed on test branch: master and test suite: functions

kira-syslogng · 2017-12-07T16:02:43Z

Build SUCCESS, the tests were executed on test branch: master and test suite: functions

MrAnno · 2017-12-08T14:29:03Z

modules/json/CMakeLists.txt

@@ -12,6 +12,8 @@ set(JSON_SOURCES
    ${CMAKE_CURRENT_BINARY_DIR}/json-parser-grammar.c
 )

+set(SJON_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR})


MrAnno · 2017-12-08T14:29:18Z

modules/json/tests/CMakeLists.txt

+endif()
+
+add_unit_test(LIBTEST TARGET test_json_parser
+  INCLUDES "${SJON_INCLUDE_DIR}"


MrAnno · 2017-12-08T14:29:30Z

modules/json/tests/CMakeLists.txt

+endif()
+
+add_unit_test(LIBTEST TARGET test_dot_notation
+  INCLUDES "${SJON_INCLUDE_DIR}" "${JSONC_INCLUDE_DIR}"


MrAnno · 2017-12-08T14:34:24Z

cmake/Modules/ExternalJSONC.cmake

@@ -48,13 +48,10 @@ if (EXISTS ${PROJECT_SOURCE_DIR}/lib/jsonc/json.h)
     )

    set(${LIB_NAME}_INTERNAL TRUE)
-    set(${LIB_NAME}_INTERNAL_INCLUDE_DIR "${PROJECT_BINARY_DIR}/include/json-c/" INTERNAL)
-    set(${LIB_NAME}_INTERNAL_LIBRARY "${PROJECT_BINARY_DIR}/lib/libjson-c.so" INTERNAL)
+    set(${LIB_NAME}_INTERNAL_INCLUDE_DIR "${PROJECT_BINARY_DIR}/include/json-c/")


Is this related to unit tests?
If not, can you extract the changes of this file to a separate commit?

MrAnno · 2017-12-08T14:36:25Z

cmake/add_tests.cmake

+
+include(CMakeParseArguments)
+
+function (add_unit_test)


MrAnno · 2017-12-08T14:48:03Z

cmake/Modules/Findsystemd.cmake

@@ -30,5 +30,4 @@ set(Libsystemd_PROCESS_INCLUDES Libsystemd_INCLUDE_DIR)
 set(Libsystemd_PROCESS_LIBS Libsystemd_LIBRARY)

 # silence warnings
-set(Libsystemd_FIND_QUIETLY 1)


Can you extract this change to a separate commit?

MrAnno · 2017-12-08T14:52:21Z

lib/filter/tests/test_filters_in_list.c

@@ -157,7 +157,8 @@ run_testcases(const char *top_srcdir)
 int
 main(int argc G_GNUC_UNUSED, char *argv[] G_GNUC_UNUSED)
 {
-  char *top_srcdir = getenv("top_srcdir");
+
+  char *top_srcdir = TOP_SRCDIR;


I would split this commit (along with the Makefile and configure changes).
In my opinion, this is a bugfix-like patch and has nothing to do with CMake.

<package>_FIND_QUIETLY is a read_only variable, it should not be set.

Signed-off-by: Antal Nemes <antal.nemes@balabit.com>

kira-syslogng · 2017-12-09T05:46:44Z

Build SUCCESS, the tests were executed on test branch: master and test suite: functions

lbudai added the in progress label Dec 7, 2017

furiel force-pushed the cmake-ut branch from 5c033a2 to 4909a67 Compare December 7, 2017 11:41

Kokan reviewed Dec 7, 2017

View reviewed changes

furiel force-pushed the cmake-ut branch from 4909a67 to 72e0bf5 Compare December 7, 2017 15:33

furiel force-pushed the cmake-ut branch from 72e0bf5 to ed8ed8f Compare December 7, 2017 15:49

Kokan approved these changes Dec 7, 2017

View reviewed changes

furiel mentioned this pull request Dec 8, 2017

cmake: func-test and some missing modules #1805

Merged

MrAnno reviewed Dec 8, 2017

View reviewed changes

cmake/add_tests.cmake

include(CMakeParseArguments)

function (add_unit_test)

Copy link

Collaborator

MrAnno Dec 8, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice 👍

MrAnno reviewed Dec 8, 2017

View reviewed changes

MrAnno approved these changes Dec 8, 2017

View reviewed changes

MrAnno added needs-review and removed in progress labels Dec 8, 2017

furiel added 4 commits December 9, 2017 06:21

cmake: fixing variable setting in ExternalJSONC.cmake

30701fb

cmake: fixing systemd detection in Findsystemd.cmake

f66f4e8

<package>_FIND_QUIETLY is a read_only variable, it should not be set.

filter: unit test: do not depend on env: set root dir with autotools

0db7a39

cmake: running unit tests

8d48321

Signed-off-by: Antal Nemes <antal.nemes@balabit.com>

furiel force-pushed the cmake-ut branch from ed8ed8f to 8d48321 Compare December 9, 2017 05:33

Kokan approved these changes Dec 9, 2017

View reviewed changes

Kokan merged commit 7510588 into syslog-ng:master Dec 9, 2017

Kokan removed the needs-review label Dec 9, 2017

furiel deleted the cmake-ut branch May 8, 2018 04:53

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

cmake: running unit tests #1802

cmake: running unit tests #1802

furiel commented Dec 7, 2017

kira-syslogng commented Dec 7, 2017

kira-syslogng commented Dec 7, 2017

Kokan Dec 7, 2017

Kokan Dec 7, 2017

Kokan Dec 7, 2017

Kokan Dec 7, 2017

furiel Dec 7, 2017

Kokan Dec 7, 2017

furiel Dec 7, 2017

Kokan Dec 7, 2017

Kokan Dec 7, 2017

kira-syslogng commented Dec 7, 2017

kira-syslogng commented Dec 7, 2017

MrAnno Dec 8, 2017

MrAnno Dec 8, 2017

MrAnno Dec 8, 2017

MrAnno Dec 8, 2017 •

edited

Loading

furiel Dec 9, 2017

MrAnno Dec 8, 2017

MrAnno Dec 8, 2017

furiel Dec 9, 2017

MrAnno Dec 8, 2017 •

edited

Loading

kira-syslogng commented Dec 9, 2017

cmake: running unit tests #1802

cmake: running unit tests #1802

Conversation

furiel commented Dec 7, 2017

kira-syslogng commented Dec 7, 2017

kira-syslogng commented Dec 7, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kira-syslogng commented Dec 7, 2017

kira-syslogng commented Dec 7, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MrAnno Dec 8, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MrAnno Dec 8, 2017 • edited Loading

Choose a reason for hiding this comment

kira-syslogng commented Dec 9, 2017

MrAnno Dec 8, 2017 •

edited

Loading

MrAnno Dec 8, 2017 •

edited

Loading