From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 962E8A04C1; Wed, 20 Nov 2019 09:37:49 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 609AC2BA3; Wed, 20 Nov 2019 09:37:49 +0100 (CET) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id F14B627D for ; Wed, 20 Nov 2019 09:37:46 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Nov 2019 00:37:45 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,221,1571727600"; d="scan'208";a="237648336" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by fmsmga002.fm.intel.com with ESMTP; 20 Nov 2019 00:37:45 -0800 Received: from fmsmsx112.amr.corp.intel.com (10.18.116.6) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 20 Nov 2019 00:37:45 -0800 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by FMSMSX112.amr.corp.intel.com (10.18.116.6) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 20 Nov 2019 00:37:44 -0800 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.213]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.149]) with mapi id 14.03.0439.000; Wed, 20 Nov 2019 16:37:43 +0800 From: "Ma, LihongX" To: "Mo, YufengX" , "dts@dpdk.org" Thread-Topic: [dts] [PATCH V1] tests: delete cmd about cd to absolute path Thread-Index: AQHVn3vW2lH1u+WyWEiN8j/JL8KaB6eTuwaA Date: Wed, 20 Nov 2019 08:37:43 +0000 Message-ID: References: <1574201247-32391-1-git-send-email-lihongx.ma@intel.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: 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 V1] tests: delete cmd about cd to absolute path 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" Hi, yufeng When we create a connect to dut, cmd 'cd dpdk directory' have been execut= ed, so we do not need to execute this command in suite To avoid cd to wrong directory in suite, I remove all the cd command in sui= te. -----Original Message----- From: Mo, YufengX=20 Sent: Wednesday, November 20, 2019 4:24 PM To: Ma, LihongX ; dts@dpdk.org Cc: Ma, LihongX Subject: RE: [dts] [PATCH V1] tests: delete cmd about cd to absolute path Hi,ma lihong Why you remove these `cd ` command? When dts run suite sript source code, dut session/dut alt_session should b= e under dpdk directory by default. It seems that the framework source code or other suite script violate this = rule. BRs Yufen, Mo > -----Original Message----- > From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of lihong > Sent: Wednesday, November 20, 2019 6:07 AM > To: dts@dpdk.org > Cc: Ma, LihongX > Subject: [dts] [PATCH V1] tests: delete cmd about cd to absolute path >=20 > Signed-off-by: lihong > --- > tests/TestSuite_multiprocess.py | 1 - > tests/TestSuite_packet_capture.py | 4 +--- > tests/TestSuite_power_empty_poll.py | 5 ++--- > tests/TestSuite_telemetry.py | 5 ++--- > tests/TestSuite_unit_tests_loopback.py | 18 +++++++++--------- > tests/TestSuite_vhost_user_live_migration.py | 1 - > 6 files changed, 14 insertions(+), 20 deletions(-) >=20 > diff --git a/tests/TestSuite_multiprocess.py=20 > b/tests/TestSuite_multiprocess.py index 384872c..aa8bfde 100644 > --- a/tests/TestSuite_multiprocess.py > +++ b/tests/TestSuite_multiprocess.py > @@ -69,7 +69,6 @@ class TestMultiprocess(TestCase): > executions.append({'nprocs': 4, 'cores': '1S/2C/2T', 'pps': 0}) > executions.append({'nprocs': 4, 'cores': '1S/4C/1T', 'pps': 0}) > executions.append({'nprocs': 8, 'cores': '1S/4C/2T', 'pps': 0}) > - self.dut.alt_session.send_expect("cd dpdk", "# ", 5) >=20 > # start new session to run secondary > self.session_secondary =3D self.dut.new_session() diff --git=20 > a/tests/TestSuite_packet_capture.py=20 > b/tests/TestSuite_packet_capture.py > index fdaa0d0..b1fbff4 100644 > --- a/tests/TestSuite_packet_capture.py > +++ b/tests/TestSuite_packet_capture.py > @@ -500,9 +500,7 @@ class TestPacketCapture(TestCase): > if not self.is_dut_on_tester: > self.tester.alt_session.send_expect( > "rm -fr {0}/*".format(self.pdump_log), "# ", 20) > - cmd =3D ';'.join([ > - "cd %s" % self.target_dir, > - self.dpdk_pdump + " '%s' >/dev/null 2>&1 &" % (option[0])]) > + cmd =3D self.dpdk_pdump + " '%s' >/dev/null 2>&1 &" %=20 > + (option[0]) > self.session_ex.send_expect(cmd, "# ", 15) > time.sleep(6) >=20 > diff --git a/tests/TestSuite_power_empty_poll.py=20 > b/tests/TestSuite_power_empty_poll.py > index 3556e74..c11ea33 100644 > --- a/tests/TestSuite_power_empty_poll.py > +++ b/tests/TestSuite_power_empty_poll.py > @@ -192,15 +192,14 @@ class TestPowerEmptPoll(TestCase): > cat /sys/devices/system/cpu/cpu$1/cpufreq/scaling_max_fr= eq >> {1} > done > """).format(self.query_min_freq, self.query_max_freq) > - fileName =3D 'vm_power_core.sh' > + fileName =3D self.target_dir + os.sep + 'vm_power_core.sh' > query_script =3D os.path.join(self.output_path, fileName) > with open(query_script, 'wb') as fp: > fp.write('#! /bin/sh' + os.linesep + script_content) > self.dut.session.copy_file_to(query_script, self.target_dir) > self.query_tool =3D ';'.join([ > - 'cd {}'.format(self.target_dir), > 'chmod 777 {}'.format(fileName), > - './' + fileName]) > + fileName]) >=20 > def start_query(self, core): > cmd =3D self.query_tool + ' {0} > /dev/null 2>&1=20 > &'.format(core) diff --git a/tests/TestSuite_telemetry.py=20 > b/tests/TestSuite_telemetry.py index c6e7e08..9962b58 100644 > --- a/tests/TestSuite_telemetry.py > +++ b/tests/TestSuite_telemetry.py > @@ -120,15 +120,14 @@ class TestTelemetry(TestCase): > client.unregistered =3D 1 > print("Get metrics done") > """) > - fileName =3D 'query_tool.py' > + fileName =3D self.target_dir + os.sep + 'query_tool.py' > query_script =3D os.path.join(self.output_path, fileName) > with open(query_script, 'wb') as fp: > fp.write('#! /usr/bin/env python' + os.linesep + script_cont= ent) > self.dut.session.copy_file_to(query_script, self.target_dir) > self.query_tool =3D ';'.join([ > - 'cd {}'.format(self.target_dir), > 'chmod 777 {}'.format(fileName), > - './' + fileName]) > + fileName]) >=20 > def rename_dpdk_telemetry_tool(self): > ''' > diff --git a/tests/TestSuite_unit_tests_loopback.py=20 > b/tests/TestSuite_unit_tests_loopback.py > index 50533a6..b52b1c2 100644 > --- a/tests/TestSuite_unit_tests_loopback.py > +++ b/tests/TestSuite_unit_tests_loopback.py > @@ -91,9 +91,9 @@ 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/' app/test/test_pmd_perf.c", "# ", 30) > - self.dut.send_expect("cd app/test", "# ") > - self.dut.send_expect("make -j", "# ", 120) > - self.dut.send_expect("cd /root/dpdk", "# ") > + out =3D self.dut.build_dpdk_apps('app/test') > + self.verify("Error" not in out, "Compilation error") > + self.verify("No such" not in out, "Compilation error") >=20 > self.tester.send_expect("rm -rf ./getPackageByTcpdump.cap", "#") > self.tester.send_expect("tcpdump -i %s -w=20 > ./getPackageByTcpdump.cap 2> /dev/null& " % self.tester_itf, "#") @@ -112= ,9 +112,9 @@ 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/' app/test/test_pmd_perf.c", "# ", 30) > - self.dut.send_expect("cd app/test", "# ") > - self.dut.send_expect("make -j", "# ", 120) > - self.dut.send_expect("cd /root/dpdk", "# ") > + out =3D self.dut.build_dpdk_apps('app/test') > + self.verify("Error" not in out, "Compilation error") > + self.verify("No such" not in out, "Compilation error") >=20 > self.tester.send_expect("rm -rf ./getPackageByTcpdump.cap", "#") > self.tester.send_expect("tcpdump -i %s -w=20 > ./getPackageByTcpdump.cap 2> /dev/null& " % self.tester_itf, "#") @@ -139= ,7 +139,7 @@ class TestUnitTestsLoopback(TestCase): > """ > 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 -j", "# ", 120) > - self.dut.send_expect("cd /root/dpdk", "# ") > + out =3D self.dut.build_dpdk_apps('app/test') > + self.verify("Error" not in out, "Compilation error") > + self.verify("No such" not in out, "Compilation error") > self.dut.kill_all() > diff --git a/tests/TestSuite_vhost_user_live_migration.py=20 > b/tests/TestSuite_vhost_user_live_migration.py > index 0b1abcc..521f3f5 100644 > --- a/tests/TestSuite_vhost_user_live_migration.py > +++ b/tests/TestSuite_vhost_user_live_migration.py > @@ -298,7 +298,6 @@ class TestVhostUserLiveMigration(TestCase): > vm_dut.send_expect('screen -S %s' % self.screen_name, '# ',=20 > 120) >=20 > vm_testpmd =3D self.target + '/app/testpmd -c 0x3 -n 4 -- -i' > - vm_dut.send_expect('cd %s' % self.base_dir, "# ") > vm_dut.send_expect(vm_testpmd, 'testpmd> ', 120) > vm_dut.send_expect('set fwd rxonly', 'testpmd> ', 30) > vm_dut.send_expect('set promisc all off', 'testpmd> ', 30) > -- > 2.7.4