1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
|
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -17,13 +17,6 @@
return()
endif()
-add_test(
- NAME test-init-py
- COMMAND ${Python3_EXECUTABLE} -m pytest
- ${CMAKE_CURRENT_SOURCE_DIR}/test_init.py
- -v
-)
-
set(_test_init_py_env "UPNP_BUILD_DIR=${CMAKE_BINARY_DIR}")
if(CMAKE_C_FLAGS MATCHES "sanitize=address" OR
CMAKE_SHARED_LINKER_FLAGS MATCHES "sanitize=address")
@@ -38,10 +31,6 @@
list(APPEND _test_init_py_env "ASAN_OPTIONS=detect_leaks=0")
endif()
-set_tests_properties(test-init-py PROPERTIES
- ENVIRONMENT "${_test_init_py_env}"
-)
-
add_test(
NAME test-issue-110-py
COMMAND ${Python3_EXECUTABLE} -m pytest
--- a/upnp/test/CMakeLists.txt
+++ b/upnp/test/CMakeLists.txt
@@ -1,9 +1,6 @@
UPNP_Add_Unit_Test(test-upnp-list test_list.c)
-UPNP_Add_Unit_Test(test-upnp-init test_init.c)
UPNP_Add_Unit_Test(test-upnp-log test_log.c)
UPNP_Add_Unit_Test(test-upnp-url test_url.c)
-UPNP_Add_Unit_Test(test-upnp-sock-io test_sock_io.c)
-UPNP_Add_Unit_Test(test-upnp-ssdp-req-port test_ssdp_req_port.c)
UPNP_Add_Unit_Test(test-upnp-virtual-dir test_virtual_dir.c)
UPNP_Add_Unit_Test(test-upnp-ssdp-multi-device test_ssdp_multi_device.c)
# test_threadpool_overflow calls internal ThreadPool API (ThreadPoolInit,
@@ -191,40 +188,6 @@
)
endif()
-# GHSA-gvhr-pxx7-ch7x: reads AUTO_RENEW_TIME and CP_MINIMUM_SUBSCRIPTION_TIME
-# from config.h (a private header) and runs a fake publisher thread.
-UPNP_Add_Unit_Test(test-upnp-gena-granted-timeout test_gena_granted_timeout.c)
-if(UPNP_BUILD_SHARED)
- target_include_directories(
- test-upnp-gena-granted-timeout
- PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../src/inc
- )
- target_link_libraries(
- test-upnp-gena-granted-timeout PRIVATE Threads::Threads
- )
-endif()
-if(UPNP_BUILD_STATIC)
- target_include_directories(
- test-upnp-gena-granted-timeout-static
- PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../src/inc
- )
- target_link_libraries(
- test-upnp-gena-granted-timeout-static PRIVATE Threads::Threads
- )
-endif()
-
-# GHSA-ggw2-jjv9-h22c: runs a fake publisher thread, then sends NOTIFY
-# requests with malformed SIDs to the control point.
-UPNP_Add_Unit_Test(test-upnp-gena-notify-sid test_gena_notify_sid.c)
-if(UPNP_BUILD_SHARED)
- target_link_libraries(test-upnp-gena-notify-sid PRIVATE Threads::Threads)
-endif()
-if(UPNP_BUILD_STATIC)
- target_link_libraries(
- test-upnp-gena-notify-sid-static PRIVATE Threads::Threads
- )
-endif()
-
# On Solaris/illumos, getaddrinfo and freeaddrinfo live in libsocket (and
# sometimes libnsl) rather than in the C library. find_library() probes for
# each library at configure time and stores the full path (or "<VAR>-NOTFOUND")
@@ -332,14 +295,6 @@
$<$<BOOL:${SOCKET_LIBRARY}>:${SOCKET_LIBRARY}>
$<$<BOOL:${NSL_LIBRARY}>:${NSL_LIBRARY}>
)
- target_link_libraries(test-upnp-gena-granted-timeout PRIVATE
- $<$<BOOL:${SOCKET_LIBRARY}>:${SOCKET_LIBRARY}>
- $<$<BOOL:${NSL_LIBRARY}>:${NSL_LIBRARY}>
- )
- target_link_libraries(test-upnp-gena-notify-sid PRIVATE
- $<$<BOOL:${SOCKET_LIBRARY}>:${SOCKET_LIBRARY}>
- $<$<BOOL:${NSL_LIBRARY}>:${NSL_LIBRARY}>
- )
target_link_libraries(test-upnp-gena-subscribe-pressure PRIVATE
$<$<BOOL:${SOCKET_LIBRARY}>:${SOCKET_LIBRARY}>
$<$<BOOL:${NSL_LIBRARY}>:${NSL_LIBRARY}>
@@ -354,14 +309,6 @@
$<$<BOOL:${SOCKET_LIBRARY}>:${SOCKET_LIBRARY}>
$<$<BOOL:${NSL_LIBRARY}>:${NSL_LIBRARY}>
)
- target_link_libraries(test-upnp-gena-granted-timeout-static PRIVATE
- $<$<BOOL:${SOCKET_LIBRARY}>:${SOCKET_LIBRARY}>
- $<$<BOOL:${NSL_LIBRARY}>:${NSL_LIBRARY}>
- )
- target_link_libraries(test-upnp-gena-notify-sid-static PRIVATE
- $<$<BOOL:${SOCKET_LIBRARY}>:${SOCKET_LIBRARY}>
- $<$<BOOL:${NSL_LIBRARY}>:${NSL_LIBRARY}>
- )
target_link_libraries(test-upnp-gena-subscribe-pressure-static PRIVATE
$<$<BOOL:${SOCKET_LIBRARY}>:${SOCKET_LIBRARY}>
$<$<BOOL:${NSL_LIBRARY}>:${NSL_LIBRARY}>
|
