diff mbox series

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

Message ID 1653041526-5872-2-git-send-email-roretzla@linux.microsoft.com (mailing list archive)
State Accepted
Delegated to: Thomas Monjalon
Headers show
Series test: enable most driver tests on windows | expand

Checks

Context Check Description
ci/checkpatch success coding style OK

Commit Message

Tyler Retzlaff May 20, 2022, 10:12 a.m. UTC
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(-)

Comments

Thomas Monjalon June 21, 2022, 3:09 p.m. UTC | #1
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.
Tyler Retzlaff June 21, 2022, 4:11 p.m. UTC | #2
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
diff mbox series

Patch

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