[V1] tests/*: Remove old DPDK RTE flags from power tests

  * CONFIG_RTE_LIBRTE_I40E_PMD option does not exist anymore
    * Telemtry is build by default + _LIBRTE_ option also does not exist anymore

Signed-off-by: Tadhg Kearney <tadhg.kearney@intel.com>
---
 tests/TestSuite_power_branch_ratio.py |  2 +-
 tests/TestSuite_power_telemetry.py    | 17 +----------------
 2 files changed, 2 insertions(+), 17 deletions(-)
  

On Mon, Mar 21, 2022 at 1:46 PM Tadhg Kearney <tadhg.kearney@intel.com> wrote:
>
>     * CONFIG_RTE_LIBRTE_I40E_PMD option does not exist anymore
>     * Telemtry is build by default + _LIBRTE_ option also does not exist anymore

What about:
"""
    def compile_switch(self):
        sw_table = [
            "CONFIG_RTE_LIBRTE_POWER",
            "CONFIG_RTE_LIBRTE_POWER_DEBUG",
        ]
        return sw_table
"""
?

This too can be removed.

>
> Signed-off-by: Tadhg Kearney <tadhg.kearney@intel.com>
> ---
>  tests/TestSuite_power_branch_ratio.py |  2 +-
>  tests/TestSuite_power_telemetry.py    | 17 +----------------
>  2 files changed, 2 insertions(+), 17 deletions(-)
>
> diff --git a/tests/TestSuite_power_branch_ratio.py b/tests/TestSuite_power_branch_ratio.py
> index dee2cc11..a7f2a047 100644
> --- a/tests/TestSuite_power_branch_ratio.py
> +++ b/tests/TestSuite_power_branch_ratio.py
> @@ -225,7 +225,7 @@ class TestPowerBranchRatio(TestCase):
>
>      def preset_compilation(self):
>          if 'meson' == load_global_setting(HOST_BUILD_TYPE_SETTING):
> -            compile_SWs = self.compile_switch + ["CONFIG_RTE_LIBRTE_I40E_PMD"]
> +            compile_SWs = self.compile_switch
>              self.dut.set_build_options(dict([(sw[7:], 'y') for sw in compile_SWs]))
>          else:
>              for sw in self.compile_switch:
> diff --git a/tests/TestSuite_power_telemetry.py b/tests/TestSuite_power_telemetry.py
> index d8182ce2..6a9740b2 100644
> --- a/tests/TestSuite_power_telemetry.py
> +++ b/tests/TestSuite_power_telemetry.py
> @@ -45,7 +45,7 @@ from pprint import pformat
>  from framework.exception import VerifyFailure
>  from framework.packet import Packet
>  from framework.pktgen import TRANSMIT_CONT
> -from framework.settings import HEADER_SIZE, HOST_BUILD_TYPE_SETTING, load_global_setting
> +from framework.settings import HEADER_SIZE, load_global_setting
>  from framework.test_case import TestCase
>  from framework.utils import create_mask as dts_create_mask
>
> @@ -121,19 +121,6 @@ class TestPowerTelemetry(TestCase):
>
>          return result
>
> -    def preset_compilation(self):
> -        if self.dut.skip_setup:
> -            return
> -        SW = "CONFIG_RTE_LIBRTE_TELEMETRY"
> -        if 'meson' == load_global_setting(HOST_BUILD_TYPE_SETTING):
> -            self.dut.set_build_options({SW[7:]: 'y'})
> -        else:
> -            cmd = "sed -i -e 's/{0}=n$/{0}=y/' {1}/config/common_base".format(
> -                SW, self.target_dir)
> -            self.d_a_con(cmd)
> -        # re-compile dpdk source code
> -        self.dut.build_install_dpdk(self.target)
> -
>      def prepare_binary(self, name):
>          example_dir = "examples/" + name
>          out = self.dut.build_dpdk_apps('./' + example_dir)
> @@ -425,8 +412,6 @@ class TestPowerTelemetry(TestCase):
>
>      def preset_test_environment(self):
>          self.is_l3fwd_on = None
> -        # open compile switch and re-compile target source code
> -        self.preset_compilation()
>          # init binary
>          self.init_l3fwd_power()
>          self.init_telemetry()
> --
> 2.25.1
>
> --------------------------------------------------------------
> Intel Research and Development Ireland Limited
> Registered in Ireland
> Registered Office: Collinstown Industrial Park, Leixlip, County Kildare
> Registered Number: 308263
>
>
> This e-mail and any attachments may contain confidential material for the sole
> use of the intended recipient(s). Any review or distribution by others is
> strictly prohibited. If you are not the intended recipient, please contact the
> sender and delete all copies.

This footer does not make sense on a public mailing list.
  

Hi David,

Actually, those are two things, when I remove makefile build code snippet, 
we found CONFIG_RTE_LIBRTE_I40E_PMD can be removed when meson build,
at the same time,  we are cleaning up changing source code about meson build.
So I think we can do those thing together, otherwise, we need submit two patch 
In same place. So sorry, I'm not stating my needs clearly originally.

Finally, if the options below can be removed,  please cleaning up it, thanks.

Best regards,
Jun Dong

> -----Original Message-----
> From: David Marchand <david.marchand@redhat.com>
> Sent: Tuesday, March 22, 2022 5:04 PM
> To: Kearney, Tadhg <tadhg.kearney@intel.com>
> Cc: dts@dpdk.org; Pattan, Reshma <reshma.pattan@intel.com>
> Subject: Re: [dts][V1] tests/*: Remove old DPDK RTE flags from power tests
> 
> On Mon, Mar 21, 2022 at 1:46 PM Tadhg Kearney <tadhg.kearney@intel.com>
> wrote:
> >
> >     * CONFIG_RTE_LIBRTE_I40E_PMD option does not exist anymore
> >     * Telemtry is build by default + _LIBRTE_ option also does not
> > exist anymore
> 
> What about:
> """
>     def compile_switch(self):
>         sw_table = [
>             "CONFIG_RTE_LIBRTE_POWER",
>             "CONFIG_RTE_LIBRTE_POWER_DEBUG",
>         ]
>         return sw_table
> """
> ?
> 
> This too can be removed.
> 
> >
> > Signed-off-by: Tadhg Kearney <tadhg.kearney@intel.com>
> > ---
> >  tests/TestSuite_power_branch_ratio.py |  2 +-
> >  tests/TestSuite_power_telemetry.py    | 17 +----------------
> >  2 files changed, 2 insertions(+), 17 deletions(-)
> >
> > diff --git a/tests/TestSuite_power_branch_ratio.py
> > b/tests/TestSuite_power_branch_ratio.py
> > index dee2cc11..a7f2a047 100644
> > --- a/tests/TestSuite_power_branch_ratio.py
> > +++ b/tests/TestSuite_power_branch_ratio.py
> > @@ -225,7 +225,7 @@ class TestPowerBranchRatio(TestCase):
> >
> >      def preset_compilation(self):
> >          if 'meson' == load_global_setting(HOST_BUILD_TYPE_SETTING):
> > -            compile_SWs = self.compile_switch +
> ["CONFIG_RTE_LIBRTE_I40E_PMD"]
> > +            compile_SWs = self.compile_switch
> >              self.dut.set_build_options(dict([(sw[7:], 'y') for sw in compile_SWs]))
> >          else:
> >              for sw in self.compile_switch:
> > diff --git a/tests/TestSuite_power_telemetry.py
> > b/tests/TestSuite_power_telemetry.py
> > index d8182ce2..6a9740b2 100644
> > --- a/tests/TestSuite_power_telemetry.py
> > +++ b/tests/TestSuite_power_telemetry.py
> > @@ -45,7 +45,7 @@ from pprint import pformat  from
> framework.exception
> > import VerifyFailure  from framework.packet import Packet  from
> > framework.pktgen import TRANSMIT_CONT -from framework.settings
> import
> > HEADER_SIZE, HOST_BUILD_TYPE_SETTING, load_global_setting
> > +from framework.settings import HEADER_SIZE, load_global_setting
> >  from framework.test_case import TestCase  from framework.utils import
> > create_mask as dts_create_mask
> >
> > @@ -121,19 +121,6 @@ class TestPowerTelemetry(TestCase):
> >
> >          return result
> >
> > -    def preset_compilation(self):
> > -        if self.dut.skip_setup:
> > -            return
> > -        SW = "CONFIG_RTE_LIBRTE_TELEMETRY"
> > -        if 'meson' == load_global_setting(HOST_BUILD_TYPE_SETTING):
> > -            self.dut.set_build_options({SW[7:]: 'y'})
> > -        else:
> > -            cmd = "sed -i -e 's/{0}=n$/{0}=y/' {1}/config/common_base".format(
> > -                SW, self.target_dir)
> > -            self.d_a_con(cmd)
> > -        # re-compile dpdk source code
> > -        self.dut.build_install_dpdk(self.target)
> > -
> >      def prepare_binary(self, name):
> >          example_dir = "examples/" + name
> >          out = self.dut.build_dpdk_apps('./' + example_dir) @@ -425,8
> > +412,6 @@ class TestPowerTelemetry(TestCase):
> >
> >      def preset_test_environment(self):
> >          self.is_l3fwd_on = None
> > -        # open compile switch and re-compile target source code
> > -        self.preset_compilation()
> >          # init binary
> >          self.init_l3fwd_power()
> >          self.init_telemetry()
> > --
> > 2.25.1
> >
> > --------------------------------------------------------------
> > Intel Research and Development Ireland Limited Registered in Ireland
> > Registered Office: Collinstown Industrial Park, Leixlip, County
> > Kildare Registered Number: 308263
> >
> >
> > This e-mail and any attachments may contain confidential material for
> > the sole use of the intended recipient(s). Any review or distribution
> > by others is strictly prohibited. If you are not the intended
> > recipient, please contact the sender and delete all copies.
> 
> This footer does not make sense on a public mailing list.
> 
> 
> --
> David Marchand