[PATCH 0/2] test: enable most driver tests on windows

[PATCH 0/2] test: enable most driver tests on windows

[Tyler Retzlaff]

* remove conditional compilation for windows from crypto tests so they
  are built and registered to be run with dpdk-test.exe.
* remaining driver tests require further investigation and will not be
  addressed in this series.

Tyler Retzlaff (2):
  test/crypto: remove Windows conditional compilation
  test: enable most driver tests on Windows

 app/test/meson.build                     | 35 ++++++++++++++++----------------
 app/test/test_cryptodev.c                |  3 ---
 app/test/test_cryptodev_asym.c           |  3 ---
 app/test/test_cryptodev_blockcipher.c    |  3 ---
 app/test/test_cryptodev_security_ipsec.c |  7 ++++---
 app/test/test_cryptodev_security_pdcp.c  |  3 ---
 6 files changed, 22 insertions(+), 32 deletions(-)

-- 
1.8.3.1

[PATCH 1/2] test/crypto: remove Windows conditional compilation

[Tyler Retzlaff]

build the test/crypto harnesses on windows to allow them to be listed
as tests to run.

Signed-off-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
---
 app/test/test_cryptodev.c                | 3 ---
 app/test/test_cryptodev_asym.c           | 3 ---
 app/test/test_cryptodev_blockcipher.c    | 3 ---
 app/test/test_cryptodev_security_ipsec.c | 7 ++++---
 app/test/test_cryptodev_security_pdcp.c  | 3 ---
 5 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index a0c8926..3cd3e42 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -3,8 +3,6 @@
  * Copyright 2020 NXP
  */
 
-#ifndef RTE_EXEC_ENV_WINDOWS
-
 #include <time.h>
 
 #include <rte_common.h>
@@ -16497,4 +16495,3 @@ struct test_crypto_vector {
 REGISTER_TEST_COMMAND(cryptodev_cn9k_autotest, test_cryptodev_cn9k);
 REGISTER_TEST_COMMAND(cryptodev_cn10k_autotest, test_cryptodev_cn10k);
 
-#endif /* !RTE_EXEC_ENV_WINDOWS */
diff --git a/app/test/test_cryptodev_asym.c b/app/test/test_cryptodev_asym.c
index 573af2a..0d81405 100644
--- a/app/test/test_cryptodev_asym.c
+++ b/app/test/test_cryptodev_asym.c
@@ -3,8 +3,6 @@
  * Copyright (c) 2019 Intel Corporation
  */
 
-#ifndef RTE_EXEC_ENV_WINDOWS
-
 #include <rte_bus_vdev.h>
 #include <rte_common.h>
 #include <rte_hexdump.h>
@@ -2266,4 +2264,3 @@ static inline void print_asym_capa(
 REGISTER_TEST_COMMAND(cryptodev_cn9k_asym_autotest, test_cryptodev_cn9k_asym);
 REGISTER_TEST_COMMAND(cryptodev_cn10k_asym_autotest, test_cryptodev_cn10k_asym);
 
-#endif /* !RTE_EXEC_ENV_WINDOWS */
diff --git a/app/test/test_cryptodev_blockcipher.c b/app/test/test_cryptodev_blockcipher.c
index 4944591..31c2d9f 100644
--- a/app/test/test_cryptodev_blockcipher.c
+++ b/app/test/test_cryptodev_blockcipher.c
@@ -2,8 +2,6 @@
  * Copyright(c) 2015-2017 Intel Corporation
  */
 
-#ifndef RTE_EXEC_ENV_WINDOWS
-
 #include <rte_common.h>
 #include <rte_hexdump.h>
 #include <rte_mbuf.h>
@@ -1220,4 +1218,3 @@ struct unit_test_suite *
 	free(ts);
 }
 
-#endif /* !RTE_EXEC_ENV_WINDOWS */
diff --git a/app/test/test_cryptodev_security_ipsec.c b/app/test/test_cryptodev_security_ipsec.c
index f66360f..602407e 100644
--- a/app/test/test_cryptodev_security_ipsec.c
+++ b/app/test/test_cryptodev_security_ipsec.c
@@ -2,8 +2,6 @@
  * Copyright(C) 2021 Marvell.
  */
 
-#ifndef RTE_EXEC_ENV_WINDOWS
-
 #include <rte_common.h>
 #include <rte_cryptodev.h>
 #include <rte_esp.h>
@@ -17,6 +15,10 @@
 
 #define IV_LEN_MAX 16
 
+#ifndef IPVERSION
+#define IPVERSION 4
+#endif
+
 struct crypto_param_comb alg_list[RTE_DIM(aead_list) +
 				  (RTE_DIM(cipher_list) *
 				   RTE_DIM(auth_list))];
@@ -1133,4 +1135,3 @@ struct crypto_param_comb alg_list[RTE_DIM(aead_list) +
 	return 0;
 }
 
-#endif /* !RTE_EXEC_ENV_WINDOWS */
diff --git a/app/test/test_cryptodev_security_pdcp.c b/app/test/test_cryptodev_security_pdcp.c
index 30d86fb..b8016a0 100644
--- a/app/test/test_cryptodev_security_pdcp.c
+++ b/app/test/test_cryptodev_security_pdcp.c
@@ -4,8 +4,6 @@
  * Copyright 2018-2019 NXP
  */
 
-#ifndef RTE_EXEC_ENV_WINDOWS
-
 #include <time.h>
 
 #include <rte_common.h>
@@ -590,4 +588,3 @@ static int uplane_encap_no_integrity(uint32_t sn_size, uint8_t dir,
 	return n - i;
 };
 
-#endif /* !RTE_EXEC_ENV_WINDOWS */
-- 
1.8.3.1

[PATCH 2/2] test: enable most driver tests on Windows

[Tyler Retzlaff]

enable most of the driver tests to run on windows, most tests will be
skipped since the drivers themselves are not available on windows.

Signed-off-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
---
 app/test/meson.build | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/app/test/meson.build b/app/test/meson.build
index 5fc1dd1..aec986b 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -290,31 +290,32 @@ perf_test_names = [
         'thash_perf_autotest',
 ]
 
-driver_test_names = []
+driver_test_names = [
+        'cryptodev_aesni_gcm_autotest',
+        'cryptodev_aesni_mb_autotest',
+        'cryptodev_cn10k_autotest',
+        'cryptodev_cn9k_autotest',
+        'cryptodev_dpaa2_sec_autotest',
+        'cryptodev_dpaa_sec_autotest',
+        'cryptodev_null_autotest',
+        'cryptodev_openssl_autotest',
+        'cryptodev_qat_autotest',
+        'cryptodev_sw_armv8_autotest',
+        'cryptodev_sw_kasumi_autotest',
+        'cryptodev_sw_mvsam_autotest',
+        'cryptodev_sw_snow3g_autotest',
+        'cryptodev_sw_zuc_autotest',
+        'dmadev_autotest',
+        'rawdev_autotest',
+]
 
 dump_test_names = []
 
 if not is_windows
     driver_test_names += [
-            'cryptodev_aesni_mb_autotest',
-            'cryptodev_aesni_gcm_autotest',
-            'cryptodev_cn9k_autotest',
-            'cryptodev_cn10k_autotest',
-            'cryptodev_dpaa_sec_autotest',
-            'cryptodev_dpaa2_sec_autotest',
-            'cryptodev_null_autotest',
-            'cryptodev_openssl_autotest',
             'cryptodev_openssl_asym_autotest',
-            'cryptodev_qat_autotest',
-            'cryptodev_sw_armv8_autotest',
-            'cryptodev_sw_kasumi_autotest',
-            'cryptodev_sw_mvsam_autotest',
-            'cryptodev_sw_snow3g_autotest',
-            'cryptodev_sw_zuc_autotest',
-            'dmadev_autotest',
             'eventdev_selftest_octeontx',
             'eventdev_selftest_sw',
-            'rawdev_autotest',
     ]
 
     dump_test_names += [
-- 
1.8.3.1

Re: [PATCH 2/2] test: enable most driver tests on Windows

[Thomas Monjalon]

29/03/2022 11:02, Tyler Retzlaff:
> enable most of the driver tests to run on windows, most tests will be
> skipped since the drivers themselves are not available on windows.
[...]
>  if not is_windows
>      driver_test_names += [
> -            'cryptodev_aesni_mb_autotest',
> -            'cryptodev_aesni_gcm_autotest',
> -            'cryptodev_cn9k_autotest',
> -            'cryptodev_cn10k_autotest',
> -            'cryptodev_dpaa_sec_autotest',
> -            'cryptodev_dpaa2_sec_autotest',
> -            'cryptodev_null_autotest',
> -            'cryptodev_openssl_autotest',
>              'cryptodev_openssl_asym_autotest',
> -            'cryptodev_qat_autotest',
> -            'cryptodev_sw_armv8_autotest',
> -            'cryptodev_sw_kasumi_autotest',
> -            'cryptodev_sw_mvsam_autotest',
> -            'cryptodev_sw_snow3g_autotest',
> -            'cryptodev_sw_zuc_autotest',
> -            'dmadev_autotest',
>              'eventdev_selftest_octeontx',
>              'eventdev_selftest_sw',
> -            'rawdev_autotest',
>      ]

Please could you mention the reason for keeping few tests 
in the conditional list?

Listing the remaining ones:
	- cryptodev_openssl_asym_autotest
	- eventdev_selftest_octeontx
	- eventdev_selftest_sw

There are also the dump tests:
	- dump_struct_sizes
	- dump_mempool
	- dump_malloc_stats
	- dump_devargs
	- dump_log_types
	- dump_ring
	- dump_physmem
	- dump_memzone

Re: [PATCH 2/2] test: enable most driver tests on Windows

[Tyler Retzlaff]

On Tue, Mar 29, 2022 at 11:12:21AM +0200, Thomas Monjalon wrote:
> 29/03/2022 11:02, Tyler Retzlaff:
> > enable most of the driver tests to run on windows, most tests will be
> > skipped since the drivers themselves are not available on windows.
> [...]
> >  if not is_windows
> >      driver_test_names += [
> > -            'cryptodev_aesni_mb_autotest',
> > -            'cryptodev_aesni_gcm_autotest',
> > -            'cryptodev_cn9k_autotest',
> > -            'cryptodev_cn10k_autotest',
> > -            'cryptodev_dpaa_sec_autotest',
> > -            'cryptodev_dpaa2_sec_autotest',
> > -            'cryptodev_null_autotest',
> > -            'cryptodev_openssl_autotest',
> >              'cryptodev_openssl_asym_autotest',
> > -            'cryptodev_qat_autotest',
> > -            'cryptodev_sw_armv8_autotest',
> > -            'cryptodev_sw_kasumi_autotest',
> > -            'cryptodev_sw_mvsam_autotest',
> > -            'cryptodev_sw_snow3g_autotest',
> > -            'cryptodev_sw_zuc_autotest',
> > -            'dmadev_autotest',
> >              'eventdev_selftest_octeontx',
> >              'eventdev_selftest_sw',
> > -            'rawdev_autotest',
> >      ]
> 
> Please could you mention the reason for keeping few tests 
> in the conditional list?

i indicated in the cover for the series.

* remaining driver tests require further investigation and will not be
  addressed in this series.

i did not mention the dump tests but the same applies.

or are you asking for the above to be stated in the commit message?

> 
> Listing the remaining ones:
> 	- cryptodev_openssl_asym_autotest
> 	- eventdev_selftest_octeontx
> 	- eventdev_selftest_sw
> 
> There are also the dump tests:
> 	- dump_struct_sizes
> 	- dump_mempool
> 	- dump_malloc_stats
> 	- dump_devargs
> 	- dump_log_types
> 	- dump_ring
> 	- dump_physmem
> 	- dump_memzone
> 

as above they will have to be investigated separately.

Re: [PATCH 2/2] test: enable most driver tests on Windows

[Thomas Monjalon]

29/03/2022 11:32, Tyler Retzlaff:
> On Tue, Mar 29, 2022 at 11:12:21AM +0200, Thomas Monjalon wrote:
> > 29/03/2022 11:02, Tyler Retzlaff:
> > > enable most of the driver tests to run on windows, most tests will be
> > > skipped since the drivers themselves are not available on windows.
> > [...]
> > >  if not is_windows
> > >      driver_test_names += [
> > > -            'cryptodev_aesni_mb_autotest',
> > > -            'cryptodev_aesni_gcm_autotest',
> > > -            'cryptodev_cn9k_autotest',
> > > -            'cryptodev_cn10k_autotest',
> > > -            'cryptodev_dpaa_sec_autotest',
> > > -            'cryptodev_dpaa2_sec_autotest',
> > > -            'cryptodev_null_autotest',
> > > -            'cryptodev_openssl_autotest',
> > >              'cryptodev_openssl_asym_autotest',
> > > -            'cryptodev_qat_autotest',
> > > -            'cryptodev_sw_armv8_autotest',
> > > -            'cryptodev_sw_kasumi_autotest',
> > > -            'cryptodev_sw_mvsam_autotest',
> > > -            'cryptodev_sw_snow3g_autotest',
> > > -            'cryptodev_sw_zuc_autotest',
> > > -            'dmadev_autotest',
> > >              'eventdev_selftest_octeontx',
> > >              'eventdev_selftest_sw',
> > > -            'rawdev_autotest',
> > >      ]
> > 
> > Please could you mention the reason for keeping few tests 
> > in the conditional list?
> 
> i indicated in the cover for the series.
> 
> * remaining driver tests require further investigation and will not be
>   addressed in this series.

Does it mean you did not try to run these tests?
Or did you see some issues to enable them?

> i did not mention the dump tests but the same applies.

Is there a blocker for dump or just a need for test?

> or are you asking for the above to be stated in the commit message?

I want to understand the exact status.


> > Listing the remaining ones:
> > 	- cryptodev_openssl_asym_autotest
> > 	- eventdev_selftest_octeontx
> > 	- eventdev_selftest_sw
> > 
> > There are also the dump tests:
> > 	- dump_struct_sizes
> > 	- dump_mempool
> > 	- dump_malloc_stats
> > 	- dump_devargs
> > 	- dump_log_types
> > 	- dump_ring
> > 	- dump_physmem
> > 	- dump_memzone
> > 
> 
> as above they will have to be investigated separately.

Re: [PATCH 2/2] test: enable most driver tests on Windows

[Tyler Retzlaff]

On Tue, Mar 29, 2022 at 01:29:55PM +0200, Thomas Monjalon wrote:
> 29/03/2022 11:32, Tyler Retzlaff:
> > On Tue, Mar 29, 2022 at 11:12:21AM +0200, Thomas Monjalon wrote:
> > > 29/03/2022 11:02, Tyler Retzlaff:
> > > > enable most of the driver tests to run on windows, most tests will be
> > > > skipped since the drivers themselves are not available on windows.
> > > [...]
> > > >  if not is_windows
> > > >      driver_test_names += [
> > > > -            'cryptodev_aesni_mb_autotest',
> > > > -            'cryptodev_aesni_gcm_autotest',
> > > > -            'cryptodev_cn9k_autotest',
> > > > -            'cryptodev_cn10k_autotest',
> > > > -            'cryptodev_dpaa_sec_autotest',
> > > > -            'cryptodev_dpaa2_sec_autotest',
> > > > -            'cryptodev_null_autotest',
> > > > -            'cryptodev_openssl_autotest',
> > > >              'cryptodev_openssl_asym_autotest',
> > > > -            'cryptodev_qat_autotest',
> > > > -            'cryptodev_sw_armv8_autotest',
> > > > -            'cryptodev_sw_kasumi_autotest',
> > > > -            'cryptodev_sw_mvsam_autotest',
> > > > -            'cryptodev_sw_snow3g_autotest',
> > > > -            'cryptodev_sw_zuc_autotest',
> > > > -            'dmadev_autotest',
> > > >              'eventdev_selftest_octeontx',
> > > >              'eventdev_selftest_sw',
> > > > -            'rawdev_autotest',
> > > >      ]
> > > 
> > > Please could you mention the reason for keeping few tests 
> > > in the conditional list?
> > 
> > i indicated in the cover for the series.
> > 
> > * remaining driver tests require further investigation and will not be
> >   addressed in this series.
> 
> Does it mean you did not try to run these tests?
> Or did you see some issues to enable them?

cryptodev_openssl_asym_autotest
  test fails because it does not bother checking to see if required
  driver is available ias the other cryptodev tests do.

eventdev_selftest_octeontx, eventdev_selftest_sw
  because it has a dependency on eventdev library which doesn't build
  on windows.

the dump_xxx tests were not evaluated, i did not try to build them or
run them.

> 
> > i did not mention the dump tests but the same applies.
> 
> Is there a blocker for dump or just a need for test?
> 
> > or are you asking for the above to be stated in the commit message?
> 
> I want to understand the exact status.
> 
> 
> > > Listing the remaining ones:
> > > 	- cryptodev_openssl_asym_autotest
> > > 	- eventdev_selftest_octeontx
> > > 	- eventdev_selftest_sw
> > > 
> > > There are also the dump tests:
> > > 	- dump_struct_sizes
> > > 	- dump_mempool
> > > 	- dump_malloc_stats
> > > 	- dump_devargs
> > > 	- dump_log_types
> > > 	- dump_ring
> > > 	- dump_physmem
> > > 	- dump_memzone
> > > 
> > 
> > as above they will have to be investigated separately.
> 
> 

Re: [PATCH 2/2] test: enable most driver tests on Windows

[Thomas Monjalon]

29/03/2022 14:10, Tyler Retzlaff:
> On Tue, Mar 29, 2022 at 01:29:55PM +0200, Thomas Monjalon wrote:
> > 29/03/2022 11:32, Tyler Retzlaff:
> > > On Tue, Mar 29, 2022 at 11:12:21AM +0200, Thomas Monjalon wrote:
> > > > 29/03/2022 11:02, Tyler Retzlaff:
> > > > > enable most of the driver tests to run on windows, most tests will be
> > > > > skipped since the drivers themselves are not available on windows.
> > > > [...]
> > > > >  if not is_windows
> > > > >      driver_test_names += [
> > > > > -            'cryptodev_aesni_mb_autotest',
> > > > > -            'cryptodev_aesni_gcm_autotest',
> > > > > -            'cryptodev_cn9k_autotest',
> > > > > -            'cryptodev_cn10k_autotest',
> > > > > -            'cryptodev_dpaa_sec_autotest',
> > > > > -            'cryptodev_dpaa2_sec_autotest',
> > > > > -            'cryptodev_null_autotest',
> > > > > -            'cryptodev_openssl_autotest',
> > > > >              'cryptodev_openssl_asym_autotest',
> > > > > -            'cryptodev_qat_autotest',
> > > > > -            'cryptodev_sw_armv8_autotest',
> > > > > -            'cryptodev_sw_kasumi_autotest',
> > > > > -            'cryptodev_sw_mvsam_autotest',
> > > > > -            'cryptodev_sw_snow3g_autotest',
> > > > > -            'cryptodev_sw_zuc_autotest',
> > > > > -            'dmadev_autotest',
> > > > >              'eventdev_selftest_octeontx',
> > > > >              'eventdev_selftest_sw',
> > > > > -            'rawdev_autotest',
> > > > >      ]
> > > > 
> > > > Please could you mention the reason for keeping few tests 
> > > > in the conditional list?
> > > 
> > > i indicated in the cover for the series.
> > > 
> > > * remaining driver tests require further investigation and will not be
> > >   addressed in this series.
> > 
> > Does it mean you did not try to run these tests?
> > Or did you see some issues to enable them?
> 
> cryptodev_openssl_asym_autotest
>   test fails because it does not bother checking to see if required
>   driver is available ias the other cryptodev tests do.
> 
> eventdev_selftest_octeontx, eventdev_selftest_sw
>   because it has a dependency on eventdev library which doesn't build
>   on windows.

It should be handled in the meson file with a condition
"if dpdk_conf.has('RTE_LIB_EVENT')"

> the dump_xxx tests were not evaluated, i did not try to build them or
> run them.

OK, they are all useful information, please add remaining issues
in the commit log, if not fixed before.

[PATCH v2 0/2] test: enable most driver tests on windows

[Tyler Retzlaff]

* remove conditional compilation for windows from crypto tests so they
  are built and registered to be run with dpdk-test.exe.
* remaining driver tests require further investigation and will not be
  addressed in this series.

sorry for the delay in addressing the final feedback. i would recommend
merge of this patch asap to lock in forward progress made as i will not
have time to rebase it again.

v2:
* amend commit message to include details of tests that are still
  conditionally avoided on windows as a hint for future progress
  on this effort.

Tyler Retzlaff (2):
  test/crypto: remove Windows conditional compilation
  test: enable most driver tests on Windows

 app/test/meson.build                     | 35 ++++++++++++++++----------------
 app/test/test_cryptodev.c                |  3 ---
 app/test/test_cryptodev_asym.c           |  3 ---
 app/test/test_cryptodev_blockcipher.c    |  3 ---
 app/test/test_cryptodev_security_ipsec.c |  7 ++++---
 app/test/test_cryptodev_security_pdcp.c  |  3 ---
 6 files changed, 22 insertions(+), 32 deletions(-)

-- 
1.8.3.1

[PATCH v2 1/2] test/crypto: remove Windows conditional compilation

[Tyler Retzlaff]

build the test/crypto harnesses on windows to allow them to be listed
as tests to run.

Signed-off-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
---
 app/test/test_cryptodev.c                | 3 ---
 app/test/test_cryptodev_asym.c           | 3 ---
 app/test/test_cryptodev_blockcipher.c    | 3 ---
 app/test/test_cryptodev_security_ipsec.c | 7 ++++---
 app/test/test_cryptodev_security_pdcp.c  | 3 ---
 5 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index f444144..55ae536 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -3,8 +3,6 @@
  * Copyright 2020 NXP
  */
 
-#ifndef RTE_EXEC_ENV_WINDOWS
-
 #include <time.h>
 
 #include <rte_common.h>
@@ -16637,4 +16635,3 @@ struct test_crypto_vector {
 REGISTER_TEST_COMMAND(cryptodev_cn9k_autotest, test_cryptodev_cn9k);
 REGISTER_TEST_COMMAND(cryptodev_cn10k_autotest, test_cryptodev_cn10k);
 
-#endif /* !RTE_EXEC_ENV_WINDOWS */
diff --git a/app/test/test_cryptodev_asym.c b/app/test/test_cryptodev_asym.c
index 573af2a..0d81405 100644
--- a/app/test/test_cryptodev_asym.c
+++ b/app/test/test_cryptodev_asym.c
@@ -3,8 +3,6 @@
  * Copyright (c) 2019 Intel Corporation
  */
 
-#ifndef RTE_EXEC_ENV_WINDOWS
-
 #include <rte_bus_vdev.h>
 #include <rte_common.h>
 #include <rte_hexdump.h>
@@ -2266,4 +2264,3 @@ static inline void print_asym_capa(
 REGISTER_TEST_COMMAND(cryptodev_cn9k_asym_autotest, test_cryptodev_cn9k_asym);
 REGISTER_TEST_COMMAND(cryptodev_cn10k_asym_autotest, test_cryptodev_cn10k_asym);
 
-#endif /* !RTE_EXEC_ENV_WINDOWS */
diff --git a/app/test/test_cryptodev_blockcipher.c b/app/test/test_cryptodev_blockcipher.c
index 4944591..31c2d9f 100644
--- a/app/test/test_cryptodev_blockcipher.c
+++ b/app/test/test_cryptodev_blockcipher.c
@@ -2,8 +2,6 @@
  * Copyright(c) 2015-2017 Intel Corporation
  */
 
-#ifndef RTE_EXEC_ENV_WINDOWS
-
 #include <rte_common.h>
 #include <rte_hexdump.h>
 #include <rte_mbuf.h>
@@ -1220,4 +1218,3 @@ struct unit_test_suite *
 	free(ts);
 }
 
-#endif /* !RTE_EXEC_ENV_WINDOWS */
diff --git a/app/test/test_cryptodev_security_ipsec.c b/app/test/test_cryptodev_security_ipsec.c
index 14c6ba6..ca60deb 100644
--- a/app/test/test_cryptodev_security_ipsec.c
+++ b/app/test/test_cryptodev_security_ipsec.c
@@ -2,8 +2,6 @@
  * Copyright(C) 2021 Marvell.
  */
 
-#ifndef RTE_EXEC_ENV_WINDOWS
-
 #include <rte_common.h>
 #include <rte_cryptodev.h>
 #include <rte_esp.h>
@@ -17,6 +15,10 @@
 
 #define IV_LEN_MAX 16
 
+#ifndef IPVERSION
+#define IPVERSION 4
+#endif
+
 struct crypto_param_comb alg_list[RTE_DIM(aead_list) +
 				  (RTE_DIM(cipher_list) *
 				   RTE_DIM(auth_list))];
@@ -1199,4 +1201,3 @@ struct crypto_param_comb alg_list[RTE_DIM(aead_list) +
 	return 0;
 }
 
-#endif /* !RTE_EXEC_ENV_WINDOWS */
diff --git a/app/test/test_cryptodev_security_pdcp.c b/app/test/test_cryptodev_security_pdcp.c
index 30d86fb..b8016a0 100644
--- a/app/test/test_cryptodev_security_pdcp.c
+++ b/app/test/test_cryptodev_security_pdcp.c
@@ -4,8 +4,6 @@
  * Copyright 2018-2019 NXP
  */
 
-#ifndef RTE_EXEC_ENV_WINDOWS
-
 #include <time.h>
 
 #include <rte_common.h>
@@ -590,4 +588,3 @@ static int uplane_encap_no_integrity(uint32_t sn_size, uint8_t dir,
 	return n - i;
 };
 
-#endif /* !RTE_EXEC_ENV_WINDOWS */
-- 
1.8.3.1

[PATCH v2 2/2] test: enable most driver tests on Windows

[Tyler Retzlaff]

enable most of the driver tests to run on windows, most tests will be
skipped since the drivers themselves are not available on windows.

tests not removed from conditional run:

cryptodev_openssl_asym_autotest
  test fails because it does not bother checking to see if required
  driver is available ias the other cryptodev tests do. the test
  should be updated to fix the issue.

eventdev_selftest_octeontx, eventdev_selftest_sw
  because it has a dependency on eventdev library which doesn't build
  on windows. these should be resolved by including/running the tests
  dependent on if dpdk_conf.has('RTE_LIB_EVENT')

dump_xxx tests are still to be evaluated, no attempt has been made
to move these out of conditional run for windows.

Signed-off-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
---
 app/test/meson.build | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/app/test/meson.build b/app/test/meson.build
index 15591ce..6f422c1 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -293,31 +293,32 @@ perf_test_names = [
         'thash_perf_autotest',
 ]
 
-driver_test_names = []
+driver_test_names = [
+        'cryptodev_aesni_gcm_autotest',
+        'cryptodev_aesni_mb_autotest',
+        'cryptodev_cn10k_autotest',
+        'cryptodev_cn9k_autotest',
+        'cryptodev_dpaa2_sec_autotest',
+        'cryptodev_dpaa_sec_autotest',
+        'cryptodev_null_autotest',
+        'cryptodev_openssl_autotest',
+        'cryptodev_qat_autotest',
+        'cryptodev_sw_armv8_autotest',
+        'cryptodev_sw_kasumi_autotest',
+        'cryptodev_sw_mvsam_autotest',
+        'cryptodev_sw_snow3g_autotest',
+        'cryptodev_sw_zuc_autotest',
+        'dmadev_autotest',
+        'rawdev_autotest',
+]
 
 dump_test_names = []
 
 if not is_windows
     driver_test_names += [
-            'cryptodev_aesni_mb_autotest',
-            'cryptodev_aesni_gcm_autotest',
-            'cryptodev_cn9k_autotest',
-            'cryptodev_cn10k_autotest',
-            'cryptodev_dpaa_sec_autotest',
-            'cryptodev_dpaa2_sec_autotest',
-            'cryptodev_null_autotest',
-            'cryptodev_openssl_autotest',
             'cryptodev_openssl_asym_autotest',
-            'cryptodev_qat_autotest',
-            'cryptodev_sw_armv8_autotest',
-            'cryptodev_sw_kasumi_autotest',
-            'cryptodev_sw_mvsam_autotest',
-            'cryptodev_sw_snow3g_autotest',
-            'cryptodev_sw_zuc_autotest',
-            'dmadev_autotest',
             'eventdev_selftest_octeontx',
             'eventdev_selftest_sw',
-            'rawdev_autotest',
     ]
 
     dump_test_names += [
-- 
1.8.3.1

RE: [EXT] [PATCH v2 0/2] test: enable most driver tests on windows

[Akhil Goyal]

Hi Thomas,

Can you take this series directly on main as it is enabling crypto as well as other tests?

Regards,
Akhil

> * remove conditional compilation for windows from crypto tests so they
>   are built and registered to be run with dpdk-test.exe.
> * remaining driver tests require further investigation and will not be
>   addressed in this series.
> 
> sorry for the delay in addressing the final feedback. i would recommend
> merge of this patch asap to lock in forward progress made as i will not
> have time to rebase it again.
> 
> v2:
> * amend commit message to include details of tests that are still
>   conditionally avoided on windows as a hint for future progress
>   on this effort.
> 
> Tyler Retzlaff (2):
>   test/crypto: remove Windows conditional compilation
>   test: enable most driver tests on Windows
> 
>  app/test/meson.build                     | 35 ++++++++++++++++----------------
>  app/test/test_cryptodev.c                |  3 ---
>  app/test/test_cryptodev_asym.c           |  3 ---
>  app/test/test_cryptodev_blockcipher.c    |  3 ---
>  app/test/test_cryptodev_security_ipsec.c |  7 ++++---
>  app/test/test_cryptodev_security_pdcp.c  |  3 ---
>  6 files changed, 22 insertions(+), 32 deletions(-)
> 
> --
> 1.8.3.1

Re: [PATCH v2 1/2] test/crypto: remove Windows conditional compilation

[Thomas Monjalon]

20/05/2022 12:12, Tyler Retzlaff:
> @@ -590,4 +588,3 @@ static int uplane_encap_no_integrity(uint32_t sn_size, uint8_t dir,
>  	return n - i;
>  };
>  
> -#endif /* !RTE_EXEC_ENV_WINDOWS */

When removing the last line of a file, you should remove the blank line before.
I'll fix when merging.

Re: [PATCH v2 0/2] test: enable most driver tests on windows

[Thomas Monjalon]

20/05/2022 12:12, Tyler Retzlaff:
> * remove conditional compilation for windows from crypto tests so they
>   are built and registered to be run with dpdk-test.exe.
> * remaining driver tests require further investigation and will not be
>   addressed in this series.
> 
> sorry for the delay in addressing the final feedback. i would recommend
> merge of this patch asap to lock in forward progress made as i will not
> have time to rebase it again.
> 
> v2:
> * amend commit message to include details of tests that are still
>   conditionally avoided on windows as a hint for future progress
>   on this effort.
> 
> Tyler Retzlaff (2):
>   test/crypto: remove Windows conditional compilation
>   test: enable most driver tests on Windows

Applied, thanks.

Re: [PATCH v2 1/2] test/crypto: remove Windows conditional compilation

[Tyler Retzlaff]

On Tue, Jun 21, 2022 at 05:09:40PM +0200, Thomas Monjalon wrote:
> 20/05/2022 12:12, Tyler Retzlaff:
> > @@ -590,4 +588,3 @@ static int uplane_encap_no_integrity(uint32_t sn_size, uint8_t dir,
> >  	return n - i;
> >  };
> >  
> > -#endif /* !RTE_EXEC_ENV_WINDOWS */
> 
> When removing the last line of a file, you should remove the blank line before.
> I'll fix when merging.
> 

this isn't a header so unlikely to be #include in preprocessing so that
should be alright.

thanks Thomas