[Openvpn-devel,3/5] Do not run check_engine test when crosscompiling

Message ID 20230208001819.244694-4-arne@rfc2549.org
State Superseded
Headers show
Series Build and run unittests with mingw in Github actions | expand

Commit Message

Arne Schwabe Feb. 8, 2023, 12:18 a.m. UTC
Signed-off-by: Arne Schwabe <arne@rfc2549.org>
---
 tests/unit_tests/engine-key/Makefile.am | 2 ++
 1 file changed, 2 insertions(+)

Comments

Selva Nair Feb. 9, 2023, 11:01 p.m. UTC | #1
Hi,

On Tue, Feb 7, 2023 at 7:19 PM Arne Schwabe <arne@rfc2549.org> wrote:

> Signed-off-by: Arne Schwabe <arne@rfc2549.org>
> ---
>  tests/unit_tests/engine-key/Makefile.am | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/tests/unit_tests/engine-key/Makefile.am
> b/tests/unit_tests/engine-key/Makefile.am
> index 246222514..0c2888576 100644
> --- a/tests/unit_tests/engine-key/Makefile.am
> +++ b/tests/unit_tests/engine-key/Makefile.am
> @@ -12,7 +12,9 @@ TESTS_ENVIRONMENT = srcdir="$(abs_srcdir)"; \
>         top_srcdir="$(top_srcdir)"; \
>         export srcdir builddir top_builddir top_srcdir;
>
> +if !CROSS_COMPILING
>  TESTS = check_engine_keys.sh
> +endif
>  check_engine_keys.sh: $(conffiles)
>
>  CLEANFILES = \
>

FTR, this patch is no longer needed (included in #2 below). So, the order
of interdependent patches are: (All acked).

1. [Openvpn-devel,1/3] Conditionally add subdir-objects option to automake
<https://patchwork.openvpn.net/project/openvpn2/patch/20230204004512.250271-1-selva.nair@gmail.com/>
2. [Openvpn-devel,v3,2/3] Build unit tests in mingw Windows build
<https://patchwork.openvpn.net/project/openvpn2/patch/20230208005925.393200-1-selva.nair@gmail.com/>
3. [Openvpn-devel,4/5] Add missing stdint.h includes in unit tests files
<https://patchwork.openvpn.net/project/openvpn2/patch/20230208001819.244694-5-arne@rfc2549.org/>
4. [Openvpn-devel,v2,5/5] Add building unit tests with mingw to github
actions
<https://patchwork.openvpn.net/project/openvpn2/patch/20230209163705.466173-1-arne@rfc2549.org/>

Selva

Patch

diff --git a/tests/unit_tests/engine-key/Makefile.am b/tests/unit_tests/engine-key/Makefile.am
index 246222514..0c2888576 100644
--- a/tests/unit_tests/engine-key/Makefile.am
+++ b/tests/unit_tests/engine-key/Makefile.am
@@ -12,7 +12,9 @@  TESTS_ENVIRONMENT = srcdir="$(abs_srcdir)"; \
 	top_srcdir="$(top_srcdir)"; \
 	export srcdir builddir top_builddir top_srcdir;
 
+if !CROSS_COMPILING
 TESTS = check_engine_keys.sh
+endif
 check_engine_keys.sh: $(conffiles)
 
 CLEANFILES = \