status-im
/
miniupnp
mirror of https://github.com/status-im/miniupnp.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

miniupnpc: make test with CMake 

fixes #531
This commit is contained in:
Thomas Bernard 2022-10-21 22:47:21 +02:00
parent fef6d4d17c
commit aa7e399604
No known key found for this signature in database
GPG Key ID: DB511043A31ACAAF
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/main.yml vendored
View File

@ -31,7 +31,7 @@ jobs:
run: make -C miniupnpc install DESTDIR=/tmp/miniupnpc_install run: make -C miniupnpc install DESTDIR=/tmp/miniupnpc_install
- name: build miniupnpc with cmake - name: build miniupnpc with cmake
run: mkdir miniupnpc/cmake-build && cd miniupnpc/cmake-build && cmake .. && make run: mkdir miniupnpc/cmake-build && cd miniupnpc/cmake-build && cmake .. && make && make test
- name: install miniupnpc with cmake - name: install miniupnpc with cmake
run: cd miniupnpc/cmake-build && make DESTDIR=/tmp/miniupnpc_cmake_install install run: cd miniupnpc/cmake-build && make DESTDIR=/tmp/miniupnpc_cmake_install install

34
miniupnpc/CMakeLists.txt
View File

@ -219,7 +219,41 @@ if (UPNPC_BUILD_TESTS)
) )
target_link_libraries (testaddr_is_reserved PRIVATE miniupnpc-tests) target_link_libraries (testaddr_is_reserved PRIVATE miniupnpc-tests)
add_executable (testportlistingparse src/testportlistingparse.c
src/minixml.c src/portlistingparse.c)
target_include_directories (testportlistingparse PRIVATE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>)
target_link_libraries (testportlistingparse PRIVATE miniupnpc-tests)
add_executable (minihttptestserver src/minihttptestserver.c)
# set (UPNPC_INSTALL_TARGETS ${UPNPC_INSTALL_TARGETS} testminixml minixmlvalid testupnpreplyparse testigddescparse testminiwget) # set (UPNPC_INSTALL_TARGETS ${UPNPC_INSTALL_TARGETS} testminixml minixmlvalid testupnpreplyparse testigddescparse testminiwget)
include(CTest)
add_test(NAME validateminixml
COMMAND minixmlvalid)
add_test(NAME validateminiwget
COMMAND ${CMAKE_SOURCE_DIR}/testminiwget.sh)
set_property(TEST validateminiwget
PROPERTY ENVIRONMENT
TESTSERVER=${CMAKE_BINARY_DIR}/minihttptestserver
TESTMINIWGET=${CMAKE_BINARY_DIR}/testminiwget)
add_test(NAME validateupnpreplyparse
COMMAND ${CMAKE_SOURCE_DIR}/testupnpreplyparse.sh
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
set_property(TEST validateupnpreplyparse
PROPERTY ENVIRONMENT
TESTUPNPREPLYPARSE=${CMAKE_BINARY_DIR}/testupnpreplyparse)
add_test(NAME validateportlistingparse
COMMAND testportlistingparse)
add_test(NAME validateigddescparse1
COMMAND testigddescparse new_LiveBox_desc.xml new_LiveBox_desc.values
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/testdesc)
add_test(NAME validateigddescparse2
COMMAND testigddescparse linksys_WAG200G_desc.xml linksys_WAG200G_desc.values
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/testdesc)
add_test(NAME validateaddr_is_reserved
COMMAND testaddr_is_reserved)
endif () endif ()
configure_file(miniupnpc.pc.in miniupnpc.pc @ONLY) configure_file(miniupnpc.pc.in miniupnpc.pc @ONLY)