From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM01-SN1-obe.outbound.protection.outlook.com (mail-sn1nam01on0045.outbound.protection.outlook.com [104.47.32.45]) by dpdk.org (Postfix) with ESMTP id 807EA559A for ; Mon, 10 Apr 2017 19:09:55 +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=YWx1pAL+sYVZdX0gI3D85rS4ZjPnfvmS7laxU1EQt4U0qXSJc2hc2ViTPUwMXZU7+9bDhsGl6/olkr4Nekyud8NW63p5baHv0k10/1nLw18+NrTJaclWT7sLUpetf6KZ9Y3b4niivzPWSFdDEIRvo6rIO7XoDsYgALIgLzjMlAU= 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 DM2PR0701MB812.namprd07.prod.outlook.com (10.242.127.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1019.17; Mon, 10 Apr 2017 17:09:54 +0000 From: Angela Czubak To: dts@dpdk.org Cc: Angela Czubak Date: Mon, 10 Apr 2017 19:09:12 +0200 Message-Id: <1491844162-16300-19-git-send-email-aczubak@caviumnetworks.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1491844162-16300-1-git-send-email-aczubak@caviumnetworks.com> References: <1491501092-14278-1-git-send-email-aczubak@caviumnetworks.com> <1491844162-16300-1-git-send-email-aczubak@caviumnetworks.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [31.172.191.173] X-ClientProxiedBy: DB6PR05CA0010.eurprd05.prod.outlook.com (10.170.218.23) To DM2PR0701MB812.namprd07.prod.outlook.com (10.242.127.26) X-MS-Office365-Filtering-Correlation-Id: 07d6803f-3255-43d7-6f98-08d4803468b9 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131423075)(201703031133081); SRVR:DM2PR0701MB812; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0701MB812; 3:jHhYwuwzQ43PKj7FPJ8UGup2wBij3Xl4O4Wyb4gGF30TWL+3C5pz6IXO6NArhkmYOoi0FY9o9US5JGGe4p6zEwFE2MDXmPsy3/we1dYJsgCBCHYdYwWIVwdxxCR2Edvd6dbAkkTrlnXHlqkZCYGFY1m/Le37ctH3fl5hNqVg+UNeqK/z63n8tEDP7NlI5tHvu2H8hJBexQ9kN2Z8ZNBbvvib4x7r2rDQAPfA5ApPClbqSpKDFRA4kMVtEpU+mgkw25x8HQcIZlKphwYc+ZbyMoMfmirsoj0pzHpNNvCOkaUd3BoEnXrYZ0tMyg96nJIYVkJWlSE+xH1hQ5cEj+v7zw==; 25:XwZ3w8fUGOS8zGo/XIgOS9ByOWeIqmpig4K5DE1WvRxq74IdcxaaXu6OB8ZdfDDcGo/kkq3sFPQ0yvJfqGM5ukcqgMQjjF1M5fiU503ILg/EYMG8OBt18qrY9FE7hhtRZkFqKaiRGrVvaJTl09yCqbXxHetjVz4aNGzuUS+ycpatcHHIhyBR/a7b9u/nBWxn2Bp4krItmFXeVmtcamgpIehzMhzDm5b+gU4UPTEb0/o0XBx3rA+3YRmitEg3F6GZskSMeRE7r0iFd3RlY0iUM+P9xDvQO/wEsZsJX+yteDATINq1U76VQgaZyzIImZrBS1PhfCDsOies4vAdDOn9oXt2GI66wbpBCfhmnUsfsdxJuHWZO1f8FGERTJ+ei9RKwC6Kkdsxy2f9zgrsZ9fZNLcsoyGtzGS+FmHzZUNNyVVKSVECS30Txm9FfeIP6uCwtPd7KCVjjHkZ1fVsnpNG4A== X-Microsoft-Exchange-Diagnostics: 1; DM2PR0701MB812; 31:l1ItwvzreWAMkuobJ8tiuz3IZtOlztQGlzBKSM30wHA2/9lByT7PXXrlRfYs935kmV2T3bK6lNY6dlunXEORCbG0wjLBOSipJVRD/07zTNsKlcMFsighglo5bT7An9AvEBY5Zi4uKBmMljjIwOAHrbC+OWfte4QOYPRvcL1IcSeDMn5C6Cz3pJj5cPjrBC/tHrjxAbDbiV00ds5qHH+bc/622ceiOC3vzvdphi9pHrs=; 20:bgbHXxFSn0uhPywjy9YbljiuwVvc8ifuIlBNzZeBFbdenXDlNihrw6mv8kmsjLXuM5weukcR8F0GMiHLMKab6YMrJOQc0e6ndEX3pNAU2Xy1UNiELN21pedGgJnSMkiA6mC6N08k/XgM/06MCzJKCSeTTXHVLiKQiTsQW7pVIVpd3wbPeQttt1A04bnYnw2P51v4IIL0c5O8y33SMBGFaRemtnCUqPqVzF2fwgX65riFPlBPGytGU5C8R6iEQYDIdhzm+xeCZXZJNwOf4bSpEHVUqnrYag22iAnTlvM2yHDkkXcBm53TLd9OTTyFc5MYL6thlK64pLiw4/3OxndSV9VE0XZnJe94I2zEBnoTXt3wulnnNOborSxUU9zLDjrwaXyGtlom4C63Mg5Yc8CUFpejLFl7tr3bYXDlCb53HZkajq+Cdt0DzqQvAfWdsrXX5snX6LNQVE/0zBvCKYHXgDjxWATxOLfCHDTTmdRwzMNWwxxngpYaAIvzvskrdZQoZF9GSBez5zIK/iXFCCq3vjitfNjYIMUInSp/ZNbQ2PTtVqq0XfJHak7kUuk71iJYxWtJcfe0r72+lhNrwkKssnXSO/W9GyF9WBGAfistMJ4= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(5005006)(8121501046)(3002001)(93006095)(10201501046)(6041248)(201703131423075)(201702281528075)(201703061421075)(20161123564025)(20161123560025)(20161123555025)(20161123562025)(6072148); SRVR:DM2PR0701MB812; BCL:0; PCL:0; RULEID:; SRVR:DM2PR0701MB812; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0701MB812; 4:SVwfFqiERAgMiLVIn5rjMk9mVphejCwPNLGshnILutjw7+oC1kSL9+gb6/jZ/BClwPHfb8PNEi5arqV7FgQt/v3q7lnjb3P2vmh82NcYsMky0piY5gVc+cpVq6So3sg0TkXec7ejJ0trphZ6a5Lb89aW6jI5UUUVDIeBgGl3z3OY1q7PPWeoDPsGc3taFAgZ9QN/DM3iRDM56TQCkohyUuJoXX+xETrYP4B8H0m0bd5HrCKTyBcxzAeJI3GAl4BSyVdrU8mTmG/Kv/ErH9QLRZB6tdDHFM3kw6BzBl+137to9Kj7DwoQ69rrefXqIouXSftoAYCu0Wb0JC9xTJ5751Y+AifImM81PzrwFLekz2BTKVXXqVH491UdGl4u4Sd8/tUePLHcywc/5T0lZz+uVXUomnV85s/+/QYsUfRrHZTaV0eUtj2J7pd2uO1rYYc8ba7q+Uqx19GL2nG7YZxxcA+QRg3ems9QghjnhwwYLhW/xZ+bKauAdAlQOaTxg59Q5OTFerDC9fVOs6VNkRArjogyNqlzEVIirMYzAQ2QWg7WQSnFWZAboK968H8xbQN6TD2AqhBGSoaX+Tpax5B25tbP727NYDkjNucoI+r/D7dJmBhJ+zb2uubzqdtmFcTM+uLyJyc1u2+9xO0gsqx+cJdGAQYPhLoVYYawXCuI9yomuPJS7QUHyiy5iSHnaq6w X-Forefront-PRVS: 027367F73D X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(39850400002)(39840400002)(39410400002)(39450400003)(39400400002)(8676002)(81166006)(2950100002)(305945005)(6512007)(7736002)(42882006)(6916009)(50226002)(48376002)(47776003)(6506006)(2906002)(53936002)(66066001)(6666003)(189998001)(6116002)(110136004)(33646002)(36756003)(38730400002)(107886003)(2361001)(5003940100001)(4326008)(3846002)(2351001)(5660300001)(6486002)(50466002)(50986999)(76176999)(42186005)(25786009); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR0701MB812; H:angela-H81M-S1.semihalf.local; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR0701MB812; 23:dDTvz101Aqz6gIfAD8MFLeuYwbTSUGpnEJtlg9Ni?= =?us-ascii?Q?+wU9qQFiF2qaM4oraqoJkAJz4eGI4T/5triUoKN6vILVfwzhTkOfeoAoC7Bz?= =?us-ascii?Q?ZEg7CrmZHfFgNCIVPqcppnVfJgorbGpn0qzpGVwaUwifxf3NjZWBuwPmdpoK?= =?us-ascii?Q?FZIwXA6/+gbqQSXZxgL6BjL+46vtkna19m4Hv/ELPgvxa4V2sGaBnKkjcO4g?= =?us-ascii?Q?qs9LDibdrJeZgziV5EUmb/6raHRVe4lBcKZUZ6rw37tX0je7uEMfX0bUVuI/?= =?us-ascii?Q?RbXL62RQ99rVdDF878kInREejepMqWcOdxVPrW3QzFDh1fVPem/TiTGc6ulo?= =?us-ascii?Q?KFZJErPEd3ghnjjsBXEMS95akl0NdUaLSYLOmokjw0Dh98JvF+AW0w5IDmo0?= =?us-ascii?Q?SJ64sXHkStrN+Rpetny36ezx/9lDZ8SoBAmfsb4age4nopmtJyHBiuqj5EWj?= =?us-ascii?Q?/0FilGsWzQPatzwSUCCz9JizyHaiy3VikB6D8zHxgY0zt6ScSNd149eZkF2r?= =?us-ascii?Q?e0BHFyWjA3CC6GP/lhuwzOiHj5kxb8wIHGDEzUBByfZ9MaMAw5BdITKZXmOJ?= =?us-ascii?Q?Kg8yLZytyG+f/4ubJkR7QkOD6V9q1A65IDqRSobhFrriEUnLkDw73HTzGZEo?= =?us-ascii?Q?fqktX+qKuJ7IJ8Zk7aHy+1Q5pS38FIOKa7i8VHjYM+OXnsdwb1hDBVlxPsR+?= =?us-ascii?Q?+cuWxaQRtQRIeaSx/ha+vy/G6Hp5JMFl2DTbP3BgaC4OnGc/R+PrvJr365td?= =?us-ascii?Q?IjpbFfayeDRFnAA9VvRYuLodU/CYUcXDNRxLy+vFPKwTrGPgciQYdsWicJwE?= =?us-ascii?Q?c0131OFn3zpUecIa/hn5n0uoJVOcuPxlz4yvUG+mzB4pDdlNcScQFoO14/lE?= =?us-ascii?Q?AUWSJYOmIiONURRbwNGb33H1hj4tbQVXEGMRM4J83kjZWTbvvuU51RZFTE3s?= =?us-ascii?Q?Gb+8b/KtQyQyO9UK3xaqoX/gmf6zBNFKjOjC2sLvNyBCk9G/FDC6pNYvFTTR?= =?us-ascii?Q?eUsA7brFJffjyg8weG7yk1ku0KqG234DFaw+uMhbD0Mj97usThixzoN4LFbA?= =?us-ascii?Q?ENJcVy4=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR0701MB812; 6:tbvoTaMf2+3EKe0Am57H+8CQpI59J+Wy5UFjqJioIzsNw9xdzpfdP+Nnu1X4afqXa9Pq2r+OUZNe84iBq/WS/6Cpjl3vEcyYORBsSrXW3/5hWw+oJjASZoz5kGcEbFLDsv8meSLUuD3kIobfdATPmRKTktxqfHdxWPNukVT2A+wYJAC+oRtKyHZ/mLtVoLWzaahkdUPZYKtAvzC2LS8AksAgCkmX8vYXB7H95F7bysZVyXxgL78CHpQmXPlgG5SCZQ8ZbVOttE3yDdBMIiYP/vEhWEumJTjt5RcOGo6WQdM4StEalMqe4y/3S+XsgrcUq9Ffz8CsS8xrijnhWS6qj3s97HhFxZMnMoe1c88FsBMX7JsCUuTf20ZtGUuc6OnMrWtXkldgJzLGqGuXMwhF4WFE1w00WJjX4t4Dh4ZGYeSfGSBkQTnIR3ZUh5mi+PqyN3SPxbF2VUlZVQWb9miajw==; 5:pLlfR88wQJzSQeGgzchAhnIRYh6cjxIeaK1rNKKF1d0J6yxEbBllBYQvAjBt8JatsAw8MARUInWTBS6CgE0veCeNSpUoS7TtDoaGVFTpL/JDtqUxmELWIizoJlxUbaXSVMqsXjYVRWapmnrcWdOJGg==; 24:IFVDlkz9uq6c5kDfEYYvhFIn1OCLlQi+gfDYLSp2jUCZMTi7d2ErX9weJD2VcyZTAe4wMvM8amnlIfFzso9uqnZ2Thm37SX23XHNKY+/D2Q= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR0701MB812; 7:WfjeMUCMo2ZQiLwxd6JqqfDE+ejQbviX38JJC2lWIu2M5boBfclkwOP08gSgvYhg33KuJnqm2VHAeaHzdYWemmVMxc1xlTk1OaDXmj849Xlg/Ry+zly7s2tOLV915iDhdEuGIwqY+N21H/y+E09n4VVpX2NmlRohw78N/obU/9/GEdEhVqEKgV756ONpM3jmR6nYW2lE4k4yMIxxAkE/t4813kl6jqopuznuakOwOJKgY9DjMpqT5op/+RjN+m/4lnPyquUyrcjosGG/bE70sbIyPTEXzVGIMxe0lvxZ6JbsZa/MdbZ9Zvw/AnCl7VrsRgPPWO1YrBA3lumX2fPksQ== X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Apr 2017 17:09:54.3626 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR0701MB812 Subject: [dts] [PATCH v2 18/28] 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: Mon, 10 Apr 2017 17:09:56 -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