[dts] [PATCH V1] framwork: align directory changes in dpdk

[dts] [PATCH V1] framwork: align directory changes in dpdk

[Wenjie Li]

DPDK directories changed as below:
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/

Align the changes in dts.

Signed-off-by: Wenjie Li <wenjiex.a.li@intel.com>
---
 framework/project_dpdk.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/framework/project_dpdk.py b/framework/project_dpdk.py
index 2ad01e8..38d99f4 100644
--- a/framework/project_dpdk.py
+++ b/framework/project_dpdk.py
@@ -259,12 +259,14 @@ class DPDKdut(Dut):
         assert ("No rule to make" not in out), "No rule to make error..."
 
     def build_install_dpdk_test_app(self, target, build_time, os_type="linux"):
-        cmd_build_test = "make -j %d -C test/" % (self.number_of_cores)
-        if os_type == "freebsd":
-            cmd_build_test = "make -j %d -C test/ CC=gcc48" % (self.number_of_cores)
-
-        self.send_expect(cmd_build_test, "# ", build_time)
-        app_list = ['./test/test/test', './test/test-acl/testacl', './test/test-pipeline/testpipeline', './test/cmdline_test/cmdline_test']
+        app_dir_list = ['app/test/', 'app/test-acl/', 'app/test-pipeline/', 'app/test-cmdline/']
+        for app_dir in app_dir_list:
+            cmd_build_test = "make -j %d -C %s" % (self.number_of_cores, app_dir)
+            if os_type == "freebsd":
+                cmd_build_test = "make -j %d -C %s CC=gcc48" % (self.number_of_cores, app_dir)
+            self.send_expect(cmd_build_test, "# ", build_time)
+
+        app_list = ['app/test/test', 'app/test-acl/testacl', 'app/test-pipeline/testpipeline', 'app/test-cmdline/cmdline_test']
         for app in app_list:
             self.send_expect('cp -f %s ./%s/app' % (app, target), "# ", 30)
          
-- 
2.17.2

Re: [dts] [PATCH V1] framwork: align directory changes in dpdk

[Zhu, ShuaiX]

Tested-by: Zhu, ShuaiX <shuaix.zhu@intel.com>

> -----Original Message-----
> From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of Wenjie Li
> Sent: Thursday, February 28, 2019 6:23 PM
> To: dts@dpdk.org
> Cc: Li, WenjieX A <wenjiex.a.li@intel.com>
> Subject: [dts] [PATCH V1] framwork: align directory changes in dpdk
> 
> DPDK directories changed as below:
> 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/
> 
> Align the changes in dts.
> 
> Signed-off-by: Wenjie Li <wenjiex.a.li@intel.com>
> ---
>  framework/project_dpdk.py | 14 ++++++++------
>  1 file changed, 8 insertions(+), 6 deletions(-)
> 
> diff --git a/framework/project_dpdk.py b/framework/project_dpdk.py index
> 2ad01e8..38d99f4 100644
> --- a/framework/project_dpdk.py
> +++ b/framework/project_dpdk.py
> @@ -259,12 +259,14 @@ class DPDKdut(Dut):
>          assert ("No rule to make" not in out), "No rule to make error..."
> 
>      def build_install_dpdk_test_app(self, target, build_time,
> os_type="linux"):
> -        cmd_build_test = "make -j %d -C test/" % (self.number_of_cores)
> -        if os_type == "freebsd":
> -            cmd_build_test = "make -j %d -C test/ CC=gcc48" %
> (self.number_of_cores)
> -
> -        self.send_expect(cmd_build_test, "# ", build_time)
> -        app_list = ['./test/test/test', './test/test-acl/testacl',
> './test/test-pipeline/testpipeline', './test/cmdline_test/cmdline_test']
> +        app_dir_list = ['app/test/', 'app/test-acl/', 'app/test-pipeline/',
> 'app/test-cmdline/']
> +        for app_dir in app_dir_list:
> +            cmd_build_test = "make -j %d -C %s" % (self.number_of_cores,
> app_dir)
> +            if os_type == "freebsd":
> +                cmd_build_test = "make -j %d -C %s CC=gcc48" %
> (self.number_of_cores, app_dir)
> +            self.send_expect(cmd_build_test, "# ", build_time)
> +
> +        app_list = ['app/test/test', 'app/test-acl/testacl',
> + 'app/test-pipeline/testpipeline', 'app/test-cmdline/cmdline_test']
>          for app in app_list:
>              self.send_expect('cp -f %s ./%s/app' % (app, target), "# ", 30)
> 
> --
> 2.17.2

Re: [dts] [PATCH V1] framwork: align directory changes in dpdk

[Tu, Lijuan]

According to dpdk commit: a9de470, the autotests app was removed to the "app" folder, and there is no separate build task necessary for building the autotests using "make test-build" while "make" covering the autotests build.


> -----Original Message-----
> From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of Wenjie Li
> Sent: Thursday, February 28, 2019 6:23 PM
> To: dts@dpdk.org
> Cc: Li, WenjieX A <wenjiex.a.li@intel.com>
> Subject: [dts] [PATCH V1] framwork: align directory changes in dpdk
> 
> DPDK directories changed as below:
> 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/
> 
> Align the changes in dts.
> 
> Signed-off-by: Wenjie Li <wenjiex.a.li@intel.com>
> ---
>  framework/project_dpdk.py | 14 ++++++++------
>  1 file changed, 8 insertions(+), 6 deletions(-)
> 
> diff --git a/framework/project_dpdk.py b/framework/project_dpdk.py index
> 2ad01e8..38d99f4 100644
> --- a/framework/project_dpdk.py
> +++ b/framework/project_dpdk.py
> @@ -259,12 +259,14 @@ class DPDKdut(Dut):
>          assert ("No rule to make" not in out), "No rule to make error..."
> 
>      def build_install_dpdk_test_app(self, target, build_time, os_type="linux"):
> -        cmd_build_test = "make -j %d -C test/" % (self.number_of_cores)
> -        if os_type == "freebsd":
> -            cmd_build_test = "make -j %d -C test/ CC=gcc48" %
> (self.number_of_cores)
> -
> -        self.send_expect(cmd_build_test, "# ", build_time)
> -        app_list = ['./test/test/test', './test/test-acl/testacl', './test/test-
> pipeline/testpipeline', './test/cmdline_test/cmdline_test']
> +        app_dir_list = ['app/test/', 'app/test-acl/', 'app/test-pipeline/', 'app/test-
> cmdline/']
> +        for app_dir in app_dir_list:
> +            cmd_build_test = "make -j %d -C %s" % (self.number_of_cores, app_dir)
> +            if os_type == "freebsd":
> +                cmd_build_test = "make -j %d -C %s CC=gcc48" %
> (self.number_of_cores, app_dir)
> +            self.send_expect(cmd_build_test, "# ", build_time)
> +
> +        app_list = ['app/test/test', 'app/test-acl/testacl',
> + 'app/test-pipeline/testpipeline', 'app/test-cmdline/cmdline_test']
>          for app in app_list:
>              self.send_expect('cp -f %s ./%s/app' % (app, target), "# ", 30)
> 
> --
> 2.17.2