DPDK patches and discussions
 help / color / mirror / Atom feed
From: Tyler Retzlaff <roretzla@linux.microsoft.com>
To: dev@dpdk.org
Cc: thomas@monjalon.net, dmitry.kozliuk@gmail.com,
	gakhil@marvell.com, roy.fan.zhang@intel.com,
	Tyler Retzlaff <roretzla@linux.microsoft.com>
Subject: [PATCH 1/2] test/crypto: remove Windows conditional compilation
Date: Tue, 29 Mar 2022 02:02:30 -0700	[thread overview]
Message-ID: <1648544551-21324-2-git-send-email-roretzla@linux.microsoft.com> (raw)
In-Reply-To: <1648544551-21324-1-git-send-email-roretzla@linux.microsoft.com>

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


  reply	other threads:[~2022-03-29  9:02 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-29  9:02 [PATCH 0/2] test: enable most driver tests on windows Tyler Retzlaff
2022-03-29  9:02 ` Tyler Retzlaff [this message]
2022-03-29  9:02 ` [PATCH 2/2] test: enable most driver tests on Windows Tyler Retzlaff
2022-03-29  9:12   ` Thomas Monjalon
2022-03-29  9:32     ` Tyler Retzlaff
2022-03-29 11:29       ` Thomas Monjalon
2022-03-29 12:10         ` Tyler Retzlaff
2022-03-29 12:28           ` Thomas Monjalon
2022-05-20 10:12 ` [PATCH v2 0/2] test: enable most driver tests on windows Tyler Retzlaff
2022-05-20 10:12   ` [PATCH v2 1/2] test/crypto: remove Windows conditional compilation Tyler Retzlaff
2022-06-21 15:09     ` Thomas Monjalon
2022-06-21 16:11       ` Tyler Retzlaff
2022-05-20 10:12   ` [PATCH v2 2/2] test: enable most driver tests on Windows Tyler Retzlaff
2022-05-31 18:39   ` [EXT] [PATCH v2 0/2] test: enable most driver tests on windows Akhil Goyal
2022-06-21 15:13   ` Thomas Monjalon

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1648544551-21324-2-git-send-email-roretzla@linux.microsoft.com \
    --to=roretzla@linux.microsoft.com \
    --cc=dev@dpdk.org \
    --cc=dmitry.kozliuk@gmail.com \
    --cc=gakhil@marvell.com \
    --cc=roy.fan.zhang@intel.com \
    --cc=thomas@monjalon.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).