From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id 4DC592C51 for ; Tue, 8 Mar 2016 04:36:17 +0100 (CET) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP; 07 Mar 2016 19:36:16 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,555,1449561600"; d="scan'208";a="919028319" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by fmsmga001.fm.intel.com with ESMTP; 07 Mar 2016 19:36:10 -0800 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.248.2; Mon, 7 Mar 2016 19:35:57 -0800 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.24]) by shsmsx102.ccr.corp.intel.com ([169.254.2.232]) with mapi id 14.03.0248.002; Tue, 8 Mar 2016 11:35:10 +0800 From: "Liu, Yong" To: "Tang, HaifengX" , "dts@dpdk.org" Thread-Topic: [dts] [DTS][PATCH] replace the default dpdk config file to common_base Thread-Index: AQHReEz19nH9STXHP0qyIkw4plki5J9O5mLA Date: Tue, 8 Mar 2016 03:35:10 +0000 Message-ID: <86228AFD5BCD8E4EBFD2B90117B5E81E14504576@SHSMSX103.ccr.corp.intel.com> References: <1457339723-55850-1-git-send-email-haifengx.tang@intel.com> In-Reply-To: <1457339723-55850-1-git-send-email-haifengx.tang@intel.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiOTQzOTE1MGQtOWM5ZC00MzAxLWJiMjYtODcxODYyOGQ5NzRkIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE1LjkuNi42IiwiVHJ1c3RlZExhYmVsSGFzaCI6Imw5SHdncHpYYTROTnZHYjlUYXAyU1g2RWczMjFFNGZiQld6TjBoSlJ1YU09In0= x-ctpclassification: CTP_IC x-originating-ip: [10.239.127.40] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dts] [DTS][PATCH] replace the default dpdk config file to common_base 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: Tue, 08 Mar 2016 03:36:18 -0000 Applied. Thanks. > -----Original Message----- > From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of haifeng > Sent: Monday, March 07, 2016 4:35 PM > To: dts@dpdk.org > Subject: [dts] [DTS][PATCH] replace the default dpdk config file to > common_base >=20 > Signed-off-by: haifeng > --- > framework/project_dpdk.py | 2 +- > tests/TestSuite_ieee1588.py | 10 ++-------- > tests/TestSuite_ipv4_reassembly.py | 5 +---- > tests/TestSuite_l3fwd.py | 4 ++-- > tests/TestSuite_vhost_cuse_one_copy_one_vm.py | 4 ++-- > tests/TestSuite_vhost_user_one_copy_one_vm.py | 2 +- > tests/TestSuite_virtio_iperf.py | 4 ++-- > tests/TestSuite_vmdq.py | 2 +- > tests/TestSuite_vxlan_sample.py | 4 ++-- > 9 files changed, 14 insertions(+), 23 deletions(-) >=20 > diff --git a/framework/project_dpdk.py b/framework/project_dpdk.py > index a96aba8..1abcd42 100644 > --- a/framework/project_dpdk.py > +++ b/framework/project_dpdk.py > @@ -74,7 +74,7 @@ class DPDKdut(Dut): > #Enable MLNX driver before installing dpdk > if dts.drivername =3D=3D DRIVERS['ConnectX4']: > self.send_expect("sed -i -e > 's/CONFIG_RTE_LIBRTE_MLX5_PMD=3Dn/" > - + "CONFIG_RTE_LIBRTE_MLX5_PMD=3Dy/' > config/common_linuxapp" , "# ", 30) > + + "CONFIG_RTE_LIBRTE_MLX5_PMD=3Dy/' > config/common_base" , "# ", 30) >=20 > if not self.skip_setup: > self.build_install_dpdk(target) > diff --git a/tests/TestSuite_ieee1588.py b/tests/TestSuite_ieee1588.py > index 012d601..bfbb23b 100644 > --- a/tests/TestSuite_ieee1588.py > +++ b/tests/TestSuite_ieee1588.py > @@ -51,10 +51,7 @@ class TestIeee1588(TestCase): > self.verify(len(dutPorts) > 0, "No ports found for " + self.nic) >=20 > # Change the config file to support IEEE1588 and recompile the > package. > - if "bsdapp" in self.target: > - self.dut.send_expect("sed -i -e 's/IEEE1588=3Dn$/IEEE1588=3D= y/' > config/common_bsdapp", "# ", 30) > - else: > - self.dut.send_expect("sed -i -e 's/IEEE1588=3Dn$/IEEE1588=3D= y/' > config/common_linuxapp", "# ", 30) > + self.dut.send_expect("sed -i -e 's/IEEE1588=3Dn$/IEEE1588=3Dy/' > config/common_base", "# ", 30) > self.dut.skip_setup =3D False > self.dut.build_install_dpdk(self.target) >=20 > @@ -160,8 +157,5 @@ class TestIeee1588(TestCase): > self.dut.send_expect("quit", "# ", 30) >=20 > # Restore the config file and recompile the package. > - if "bsdapp" in self.target: > - self.dut.send_expect("sed -i -e 's/IEEE1588=3Dy$/IEEE1588=3D= n/' > config/common_bsdapp", "# ", 30) > - else: > - self.dut.send_expect("sed -i -e 's/IEEE1588=3Dy$/IEEE1588=3D= n/' > config/common_linuxapp", "# ", 30) > + self.dut.send_expect("sed -i -e 's/IEEE1588=3Dy$/IEEE1588=3Dn/' > config/common_base", "# ", 30) > self.dut.build_install_dpdk(self.target) > diff --git a/tests/TestSuite_ipv4_reassembly.py > b/tests/TestSuite_ipv4_reassembly.py > index 3af4493..7935478 100644 > --- a/tests/TestSuite_ipv4_reassembly.py > +++ b/tests/TestSuite_ipv4_reassembly.py > @@ -96,10 +96,7 @@ class TestIpReassembly(TestCase): > # r"examples/ip_reassembly/ipv4_rsmbl.h") > # self.dut.send_expect("sed -i > 's/CONFIG_RTE_LIBRTE_IP_FRAG_MAX_FRAG=3D.*$/CONFIG_RTE_LIBRTE_IP_FRAG_MAX= _F > RAG=3D%s/' ./config/common_linuxapp" %int(num_of_fragments), "# ") > # self.dut.send_expect(sed_command % int(num_of_fragments), '#', > 60) > - if 'bsdapp' in self.target: > - self.dut.send_expect("sed -i > 's/CONFIG_RTE_LIBRTE_IP_FRAG_MAX_FRAG=3D.*$/CONFIG_RTE_LIBRTE_IP_FRAG_MAX= _F > RAG=3D%s/' ./config/common_bsdapp" % int(num_of_fragments), "# ") > - else: > - self.dut.send_expect("sed -i > 's/CONFIG_RTE_LIBRTE_IP_FRAG_MAX_FRAG=3D.*$/CONFIG_RTE_LIBRTE_IP_FRAG_MAX= _F > RAG=3D%s/' ./config/common_linuxapp" % int(num_of_fragments), "# ") > + self.dut.send_expect("sed -i > 's/CONFIG_RTE_LIBRTE_IP_FRAG_MAX_FRAG=3D.*$/CONFIG_RTE_LIBRTE_IP_FRAG_MAX= _F > RAG=3D%s/' ./config/common_base" % int(num_of_fragments), "# ") > self.dut.send_expect("export RTE_TARGET=3D" + self.target, "#") > self.dut.send_expect("export RTE_SDK=3D`pwd`", "#") > self.dut.send_expect("rm -rf %s" % self.target, "# ", 5) > diff --git a/tests/TestSuite_l3fwd.py b/tests/TestSuite_l3fwd.py > index 31bb48c..e112b18 100644 > --- a/tests/TestSuite_l3fwd.py > +++ b/tests/TestSuite_l3fwd.py > @@ -152,8 +152,8 @@ class TestL3fwd(TestCase,IxiaPacketGenerator): >=20 > pat =3D re.compile("P([0123])") > # Update config file and rebuild to get best perf on FVL > - self.dut.send_expect("sed -i -e > 's/CONFIG_RTE_PCI_CONFIG=3Dn/CONFIG_RTE_PCI_CONFIG=3Dy/' ./config/common_= linu > xapp", "#", 20) > - self.dut.send_expect("sed -i -e > 's/CONFIG_RTE_PCI_EXTENDED_TAG=3D.*$/CONFIG_RTE_PCI_EXTENDED_TAG=3D\"on\"= /' . > /config/common_linuxapp", "#", 20) > + self.dut.send_expect("sed -i -e > 's/CONFIG_RTE_PCI_CONFIG=3Dn/CONFIG_RTE_PCI_CONFIG=3Dy/' ./config/common_= base > ", "#", 20) > + self.dut.send_expect("sed -i -e > 's/CONFIG_RTE_PCI_EXTENDED_TAG=3D.*$/CONFIG_RTE_PCI_EXTENDED_TAG=3D\"on\"= /' . > /config/common_base", "#", 20) > self.dut.build_install_dpdk(self.target) >=20 >=20 > diff --git a/tests/TestSuite_vhost_cuse_one_copy_one_vm.py > b/tests/TestSuite_vhost_cuse_one_copy_one_vm.py > index 007ac37..e7d71e9 100644 > --- a/tests/TestSuite_vhost_cuse_one_copy_one_vm.py > +++ b/tests/TestSuite_vhost_cuse_one_copy_one_vm.py > @@ -56,7 +56,7 @@ class TestVhostCuseOneCopyOneVm(TestCase, > IxiaPacketGenerator): > # Change config file to enable vhost-cuse compiled. > self.dut.send_expect( > "sed -i -e > 's/CONFIG_RTE_LIBRTE_VHOST_USER=3D.*$/CONFIG_RTE_LIBRTE" > - "_VHOST_USER=3Dn/' ./config/common_linuxapp", > + "_VHOST_USER=3Dn/' ./config/common_base", > "# ", > 30) > self.dut.build_install_dpdk(self.target) > @@ -439,7 +439,7 @@ class TestVhostCuseOneCopyOneVm(TestCase, > IxiaPacketGenerator): > # Restore the config file and recompile the package > self.dut.send_expect( > "sed -i -e > 's/CONFIG_RTE_LIBRTE_VHOST_USER=3D.*$/CONFIG_RTE_LIBRTE_VHOST_USER=3Dy/' = " > - "./config/common_linuxapp", > + "./config/common_base", > "# ", > 30) > self.dut.build_install_dpdk(self.target) > diff --git a/tests/TestSuite_vhost_user_one_copy_one_vm.py > b/tests/TestSuite_vhost_user_one_copy_one_vm.py > index 7352a35..24d68b7 100644 > --- a/tests/TestSuite_vhost_user_one_copy_one_vm.py > +++ b/tests/TestSuite_vhost_user_one_copy_one_vm.py > @@ -56,7 +56,7 @@ class TestVhostUserOneCopyOneVm(TestCase, > IxiaPacketGenerator): > # Build target with modified config file > self.dut.send_expect( > "sed -i -e > 's/CONFIG_RTE_LIBRTE_VHOST_USER=3D.*$/CONFIG_RTE_LIBRTE" > - "_VHOST_USER=3Dy/' ./config/common_linuxapp", > + "_VHOST_USER=3Dy/' ./config/common_base", > "# ", > 30) > self.dut.build_install_dpdk(self.target) > diff --git a/tests/TestSuite_virtio_iperf.py > b/tests/TestSuite_virtio_iperf.py > index d3c1e85..7f7e427 100644 > --- a/tests/TestSuite_virtio_iperf.py > +++ b/tests/TestSuite_virtio_iperf.py > @@ -70,11 +70,11 @@ class TestVirtioIperf(TestCase): > if vhost =3D=3D 'cuse': > self.dut_execut_cmd( > "sed -i -e > 's/CONFIG_RTE_LIBRTE_VHOST_USER=3D.*$/CONFIG_RTE_LIBRTE" + > - "_VHOST_USER=3Dn/' ./config/common_linuxapp") > + "_VHOST_USER=3Dn/' ./config/common_base") > else: > self.dut_execut_cmd( > "sed -i -e > 's/CONFIG_RTE_LIBRTE_VHOST_USER=3D.*$/CONFIG_RTE_LIBRTE" + > - "_VHOST_USER=3Dy/' ./config/common_linuxapp") > + "_VHOST_USER=3Dy/' ./config/common_base") > self.dut.build_install_dpdk(self.target) > self.dut_execut_cmd("cd ./lib/librte_vhost") > out =3D self.dut_execut_cmd("make") > diff --git a/tests/TestSuite_vmdq.py b/tests/TestSuite_vmdq.py > index 429870a..8c5fa57 100644 > --- a/tests/TestSuite_vmdq.py > +++ b/tests/TestSuite_vmdq.py > @@ -33,7 +33,7 @@ class TestVmdq(TestCase, IxiaPacketGenerator): >=20 > self.tester.extend_external_packet_generator(TestVmdq, self) >=20 > - self.dut.send_expect("sed -i > 's/CONFIG_RTE_MAX_QUEUES_PER_PORT=3D256/CONFIG_RTE_MAX_QUEUES_PER_PORT=3D= 1024 > /' ./config/common_linuxapp", "# ", 5) > + self.dut.send_expect("sed -i > 's/CONFIG_RTE_MAX_QUEUES_PER_PORT=3D256/CONFIG_RTE_MAX_QUEUES_PER_PORT=3D= 1024 > /' ./config/common_base", "# ", 5) >=20 > self.dut.build_install_dpdk(self.target) > # Update the max queue per port for Fortville. > diff --git a/tests/TestSuite_vxlan_sample.py > b/tests/TestSuite_vxlan_sample.py > index db40a96..c7e0701 100644 > --- a/tests/TestSuite_vxlan_sample.py > +++ b/tests/TestSuite_vxlan_sample.py > @@ -77,7 +77,7 @@ class TestVxlanSample(TestCase): > # Change the config file to support vhost and recompile the > package. > self.dut.send_expect("sed -i -e 's/RTE_LIBRTE_VHOST=3Dn$/" > + "RTE_LIBRTE_VHOST=3Dy/' config/" > - + "common_linuxapp", "# ", 30) > + + "common_base", "# ", 30) > # temporary disable skip_setup > skip_setup =3D self.dut.skip_setup > self.dut.skip_setup =3D False > @@ -623,7 +623,7 @@ class TestVxlanSample(TestCase): > """ > # Restore the config file and recompile the package. > self.dut.send_expect("sed -i -e 's/RTE_LIBRTE_VHOST=3Dy$/" > - + "RTE_LIBRTE_VHOST=3Dn/' > config/common_linuxapp", > + + "RTE_LIBRTE_VHOST=3Dn/' config/common_bas= e", > "# ", 30) > # temporary disable skip_setup > skip_setup =3D self.dut.skip_setup > -- > 1.9.3