From: "flichtenheld (Code Review)" Date: Mon, 26 Jan 2026 13:56:33 +0000 References: Reply-To: frank@...2641..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="A9U+KxWMN8Y="; 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: plaisthos Cc: openvpn-devel --A9U+KxWMN8Y= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: plaisthos. Hello plaisthos, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/1488?usp=3Demail to review the following change. 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 --- M .github/workflows/build.yaml M tests/unit_tests/openvpnserv/test_openvpnserv.c 2 files changed, 7 insertions(+), 3 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/88/1488/1 diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 5f5d624..7d1574c 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 @@ -274,7 +274,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: newchange Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I3b246bcc36ba35c2ed9630dc18e97aff436eaa0b Gerrit-Change-Number: 1488 Gerrit-PatchSet: 1 Gerrit-Owner: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos --A9U+KxWMN8Y= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is cur= rently required from: plaisthos.

flichtenheld would like plaisthos to review this change.

V= iew Change

test_openvpnserv: Make sure to include conf=
ig.h

Otherwise the check for cmocka version doesn't
work. Inc= ludes the update to vcpkg in GHA since
that exposed the problem.

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

Change-Id: I3b246bcc36ba= 35c2ed9630dc18e97aff436eaa0b
Signed-off-by: Frank Lichtenheld <frank@= ...2641...>
---
M .github/workflows/build.yaml
M tests/unit_tes= ts/openvpnserv/test_openvpnserv.c
2 files changed, 7 insertions(+), 3 de= letions(-)

git pull ssh://gerrit.openvpn.net:294=
18/openvpn refs/changes/88/1488/1
diff --git a/.github/workflows/bu=
ild.yaml b/.github/workflows/build.yaml
index 5f5d624..7d15= 74c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -49,7 +49,7 @@

- name: Install vcpkg
uses: lu= kka/run-vcpkg@...2815... # v11.5
with:
<= span style=3D"color: hsl(0, 100%, 40%);">- vcpkgGitCommitId: eeb00= f1ecba68f68fad6a1ee93eec77921b3146e
+ vcpkgGitCommitId: 6d332a018c433fad20822ff4b536e4c= cdc3413bd
- name: Install dependencies
run: ${VCPKG_ROOT}/vcpkg install openssl lz4 cmocka
<= span> - 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
+ vcpkgGitCommitI= d: 6d332a018c433fad20822ff4b536e4ccdc3413bd
vcpk= gJsonGlob: '**/mingw/vcpkg.json'

= - name: Run CMake with vcpkg.json manifest
@@ -274,7= +274,7 @@
- name: Restore artifacts, or setup vcpkg= (do not install any package)
uses: lukka/run-vcpk= g@...2815... # v11.5
with:
- vcpkgGitCommitId: eeb00f1ecba68f6= 8fad6a1ee93eec77921b3146e
+ vcpkgGitCommitId: 6d332a018c433fad20822ff4b536e4ccdc3413bd<= /span>
vcpkgJsonGlob: '**/windows/vcpkg.json'

- name: Run CMake with vcpkg.json m= anifest (NO TESTS)
diff --git a/tests/unit_tests/openvpnser= v/test_openvpnserv.c b/tests/unit_tests/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 <https://www.gnu.org/license= s/>.
*/

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <setjmp.h>=
#include <cmocka.h>
#include "test_c= ommon.h"

To view, visit change 1488. T= o unsubscribe, or for help writing mail filters, visit settings.

Gerrit-MessageType: newchange
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I3b246bcc36ba35c2ed9630dc18e= 97aff436eaa0b
Gerrit-Change-Number: 1488
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <frank@...2723...= .>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...= ..1227...>
= --A9U+KxWMN8Y=--