test suite reviews and discussions
 help / color / mirror / Atom feed
From: haifeng <haifengx.tang@intel.com>
To: dts@dpdk.org
Subject: [dts] [DTS][PATCH] replace the default dpdk config file to common_base
Date: Mon,  7 Mar 2016 16:35:23 +0800	[thread overview]
Message-ID: <1457339723-55850-1-git-send-email-haifengx.tang@intel.com> (raw)

Signed-off-by: haifeng <haifengx.tang@intel.com>
---
 framework/project_dpdk.py                     |  2 +-
 tests/TestSuite_ieee1588.py                   | 10 ++--------
 tests/TestSuite_ipv4_reassembly.py            |  5 +----
 tests/TestSuite_l3fwd.py                      |  4 ++--
 tests/TestSuite_vhost_cuse_one_copy_one_vm.py |  4 ++--
 tests/TestSuite_vhost_user_one_copy_one_vm.py |  2 +-
 tests/TestSuite_virtio_iperf.py               |  4 ++--
 tests/TestSuite_vmdq.py                       |  2 +-
 tests/TestSuite_vxlan_sample.py               |  4 ++--
 9 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/framework/project_dpdk.py b/framework/project_dpdk.py
index a96aba8..1abcd42 100644
--- a/framework/project_dpdk.py
+++ b/framework/project_dpdk.py
@@ -74,7 +74,7 @@ class DPDKdut(Dut):
         #Enable MLNX driver before installing dpdk
         if dts.drivername == DRIVERS['ConnectX4']:
             self.send_expect("sed -i -e 's/CONFIG_RTE_LIBRTE_MLX5_PMD=n/"
-                             + "CONFIG_RTE_LIBRTE_MLX5_PMD=y/' config/common_linuxapp" , "# ", 30)
+                             + "CONFIG_RTE_LIBRTE_MLX5_PMD=y/' config/common_base" , "# ", 30)
 
         if not self.skip_setup:
             self.build_install_dpdk(target)
diff --git a/tests/TestSuite_ieee1588.py b/tests/TestSuite_ieee1588.py
index 012d601..bfbb23b 100644
--- a/tests/TestSuite_ieee1588.py
+++ b/tests/TestSuite_ieee1588.py
@@ -51,10 +51,7 @@ class TestIeee1588(TestCase):
         self.verify(len(dutPorts) > 0, "No ports found for " + self.nic)
 
         # Change the config file to support IEEE1588 and recompile the package.
-        if "bsdapp" in self.target:
-            self.dut.send_expect("sed -i -e 's/IEEE1588=n$/IEEE1588=y/' config/common_bsdapp", "# ", 30)
-        else:
-            self.dut.send_expect("sed -i -e 's/IEEE1588=n$/IEEE1588=y/' config/common_linuxapp", "# ", 30)
+        self.dut.send_expect("sed -i -e 's/IEEE1588=n$/IEEE1588=y/' config/common_base", "# ", 30)
         self.dut.skip_setup = False
         self.dut.build_install_dpdk(self.target)
 
@@ -160,8 +157,5 @@ class TestIeee1588(TestCase):
         self.dut.send_expect("quit", "# ", 30)
 
         # Restore the config file and recompile the package.
-        if "bsdapp" in self.target:
-            self.dut.send_expect("sed -i -e 's/IEEE1588=y$/IEEE1588=n/' config/common_bsdapp", "# ", 30)
-        else:
-            self.dut.send_expect("sed -i -e 's/IEEE1588=y$/IEEE1588=n/' config/common_linuxapp", "# ", 30)
+        self.dut.send_expect("sed -i -e 's/IEEE1588=y$/IEEE1588=n/' config/common_base", "# ", 30)
         self.dut.build_install_dpdk(self.target)
diff --git a/tests/TestSuite_ipv4_reassembly.py b/tests/TestSuite_ipv4_reassembly.py
index 3af4493..7935478 100644
--- a/tests/TestSuite_ipv4_reassembly.py
+++ b/tests/TestSuite_ipv4_reassembly.py
@@ -96,10 +96,7 @@ class TestIpReassembly(TestCase):
         #               r"examples/ip_reassembly/ipv4_rsmbl.h")
         # self.dut.send_expect("sed -i 's/CONFIG_RTE_LIBRTE_IP_FRAG_MAX_FRAG=.*$/CONFIG_RTE_LIBRTE_IP_FRAG_MAX_FRAG=%s/' ./config/common_linuxapp" %int(num_of_fragments), "# ")
         # self.dut.send_expect(sed_command % int(num_of_fragments), '#', 60)
-        if 'bsdapp' in self.target:
-            self.dut.send_expect("sed -i 's/CONFIG_RTE_LIBRTE_IP_FRAG_MAX_FRAG=.*$/CONFIG_RTE_LIBRTE_IP_FRAG_MAX_FRAG=%s/' ./config/common_bsdapp" % int(num_of_fragments), "# ")
-        else:
-            self.dut.send_expect("sed -i 's/CONFIG_RTE_LIBRTE_IP_FRAG_MAX_FRAG=.*$/CONFIG_RTE_LIBRTE_IP_FRAG_MAX_FRAG=%s/' ./config/common_linuxapp" % int(num_of_fragments), "# ")
+        self.dut.send_expect("sed -i 's/CONFIG_RTE_LIBRTE_IP_FRAG_MAX_FRAG=.*$/CONFIG_RTE_LIBRTE_IP_FRAG_MAX_FRAG=%s/' ./config/common_base" % int(num_of_fragments), "# ")
         self.dut.send_expect("export RTE_TARGET=" + self.target, "#")
         self.dut.send_expect("export RTE_SDK=`pwd`", "#")
         self.dut.send_expect("rm -rf %s" % self.target, "# ", 5)
diff --git a/tests/TestSuite_l3fwd.py b/tests/TestSuite_l3fwd.py
index 31bb48c..e112b18 100644
--- a/tests/TestSuite_l3fwd.py
+++ b/tests/TestSuite_l3fwd.py
@@ -152,8 +152,8 @@ class TestL3fwd(TestCase,IxiaPacketGenerator):
 
         pat = re.compile("P([0123])")
         # Update config file and rebuild to get best perf on FVL
-        self.dut.send_expect("sed -i -e 's/CONFIG_RTE_PCI_CONFIG=n/CONFIG_RTE_PCI_CONFIG=y/' ./config/common_linuxapp", "#", 20)
-        self.dut.send_expect("sed -i -e 's/CONFIG_RTE_PCI_EXTENDED_TAG=.*$/CONFIG_RTE_PCI_EXTENDED_TAG=\"on\"/' ./config/common_linuxapp", "#", 20)
+        self.dut.send_expect("sed -i -e 's/CONFIG_RTE_PCI_CONFIG=n/CONFIG_RTE_PCI_CONFIG=y/' ./config/common_base", "#", 20)
+        self.dut.send_expect("sed -i -e 's/CONFIG_RTE_PCI_EXTENDED_TAG=.*$/CONFIG_RTE_PCI_EXTENDED_TAG=\"on\"/' ./config/common_base", "#", 20)
         self.dut.build_install_dpdk(self.target)
 
 
diff --git a/tests/TestSuite_vhost_cuse_one_copy_one_vm.py b/tests/TestSuite_vhost_cuse_one_copy_one_vm.py
index 007ac37..e7d71e9 100644
--- a/tests/TestSuite_vhost_cuse_one_copy_one_vm.py
+++ b/tests/TestSuite_vhost_cuse_one_copy_one_vm.py
@@ -56,7 +56,7 @@ class TestVhostCuseOneCopyOneVm(TestCase, IxiaPacketGenerator):
         # Change config file to enable vhost-cuse compiled.
         self.dut.send_expect(
             "sed -i -e 's/CONFIG_RTE_LIBRTE_VHOST_USER=.*$/CONFIG_RTE_LIBRTE"
-            "_VHOST_USER=n/' ./config/common_linuxapp",
+            "_VHOST_USER=n/' ./config/common_base",
             "# ",
             30)
         self.dut.build_install_dpdk(self.target)
@@ -439,7 +439,7 @@ class TestVhostCuseOneCopyOneVm(TestCase, IxiaPacketGenerator):
         # Restore the config file and recompile the package
         self.dut.send_expect(
             "sed -i -e 's/CONFIG_RTE_LIBRTE_VHOST_USER=.*$/CONFIG_RTE_LIBRTE_VHOST_USER=y/' "
-            "./config/common_linuxapp",
+            "./config/common_base",
             "# ",
             30)
         self.dut.build_install_dpdk(self.target)
diff --git a/tests/TestSuite_vhost_user_one_copy_one_vm.py b/tests/TestSuite_vhost_user_one_copy_one_vm.py
index 7352a35..24d68b7 100644
--- a/tests/TestSuite_vhost_user_one_copy_one_vm.py
+++ b/tests/TestSuite_vhost_user_one_copy_one_vm.py
@@ -56,7 +56,7 @@ class TestVhostUserOneCopyOneVm(TestCase, IxiaPacketGenerator):
         # Build target with modified config file
         self.dut.send_expect(
             "sed -i -e 's/CONFIG_RTE_LIBRTE_VHOST_USER=.*$/CONFIG_RTE_LIBRTE"
-            "_VHOST_USER=y/' ./config/common_linuxapp",
+            "_VHOST_USER=y/' ./config/common_base",
             "# ",
             30)
         self.dut.build_install_dpdk(self.target)
diff --git a/tests/TestSuite_virtio_iperf.py b/tests/TestSuite_virtio_iperf.py
index d3c1e85..7f7e427 100644
--- a/tests/TestSuite_virtio_iperf.py
+++ b/tests/TestSuite_virtio_iperf.py
@@ -70,11 +70,11 @@ class TestVirtioIperf(TestCase):
         if vhost == 'cuse':
             self.dut_execut_cmd(
                 "sed -i -e 's/CONFIG_RTE_LIBRTE_VHOST_USER=.*$/CONFIG_RTE_LIBRTE" +
-                "_VHOST_USER=n/' ./config/common_linuxapp")
+                "_VHOST_USER=n/' ./config/common_base")
         else:
             self.dut_execut_cmd(
                 "sed -i -e 's/CONFIG_RTE_LIBRTE_VHOST_USER=.*$/CONFIG_RTE_LIBRTE" +
-                "_VHOST_USER=y/' ./config/common_linuxapp")
+                "_VHOST_USER=y/' ./config/common_base")
         self.dut.build_install_dpdk(self.target)
         self.dut_execut_cmd("cd ./lib/librte_vhost")
         out = self.dut_execut_cmd("make")
diff --git a/tests/TestSuite_vmdq.py b/tests/TestSuite_vmdq.py
index 429870a..8c5fa57 100644
--- a/tests/TestSuite_vmdq.py
+++ b/tests/TestSuite_vmdq.py
@@ -33,7 +33,7 @@ class TestVmdq(TestCase, IxiaPacketGenerator):
 
         self.tester.extend_external_packet_generator(TestVmdq, self)
         
-        self.dut.send_expect("sed -i 's/CONFIG_RTE_MAX_QUEUES_PER_PORT=256/CONFIG_RTE_MAX_QUEUES_PER_PORT=1024/' ./config/common_linuxapp", "# ", 5)
+        self.dut.send_expect("sed -i 's/CONFIG_RTE_MAX_QUEUES_PER_PORT=256/CONFIG_RTE_MAX_QUEUES_PER_PORT=1024/' ./config/common_base", "# ", 5)
         
         self.dut.build_install_dpdk(self.target)
         # Update the max queue per port for Fortville.
diff --git a/tests/TestSuite_vxlan_sample.py b/tests/TestSuite_vxlan_sample.py
index db40a96..c7e0701 100644
--- a/tests/TestSuite_vxlan_sample.py
+++ b/tests/TestSuite_vxlan_sample.py
@@ -77,7 +77,7 @@ class TestVxlanSample(TestCase):
         # Change the config file to support vhost and recompile the package.
         self.dut.send_expect("sed -i -e 's/RTE_LIBRTE_VHOST=n$/"
                              + "RTE_LIBRTE_VHOST=y/' config/"
-                             + "common_linuxapp", "# ", 30)
+                             + "common_base", "# ", 30)
         # temporary disable skip_setup
         skip_setup = self.dut.skip_setup
         self.dut.skip_setup = False
@@ -623,7 +623,7 @@ class TestVxlanSample(TestCase):
         """
         # Restore the config file and recompile the package.
         self.dut.send_expect("sed -i -e 's/RTE_LIBRTE_VHOST=y$/"
-                             + "RTE_LIBRTE_VHOST=n/' config/common_linuxapp",
+                             + "RTE_LIBRTE_VHOST=n/' config/common_base",
                              "# ", 30)
         # temporary disable skip_setup
         skip_setup = self.dut.skip_setup
-- 
1.9.3

             reply	other threads:[~2016-03-07  8:39 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-07  8:35 haifeng [this message]
2016-03-08  3:35 ` Liu, Yong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1457339723-55850-1-git-send-email-haifengx.tang@intel.com \
    --to=haifengx.tang@intel.com \
    --cc=dts@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).