From 7d69b5b2080a7e98b4d30a2fa5b087850889d2b8 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Fri, 17 Jun 2022 09:22:37 +0200 Subject: [PATCH] Tests: Provide valgrind testapps in cmake build Change-Id: I4ec94504e3d2265d066434e118ab2eae6279a42f Reviewed-by: hjk Reviewed-by: Reviewed-by: Qt CI Bot Reviewed-by: Eike Ziller --- tests/auto/valgrind/CMakeLists.txt | 4 +++- tests/auto/valgrind/memcheck/CMakeLists.txt | 1 + tests/auto/valgrind/memcheck/testapps/CMakeLists.txt | 12 ++++++++++++ .../valgrind/memcheck/testapps/free1/CMakeLists.txt | 3 +++ .../valgrind/memcheck/testapps/free2/CMakeLists.txt | 3 +++ .../memcheck/testapps/invalidjump/CMakeLists.txt | 3 +++ .../valgrind/memcheck/testapps/leak1/CMakeLists.txt | 5 +++++ .../valgrind/memcheck/testapps/leak2/CMakeLists.txt | 3 +++ .../valgrind/memcheck/testapps/leak3/CMakeLists.txt | 3 +++ .../valgrind/memcheck/testapps/leak4/CMakeLists.txt | 4 ++++ .../memcheck/testapps/overlap/CMakeLists.txt | 3 +++ .../memcheck/testapps/syscall/CMakeLists.txt | 3 +++ tests/auto/valgrind/memcheck/testapps/testapp.cmake | 4 ++++ .../memcheck/testapps/uninit1/CMakeLists.txt | 3 +++ .../memcheck/testapps/uninit2/CMakeLists.txt | 3 +++ .../memcheck/testapps/uninit3/CMakeLists.txt | 3 +++ 16 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 tests/auto/valgrind/memcheck/CMakeLists.txt create mode 100644 tests/auto/valgrind/memcheck/testapps/CMakeLists.txt create mode 100644 tests/auto/valgrind/memcheck/testapps/free1/CMakeLists.txt create mode 100644 tests/auto/valgrind/memcheck/testapps/free2/CMakeLists.txt create mode 100644 tests/auto/valgrind/memcheck/testapps/invalidjump/CMakeLists.txt create mode 100644 tests/auto/valgrind/memcheck/testapps/leak1/CMakeLists.txt create mode 100644 tests/auto/valgrind/memcheck/testapps/leak2/CMakeLists.txt create mode 100644 tests/auto/valgrind/memcheck/testapps/leak3/CMakeLists.txt create mode 100644 tests/auto/valgrind/memcheck/testapps/leak4/CMakeLists.txt create mode 100644 tests/auto/valgrind/memcheck/testapps/overlap/CMakeLists.txt create mode 100644 tests/auto/valgrind/memcheck/testapps/syscall/CMakeLists.txt create mode 100644 tests/auto/valgrind/memcheck/testapps/testapp.cmake create mode 100644 tests/auto/valgrind/memcheck/testapps/uninit1/CMakeLists.txt create mode 100644 tests/auto/valgrind/memcheck/testapps/uninit2/CMakeLists.txt create mode 100644 tests/auto/valgrind/memcheck/testapps/uninit3/CMakeLists.txt diff --git a/tests/auto/valgrind/CMakeLists.txt b/tests/auto/valgrind/CMakeLists.txt index 4091dd61268..9a19241b2a0 100644 --- a/tests/auto/valgrind/CMakeLists.txt +++ b/tests/auto/valgrind/CMakeLists.txt @@ -1,2 +1,4 @@ add_subdirectory(callgrind) -# add_subdirectory(memcheck) +if (UNIX) + add_subdirectory(memcheck) +endif() diff --git a/tests/auto/valgrind/memcheck/CMakeLists.txt b/tests/auto/valgrind/memcheck/CMakeLists.txt new file mode 100644 index 00000000000..8ea0f41a15b --- /dev/null +++ b/tests/auto/valgrind/memcheck/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(testapps) diff --git a/tests/auto/valgrind/memcheck/testapps/CMakeLists.txt b/tests/auto/valgrind/memcheck/testapps/CMakeLists.txt new file mode 100644 index 00000000000..89149fc5309 --- /dev/null +++ b/tests/auto/valgrind/memcheck/testapps/CMakeLists.txt @@ -0,0 +1,12 @@ +add_subdirectory(free1) +add_subdirectory(free2) +add_subdirectory(invalidjump) +add_subdirectory(leak1) +add_subdirectory(leak2) +add_subdirectory(leak3) +add_subdirectory(leak4) +add_subdirectory(overlap) +add_subdirectory(syscall) +add_subdirectory(uninit1) +add_subdirectory(uninit2) +add_subdirectory(uninit3) diff --git a/tests/auto/valgrind/memcheck/testapps/free1/CMakeLists.txt b/tests/auto/valgrind/memcheck/testapps/free1/CMakeLists.txt new file mode 100644 index 00000000000..99ca11c06c2 --- /dev/null +++ b/tests/auto/valgrind/memcheck/testapps/free1/CMakeLists.txt @@ -0,0 +1,3 @@ +include(../testapp.cmake) + +add_valgrind_testapp(free1) diff --git a/tests/auto/valgrind/memcheck/testapps/free2/CMakeLists.txt b/tests/auto/valgrind/memcheck/testapps/free2/CMakeLists.txt new file mode 100644 index 00000000000..798be2b8122 --- /dev/null +++ b/tests/auto/valgrind/memcheck/testapps/free2/CMakeLists.txt @@ -0,0 +1,3 @@ +include(../testapp.cmake) + +add_valgrind_testapp(free2) diff --git a/tests/auto/valgrind/memcheck/testapps/invalidjump/CMakeLists.txt b/tests/auto/valgrind/memcheck/testapps/invalidjump/CMakeLists.txt new file mode 100644 index 00000000000..17ab08a4e44 --- /dev/null +++ b/tests/auto/valgrind/memcheck/testapps/invalidjump/CMakeLists.txt @@ -0,0 +1,3 @@ +include(../testapp.cmake) + +add_valgrind_testapp(invalidjump) diff --git a/tests/auto/valgrind/memcheck/testapps/leak1/CMakeLists.txt b/tests/auto/valgrind/memcheck/testapps/leak1/CMakeLists.txt new file mode 100644 index 00000000000..cd05f350fda --- /dev/null +++ b/tests/auto/valgrind/memcheck/testapps/leak1/CMakeLists.txt @@ -0,0 +1,5 @@ +include(../testapp.cmake) + +add_valgrind_testapp(leak1) +target_link_libraries(leak1 PRIVATE Qt5::Core) + diff --git a/tests/auto/valgrind/memcheck/testapps/leak2/CMakeLists.txt b/tests/auto/valgrind/memcheck/testapps/leak2/CMakeLists.txt new file mode 100644 index 00000000000..a1134baf9c9 --- /dev/null +++ b/tests/auto/valgrind/memcheck/testapps/leak2/CMakeLists.txt @@ -0,0 +1,3 @@ +include(../testapp.cmake) + +add_valgrind_testapp(leak2) diff --git a/tests/auto/valgrind/memcheck/testapps/leak3/CMakeLists.txt b/tests/auto/valgrind/memcheck/testapps/leak3/CMakeLists.txt new file mode 100644 index 00000000000..d825d1ac82d --- /dev/null +++ b/tests/auto/valgrind/memcheck/testapps/leak3/CMakeLists.txt @@ -0,0 +1,3 @@ +include(../testapp.cmake) + +add_valgrind_testapp(leak3) diff --git a/tests/auto/valgrind/memcheck/testapps/leak4/CMakeLists.txt b/tests/auto/valgrind/memcheck/testapps/leak4/CMakeLists.txt new file mode 100644 index 00000000000..112d8b2e9df --- /dev/null +++ b/tests/auto/valgrind/memcheck/testapps/leak4/CMakeLists.txt @@ -0,0 +1,4 @@ +include(../testapp.cmake) + +add_valgrind_testapp(leak4) +target_link_libraries(leak4 PRIVATE Qt5::Core) diff --git a/tests/auto/valgrind/memcheck/testapps/overlap/CMakeLists.txt b/tests/auto/valgrind/memcheck/testapps/overlap/CMakeLists.txt new file mode 100644 index 00000000000..149f26e3bdf --- /dev/null +++ b/tests/auto/valgrind/memcheck/testapps/overlap/CMakeLists.txt @@ -0,0 +1,3 @@ +include(../testapp.cmake) + +add_valgrind_testapp(overlap) diff --git a/tests/auto/valgrind/memcheck/testapps/syscall/CMakeLists.txt b/tests/auto/valgrind/memcheck/testapps/syscall/CMakeLists.txt new file mode 100644 index 00000000000..639996072b3 --- /dev/null +++ b/tests/auto/valgrind/memcheck/testapps/syscall/CMakeLists.txt @@ -0,0 +1,3 @@ +include(../testapp.cmake) + +add_valgrind_testapp(syscall) diff --git a/tests/auto/valgrind/memcheck/testapps/testapp.cmake b/tests/auto/valgrind/memcheck/testapps/testapp.cmake new file mode 100644 index 00000000000..25d8a154b7e --- /dev/null +++ b/tests/auto/valgrind/memcheck/testapps/testapp.cmake @@ -0,0 +1,4 @@ +function(add_valgrind_testapp name) + add_executable("${name}" + ${CMAKE_CURRENT_LIST_DIR}/main.cpp) +endfunction() diff --git a/tests/auto/valgrind/memcheck/testapps/uninit1/CMakeLists.txt b/tests/auto/valgrind/memcheck/testapps/uninit1/CMakeLists.txt new file mode 100644 index 00000000000..99296862d5f --- /dev/null +++ b/tests/auto/valgrind/memcheck/testapps/uninit1/CMakeLists.txt @@ -0,0 +1,3 @@ +include(../testapp.cmake) + +add_valgrind_testapp(uninit1) diff --git a/tests/auto/valgrind/memcheck/testapps/uninit2/CMakeLists.txt b/tests/auto/valgrind/memcheck/testapps/uninit2/CMakeLists.txt new file mode 100644 index 00000000000..32f279703cc --- /dev/null +++ b/tests/auto/valgrind/memcheck/testapps/uninit2/CMakeLists.txt @@ -0,0 +1,3 @@ +include(../testapp.cmake) + +add_valgrind_testapp(uninit2) diff --git a/tests/auto/valgrind/memcheck/testapps/uninit3/CMakeLists.txt b/tests/auto/valgrind/memcheck/testapps/uninit3/CMakeLists.txt new file mode 100644 index 00000000000..def23876926 --- /dev/null +++ b/tests/auto/valgrind/memcheck/testapps/uninit3/CMakeLists.txt @@ -0,0 +1,3 @@ +include(../testapp.cmake) + +add_valgrind_testapp(uninit3)