From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-bl2nam02on0070.outbound.protection.outlook.com [104.47.38.70]) by dpdk.org (Postfix) with ESMTP id 61C4B5905 for ; Wed, 19 Apr 2017 14:23:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=DTVQHqvi+cQBmuiuezAoYZW+U6vDZ8wWe/G6zA0kybw=; b=iyYfON1/6iwzFBEqdDMFOXSBUQaiP14AgPYyqkS17m4mTX/MEH4rGkpP2uMvqy5NAdapRs/zAMy1HqU/UYm+4pUQCHYBzEyTqO9JLhLy42HcmnqQXGEtIzbehQkJLui5FLYjL0ZHe9qg0gwjj5LkyJeegyD7DNHPOQfH7mxwa2A= Authentication-Results: dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=none action=none header.from=caviumnetworks.com; Received: from angela-H81M-S1.semihalf.local (31.172.191.173) by CO2PR0701MB805.namprd07.prod.outlook.com (10.141.246.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1034.10; Wed, 19 Apr 2017 12:23:00 +0000 From: Angela Czubak To: dts@dpdk.org Cc: Angela Czubak Date: Wed, 19 Apr 2017 14:22:10 +0200 Message-Id: <1492604540-12114-18-git-send-email-aczubak@caviumnetworks.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1492604540-12114-1-git-send-email-aczubak@caviumnetworks.com> References: <1491501092-14278-1-git-send-email-aczubak@caviumnetworks.com> <1492604540-12114-1-git-send-email-aczubak@caviumnetworks.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [31.172.191.173] X-ClientProxiedBy: AM5PR0701CA0064.eurprd07.prod.outlook.com (10.169.145.154) To CO2PR0701MB805.namprd07.prod.outlook.com (10.141.246.23) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8c8d3317-496f-4652-b9d5-08d4871ed253 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131423075)(201703031133081); SRVR:CO2PR0701MB805; X-Microsoft-Exchange-Diagnostics: 1; CO2PR0701MB805; 3:A+PA3deoX+pG0H4u9gzatfaVzNY3ZuWCg1xXiMNglwzynW0RQKCOU0NQPZMe0EPxjXyVdWIQpNa2dmiH5J7xsC6T1X7FrnNK/GPVARzyvxCt0trWmEc4gytzjdKhQMpip0POATRUH/A0y87WOehCdmYofbscFKzS33vnOzE5cABraB9sxIi8UkFYZ9ZMKmsHuluB2n6OabSN9GCa3gXiffg2MgqCTadv+3Hr12yncA70WVPkgcgl8WdufLdme6svE4m6qx5XtrdFXMxSOLB+FbfaztRR3zHFML7VCJ5sfYkn9HmrOO7BjwQcGCIr0i6U/Kf1FSpxIgV6c2BqeUDLjw==; 25:4jI1NcQrZRV1TLVP7AsQhV2FUNL+L4kBJ19pG+l56Hbnao2Rc2gbqlykApCUQvs3f3EFUyvwgRkIb70kgcEiQabWGlF996Ot9CGg3KRNf7V08Cf6QMj8Jkf4fnwpiymnu0FiETFRDEE9WEzKQVG5C1NGIZ4WwWpN5Vy0sUwvKok6J2MV0iOp/htni+lcljChahFoN6yZpke7oWAYVyvCRgyk9Z8rubnxJGzZSiqW5ZH1MgjOieTgb9ty6lkP1WRKWzORPGeIX+4NNBWWuigFk4WOnA15y5dBrnN/F2UsF2HXQPycQ4EaMg0l+W35FpW4SYA36vT5O891q2jriFuceAeeMgO/64depdJtYSy9dx2XxPRtbweOrRQtq010u6cby3xPHvl89axHCqiAErFwXyUtdfze4LcxLfg7LmmMq15sK7fbkoEQVAMUaSFA1h4AaRMy7AHqIjvpYu4iib3q4w== X-Microsoft-Exchange-Diagnostics: 1; CO2PR0701MB805; 31:SvGMglj04hJGxv5yMl+GmSqIzkeNOe0icI6E+OZ1VPlWbxx2FHJnOPa55eGXg2rLcmIPVTuU2992pGWEjHHGnrbsflQgsyMkm5CUGrUb5uJ8iz4z+iVmMZZT7q5048O5i3XVcg3fF9Odehq983Rs9hHN/tx30YnrHlxtFoU7d+eoMH/2gptpmO6+EYJ/fvT6h5lUHx8Kg2cgEDgx6vzSoy4dwfKmw/8hH+GXYSMdTgs=; 20:Up37RqclGtRMDsutPc6kcCARVocHVHEAOICkRp8T7tralcUelo4gLvyQJcps0c9munGr/SgBsjA1Z1rdHwsNlWMnA7SKGmLmf44EdAKoJm15qqdzmXM/9vllRea9otB7RrHk1gAxzf0kvPuNZhZVlRM+rz03/Gw96oW1zPnakz2DIBDaDxKusuIgLI3UJQgsrHWOyiVbl29Ad13htFJdO1Zde8GkZq9bUJ+K1FlMNIFt1QH/mo1ayRZLaDbPCG4kKijOpsBQ9o/4KvzL3zwbLVSsYwdyxooTOFgmlh5TsHrIeY/FcVc7WiBINWS50O5re35kfYjVEh2OP5oqkAe/o9XnZawg68E7LF96NrlVndaeYklHac70BWfkhJRvyhRfX09TblLrOC5fFQFbFKZacRzVrGWnxA8Nbzc4mviKmShfiF9fQrFNyP5O3yRRi3MT1x5ohjTc/W5O6HFXEm8XpRAKeH3sLaJfMzBW0YUfu9Q3mB0WLnCis+FVYiJVh7GR242E3jCGb5rqKvNSQhcJ4XwjkWRXRE5Qh2VCBGrUK09Wl6xrMveeqRwH8gWXpG88g8X/iWsTz8GdeiGF56y+YoRFMY6D3qYTzfXVRhvM2Cg= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(93006095)(6041248)(20161123560025)(20161123564025)(20161123555025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(6072148); SRVR:CO2PR0701MB805; BCL:0; PCL:0; RULEID:; SRVR:CO2PR0701MB805; X-Microsoft-Exchange-Diagnostics: 1; CO2PR0701MB805; 4:RyFwg5obs4a57eBUMouJ5KrBCiLkoJtfOM4t1uD/miVaPqZIxjPuTMo4xZrbQCnsAK5vFebv0k3rUYeqv51asPcOhk8cTlr54tQCikJNrvFpK7I9q1UcbEdLYFTW3G2UQTbJ6//lhjNw5wTi4v+qXJc2l1LVqrEe7TovuTQjAjQglppsS0XrxTS9PFq2C/CumEbwESeHsT8bHKS7ITPJI8hYHYfDdeQ05G0fkXRUyTFrwYCmXlQpd+9CHGlVYX0nPw+jSAOX1Cvr43a8jGglrmErzkJRn2HtsFlFjgQeLNn/EywBgcwXR3t59kmZxp9dMx8WU4joufytVgDXcMqW2vgqqGbkhbaga/ohatlEl2NAAjE3G+vNDKWzq4ISmjDrDYerZumZbNG8dEk+cNiNZ9cY1CcsYSCj8T9rkeQhENRyWDvPTtI2/Hi7/debA1W+r2A1tI1Jz7/pH6kIdWNceydr23exnoZ5wJThhGZHF0l0dlvvcBMIKOg0+b9Wsa6HCevrWlmqxBuv0bHKAKnecK7Q0jyQTN9SZu/7GvyLdCuQSDy3MDbloVGXvObAsveu9I498kJ5D8qI/pWWaCAmiRDeu9mBDQ3lwyWljS7Kz63jB1IhorquACkbgN2p+OmKom3GvGkh+UbMKswhX1LrGsyS568uh0g1B15f4PZ/hubz82Wkpj94B+Vx4RfKlXAq X-Forefront-PRVS: 028256169F X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(39410400002)(39850400002)(39400400002)(39840400002)(39450400003)(6486002)(5660300001)(38730400002)(6506006)(7736002)(6512007)(66066001)(305945005)(47776003)(53936002)(42882006)(110136004)(6916009)(2906002)(8676002)(4326008)(2950100002)(50226002)(81166006)(25786009)(107886003)(6666003)(36756003)(5003940100001)(42186005)(33646002)(3846002)(6116002)(2351001)(2361001)(189998001)(76176999)(50986999)(48376002)(50466002); DIR:OUT; SFP:1101; SCL:1; SRVR:CO2PR0701MB805; H:angela-H81M-S1.semihalf.local; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CO2PR0701MB805; 23:Yq8xR/OdvCLD3H9sMokLO2rhgpevIACZ7ZhjcIBw?= =?us-ascii?Q?vkygtjSoUbQbjPeSSh1pq9NXjgcNSaF62C9M612+ResnhVOR6EmgxYhdiAkR?= =?us-ascii?Q?Lbycl337D1UN3kqjvT1BYNfDdaj9LzPiM6ITDhWUwBIY4v6rpzAPrCWKojLp?= =?us-ascii?Q?UIlgX4iVMh2Hvk9iIjDO2pKBv5JNa9zBd6tNW+n98qQ5f4bvcAacBcctKL9X?= =?us-ascii?Q?/vY7rJ5dmsSfLeyv9UPax5zaTFVNaLn0dvC5GMdKHRoDZoM+Bo6puxZ5j+0L?= =?us-ascii?Q?V4oEKgS7FEt7gWuXt/5qYNUQ9o9M7SP6056B/ImV6bxL+VvmDk80SCGQc2jZ?= =?us-ascii?Q?nQIVfIhdwXiEFHNTC7DhqxazP089TbZEDkg/ej1wDVCsLJeyix9gNqQClu45?= =?us-ascii?Q?b9+9NVYG9pgvZtg8sGht6JcbUjQd45hE7a+Wlej0YDP2bPKZqSACDEMrfHOA?= =?us-ascii?Q?rMBOMIoQhD+ZGe0ulrcqHqMZo5ppO5ot4+bKsGjL1vnMtDjeCuC4h9qG375b?= =?us-ascii?Q?wT0r9TDAFKwNoGyigoS34MdpaqSjTuzffw7PGKVXIpM+e59Q0EPGkq9YQ3V4?= =?us-ascii?Q?+0KPx+umjmNgG4vNmwkxkirb1KCGKo/d0bvsPjqDBwRCbYPNAM6vgvn3Q8H4?= =?us-ascii?Q?fTQcCEBbre3FyN0F1Z3GzObWjhy0r+yf01Cbj0Jqzz60ty2wAVtQePczqzl+?= =?us-ascii?Q?98mkDvoirEl1p/UzPS3G8EraScoQq71a0bPJNjaWdtRxpClTNwSWqdubng3Y?= =?us-ascii?Q?SFCDysBJWLq5GHQu72CWO6fXRF2tdUxMnsALE7QgibJ+A28klRJx+FKdIBzq?= =?us-ascii?Q?qS5msju/9vwfHo8aLQMAFwrdFv9nI8/Mcmd6yxZlb5V/XRuJPIsxqV3WBOT1?= =?us-ascii?Q?1+phUGYv3hO9LGm5IeuNWzykdsL7KDht2QJlFHxGqgzVCZucQHBCOi6Y7yK3?= =?us-ascii?Q?EgGSBJCmgKHHiJcQtrLk/gkDQOtJ61SUM3aJa4QkjVbAOISum32+LyNMMpk8?= =?us-ascii?Q?w4HyASx1xEyV6toe+m8F/D+27jTVaOzI+CCvXcPHIRhSNF590sm1dZRedPNc?= =?us-ascii?Q?g1m4gxI=3D?= X-Microsoft-Exchange-Diagnostics: 1; CO2PR0701MB805; 6:s11gpc0XrtQesDOKTXVEU8ZLvXRDnVFEPpBKVnFv6admDbBEj4cwGAWwVClxxb83Ue5q/vLHqiJAFWqR/mvRIQp6p0F+J9eI0gitgmJdi29PT42Iog1raPPO7A0M9QSqi35d4Yr2xJmV7mloJ/DzvCb+MPFZ6FYaX5jT7YTENiukjlzdCF6O5Zh0M4U8fc585tzZtyM+ZaGhCmzh8Bz4Q+TnWpSgb20ncbfZOtbc5EbUr+4lGB0JDqulzaaorVp9Q4o01bDwbrqvqkzJcY9eYiBeQixZjDq6RDjGyc/bBrV6B+ELdYhhH68QEn4fFrQyUrqchovfWvX1eaiNc66nL9WuigEPTgoQB3gcRQbBSwlRlyGSbDsymTga5tr/vk3YJCRM/7dQ9vlZy8EBaQdw8m7HqeqdlJzCIcvO4qXhQDWKQ8GDEPs1RDYlO2PogRBz1bPQvs88vAMB7fJvN4SUxQ==; 5:EMN6X619dfbZiNrrowBwz6QmRKJLR+BvTiFqBxt7k8ptHJ8JEaaT4zTxsbeD2Yc7wy1c6J2tcr1LTcbd54SHewgXromO+bfq3/1a63o30lfWqBPYp8Zvh2kKnjp+tfeYsvefGWbZa85YXxS0R5SqVA==; 24:/H0WYBFZvVBwwlTHx6/RKVnL7Dn6E4Usbbc1U7dwpeUxsFywhKGO0zoWz+AX1L5MkfDyaVG5GCni3f+Hzs4E0IeMjz+qJ/PVi9RV1JsLjv4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CO2PR0701MB805; 7:tpyfSe1n73aVseJUtIaWuRtQ+p4Vz8EupD3UOXw4VaZ41SzJAvg0Qd/QUbCQE1/DhCBkkcMSZNRTDfRRrfcU1P5WkLCVx22yyg3VOl5wfSyDMNvjghrjuecjVMJM9nokjgFwY10tNnto7XeUC/2VXGAOBZuOFvRihjUwPfRE6w3ho/+DLSt/29zq1ZPefp5SIC6UGnaSB8wLleOfoeLOMUtYyb7K2qKaoDOuhuj/jVff+6T3+qYf4gk5qw48brgnBpsvikz7TSzszYU7fWhNjnei8c+gwsSOYf9QbXaH9yyGqeOQyaANqlJSsRyASIm6K3EPgH6GrvOhLEyzSDdmsQ== X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Apr 2017 12:23:00.6297 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO2PR0701MB805 Subject: [dts] [PATCH v3 17/27] tests: pmdpcap - modifying the right config file + importing utils after scapy X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Apr 2017 12:23:03 -0000 This test used to modify config/common_linuxapp or config/common_bsdapp to compile DPDK with PCAP, however, this config may lie as well in config/common_base. If the PCAP variable is not found in OS specific files, then it is assumed that config/common_base should be modified. Scapy may contain utils itself, therefore importing dts utils is moved after importing from scapy (so as to override utils). Signed-off-by: Angela Czubak --- tests/TestSuite_pmdpcap.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/TestSuite_pmdpcap.py b/tests/TestSuite_pmdpcap.py index 0a79e96..a51eb31 100644 --- a/tests/TestSuite_pmdpcap.py +++ b/tests/TestSuite_pmdpcap.py @@ -32,10 +32,10 @@ ''' ''' from test_case import TestCase -import utils from time import sleep from scapy.all import * +import utils # @@ -73,8 +73,11 @@ class TestPmdPcap(TestCase): else: raise Exception( "Unknow os type, please check to make sure pcap can work in OS [ %s ]" % os_type) - - return config_head + config_tail + out = self.dut.send_command("cat config/%s" % (config_head + config_tail)) + if "CONFIG_RTE_LIBRTE_PMD_PCAP" in out: + return config_head + config_tail + else: + return config_head + "base" def create_pcap_file(self, filename, number_of_packets): flow = [] -- 2.7.4