test/crypto: remove Windows conditional compilation

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>

diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index 524019c..38c8ea3 100644 (file)
--- 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>
@@ -16654,5 +16652,3 @@ REGISTER_TEST_COMMAND(cryptodev_nitrox_autotest, test_cryptodev_nitrox);
 REGISTER_TEST_COMMAND(cryptodev_bcmfs_autotest, test_cryptodev_bcmfs);
 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 7bd7cde..41e9e58 100644 (file)
--- 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>
@@ -2268,5 +2266,3 @@ REGISTER_TEST_COMMAND(cryptodev_octeontx_asym_autotest,
                                          test_cryptodev_octeontx_asym);
 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..127e2a5 100644 (file)
--- 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>
@@ -1219,5 +1217,3 @@ free_blockcipher_test_suite(struct unit_test_suite *ts)
 {
        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 408bd0b..6086055 100644 (file)
--- 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))];
@@ -1231,5 +1233,3 @@ test_ipsec_pkt_update(uint8_t *pkt, const struct ipsec_test_flags *flags)
 
        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..a7641ba 100644 (file)
--- 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>
@@ -589,5 +587,3 @@ test_PDCP_PROTO_uplane_decap_all(void)
 
        return n - i;
 };
-
-#endif /* !RTE_EXEC_ENV_WINDOWS */