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 1620BA04C1; Wed, 20 Nov 2019 06:32:52 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C4DEE2C36; Wed, 20 Nov 2019 06:32:51 +0100 (CET) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id 63FE4237 for ; Wed, 20 Nov 2019 06:32:50 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Nov 2019 21:32:49 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,220,1571727600"; d="scan'208";a="200600138" Received: from dpdk-lihong-ub1604.sh.intel.com ([10.67.118.203]) by orsmga008.jf.intel.com with ESMTP; 19 Nov 2019 21:32:48 -0800 From: lihong To: dts@dpdk.org Cc: lihong Date: Wed, 20 Nov 2019 06:07:27 +0800 Message-Id: <1574201247-32391-1-git-send-email-lihongx.ma@intel.com> X-Mailer: git-send-email 2.7.4 Subject: [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" 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(-) diff --git a/tests/TestSuite_multiprocess.py 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) # start new session to run secondary self.session_secondary = self.dut.new_session() diff --git a/tests/TestSuite_packet_capture.py 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 = ';'.join([ - "cd %s" % self.target_dir, - self.dpdk_pdump + " '%s' >/dev/null 2>&1 &" % (option[0])]) + cmd = self.dpdk_pdump + " '%s' >/dev/null 2>&1 &" % (option[0]) self.session_ex.send_expect(cmd, "# ", 15) time.sleep(6) diff --git a/tests/TestSuite_power_empty_poll.py 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_freq >> {1} done """).format(self.query_min_freq, self.query_max_freq) - fileName = 'vm_power_core.sh' + fileName = self.target_dir + os.sep + 'vm_power_core.sh' query_script = 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 = ';'.join([ - 'cd {}'.format(self.target_dir), 'chmod 777 {}'.format(fileName), - './' + fileName]) + fileName]) def start_query(self, core): cmd = self.query_tool + ' {0} > /dev/null 2>&1 &'.format(core) diff --git a/tests/TestSuite_telemetry.py 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 = 1 print("Get metrics done") """) - fileName = 'query_tool.py' + fileName = self.target_dir + os.sep + 'query_tool.py' query_script = os.path.join(self.output_path, fileName) with open(query_script, 'wb') as fp: fp.write('#! /usr/bin/env python' + os.linesep + script_content) self.dut.session.copy_file_to(query_script, self.target_dir) self.query_tool = ';'.join([ - 'cd {}'.format(self.target_dir), 'chmod 777 {}'.format(fileName), - './' + fileName]) + fileName]) def rename_dpdk_telemetry_tool(self): ''' diff --git a/tests/TestSuite_unit_tests_loopback.py 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 = 0/lpbk_mode = 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 = 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.tester.send_expect("rm -rf ./getPackageByTcpdump.cap", "#") self.tester.send_expect("tcpdump -i %s -w ./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 = 1/lpbk_mode = 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 = 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.tester.send_expect("rm -rf ./getPackageByTcpdump.cap", "#") self.tester.send_expect("tcpdump -i %s -w ./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 = 0/lpbk_mode = 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 = 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 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, '# ', 120) vm_testpmd = 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