Skip to contentSkip to conversation

Change in openvpn[master]: test_openvpnserv: Make sure to include config.h

Openvpn-devel In review flichtenheld (Code Review) 2 participants 6 messages Jan 26 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): gerrit.1769435786000.I3b246bcc36ba35c2ed9630dc18e97aff436eaa0b@...2715...

#1 lore raw

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=email

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

---
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

.github/workflows/build.yaml +3 -3
index 5f5d624..7d1574c 100644
@@ -49,7 +49,7 @@
       - name: Install vcpkg
         uses: lukka/[email protected]... # 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/[email protected]... # 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 package)
         uses: lukka/[email protected]... # v11.5
         with:
-          vcpkgGitCommitId: eeb00f1ecba68f68fad6a1ee93eec77921b3146e
+          vcpkgGitCommitId: 6d332a018c433fad20822ff4b536e4ccdc3413bd
           vcpkgJsonGlob: '**/windows/vcpkg.json'
 
       - name: Run CMake with vcpkg.json manifest (NO TESTS)
tests/unit_tests/openvpnserv/test_openvpnserv.c +4 -0
index 348de4f..45096a1 100644
@@ -21,6 +21,10 @@
  *  with this program; if not, see <https://www.gnu.org/licenses/>.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <setjmp.h>
 #include <cmocka.h>
 #include "test_common.h"

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1488?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email

Gerrit-MessageType: newchange
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I3b246bcc36ba35c2ed9630dc18e97aff436eaa0b
Gerrit-Change-Number: 1488
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>

#2 lore raw
In reply to a message not in the archive

Attention is currently required from: flichtenheld, plaisthos.

cron2 has posted comments on this change by flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/1488?usp=email )

Change subject: test_openvpnserv: Make sure to include config.h
......................................................................

Patch Set 2: Code-Review+2

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1488?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email

Gerrit-MessageType: comment
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I3b246bcc36ba35c2ed9630dc18e97aff436eaa0b
Gerrit-Change-Number: 1488
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Mon, 26 Jan 2026 14:55:43 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes

#3 lore raw

PATCH v2 1/1 test_openvpnserv: Make sure to include config.h

In reply to a message not in the archive

From: Frank Lichtenheld <[email protected]...>

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

Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1488
---

This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master.

Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1488
This mail reflects revision 2 of this Change.

Acked-by according to Gerrit (reflected above):
Gert Doering <[email protected]...>

.github/workflows/build.yaml +3 -3
index 5f5d624..7d1574c 100644
@@ -49,7 +49,7 @@
       - name: Install vcpkg
         uses: lukka/[email protected]... # 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/[email protected]... # 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 package)
         uses: lukka/[email protected]... # v11.5
         with:
-          vcpkgGitCommitId: eeb00f1ecba68f68fad6a1ee93eec77921b3146e
+          vcpkgGitCommitId: 6d332a018c433fad20822ff4b536e4ccdc3413bd
           vcpkgJsonGlob: '**/windows/vcpkg.json'
 
       - name: Run CMake with vcpkg.json manifest (NO TESTS)
tests/unit_tests/openvpnserv/test_openvpnserv.c +4 -0
index 348de4f..45096a1 100644
@@ -21,6 +21,10 @@
  *  with this program; if not, see <https://www.gnu.org/licenses/>.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <setjmp.h>
 #include <cmocka.h>
 #include "test_common.h"
#4 lore raw

[Openvpn-devel] [PATCH applied] Re: test_openvpnserv: Make sure to include config.h

"Because it makes sense". Test-infrastructure only, so only stared-at-code, and let the BBs and GHA do the test.

Your patch has been applied to the master branch.

commit 83f9c55efb1fb320c3dd913361c0181777c61294

Author: Frank Lichtenheld
Date:   Mon Jan 26 15:55:53 2026 +0100
     test_openvpnserv: Make sure to include config.h

     Signed-off-by: Frank Lichtenheld <[email protected]...>
     Acked-by: Gert Doering <[email protected]...>
     Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1488
     Message-Id: <[email protected]...>
     URL: https://www.mail-archive.com/[email protected]/msg35437.html
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering

#5 lore raw
In reply to a message not in the archive

cron2 has uploaded a new patch set (#3) to the change originally created by flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/1488?usp=email )

The following approvals got outdated and were removed:
Code-Review+2 by cron2

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

Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1488
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg35437.html

---
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/3

.github/workflows/build.yaml +3 -3
index ef9b3f5..4570417 100644
@@ -49,7 +49,7 @@
       - name: Install vcpkg
         uses: lukka/[email protected]... # 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/[email protected]... # 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 package)
         uses: lukka/[email protected]... # v11.5
         with:
-          vcpkgGitCommitId: eeb00f1ecba68f68fad6a1ee93eec77921b3146e
+          vcpkgGitCommitId: 6d332a018c433fad20822ff4b536e4ccdc3413bd
           vcpkgJsonGlob: '**/windows/vcpkg.json'
 
       - name: Run CMake with vcpkg.json manifest (NO TESTS)
tests/unit_tests/openvpnserv/test_openvpnserv.c +4 -0
index 348de4f..45096a1 100644
@@ -21,6 +21,10 @@
  *  with this program; if not, see <https://www.gnu.org/licenses/>.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <setjmp.h>
 #include <cmocka.h>
 #include "test_common.h"

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1488?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email

Gerrit-MessageType: newpatchset
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I3b246bcc36ba35c2ed9630dc18e97aff436eaa0b
Gerrit-Change-Number: 1488
Gerrit-PatchSet: 3
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>

#6 lore raw
In reply to a message not in the archive

cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/1488?usp=email )

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

Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1488
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg35437.html

---
M .github/workflows/build.yaml
M tests/unit_tests/openvpnserv/test_openvpnserv.c

2 files changed, 7 insertions(+), 3 deletions(-)
.github/workflows/build.yaml +3 -3
index ef9b3f5..4570417 100644
@@ -49,7 +49,7 @@
       - name: Install vcpkg
         uses: lukka/[email protected]... # 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/[email protected]... # 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 package)
         uses: lukka/[email protected]... # v11.5
         with:
-          vcpkgGitCommitId: eeb00f1ecba68f68fad6a1ee93eec77921b3146e
+          vcpkgGitCommitId: 6d332a018c433fad20822ff4b536e4ccdc3413bd
           vcpkgJsonGlob: '**/windows/vcpkg.json'
 
       - name: Run CMake with vcpkg.json manifest (NO TESTS)
tests/unit_tests/openvpnserv/test_openvpnserv.c +4 -0
index 348de4f..45096a1 100644
@@ -21,6 +21,10 @@
  *  with this program; if not, see <https://www.gnu.org/licenses/>.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <setjmp.h>
 #include <cmocka.h>
 #include "test_common.h"

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1488?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email

Gerrit-MessageType: merged
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I3b246bcc36ba35c2ed9630dc18e97aff436eaa0b
Gerrit-Change-Number: 1488
Gerrit-PatchSet: 3
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>