From patchwork Tue Mar 29 09:02:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 108993 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 485BCA0506; Tue, 29 Mar 2022 11:02:49 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1C14A428A8; Tue, 29 Mar 2022 11:02:39 +0200 (CEST) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 0D3AD41151 for ; Tue, 29 Mar 2022 11:02:36 +0200 (CEST) Received: by linux.microsoft.com (Postfix, from userid 1086) id 0B63020DEDF9; Tue, 29 Mar 2022 02:02:35 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 0B63020DEDF9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1648544555; bh=xgUtcuUf0QMu94z1dxioTF2BHjISYLj3SVXlh53gxCI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pkcNkHYwyGgJsE6T0XIcyq2tSdeK4cgB1qVLKW0/vK6k9y9+GKimYC/6MdlIIxjKR aqfG6744WvfTBwZis1H24hqDX8AqEsemDkVkR+mHCdZ3Ir+4P/yWxjktDm1ceh7iQU HyBRR7FQe6zZhzdvHdEADAmbSqbpP3Tq/ZSLiobY= From: Tyler Retzlaff To: dev@dpdk.org Cc: thomas@monjalon.net, dmitry.kozliuk@gmail.com, gakhil@marvell.com, roy.fan.zhang@intel.com, Tyler Retzlaff Subject: [PATCH 1/2] test/crypto: remove Windows conditional compilation Date: Tue, 29 Mar 2022 02:02:30 -0700 Message-Id: <1648544551-21324-2-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1648544551-21324-1-git-send-email-roretzla@linux.microsoft.com> References: <1648544551-21324-1-git-send-email-roretzla@linux.microsoft.com> X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org build the test/crypto harnesses on windows to allow them to be listed as tests to run. Signed-off-by: Tyler Retzlaff --- 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 #include @@ -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 #include #include @@ -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 #include #include @@ -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 #include #include @@ -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 #include @@ -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 */ From patchwork Tue Mar 29 09:02:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 108992 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4984DA0506; Tue, 29 Mar 2022 11:02:43 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3D3D542880; Tue, 29 Mar 2022 11:02:38 +0200 (CEST) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 25B8B4280E for ; Tue, 29 Mar 2022 11:02:36 +0200 (CEST) Received: by linux.microsoft.com (Postfix, from userid 1086) id 1816E20DEE22; Tue, 29 Mar 2022 02:02:35 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 1816E20DEE22 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1648544555; bh=6uEDet4Et0S1aoLEuN4l/7UsyY5ImFEZV1ucyOvCLrw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OmeDLgej1W9jAKNj9ZlJsjKwpS4ocepqV4ZuqUqFfGQyMq58EbKa8p/d0Zv8PFYaB p5KUc6W2SiPI8R0nOWj+G4EBAFFV7bshfF3QP1rKLwXis2Z8wW6hEW4pfkVeSXXyp4 ck1VtnrWRcyr5HRIhbMsxDmigfWDcbEDMHsQqUxs= From: Tyler Retzlaff To: dev@dpdk.org Cc: thomas@monjalon.net, dmitry.kozliuk@gmail.com, gakhil@marvell.com, roy.fan.zhang@intel.com, Tyler Retzlaff Subject: [PATCH 2/2] test: enable most driver tests on Windows Date: Tue, 29 Mar 2022 02:02:31 -0700 Message-Id: <1648544551-21324-3-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1648544551-21324-1-git-send-email-roretzla@linux.microsoft.com> References: <1648544551-21324-1-git-send-email-roretzla@linux.microsoft.com> X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org 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 --- 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 += [