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 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]> --- 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 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@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # 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@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # 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/run-vcpkg@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # 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_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/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]>
_______________________________________________ Openvpn-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openvpn-devel
