From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by dpdk.org (Postfix) with ESMTP id 3CF782BAC for ; Fri, 1 Mar 2019 06:45:25 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Feb 2019 21:45:24 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,426,1544515200"; d="scan'208";a="151061088" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by fmsmga001.fm.intel.com with ESMTP; 28 Feb 2019 21:45:24 -0800 Received: from fmsmsx118.amr.corp.intel.com (10.18.116.18) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.408.0; Thu, 28 Feb 2019 21:45:23 -0800 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by fmsmsx118.amr.corp.intel.com (10.18.116.18) with Microsoft SMTP Server (TLS) id 14.3.408.0; Thu, 28 Feb 2019 21:45:23 -0800 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.158]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.26]) with mapi id 14.03.0415.000; Fri, 1 Mar 2019 13:45:21 +0800 From: "Zhu, ShuaiX" To: "Yao, BingX Y" , "dts@dpdk.org" CC: "Yao, BingX Y" , "Zhu, ShuaiX" Thread-Topic: [dts] [PATCH V1] test:align directory changes in dpdk Thread-Index: AQHUz9GoCf3nrueRjESeh24maaKzzaX2RCaw Date: Fri, 1 Mar 2019 05:45:20 +0000 Message-ID: <4DC48DF9BDA3E54A836D2D3C057DEC6F0B14E6D8@SHSMSX101.ccr.corp.intel.com> References: <1551405458-58347-1-git-send-email-bingx.y.yao@intel.com> In-Reply-To: <1551405458-58347-1-git-send-email-bingx.y.yao@intel.com> Accept-Language: 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-originating-ip: [10.239.127.40] Content-Type: text/plain; charset="iso-2022-jp" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dts] [PATCH V1] test: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: , X-List-Received-Date: Fri, 01 Mar 2019 05:45:26 -0000 Tested-by=1B$B!'=1B(BZhu, ShuaiX > -----Original Message----- > From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of yaobing > Sent: Friday, March 1, 2019 9:58 AM > To: dts@dpdk.org > Cc: Yao, BingX Y > Subject: [dts] [PATCH V1] test:align directory changes in dpdk >=20 > 1 move test/test/ to app/test/ > 2 move test/test-acl/ to app/test-acl/ > 3 move test/test-pipeline/ to app/test-pipeline/ > 4 move test/test-cmdline/ to app/test-cmdline/ >=20 > Signed-off-by: yaobing > --- > tests/TestSuite_distributor.py | 6 +++--- > tests/TestSuite_efd.py | 6 +++--- > tests/TestSuite_unit_tests_loopback.py | 22 +++++++++++----------- > tests/TestSuite_unit_tests_pmd_perf.py | 12 ++++++------ > 4 files changed, 23 insertions(+), 23 deletions(-) >=20 > diff --git a/tests/TestSuite_distributor.py b/tests/TestSuite_distributor= .py index > a900f5e..badbaf6 100644 > --- a/tests/TestSuite_distributor.py > +++ b/tests/TestSuite_distributor.py > @@ -45,7 +45,7 @@ class TestDistributor(TestCase, IxiaPacketGenerator): > """ > self.tester.extend_external_packet_generator(TestDistributor, > self) >=20 > - out =3D self.dut.send_expect("make -C test -j", "#") > + out =3D self.dut.send_expect("make -C app/test -j", "#") > self.verify("Error" not in out, "Compilation error") > self.verify("No such" not in out, "Compilation error") >=20 > @@ -68,7 +68,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("./app/test/test -n 1 -c f", "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 +77,7 @@ > class 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("./app/test/test -n 1 -c f", "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..1020f30 > 100644 > --- a/tests/TestSuite_efd.py > +++ b/tests/TestSuite_efd.py > @@ -45,7 +45,7 @@ class TestEFD(TestCase, IxiaPacketGenerator): > """ > self.tester.extend_external_packet_generator(TestEFD, self) >=20 > - out =3D self.dut.send_expect("make -C test -j", "#") > + out =3D self.dut.send_expect("make -C app/test -j", "#") > self.verify("Error" not in out, "Compilation error") > self.verify("No such" not in out, "Compilation error") >=20 > @@ -67,7 +67,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("./app/test/test -n 1 -c f", "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 +76,7 @@ > class 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("./app/test/test -n 1 -c f", "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>>", > 120) @@ -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 > --lcores=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