1From 9b806483d804ab335f7161fdd6248ae3e7ae3bde Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 9 Aug 2024 13:50:05 -0700
4Subject: [PATCH 2/2] network_tests: Include iomanip system header
5
6Latest gcc-14/clang-18 needs this header for setfill and setw
7
8Upstream-Status: Submitted [https://github.com/COVESA/vsomeip/pull/751]
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 .../network_tests/big_payload_tests/big_payload_test_service.hpp | 1 +
12 test/network_tests/cpu_load_tests/cpu_load_test_service.cpp      | 1 +
13 test/network_tests/e2e_tests/e2e_profile_04_test_client.hpp      | 1 +
14 test/network_tests/e2e_tests/e2e_profile_04_test_service.hpp     | 1 +
15 test/network_tests/e2e_tests/e2e_profile_07_test_client.hpp      | 1 +
16 test/network_tests/e2e_tests/e2e_profile_07_test_service.hpp     | 1 +
17 test/network_tests/e2e_tests/e2e_test_client.hpp                 | 1 +
18 test/network_tests/e2e_tests/e2e_test_service.hpp                | 1 +
19 test/network_tests/event_tests/event_test_service.cpp            | 1 +
20 .../header_factory_tests/header_factory_test_client.hpp          | 1 +
21 .../header_factory_tests/header_factory_test_service.hpp         | 1 +
22 test/network_tests/npdu_tests/npdu_test_client.hpp               | 1 +
23 test/network_tests/npdu_tests/npdu_test_service.hpp              | 1 +
24 test/network_tests/payload_tests/payload_test_client.hpp         | 1 +
25 test/network_tests/payload_tests/payload_test_service.hpp        | 1 +
26 .../restart_routing_tests/restart_routing_test_client.hpp        | 1 +
27 .../restart_routing_tests/restart_routing_test_service.hpp       | 1 +
28 .../routing_tests/external_local_routing_test_service.hpp        | 1 +
29 test/network_tests/routing_tests/local_routing_test_client.hpp   | 1 +
30 test/network_tests/routing_tests/local_routing_test_service.hpp  | 1 +
31 .../second_address_tests/second_address_test_service.cpp         | 1 +
32 test/network_tests/security_tests/security_test_client.hpp       | 1 +
33 test/network_tests/security_tests/security_test_service.hpp      | 1 +
34 .../suspend_resume_tests/suspend_resume_test_service.cpp         | 1 +
35 24 files changed, 24 insertions(+)
36
37diff --git a/test/network_tests/big_payload_tests/big_payload_test_service.hpp b/test/network_tests/big_payload_tests/big_payload_test_service.hpp
38index 44af28a9..101b6758 100644
39--- a/test/network_tests/big_payload_tests/big_payload_test_service.hpp
40+++ b/test/network_tests/big_payload_tests/big_payload_test_service.hpp
41@@ -14,6 +14,7 @@
42 #include <condition_variable>
43 #include <functional>
44 #include <queue>
45+#include <iomanip>
46
47 #include "big_payload_test_globals.hpp"
48 #include <vsomeip/internal/logger.hpp>
49diff --git a/test/network_tests/cpu_load_tests/cpu_load_test_service.cpp b/test/network_tests/cpu_load_tests/cpu_load_test_service.cpp
50index 3d935e39..a98f3edf 100644
51--- a/test/network_tests/cpu_load_tests/cpu_load_test_service.cpp
52+++ b/test/network_tests/cpu_load_tests/cpu_load_test_service.cpp
53@@ -13,6 +13,7 @@
54 #include <functional>
55 #include <numeric>
56 #include <cmath> // for isfinite
57+#include <iomanip>
58
59 #include "cpu_load_test_globals.hpp"
60 #include <vsomeip/internal/logger.hpp>
61diff --git a/test/network_tests/e2e_tests/e2e_profile_04_test_client.hpp b/test/network_tests/e2e_tests/e2e_profile_04_test_client.hpp
62index ad002913..82d5e7e2 100644
63--- a/test/network_tests/e2e_tests/e2e_profile_04_test_client.hpp
64+++ b/test/network_tests/e2e_tests/e2e_profile_04_test_client.hpp
65@@ -14,6 +14,7 @@
66 #include <mutex>
67 #include <condition_variable>
68 #include <atomic>
69+#include <iomanip>
70
71 class e2e_profile_04_test_client {
72 public:
73diff --git a/test/network_tests/e2e_tests/e2e_profile_04_test_service.hpp b/test/network_tests/e2e_tests/e2e_profile_04_test_service.hpp
74index 25617917..17852b85 100644
75--- a/test/network_tests/e2e_tests/e2e_profile_04_test_service.hpp
76+++ b/test/network_tests/e2e_tests/e2e_profile_04_test_service.hpp
77@@ -17,6 +17,7 @@
78 #include <condition_variable>
79 #include <mutex>
80 #include <thread>
81+#include <iomanip>
82
83 class e2e_profile_04_test_service {
84 public:
85diff --git a/test/network_tests/e2e_tests/e2e_profile_07_test_client.hpp b/test/network_tests/e2e_tests/e2e_profile_07_test_client.hpp
86index 9b10a589..30d889b5 100644
87--- a/test/network_tests/e2e_tests/e2e_profile_07_test_client.hpp
88+++ b/test/network_tests/e2e_tests/e2e_profile_07_test_client.hpp
89@@ -14,6 +14,7 @@
90 #include <mutex>
91 #include <condition_variable>
92 #include <atomic>
93+#include <iomanip>
94
95 class e2e_profile_07_test_client {
96 public:
97diff --git a/test/network_tests/e2e_tests/e2e_profile_07_test_service.hpp b/test/network_tests/e2e_tests/e2e_profile_07_test_service.hpp
98index ad6488a5..ea1cc05c 100644
99--- a/test/network_tests/e2e_tests/e2e_profile_07_test_service.hpp
100+++ b/test/network_tests/e2e_tests/e2e_profile_07_test_service.hpp
101@@ -17,6 +17,7 @@
102 #include <condition_variable>
103 #include <mutex>
104 #include <thread>
105+#include <iomanip>
106
107 class e2e_profile_07_test_service {
108 public:
109diff --git a/test/network_tests/e2e_tests/e2e_test_client.hpp b/test/network_tests/e2e_tests/e2e_test_client.hpp
110index 10f49784..c253f101 100644
111--- a/test/network_tests/e2e_tests/e2e_test_client.hpp
112+++ b/test/network_tests/e2e_tests/e2e_test_client.hpp
113@@ -18,6 +18,7 @@
114 #include <mutex>
115 #include <condition_variable>
116 #include <atomic>
117+#include <iomanip>
118
119 class e2e_test_client {
120 public:
121diff --git a/test/network_tests/e2e_tests/e2e_test_service.hpp b/test/network_tests/e2e_tests/e2e_test_service.hpp
122index 7fd1c5a9..e839aacb 100644
123--- a/test/network_tests/e2e_tests/e2e_test_service.hpp
124+++ b/test/network_tests/e2e_tests/e2e_test_service.hpp
125@@ -16,6 +16,7 @@
126 #include <thread>
127 #include <mutex>
128 #include <condition_variable>
129+#include <iomanip>
130
131 class e2e_test_service {
132 public:
133diff --git a/test/network_tests/event_tests/event_test_service.cpp b/test/network_tests/event_tests/event_test_service.cpp
134index 3728a827..d1f117e2 100644
135--- a/test/network_tests/event_tests/event_test_service.cpp
136+++ b/test/network_tests/event_tests/event_test_service.cpp
137@@ -10,6 +10,7 @@
138 #include <thread>
139 #include <map>
140 #include <atomic>
141+#include <iomanip>
142
143 #include <gtest/gtest.h>
144
145diff --git a/test/network_tests/header_factory_tests/header_factory_test_client.hpp b/test/network_tests/header_factory_tests/header_factory_test_client.hpp
146index 79461b69..b72bbdca 100644
147--- a/test/network_tests/header_factory_tests/header_factory_test_client.hpp
148+++ b/test/network_tests/header_factory_tests/header_factory_test_client.hpp
149@@ -14,6 +14,7 @@
150 #include <mutex>
151 #include <condition_variable>
152 #include <functional>
153+#include <iomanip>
154
155 #include "../someip_test_globals.hpp"
156 #include <common/vsomeip_app_utilities.hpp>
157diff --git a/test/network_tests/header_factory_tests/header_factory_test_service.hpp b/test/network_tests/header_factory_tests/header_factory_test_service.hpp
158index 7879946a..a553adde 100644
159--- a/test/network_tests/header_factory_tests/header_factory_test_service.hpp
160+++ b/test/network_tests/header_factory_tests/header_factory_test_service.hpp
161@@ -13,6 +13,7 @@
162 #include <mutex>
163 #include <condition_variable>
164 #include <functional>
165+#include <iomanip>
166
167 #include "../someip_test_globals.hpp"
168 #include <common/vsomeip_app_utilities.hpp>
169diff --git a/test/network_tests/npdu_tests/npdu_test_client.hpp b/test/network_tests/npdu_tests/npdu_test_client.hpp
170index 2f469d40..7f615f14 100644
171--- a/test/network_tests/npdu_tests/npdu_test_client.hpp
172+++ b/test/network_tests/npdu_tests/npdu_test_client.hpp
173@@ -15,6 +15,7 @@
174 #include <condition_variable>
175 #include <functional>
176 #include <map>
177+#include <iomanip>
178
179 #include "../npdu_tests/npdu_test_globals.hpp"
180 #include "../someip_test_globals.hpp"
181diff --git a/test/network_tests/npdu_tests/npdu_test_service.hpp b/test/network_tests/npdu_tests/npdu_test_service.hpp
182index bef06806..1caae785 100644
183--- a/test/network_tests/npdu_tests/npdu_test_service.hpp
184+++ b/test/network_tests/npdu_tests/npdu_test_service.hpp
185@@ -15,6 +15,7 @@
186 #include <functional>
187 #include <chrono>
188 #include <deque>
189+#include <iomanip>
190
191 class npdu_test_service
192 {
193diff --git a/test/network_tests/payload_tests/payload_test_client.hpp b/test/network_tests/payload_tests/payload_test_client.hpp
194index 1bab6ba6..1754320c 100644
195--- a/test/network_tests/payload_tests/payload_test_client.hpp
196+++ b/test/network_tests/payload_tests/payload_test_client.hpp
197@@ -15,6 +15,7 @@
198 #include <mutex>
199 #include <condition_variable>
200 #include <functional>
201+#include <iomanip>
202
203 #include "../someip_test_globals.hpp"
204 #include <common/vsomeip_app_utilities.hpp>
205diff --git a/test/network_tests/payload_tests/payload_test_service.hpp b/test/network_tests/payload_tests/payload_test_service.hpp
206index 7d3c01d5..06dbb684 100644
207--- a/test/network_tests/payload_tests/payload_test_service.hpp
208+++ b/test/network_tests/payload_tests/payload_test_service.hpp
209@@ -13,6 +13,7 @@
210 #include <mutex>
211 #include <condition_variable>
212 #include <functional>
213+#include <iomanip>
214
215 #include "../someip_test_globals.hpp"
216 #include <common/vsomeip_app_utilities.hpp>
217diff --git a/test/network_tests/restart_routing_tests/restart_routing_test_client.hpp b/test/network_tests/restart_routing_tests/restart_routing_test_client.hpp
218index 8a7c9e70..6a758318 100644
219--- a/test/network_tests/restart_routing_tests/restart_routing_test_client.hpp
220+++ b/test/network_tests/restart_routing_tests/restart_routing_test_client.hpp
221@@ -19,6 +19,7 @@
222 #include <condition_variable>
223 #include <atomic>
224 #include <future>
225+#include <iomanip>
226
227 class routing_restart_test_client {
228 public:
229diff --git a/test/network_tests/restart_routing_tests/restart_routing_test_service.hpp b/test/network_tests/restart_routing_tests/restart_routing_test_service.hpp
230index 7660b8fc..1fe4d86c 100644
231--- a/test/network_tests/restart_routing_tests/restart_routing_test_service.hpp
232+++ b/test/network_tests/restart_routing_tests/restart_routing_test_service.hpp
233@@ -16,6 +16,7 @@
234 #include <thread>
235 #include <mutex>
236 #include <condition_variable>
237+#include <iomanip>
238
239 class routing_restart_test_service {
240 public:
241diff --git a/test/network_tests/routing_tests/external_local_routing_test_service.hpp b/test/network_tests/routing_tests/external_local_routing_test_service.hpp
242index 2499bc84..b1e2dfd8 100644
243--- a/test/network_tests/routing_tests/external_local_routing_test_service.hpp
244+++ b/test/network_tests/routing_tests/external_local_routing_test_service.hpp
245@@ -13,6 +13,7 @@
246 #include <mutex>
247 #include <condition_variable>
248 #include <functional>
249+#include <iomanip>
250
251 #include "../someip_test_globals.hpp"
252 #include <common/vsomeip_app_utilities.hpp>
253diff --git a/test/network_tests/routing_tests/local_routing_test_client.hpp b/test/network_tests/routing_tests/local_routing_test_client.hpp
254index 09af0bf0..69ee6bfc 100644
255--- a/test/network_tests/routing_tests/local_routing_test_client.hpp
256+++ b/test/network_tests/routing_tests/local_routing_test_client.hpp
257@@ -14,6 +14,7 @@
258 #include <mutex>
259 #include <condition_variable>
260 #include <functional>
261+#include <iomanip>
262
263 #include "../someip_test_globals.hpp"
264 #include <common/vsomeip_app_utilities.hpp>
265diff --git a/test/network_tests/routing_tests/local_routing_test_service.hpp b/test/network_tests/routing_tests/local_routing_test_service.hpp
266index 109dade4..932423d8 100644
267--- a/test/network_tests/routing_tests/local_routing_test_service.hpp
268+++ b/test/network_tests/routing_tests/local_routing_test_service.hpp
269@@ -13,6 +13,7 @@
270 #include <mutex>
271 #include <condition_variable>
272 #include <functional>
273+#include <iomanip>
274
275 #include "../someip_test_globals.hpp"
276 #include <common/vsomeip_app_utilities.hpp>
277diff --git a/test/network_tests/second_address_tests/second_address_test_service.cpp b/test/network_tests/second_address_tests/second_address_test_service.cpp
278index fc9d0a28..3ffa493f 100644
279--- a/test/network_tests/second_address_tests/second_address_test_service.cpp
280+++ b/test/network_tests/second_address_tests/second_address_test_service.cpp
281@@ -9,6 +9,7 @@
282 #include <sstream>
283 #include <thread>
284 #include <map>
285+#include <iomanip>
286
287 #include <gtest/gtest.h>
288 #include <vsomeip/vsomeip.hpp>
289diff --git a/test/network_tests/security_tests/security_test_client.hpp b/test/network_tests/security_tests/security_test_client.hpp
290index ab3d98b8..bd331138 100644
291--- a/test/network_tests/security_tests/security_test_client.hpp
292+++ b/test/network_tests/security_tests/security_test_client.hpp
293@@ -18,6 +18,7 @@
294 #include <mutex>
295 #include <condition_variable>
296 #include <atomic>
297+#include <iomanip>
298
299 class security_test_client {
300 public:
301diff --git a/test/network_tests/security_tests/security_test_service.hpp b/test/network_tests/security_tests/security_test_service.hpp
302index 87fb94fd..1f227072 100644
303--- a/test/network_tests/security_tests/security_test_service.hpp
304+++ b/test/network_tests/security_tests/security_test_service.hpp
305@@ -16,6 +16,7 @@
306 #include <thread>
307 #include <mutex>
308 #include <condition_variable>
309+#include <iomanip>
310
311 class security_test_service {
312 public:
313diff --git a/test/network_tests/suspend_resume_tests/suspend_resume_test_service.cpp b/test/network_tests/suspend_resume_tests/suspend_resume_test_service.cpp
314index 6f099ce7..dc9df239 100644
315--- a/test/network_tests/suspend_resume_tests/suspend_resume_test_service.cpp
316+++ b/test/network_tests/suspend_resume_tests/suspend_resume_test_service.cpp
317@@ -7,6 +7,7 @@
318 #include <mutex>
319 #include <thread>
320 #include <atomic>
321+#include <iomanip>
322
323 #include <gtest/gtest.h>
324
325