diff options
-rw-r--r-- | .SRCINFO | 16 | ||||
-rw-r--r-- | PKGBUILD | 22 | ||||
-rw-r--r-- | cmake.patch | 12 | ||||
-rw-r--r-- | crosscompilingemulator.patch | 154 | ||||
-rw-r--r-- | exesuffix.patch | 154 |
5 files changed, 29 insertions, 329 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Sat Sep 22 15:30:10 UTC 2018 +# Mon Oct 1 22:31:19 UTC 2018 pkgbase = mingw-w64-cmocka pkgdesc = Elegant unit testing framework for C with support for mock objects (mingw-w64) - pkgver = 1.1.2 + pkgver = 1.1.3 pkgrel = 1 url = https://cmocka.org/ arch = any @@ -14,14 +14,12 @@ pkgbase = mingw-w64-cmocka options = !strip options = !buildflags options = staticlibs - source = https://cmocka.org/files/1.1/cmocka-1.1.2.tar.xz - source = https://cmocka.org/files/1.1/cmocka-1.1.2.tar.xz.asc - source = exesuffix.patch - source = crosscompilingemulator.patch - sha512sums = 84435c97a4002c111672f8e18a9270a61de18343de19587ba59436617e57997050a63aac2242a79ec892474e824ca382f78af3e74dc1919cc50e04fd88d5e8f4 + source = https://cmocka.org/files/1.1/cmocka-1.1.3.tar.xz + source = https://cmocka.org/files/1.1/cmocka-1.1.3.tar.xz.asc + source = cmake.patch + sha512sums = b1a2ce72234256d653eebf95f8744a34525b9027e1ecf6552e1620c83a4bdda8b5674b748cc5fd14abada1e374829e2e7f0bcab0b1c8d6c3b7d9b7ec474b6ed3 sha512sums = SKIP - sha512sums = 3fad0674a428311fbb3a3d0809ec385ac788d3ce539f41da671b6db8b7db188866248cf6a57c8d4ab441d930171dd5cb4790d36cde4917da62b3ed0816067a69 - sha512sums = 152d4bef0cc0ae08ec0c3163a5ec12742e237c4d3aa50c2bdcabfa37cea2d689a858bc38558b97679622d7b9e4a87773d6362db01fd15e6f9873ab5cf8686162 + sha512sums = a9f959ca9f489c3ca57e7671e249064c28b45a00df95395ac46ba0cea5bfc8760253a708a470e04e6c1f9a6f5a882b75fbceef7933b8e200da3579b1580cd671 pkgname = mingw-w64-cmocka @@ -3,7 +3,7 @@ # Contributor: Anatol Pomozov <anatol.pomozov@gmail.com> pkgname=mingw-w64-cmocka -pkgver=1.1.2 +pkgver=1.1.3 pkgrel=1 pkgdesc='Elegant unit testing framework for C with support for mock objects (mingw-w64)' url='https://cmocka.org/' @@ -13,27 +13,28 @@ depends=('mingw-w64-crt') makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'mingw-w64-wine') options=(!strip !buildflags staticlibs) source=(https://cmocka.org/files/1.1/cmocka-${pkgver}.tar.xz{,.asc} - exesuffix.patch - crosscompilingemulator.patch) -sha512sums=('84435c97a4002c111672f8e18a9270a61de18343de19587ba59436617e57997050a63aac2242a79ec892474e824ca382f78af3e74dc1919cc50e04fd88d5e8f4' + 'cmake.patch') +sha512sums=('b1a2ce72234256d653eebf95f8744a34525b9027e1ecf6552e1620c83a4bdda8b5674b748cc5fd14abada1e374829e2e7f0bcab0b1c8d6c3b7d9b7ec474b6ed3' 'SKIP' - '3fad0674a428311fbb3a3d0809ec385ac788d3ce539f41da671b6db8b7db188866248cf6a57c8d4ab441d930171dd5cb4790d36cde4917da62b3ed0816067a69' - '152d4bef0cc0ae08ec0c3163a5ec12742e237c4d3aa50c2bdcabfa37cea2d689a858bc38558b97679622d7b9e4a87773d6362db01fd15e6f9873ab5cf8686162') + 'a9f959ca9f489c3ca57e7671e249064c28b45a00df95395ac46ba0cea5bfc8760253a708a470e04e6c1f9a6f5a882b75fbceef7933b8e200da3579b1580cd671') validpgpkeys=('8DFF53E18F2ABC8D8F3C92237EE0FC4DCC014E3D') # Andreas Schneider <asn@cryptomilk.org> _architectures="i686-w64-mingw32 x86_64-w64-mingw32" prepare() { cd "${srcdir}/cmocka-${pkgver}" - patch -Np1 -i "${srcdir}"/exesuffix.patch - patch -Np1 -i "${srcdir}"/crosscompilingemulator.patch + patch -Np1 -i "${srcdir}"/cmake.patch } build() { for _arch in ${_architectures}; do mkdir -p "${srcdir}"/build-${_arch} && cd "${srcdir}"/build-${_arch} - ${_arch}-cmake ../cmocka-${pkgver} \ + WINEPATH="/usr/${_arch}/bin" ${_arch}-cmake ../cmocka-${pkgver} \ -DCMAKE_CROSSCOMPILING=TRUE \ + -DBUILD_STATIC_LIB=TRUE \ + -DWITH_STATIC_LIB=TRUE \ + -DBIN_INSTALL_DIR="/usr/${_arch}/bin" \ + -DTARGET_SYSTEM_EMULATOR=${_arch}-wine \ -DUNIT_TESTING=ON make done @@ -42,8 +43,6 @@ build() { check() { for _arch in ${_architectures}; do cd "${srcdir}"/build-${_arch} - cp src/cmocka.dll example/ - cp src/cmocka.dll example/chef_wrap/ WINEDEBUG=-all make test done } @@ -55,7 +54,6 @@ package() { ${_arch}-strip --strip-unneeded "${pkgdir}"/usr/${_arch}/bin/*.dll ${_arch}-strip -g "${pkgdir}"/usr/${_arch}/lib/*.a - rm -r "${pkgdir}"/usr/${_arch}/CMake/ done } diff --git a/cmake.patch b/cmake.patch new file mode 100644 index 000000000000..30bd16867901 --- /dev/null +++ b/cmake.patch @@ -0,0 +1,12 @@ +diff -ruN cmocka-1.1.3/src/CMakeLists.txt patched/src/CMakeLists.txt +--- cmocka-1.1.3/src/CMakeLists.txt 2018-09-27 15:27:59.000000000 +0200 ++++ patched/src/CMakeLists.txt 2018-10-01 23:39:21.928642794 +0200 +@@ -74,6 +74,8 @@ + + install(TARGETS + ${CMOCKA_SHARED_LIBRARY} ++ RUNTIME DESTINATION ++ ${BIN_INSTALL_DIR} + ARCHIVE DESTINATION + ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION diff --git a/crosscompilingemulator.patch b/crosscompilingemulator.patch deleted file mode 100644 index 6c54b8416a9e..000000000000 --- a/crosscompilingemulator.patch +++ /dev/null @@ -1,154 +0,0 @@ -diff -ruN cmocka-1.1.1/cmake/Modules/AddCMockaTest.cmake patched/cmake/Modules/AddCMockaTest.cmake ---- cmocka-1.1.1/cmake/Modules/AddCMockaTest.cmake 2018-08-25 22:13:02.393732017 +0200 -+++ patched/cmake/Modules/AddCMockaTest.cmake 2018-08-25 22:14:20.245142615 +0200 -@@ -19,5 +19,5 @@ - function (ADD_CMOCKA_TEST _testName _testSource) - add_executable(${_testName} ${_testSource}) - target_link_libraries(${_testName} ${ARGN}) -- add_test(${_testName} ${CMAKE_CURRENT_BINARY_DIR}/${_testName}${CMAKE_EXECUTABLE_SUFFIX}) -+ add_test(${_testName} ${CMAKE_CROSSCOMPILING_EMULATOR} ${CMAKE_CURRENT_BINARY_DIR}/${_testName}${CMAKE_EXECUTABLE_SUFFIX}) - endfunction (ADD_CMOCKA_TEST) -diff -ruN cmocka-1.1.1/example/chef_wrap/CMakeLists.txt patched/example/chef_wrap/CMakeLists.txt ---- cmocka-1.1.1/example/chef_wrap/CMakeLists.txt 2018-08-25 22:13:02.393732017 +0200 -+++ patched/example/chef_wrap/CMakeLists.txt 2018-08-25 22:14:09.604949817 +0200 -@@ -9,7 +9,7 @@ - add_executable(waiter_test_wrap waiter_test_wrap.c chef.c) - target_link_libraries(waiter_test_wrap ${CMOCKA_SHARED_LIBRARY}) - --add_test(waiter_test_wrap ${CMAKE_CURRENT_BINARY_DIR}/waiter_test_wrap${CMAKE_EXECUTABLE_SUFFIX}) -+add_test(waiter_test_wrap ${CMAKE_CROSSCOMPILING_EMULATOR} ${CMAKE_CURRENT_BINARY_DIR}/waiter_test_wrap${CMAKE_EXECUTABLE_SUFFIX}) - - set_target_properties(waiter_test_wrap - PROPERTIES -diff -ruN cmocka-1.1.2/example/uptime/CMakeLists.txt patched/example/uptime/CMakeLists.txt ---- cmocka-1.1.2/example/uptime/CMakeLists.txt 2018-09-22 16:36:31.587036313 +0200 -+++ patched/example/uptime/CMakeLists.txt 2018-09-22 16:36:23.656881286 +0200 -@@ -18,4 +18,4 @@ - PROPERTIES - LINK_FLAGS "-Wl,--wrap=uptime") - --add_test(test_uptime ${CMAKE_CURRENT_BINARY_DIR}/test_uptime${CMAKE_EXECUTABLE_SUFFIX}) -+add_test(test_uptime ${CMAKE_CROSSCOMPILING_EMULATOR} ${CMAKE_CURRENT_BINARY_DIR}/test_uptime${CMAKE_EXECUTABLE_SUFFIX}) -diff -ruN cmocka-1.1.1/example/CMakeLists.txt patched/example/CMakeLists.txt ---- cmocka-1.1.1/example/CMakeLists.txt 2018-08-25 22:13:02.393732017 +0200 -+++ patched/example/CMakeLists.txt 2018-08-25 22:14:20.245142615 +0200 -@@ -32,7 +32,7 @@ - add_executable(simple_test simple_test.c) - target_link_libraries(simple_test ${CMOCKA_SHARED_LIBRARY}) - --add_test(simple_test ${CMAKE_CURRENT_BINARY_DIR}/simple_test${CMAKE_EXECUTABLE_SUFFIX}) -+add_test(simple_test ${CMAKE_CROSSCOMPILING_EMULATOR} ${CMAKE_CURRENT_BINARY_DIR}/simple_test${CMAKE_EXECUTABLE_SUFFIX}) - if (WIN32 OR CYGWIN OR MINGW) - set_tests_properties(simple_test PROPERTIES ENVIRONMENT "PATH=${DLL_PATH_ENV}") - endif (WIN32 OR CYGWIN OR MINGW) -@@ -41,7 +41,7 @@ - #TODO investigate dll jmp issue on MinGW - if (NOT MINGW OR WITH_STATIC_LIB) - add_executable(calculator_test calculator.c calculator_test.c) -- add_test(calculator_test ${CMAKE_CURRENT_BINARY_DIR}/calculator_test${CMAKE_EXECUTABLE_SUFFIX}) -+ add_test(calculator_test ${CMAKE_CROSSCOMPILING_EMULATOR} ${CMAKE_CURRENT_BINARY_DIR}/calculator_test${CMAKE_EXECUTABLE_SUFFIX}) - if (WIN32 OR CYGWIN) - set_tests_properties(calculator_test PROPERTIES ENVIRONMENT "PATH=${DLL_PATH_ENV}") - endif (WIN32 OR CYGWIN) -@@ -62,7 +62,7 @@ - target_link_libraries(allocate_module_test ${CMOCKA_SHARED_LIBRARY}) - - # This is a test that should detect leaks and overflows and will fail for that --add_test(allocate_module_test ${CMAKE_CURRENT_BINARY_DIR}/allocate_module_test${CMAKE_EXECUTABLE_SUFFIX}) -+add_test(allocate_module_test ${CMAKE_CROSSCOMPILING_EMULATOR} ${CMAKE_CURRENT_BINARY_DIR}/allocate_module_test${CMAKE_EXECUTABLE_SUFFIX}) - if (WIN32 OR CYGWIN OR MINGW) - set_tests_properties(allocate_module_test PROPERTIES ENVIRONMENT "PATH=${DLL_PATH_ENV}") - endif (WIN32 OR CYGWIN OR MINGW) -@@ -77,7 +77,7 @@ - add_executable(assert_macro_test assert_macro.c assert_macro_test.c) - target_link_libraries(assert_macro_test ${CMOCKA_SHARED_LIBRARY}) - --add_test(assert_macro_test ${CMAKE_CURRENT_BINARY_DIR}/assert_macro_test${CMAKE_EXECUTABLE_SUFFIX}) -+add_test(assert_macro_test ${CMAKE_CROSSCOMPILING_EMULATOR} ${CMAKE_CURRENT_BINARY_DIR}/assert_macro_test${CMAKE_EXECUTABLE_SUFFIX}) - set_tests_properties( - assert_macro_test - PROPERTIES -@@ -91,7 +91,7 @@ - add_executable(assert_module_test assert_module.c assert_module_test.c) - target_link_libraries(assert_module_test ${CMOCKA_SHARED_LIBRARY}) - --add_test(assert_module_test ${CMAKE_CURRENT_BINARY_DIR}/assert_module_test${CMAKE_EXECUTABLE_SUFFIX}) -+add_test(assert_module_test ${CMAKE_CROSSCOMPILING_EMULATOR} ${CMAKE_CURRENT_BINARY_DIR}/assert_module_test${CMAKE_EXECUTABLE_SUFFIX}) - set_tests_properties( - assert_module_test - PROPERTIES -@@ -105,7 +105,7 @@ - add_executable(customer_database_test customer_database.c customer_database_test.c) - target_link_libraries(customer_database_test ${CMOCKA_SHARED_LIBRARY}) - --add_test(customer_database_test ${CMAKE_CURRENT_BINARY_DIR}/customer_database_test${CMAKE_EXECUTABLE_SUFFIX}) -+add_test(customer_database_test ${CMAKE_CROSSCOMPILING_EMULATOR} ${CMAKE_CURRENT_BINARY_DIR}/customer_database_test${CMAKE_EXECUTABLE_SUFFIX}) - if (WIN32 OR CYGWIN OR MINGW) - set_tests_properties(customer_database_test PROPERTIES ENVIRONMENT "PATH=${DLL_PATH_ENV}") - endif (WIN32 OR CYGWIN OR MINGW) -@@ -114,7 +114,7 @@ - add_executable(key_value_test key_value.c key_value_test.c) - target_link_libraries(key_value_test ${CMOCKA_SHARED_LIBRARY}) - --add_test(key_value_test ${CMAKE_CURRENT_BINARY_DIR}/key_value_test${CMAKE_EXECUTABLE_SUFFIX}) -+add_test(key_value_test ${CMAKE_CROSSCOMPILING_EMULATOR} ${CMAKE_CURRENT_BINARY_DIR}/key_value_test${CMAKE_EXECUTABLE_SUFFIX}) - if (WIN32 OR CYGWIN OR MINGW) - set_tests_properties(key_value_test PROPERTIES ENVIRONMENT "PATH=${DLL_PATH_ENV}") - endif (WIN32 OR CYGWIN OR MINGW) -@@ -123,7 +123,7 @@ - add_executable(product_database_test product_database.c product_database_test.c) - target_link_libraries(product_database_test ${CMOCKA_SHARED_LIBRARY}) - --add_test(product_database_test ${CMAKE_CURRENT_BINARY_DIR}/product_database_test${CMAKE_EXECUTABLE_SUFFIX}) -+add_test(product_database_test ${CMAKE_CROSSCOMPILING_EMULATOR} ${CMAKE_CURRENT_BINARY_DIR}/product_database_test${CMAKE_EXECUTABLE_SUFFIX}) - set_tests_properties( - product_database_test - PROPERTIES -diff -ruN cmocka-1.1.1/tests/CMakeLists.txt patched/tests/CMakeLists.txt ---- cmocka-1.1.1/tests/CMakeLists.txt 2018-08-25 22:13:02.393732017 +0200 -+++ patched/tests/CMakeLists.txt 2018-08-25 22:14:20.245142615 +0200 -@@ -105,7 +105,7 @@ - 1 - ) - --add_test (test_setup_fail_1_failed test_setup_fail${CMAKE_EXECUTABLE_SUFFIX}) -+add_test (test_setup_fail_1_failed ${CMAKE_CROSSCOMPILING_EMULATOR} test_setup_fail${CMAKE_EXECUTABLE_SUFFIX}) - set_tests_properties( - test_setup_fail_1_failed - PROPERTIES -@@ -113,7 +113,7 @@ - "\\[ ERROR \\] int_test_ignored" - ) - --add_test (test_setup_fail_1_passed test_setup_fail${CMAKE_EXECUTABLE_SUFFIX}) -+add_test (test_setup_fail_1_passed ${CMAKE_CROSSCOMPILING_EMULATOR} test_setup_fail${CMAKE_EXECUTABLE_SUFFIX}) - set_tests_properties( - test_setup_fail_1_passed - PROPERTIES -@@ -121,7 +121,7 @@ - "\\[ PASSED \\] 1 test\\(s\\)." - ) - --add_test (test_setup_fail_match_failed test_setup_fail${CMAKE_EXECUTABLE_SUFFIX}) -+add_test (test_setup_fail_match_failed ${CMAKE_CROSSCOMPILING_EMULATOR} test_setup_fail${CMAKE_EXECUTABLE_SUFFIX}) - set_tests_properties( - test_setup_fail_match_failed - PROPERTIES -@@ -129,7 +129,7 @@ - "\\[ ERROR \\] int_test_ignored" - ) - --add_test (test_setup_fail_match_passed test_setup_fail${CMAKE_EXECUTABLE_SUFFIX}) -+add_test (test_setup_fail_match_passed ${CMAKE_CROSSCOMPILING_EMULATOR} test_setup_fail${CMAKE_EXECUTABLE_SUFFIX}) - set_tests_properties( - test_setup_fail_match_passed - PROPERTIES -@@ -215,7 +215,7 @@ - foreach(_TEST_OUTPUT_FMT ${TEST_OUTPUT_FMTS}) - foreach(_OUTPUT_TEST ${OUTPUT_TESTS}) - set(TEST_NAME ${_OUTPUT_TEST}_${_TEST_OUTPUT_FMT}) -- add_test(${TEST_NAME} ${_OUTPUT_TEST}${CMAKE_EXECUTABLE_SUFFIX}) -+ add_test(${TEST_NAME} ${CMAKE_CROSSCOMPILING_EMULATOR} ${_OUTPUT_TEST}${CMAKE_EXECUTABLE_SUFFIX}) - - set_property( - TEST diff --git a/exesuffix.patch b/exesuffix.patch deleted file mode 100644 index 657b5aae1125..000000000000 --- a/exesuffix.patch +++ /dev/null @@ -1,154 +0,0 @@ -diff -ruN cmocka-1.1.1/cmake/Modules/AddCMockaTest.cmake patched/cmake/Modules/AddCMockaTest.cmake ---- cmocka-1.1.1/cmake/Modules/AddCMockaTest.cmake 2013-12-23 15:50:11.000000000 +0100 -+++ patched/cmake/Modules/AddCMockaTest.cmake 2018-08-25 20:09:31.030127812 +0200 -@@ -19,5 +19,5 @@ - function (ADD_CMOCKA_TEST _testName _testSource) - add_executable(${_testName} ${_testSource}) - target_link_libraries(${_testName} ${ARGN}) -- add_test(${_testName} ${CMAKE_CURRENT_BINARY_DIR}/${_testName}) -+ add_test(${_testName} ${CMAKE_CURRENT_BINARY_DIR}/${_testName}${CMAKE_EXECUTABLE_SUFFIX}) - endfunction (ADD_CMOCKA_TEST) -diff -ruN cmocka-1.1.1/example/chef_wrap/CMakeLists.txt patched/example/chef_wrap/CMakeLists.txt ---- cmocka-1.1.1/example/chef_wrap/CMakeLists.txt 2016-09-21 15:31:28.000000000 +0200 -+++ patched/example/chef_wrap/CMakeLists.txt 2018-08-25 20:05:18.555532103 +0200 -@@ -9,7 +9,7 @@ - add_executable(waiter_test_wrap waiter_test_wrap.c chef.c) - target_link_libraries(waiter_test_wrap ${CMOCKA_SHARED_LIBRARY}) - --add_test(waiter_test_wrap ${CMAKE_CURRENT_BINARY_DIR}/waiter_test_wrap) -+add_test(waiter_test_wrap ${CMAKE_CURRENT_BINARY_DIR}/waiter_test_wrap${CMAKE_EXECUTABLE_SUFFIX}) - - set_target_properties(waiter_test_wrap - PROPERTIES -diff -ruN cmocka-1.1.2/example/uptime/CMakeLists.txt patched/example/uptime/CMakeLists.txt ---- cmocka-1.1.2/example/uptime/CMakeLists.txt 2018-08-22 13:02:28.000000000 +0200 -+++ patched/example/uptime/CMakeLists.txt 2018-09-22 16:33:47.693794439 +0200 -@@ -18,4 +18,4 @@ - PROPERTIES - LINK_FLAGS "-Wl,--wrap=uptime") - --add_test(test_uptime ${CMAKE_CURRENT_BINARY_DIR}/test_uptime) -+add_test(test_uptime ${CMAKE_CURRENT_BINARY_DIR}/test_uptime${CMAKE_EXECUTABLE_SUFFIX}) -diff -ruN cmocka-1.1.1/example/CMakeLists.txt patched/example/CMakeLists.txt ---- cmocka-1.1.1/example/CMakeLists.txt 2016-09-21 15:31:28.000000000 +0200 -+++ patched/example/CMakeLists.txt 2018-08-25 20:04:44.554913232 +0200 -@@ -32,7 +32,7 @@ - add_executable(simple_test simple_test.c) - target_link_libraries(simple_test ${CMOCKA_SHARED_LIBRARY}) - --add_test(simple_test ${CMAKE_CURRENT_BINARY_DIR}/simple_test) -+add_test(simple_test ${CMAKE_CURRENT_BINARY_DIR}/simple_test${CMAKE_EXECUTABLE_SUFFIX}) - if (WIN32 OR CYGWIN OR MINGW) - set_tests_properties(simple_test PROPERTIES ENVIRONMENT "PATH=${DLL_PATH_ENV}") - endif (WIN32 OR CYGWIN OR MINGW) -@@ -41,7 +41,7 @@ - #TODO investigate dll jmp issue on MinGW - if (NOT MINGW OR WITH_STATIC_LIB) - add_executable(calculator_test calculator.c calculator_test.c) -- add_test(calculator_test ${CMAKE_CURRENT_BINARY_DIR}/calculator_test) -+ add_test(calculator_test ${CMAKE_CURRENT_BINARY_DIR}/calculator_test${CMAKE_EXECUTABLE_SUFFIX}) - if (WIN32 OR CYGWIN) - set_tests_properties(calculator_test PROPERTIES ENVIRONMENT "PATH=${DLL_PATH_ENV}") - endif (WIN32 OR CYGWIN) -@@ -62,7 +62,7 @@ - target_link_libraries(allocate_module_test ${CMOCKA_SHARED_LIBRARY}) - - # This is a test that should detect leaks and overflows and will fail for that --add_test(allocate_module_test ${CMAKE_CURRENT_BINARY_DIR}/allocate_module_test) -+add_test(allocate_module_test ${CMAKE_CURRENT_BINARY_DIR}/allocate_module_test${CMAKE_EXECUTABLE_SUFFIX}) - if (WIN32 OR CYGWIN OR MINGW) - set_tests_properties(allocate_module_test PROPERTIES ENVIRONMENT "PATH=${DLL_PATH_ENV}") - endif (WIN32 OR CYGWIN OR MINGW) -@@ -77,7 +77,7 @@ - add_executable(assert_macro_test assert_macro.c assert_macro_test.c) - target_link_libraries(assert_macro_test ${CMOCKA_SHARED_LIBRARY}) - --add_test(assert_macro_test ${CMAKE_CURRENT_BINARY_DIR}/assert_macro_test) -+add_test(assert_macro_test ${CMAKE_CURRENT_BINARY_DIR}/assert_macro_test${CMAKE_EXECUTABLE_SUFFIX}) - set_tests_properties( - assert_macro_test - PROPERTIES -@@ -91,7 +91,7 @@ - add_executable(assert_module_test assert_module.c assert_module_test.c) - target_link_libraries(assert_module_test ${CMOCKA_SHARED_LIBRARY}) - --add_test(assert_module_test ${CMAKE_CURRENT_BINARY_DIR}/assert_module_test) -+add_test(assert_module_test ${CMAKE_CURRENT_BINARY_DIR}/assert_module_test${CMAKE_EXECUTABLE_SUFFIX}) - set_tests_properties( - assert_module_test - PROPERTIES -@@ -105,7 +105,7 @@ - add_executable(customer_database_test customer_database.c customer_database_test.c) - target_link_libraries(customer_database_test ${CMOCKA_SHARED_LIBRARY}) - --add_test(customer_database_test ${CMAKE_CURRENT_BINARY_DIR}/customer_database_test) -+add_test(customer_database_test ${CMAKE_CURRENT_BINARY_DIR}/customer_database_test${CMAKE_EXECUTABLE_SUFFIX}) - if (WIN32 OR CYGWIN OR MINGW) - set_tests_properties(customer_database_test PROPERTIES ENVIRONMENT "PATH=${DLL_PATH_ENV}") - endif (WIN32 OR CYGWIN OR MINGW) -@@ -114,7 +114,7 @@ - add_executable(key_value_test key_value.c key_value_test.c) - target_link_libraries(key_value_test ${CMOCKA_SHARED_LIBRARY}) - --add_test(key_value_test ${CMAKE_CURRENT_BINARY_DIR}/key_value_test) -+add_test(key_value_test ${CMAKE_CURRENT_BINARY_DIR}/key_value_test${CMAKE_EXECUTABLE_SUFFIX}) - if (WIN32 OR CYGWIN OR MINGW) - set_tests_properties(key_value_test PROPERTIES ENVIRONMENT "PATH=${DLL_PATH_ENV}") - endif (WIN32 OR CYGWIN OR MINGW) -@@ -123,7 +123,7 @@ - add_executable(product_database_test product_database.c product_database_test.c) - target_link_libraries(product_database_test ${CMOCKA_SHARED_LIBRARY}) - --add_test(product_database_test ${CMAKE_CURRENT_BINARY_DIR}/product_database_test) -+add_test(product_database_test ${CMAKE_CURRENT_BINARY_DIR}/product_database_test${CMAKE_EXECUTABLE_SUFFIX}) - set_tests_properties( - product_database_test - PROPERTIES -diff -ruN cmocka-1.1.1/tests/CMakeLists.txt patched/tests/CMakeLists.txt ---- cmocka-1.1.1/tests/CMakeLists.txt 2017-04-05 08:40:50.000000000 +0200 -+++ patched/tests/CMakeLists.txt 2018-08-25 20:08:18.638810060 +0200 -@@ -105,7 +105,7 @@ - 1 - ) - --add_test (test_setup_fail_1_failed test_setup_fail) -+add_test (test_setup_fail_1_failed test_setup_fail${CMAKE_EXECUTABLE_SUFFIX}) - set_tests_properties( - test_setup_fail_1_failed - PROPERTIES -@@ -113,7 +113,7 @@ - "\\[ ERROR \\] int_test_ignored" - ) - --add_test (test_setup_fail_1_passed test_setup_fail) -+add_test (test_setup_fail_1_passed test_setup_fail${CMAKE_EXECUTABLE_SUFFIX}) - set_tests_properties( - test_setup_fail_1_passed - PROPERTIES -@@ -121,7 +121,7 @@ - "\\[ PASSED \\] 1 test\\(s\\)." - ) - --add_test (test_setup_fail_match_failed test_setup_fail) -+add_test (test_setup_fail_match_failed test_setup_fail${CMAKE_EXECUTABLE_SUFFIX}) - set_tests_properties( - test_setup_fail_match_failed - PROPERTIES -@@ -129,7 +129,7 @@ - "\\[ ERROR \\] int_test_ignored" - ) - --add_test (test_setup_fail_match_passed test_setup_fail) -+add_test (test_setup_fail_match_passed test_setup_fail${CMAKE_EXECUTABLE_SUFFIX}) - set_tests_properties( - test_setup_fail_match_passed - PROPERTIES -@@ -215,7 +215,7 @@ - foreach(_TEST_OUTPUT_FMT ${TEST_OUTPUT_FMTS}) - foreach(_OUTPUT_TEST ${OUTPUT_TESTS}) - set(TEST_NAME ${_OUTPUT_TEST}_${_TEST_OUTPUT_FMT}) -- add_test(${TEST_NAME} ${_OUTPUT_TEST}) -+ add_test(${TEST_NAME} ${_OUTPUT_TEST}${CMAKE_EXECUTABLE_SUFFIX}) - - set_property( - TEST |