From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id B0142A0679 for ; Wed, 3 Apr 2019 16:48:50 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A6C241B487; Wed, 3 Apr 2019 16:48:50 +0200 (CEST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 2EBFD1B476 for ; Wed, 3 Apr 2019 16:48:49 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Apr 2019 07:48:48 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,304,1549958400"; d="scan'208";a="333436342" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by fmsmga006.fm.intel.com with ESMTP; 03 Apr 2019 07:48:47 -0700 Received: from FMSMSX109.amr.corp.intel.com (10.18.116.9) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.408.0; Wed, 3 Apr 2019 07:48:47 -0700 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by fmsmsx109.amr.corp.intel.com (10.18.116.9) with Microsoft SMTP Server (TLS) id 14.3.408.0; Wed, 3 Apr 2019 07:48:46 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.164]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.39]) with mapi id 14.03.0415.000; Wed, 3 Apr 2019 22:48:45 +0800 From: "Tu, Lijuan" To: "Yao, BingX Y" , "dts@dpdk.org" CC: "Yao, BingX Y" Thread-Topic: [dts] [PATCH V3] tests:align directory changes in dpdk Thread-Index: AQHU4srjiLitf0qSWkCF7F7Y0GvbwqYqkwsg Date: Wed, 3 Apr 2019 14:48:44 +0000 Message-ID: <8CE3E05A3F976642AAB0F4675D0AD20E0BA5B393@SHSMSX101.ccr.corp.intel.com> References: <1553491630-82461-1-git-send-email-bingx.y.yao@intel.com> In-Reply-To: <1553491630-82461-1-git-send-email-bingx.y.yao@intel.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.0.400.15 dlp-reaction: no-action x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiOGU1OWUwN2YtMmNlNC00M2NmLThhMDQtMjgzYzA2NzM4NmI1IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiUHZVZW9vcGtjaytMa0p4V004clViNjNvUUpKTzVxSGNpSU5McmhGY0lBc1FudWVibjBBVXNzQkZraDJxRVJsRSJ9 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] [PATCH V3] tests:align directory changes in dpdk 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: , Errors-To: dts-bounces@dpdk.org Sender: "dts" Applied, thanks > -----Original Message----- > From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of yaobing > Sent: Sunday, March 24, 2019 10:27 PM > To: dts@dpdk.org > Cc: Yao, BingX Y > Subject: [dts] [PATCH V3] tests:align directory changes in dpdk >=20 > V1: > move test/test/ to app/test/ >=20 > V2: > According to dpdk commit: a9de470,DPDK moved dpdk/test to > dpdk/app/test, it is unnecessary to build dpdk/test anymore >=20 > V3: > no need to rebuild unit test app >=20 > Signed-off-by: yaobing > --- > tests/TestSuite_distributor.py | 8 ++------ > tests/TestSuite_efd.py | 8 ++------ > tests/TestSuite_unit_tests_loopback.py | 22 +++++++++++----------- > tests/TestSuite_unit_tests_pmd_perf.py | 12 ++++++------ > 4 files changed, 21 insertions(+), 29 deletions(-) >=20 > diff --git a/tests/TestSuite_distributor.py b/tests/TestSuite_distributor= .py > index a900f5e..985fbce 100644 > --- a/tests/TestSuite_distributor.py > +++ b/tests/TestSuite_distributor.py > @@ -45,10 +45,6 @@ class TestDistributor(TestCase, IxiaPacketGenerator): > """ > self.tester.extend_external_packet_generator(TestDistributor, se= lf) >=20 > - out =3D self.dut.send_expect("make -C test -j", "#") > - self.verify("Error" not in out, "Compilation error") > - self.verify("No such" not in out, "Compilation error") > - > # reduce tx queues for enable many workers > self.dut.send_expect("sed -i -e 's/.*txRings =3D .*/\\tconst uin= t16_t > rxRings =3D 1, txRings =3D 1;/' ./examples/distributor/main.c", "#") > out =3D self.dut.build_dpdk_apps("./examples/distributor") > @@ -68,7 +64,7 @@ class TestDistributor(TestCase, IxiaPacketGenerator): > """ > Run distributor unit test > """ > - self.dut.send_expect("./test/test/test -n 1 -c f", "RTE>>", 60) > + self.dut.send_expect("./%s/app/test -n 1 -c f" % self.target, > + "RTE>>", 60) > out =3D self.dut.send_expect("distributor_autotest", "RTE>>", 30= ) > self.dut.send_expect("quit", "# ") > self.verify("Test OK" in out, "Test failed") @@ -77,7 +73,7 @@ c= lass > TestDistributor(TestCase, IxiaPacketGenerator): > """ > Run distributor unit perf test > """ > - self.dut.send_expect("./test/test/test -n 1 -c f", "RTE>>", 60) > + self.dut.send_expect("./%s/app/test -n 1 -c f" % self.target, > + "RTE>>", 60) > out =3D self.dut.send_expect("distributor_perf_autotest", "RTE>>= ", 120) > cycles_single =3D self.strip_cycles(out, "single") > cycles_burst =3D self.strip_cycles(out, "burst") diff --git > a/tests/TestSuite_efd.py b/tests/TestSuite_efd.py index 2c80464..16eb3b7 > 100644 > --- a/tests/TestSuite_efd.py > +++ b/tests/TestSuite_efd.py > @@ -45,10 +45,6 @@ class TestEFD(TestCase, IxiaPacketGenerator): > """ > self.tester.extend_external_packet_generator(TestEFD, self) >=20 > - out =3D self.dut.send_expect("make -C test -j", "#") > - self.verify("Error" not in out, "Compilation error") > - self.verify("No such" not in out, "Compilation error") > - > out =3D self.dut.build_dpdk_apps("./examples/server_node_efd") > self.verify("Error" not in out, "Compilation error") > self.verify("No such" not in out, "Compilation error") @@ -67,7 = +63,7 > @@ class TestEFD(TestCase, IxiaPacketGenerator): > """ > Run EFD unit test > """ > - self.dut.send_expect("./test/test/test -n 1 -c f", "RTE>>", 60) > + self.dut.send_expect("./%s/app/test -n 1 -c f" % self.target, > + "RTE>>", 60) > out =3D self.dut.send_expect("efd_autotest", "RTE>>", 120) > self.dut.send_expect("quit", "# ") > self.verify("Test OK" in out, "Test failed") @@ -76,7 +72,7 @@ c= lass > TestEFD(TestCase, IxiaPacketGenerator): > """ > Run EFD unit perf test > """ > - self.dut.send_expect("./test/test/test -n 1 -c f", "RTE>>", 60) > + self.dut.send_expect("./%s/app/test -n 1 -c f" % self.target, > + "RTE>>", 60) > out =3D self.dut.send_expect("efd_perf_autotest", "RTE>>", 120) > self.logger.info(out) > self.dut.send_expect("quit", "# ") diff --git > a/tests/TestSuite_unit_tests_loopback.py > b/tests/TestSuite_unit_tests_loopback.py > index 469865f..e56c085 100644 > --- a/tests/TestSuite_unit_tests_loopback.py > +++ b/tests/TestSuite_unit_tests_loopback.py > @@ -70,7 +70,7 @@ class TestUnitTestsLoopback(TestCase): > [self.arch, machine, env, toolchain] =3D self.target.split('-') > self.verify(self.arch in ["x86_64", "arm64"], "pmd perf request = running > in x86_64 or arm64") > self.max_traffic_burst =3D self.get_max_traffic_burst() > - self.dut.send_expect("sed -i -e 's/#define > MAX_TRAFFIC_BURST %s/#define MAX_TRAFFIC_BURST = 32/' > test/test/test_pmd_perf.c" % self.max_traffic_burst, "# ", 30) > + self.dut.send_expect("sed -i -e 's/#define > MAX_TRAFFIC_BURST %s/#define MAX_TRAFFIC_BURST = 32/' > app/test/test_pmd_perf.c" % self.max_traffic_burst, "# ", 30) >=20 > def set_up(self): > """ > @@ -79,7 +79,7 @@ class TestUnitTestsLoopback(TestCase): > pass >=20 > def get_max_traffic_burst(self): > - pmd_file =3D self.dut.send_expect("cat test/test/test_pmd_perf.c= ", "# ", > 30) > + pmd_file =3D self.dut.send_expect("cat app/test/test_pmd_perf.c"= , > + "# ", 30) > result_scanner =3D r"#define MAX_TRAFFIC_BURST\s+([0-9]+)" > scanner =3D re.compile(result_scanner, re.DOTALL) > m =3D scanner.search(pmd_file) > @@ -90,14 +90,14 @@ class TestUnitTestsLoopback(TestCase): > """ > Run pmd stream control mode burst test case. > """ > - self.dut.send_expect("sed -i -e 's/lpbk_mode =3D 0/lpbk_mode =3D= 1/' > test/test/test_pmd_perf.c", "# ", 30) > - self.dut.send_expect("cd test/test", "# ") > + self.dut.send_expect("sed -i -e 's/lpbk_mode =3D 0/lpbk_mode =3D= 1/' > app/test/test_pmd_perf.c", "# ", 30) > + self.dut.send_expect("cd app/test", "# ") > self.dut.send_expect("make", "# ", 120) > self.dut.send_expect("cd /root/dpdk", "# ") >=20 > self.tester.send_expect("rm -rf ./getPackageByTcpdump.cap", "#") > self.tester.send_expect("tcpdump -i %s -w ./getPackageByTcpdump.= cap > 2> /dev/null& " % self.tester_itf, "#") > - self.dut.send_expect("./test/test/test -n 1 -c %s" % self.corema= sk, > "R.*T.*E.*>.*>", 60) > + self.dut.send_expect("./app/test/test -n 1 -c %s" % > + self.coremask, "R.*T.*E.*>.*>", 60) > out =3D self.dut.send_expect("pmd_perf_autotest", "RTE>>", 120) > print out > self.dut.send_expect("quit", "# ") @@ -111,14 +111,14 @@ class > TestUnitTestsLoopback(TestCase): > """ > Run pmd stream control mode burst test case. > """ > - self.dut.send_expect("sed -i -e 's/lpbk_mode =3D 1/lpbk_mode =3D= 0/' > test/test/test_pmd_perf.c", "# ", 30) > - self.dut.send_expect("cd test/test", "# ") > + self.dut.send_expect("sed -i -e 's/lpbk_mode =3D 1/lpbk_mode =3D= 0/' > app/test/test_pmd_perf.c", "# ", 30) > + self.dut.send_expect("cd app/test", "# ") > self.dut.send_expect("make", "# ", 120) > self.dut.send_expect("cd /root/dpdk", "# ") >=20 > self.tester.send_expect("rm -rf ./getPackageByTcpdump.cap", "#") > self.tester.send_expect("tcpdump -i %s -w ./getPackageByTcpdump.= cap > 2> /dev/null& " % self.tester_itf, "#") > - self.dut.send_expect("./test/test/test -n 1 -c %s" % self.corema= sk, > "R.*T.*E.*>.*>", 60) > + self.dut.send_expect("./app/test/test -n 1 -c %s" % > + self.coremask, "R.*T.*E.*>.*>", 60) > self.dut.send_command("pmd_perf_autotest", 30) > # There is no packet loopback, so the test is hung. > # It needs to kill the process manually. > @@ -137,9 +137,9 @@ class TestUnitTestsLoopback(TestCase): > """ > Run after each test suite. > """ > - self.dut.send_expect("sed -i -e 's/lpbk_mode =3D 0/lpbk_mode =3D= 1/' > test/test/test_pmd_perf.c", "# ", 30) > - self.dut.send_expect("sed -i -e 's/#define MAX_TRAFFIC_BURST > 32/#define MAX_TRAFFIC_BURST %s/' test/test/test_pmd_perf.c"= % > self.max_traffic_burst, "# ", 30) > - self.dut.send_expect("cd test/test", "# ") > + self.dut.send_expect("sed -i -e 's/lpbk_mode =3D 0/lpbk_mode =3D= 1/' > app/test/test_pmd_perf.c", "# ", 30) > + self.dut.send_expect("sed -i -e 's/#define MAX_TRAFFIC_BURST > 32/#define MAX_TRAFFIC_BURST %s/' app/test/test_pmd_perf.c" = % > self.max_traffic_burst, "# ", 30) > + self.dut.send_expect("cd app/test", "# ") > self.dut.send_expect("make", "# ", 30) > self.dut.send_expect("cd /root/dpdk", "# ") > self.dut.kill_all() > diff --git a/tests/TestSuite_unit_tests_pmd_perf.py > b/tests/TestSuite_unit_tests_pmd_perf.py > index 75c2a5f..6938839 100644 > --- a/tests/TestSuite_unit_tests_pmd_perf.py > +++ b/tests/TestSuite_unit_tests_pmd_perf.py > @@ -71,12 +71,12 @@ class TestUnitTestsPmdPerf(TestCase): > [arch, machine, env, toolchain] =3D self.target.split('-') > self.dut.send_expect("sed -i -e > 's/CONFIG_RTE_IXGBE_INC_VECTOR=3Dy/CONFIG_RTE_IXGBE_INC_VECTOR=3Dn/' > config/common_%s" % env, "# ", 30) > self.dut.build_install_dpdk(self.target) > - out =3D self.dut.build_dpdk_apps('./test/test/') > + out =3D self.dut.build_dpdk_apps('./app/test/') > self.verify('make: Leaving directory' in out, "Compilation faile= d") > - self.dut.send_expect("mv -f ./test/test/test ./test/test/test_sc= alar", "# ") > + self.dut.send_expect("mv -f ./app/test/test > + ./app/test/test_scalar", "# ") > self.dut.send_expect("sed -i -e > 's/CONFIG_RTE_IXGBE_INC_VECTOR=3Dn/CONFIG_RTE_IXGBE_INC_VECTOR=3Dy/' > config/common_%s" % env, "# ", 30) > self.dut.build_install_dpdk(self.target) > - out =3D self.dut.build_dpdk_apps('./test/test/') > + out =3D self.dut.build_dpdk_apps('./app/test/') > self.verify('make: Leaving directory' in out, "Compilation faile= d") >=20 > def set_up(self): > @@ -105,7 +105,7 @@ class TestUnitTestsPmdPerf(TestCase): > """ >=20 > self.core =3D self.get_core_from_socket() > - self.dut.send_expect("./test/test/test -n 1 --lcores=3D'%d-%d'" = % (self.core, > self.core + 1), "R.*T.*E.*>.*>", 60) > + self.dut.send_expect("./app/test/test -n 1 --lcores=3D'%d-%d'" % > + (self.core, self.core + 1), "R.*T.*E.*>.*>", 60) > for mode in self.burst_ctlmodes: > self.dut.send_expect("set_rxtx_sc %s" % mode, "RTE>>", 10) > out =3D self.dut.send_expect("pmd_perf_autotest", "RTE>>", 1= 20) @@ > -129,9 +129,9 @@ class TestUnitTestsPmdPerf(TestCase): >=20 > for mode in self.rxtx_modes: > if mode is "scalar": > - self.dut.send_expect("./test/test/test_scalar -n 1 --lco= res=3D'%d-%d'" % > (self.core, self.core + 1), "R.*T.*E.*>.*>", 60) > + self.dut.send_expect("./app/test/test_scalar -n 1 > + --lcores=3D'%d-%d'" % (self.core, self.core + 1), "R.*T.*E.*>.*>", 60) > else: > - self.dut.send_expect("./test/test/test -n 1 --lcores=3D'= %d-%d'" % > (self.core, self.core + 1), "R.*T.*E.*>.*>", 60) > + self.dut.send_expect("./app/test/test -n 1 > + --lcores=3D'%d-%d'" % (self.core, self.core + 1), "R.*T.*E.*>.*>", 60) >=20 > table_row =3D [mode] > self.dut.send_expect("set_rxtx_sc continuous", "RTE>>", 10) > -- > 2.17.2