From: "cron2 (Code Review)" Date: Mon, 26 Jan 2026 15:33:41 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <5801b8445c014a092e3e81e306a4f07b2cce59dc-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="ERkN/7Qhj5Q="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: test_openvpnserv: Make sure to include config.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: flichtenheld Cc: plaisthos , openvpn-devel --ERkN/7Qhj5Q= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/14= 88?usp=3Demail ) Change subject: test_openvpnserv: Make sure to include config.h ...................................................................... test_openvpnserv: Make sure to include config.h Otherwise the check for cmocka version doesn't work. Includes the update to vcpkg in GHA since that exposed the problem. chore(deps): update vcpkg digest to 6d332a0 Change-Id: I3b246bcc36ba35c2ed9630dc18e97aff436eaa0b Signed-off-by: Frank Lichtenheld Acked-by: Gert Doering Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1488 Message-Id: <20260126145558.31460-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg35= 437.html Signed-off-by: Gert Doering --- M .github/workflows/build.yaml M tests/unit_tests/openvpnserv/test_openvpnserv.c 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index ef9b3f5..4570417 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -49,7 +49,7 @@ - name: Install vcpkg uses: lukka/run-vcpkg@...2815... # v11.5 with: - vcpkgGitCommitId: eeb00f1ecba68f68fad6a1ee93eec77921b3146e + vcpkgGitCommitId: 6d332a018c433fad20822ff4b536e4ccdc3413bd - name: Install dependencies run: ${VCPKG_ROOT}/vcpkg install openssl lz4 cmocka - name: configure OpenVPN with cmake @@ -84,7 +84,7 @@ - name: Restore from cache and install vcpkg uses: lukka/run-vcpkg@...2815... # v11.5 with: - vcpkgGitCommitId: eeb00f1ecba68f68fad6a1ee93eec77921b3146e + vcpkgGitCommitId: 6d332a018c433fad20822ff4b536e4ccdc3413bd vcpkgJsonGlob: '**/mingw/vcpkg.json' - name: Run CMake with vcpkg.json manifest @@ -272,7 +272,7 @@ - name: Restore artifacts, or setup vcpkg (do not install any packag= e) uses: lukka/run-vcpkg@...2815... # v11.5 with: - vcpkgGitCommitId: eeb00f1ecba68f68fad6a1ee93eec77921b3146e + vcpkgGitCommitId: 6d332a018c433fad20822ff4b536e4ccdc3413bd vcpkgJsonGlob: '**/windows/vcpkg.json' - name: Run CMake with vcpkg.json manifest (NO TESTS) diff --git a/tests/unit_tests/openvpnserv/test_openvpnserv.c b/tests/unit_t= ests/openvpnserv/test_openvpnserv.c index 348de4f..45096a1 100644 --- a/tests/unit_tests/openvpnserv/test_openvpnserv.c +++ b/tests/unit_tests/openvpnserv/test_openvpnserv.c @@ -21,6 +21,10 @@ * with this program; if not, see . */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include #include "test_common.h" -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1488?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings?usp=3Demail Gerrit-MessageType: merged Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I3b246bcc36ba35c2ed9630dc18e97aff436eaa0b Gerrit-Change-Number: 1488 Gerrit-PatchSet: 3 Gerrit-Owner: flichtenheld Gerrit-Reviewer: cron2 Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel --ERkN/7Qhj5Q= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 sub= mitted this change.

View Change

test_openvpnserv: Make sure to include config.h<=
br>
Otherwise the check for cmocka version doesn't
work. Includes= the update to vcpkg in GHA since
that exposed the problem.

chore= (deps): update vcpkg digest to 6d332a0

Change-Id: I3b246bcc36ba35c2e= d9630dc18e97aff436eaa0b
Signed-off-by: Frank Lichtenheld <frank@...2375...= 41...>
Acked-by: Gert Doering <gert@...1296...>
Gerrit URL: = https://gerrit.openvpn.net/c/openvpn/+/1488
Message-Id: <202601261455= 58.31460-1-gert@...1296...>
URL: https://www.mail-archive.com/openvpn= -devel@lists.sourceforge.net/msg35437.html
Signed-off-by: Gert Doering &= lt;gert@...1296...>
---
M .github/workflows/build.yaml
M tests/= unit_tests/openvpnserv/test_openvpnserv.c
2 files changed, 7 insertions(= +), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml=

index ef9b3f5..4570417 100644
--- a/.githu= b/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -49,7 +49,7 @@
- name: Install vcp= kg
uses: lukka/run-vcpkg@...2815... # v11.5=
with:
+ vcpkgGitCommi= tId: 6d332a018c433fad20822ff4b536e4ccdc3413bd
- name= : Install dependencies
run: ${VCPKG_ROOT}/vcpkg in= stall openssl lz4 cmocka
- name: configure OpenVPN w= ith cmake
@@ -84,7 +84,7 @@
- name: = Restore from cache and install vcpkg
uses: lukka/r= un-vcpkg@...2815... # v11.5
with:
- vcpkgGitCommitId: eeb00f1ecb= a68f68fad6a1ee93eec77921b3146e
+ vcpkgGitCommitId: 6d332a018c433fad20822ff4b536e4ccdc34= 13bd
vcpkgJsonGlob: '**/mingw/vcpkg.json'= ;

- name: Run CMake with vcpkg.jso= n manifest
@@ -272,7 +272,7 @@
- nam= e: Restore artifacts, or setup vcpkg (do not install any package) uses: lukka/run-vcpkg@...2815... # v11.5
= with:
- = vcpkgGitCommitId: eeb00f1ecba68f68fad6a1ee93eec77921b3146e
+ vcpkgGitCommitId: 6d332a0= 18c433fad20822ff4b536e4ccdc3413bd

vcpkgJsonGlob:= '**/windows/vcpkg.json'

-= name: Run CMake with vcpkg.json manifest (NO TESTS)
diff -= -git a/tests/unit_tests/openvpnserv/test_openvpnserv.c b/tests/unit_tests/o= penvpnserv/test_openvpnserv.c
index 348de4f..45096a1 100644=
--- a/tests/unit_tests/openvpnserv/test_openvpnserv.c
+++ b/tests/unit_tests/openvpnserv/test_openvpnserv.c@@ -21,6 +21,10 @@
* with this program; if not, s= ee <https://www.gnu.org/licenses/>.
*/

+#ifdef HAVE_CO= NFIG_H
+#include &quo= t;config.h"
+#en= dif
+
#include <setjmp.h>
#include <cmocka.h>
#include "test_common.h"

=

To view, visit change 1488. To unsubscribe, or for help writing mail f= ilters, visit se= ttings.

<= div itemscope itemprop=3D"action" itemtype=3D"http://schema.org/ViewAction"= >
Gerrit-MessageType: merged
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I3b246bcc36ba35c2ed9630dc18e= 97aff436eaa0b
Gerrit-Change-Number: 1488
Gerrit-PatchSet: 3
Gerrit-Owner: flichtenheld <frank@...2723...= .>
Gerrit-Reviewer: cron2 <gert@...1296...>=
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
= --ERkN/7Qhj5Q=--