test suite reviews and discussions
 help / color / Atom feed
* [dts] [PATCH V2] tests: delete cmd about cd to absolute path
@ 2019-11-21 18:34 lihong
  2019-11-27  9:02 ` Tu, Lijuan
  0 siblings, 1 reply; 2+ messages in thread
From: lihong @ 2019-11-21 18:34 UTC (permalink / raw)
  To: dts; +Cc: lihong

Signed-off-by: lihong <lihongx.ma@intel.com>
---
 tests/TestSuite_multiprocess.py              |  1 -
 tests/TestSuite_packet_capture.py            |  4 +---
 tests/TestSuite_unit_tests_loopback.py       | 18 +++++++++---------
 tests/TestSuite_vhost_user_live_migration.py |  1 -
 4 files changed, 10 insertions(+), 14 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_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


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [dts] [PATCH V2] tests: delete cmd about cd to absolute path
  2019-11-21 18:34 [dts] [PATCH V2] tests: delete cmd about cd to absolute path lihong
@ 2019-11-27  9:02 ` Tu, Lijuan
  0 siblings, 0 replies; 2+ messages in thread
From: Tu, Lijuan @ 2019-11-27  9:02 UTC (permalink / raw)
  To: Ma, LihongX, dts; +Cc: Ma, LihongX

Applied, thanks

> -----Original Message-----
> From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of lihong
> Sent: Friday, November 22, 2019 2:35 AM
> To: dts@dpdk.org
> Cc: Ma, LihongX <lihongx.ma@intel.com>
> Subject: [dts] [PATCH V2] tests: delete cmd about cd to absolute path
> 
> Signed-off-by: lihong <lihongx.ma@intel.com>
> ---
>  tests/TestSuite_multiprocess.py              |  1 -
>  tests/TestSuite_packet_capture.py            |  4 +---
>  tests/TestSuite_unit_tests_loopback.py       | 18 +++++++++---------
>  tests/TestSuite_vhost_user_live_migration.py |  1 -
>  4 files changed, 10 insertions(+), 14 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_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


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, back to index

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-21 18:34 [dts] [PATCH V2] tests: delete cmd about cd to absolute path lihong
2019-11-27  9:02 ` Tu, Lijuan

test suite reviews and discussions

Archives are clonable:
	git clone --mirror http://inbox.dpdk.org/dts/0 dts/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 dts dts/ http://inbox.dpdk.org/dts \
		dts@dpdk.org
	public-inbox-index dts


Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.dts


AGPL code for this site: git clone https://public-inbox.org/ public-inbox