diff mbox series

[v2,1/5] test: dm: skip scmi tests against disabled protocols

Message ID 20231113014911.3308990-2-takahiro.akashi@linaro.org
State New
Headers show
Series cmd: add scmi command | expand

Commit Message

AKASHI Takahiro Nov. 13, 2023, 1:49 a.m. UTC 
This is a precautionary change to make scmi tests workable whether or not
a specific protocol be enabled.

Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
---
 test/dm/scmi.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

Comments

Simon Glass Nov. 13, 2023, 6:01 p.m. UTC | #1 
Hi AKASHI,

On Sun, 12 Nov 2023 at 18:49, AKASHI Takahiro
<takahiro.akashi@linaro.org> wrote:
>
> This is a precautionary change to make scmi tests workable whether or not
> a specific protocol be enabled.
>
> Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
> ---
>  test/dm/scmi.c | 12 ++++++++++++
>  1 file changed, 12 insertions(+)
>
> diff --git a/test/dm/scmi.c b/test/dm/scmi.c
> index da45314f2e4c..2f63f2da16fb 100644
> --- a/test/dm/scmi.c
> +++ b/test/dm/scmi.c
> @@ -217,6 +217,9 @@ static int dm_test_scmi_power_domains(struct unit_test_state *uts)
>         u8 *name;
>         int ret;
>
> +       if (!IS_ENABLED(CONFIG_SCMI_POWER_DOMAIN))
> +               return 0;

-EAGAIN to skip a test

Please update a comment if this needs to be documented better

> +
>         /* preparation */
>         ut_assertok(load_sandbox_scmi_test_devices(uts, &agent, &dev));
>         ut_assertnonnull(agent);
> @@ -317,6 +320,9 @@ static int dm_test_scmi_clocks(struct unit_test_state *uts)
>         int ret_dev;
>         int ret;
>
> +       if (!IS_ENABLED(CONFIG_CLK_SCMI))
> +               return 0;
> +
>         ret = load_sandbox_scmi_test_devices(uts, &agent, &dev);
>         if (ret)
>                 return ret;
> @@ -382,6 +388,9 @@ static int dm_test_scmi_resets(struct unit_test_state *uts)
>         struct udevice *agent_dev, *reset_dev, *dev = NULL;
>         int ret;
>
> +       if (!IS_ENABLED(CONFIG_RESET_SCMI))
> +               return 0;
> +
>         ret = load_sandbox_scmi_test_devices(uts, &agent, &dev);
>         if (ret)
>                 return ret;
> @@ -418,6 +427,9 @@ static int dm_test_scmi_voltage_domains(struct unit_test_state *uts)
>         struct udevice *dev;
>         struct udevice *regul0_dev;
>
> +       if (!IS_ENABLED(CONFIG_DM_REGULATOR_SCMI))
> +               return 0;
> +
>         ut_assertok(load_sandbox_scmi_test_devices(uts, &agent, &dev));
>
>         scmi_devices = sandbox_scmi_devices_ctx(dev);
> --
> 2.34.1
>

Regards,
Simon
AKASHI Takahiro Nov. 14, 2023, 1:44 a.m. UTC | #2 
On Mon, Nov 13, 2023 at 11:01:18AM -0700, Simon Glass wrote:
> Hi AKASHI,
> 
> On Sun, 12 Nov 2023 at 18:49, AKASHI Takahiro
> <takahiro.akashi@linaro.org> wrote:
> >
> > This is a precautionary change to make scmi tests workable whether or not
> > a specific protocol be enabled.
> >
> > Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
> > ---
> >  test/dm/scmi.c | 12 ++++++++++++
> >  1 file changed, 12 insertions(+)
> >
> > diff --git a/test/dm/scmi.c b/test/dm/scmi.c
> > index da45314f2e4c..2f63f2da16fb 100644
> > --- a/test/dm/scmi.c
> > +++ b/test/dm/scmi.c
> > @@ -217,6 +217,9 @@ static int dm_test_scmi_power_domains(struct unit_test_state *uts)
> >         u8 *name;
> >         int ret;
> >
> > +       if (!IS_ENABLED(CONFIG_SCMI_POWER_DOMAIN))
> > +               return 0;
> 
> -EAGAIN to skip a test

Ah, I didn't notice such a common practice as it is rarely seen
under ut. Will fix.

-Takahiro Akashi

> Please update a comment if this needs to be documented better
> 
> > +
> >         /* preparation */
> >         ut_assertok(load_sandbox_scmi_test_devices(uts, &agent, &dev));
> >         ut_assertnonnull(agent);
> > @@ -317,6 +320,9 @@ static int dm_test_scmi_clocks(struct unit_test_state *uts)
> >         int ret_dev;
> >         int ret;
> >
> > +       if (!IS_ENABLED(CONFIG_CLK_SCMI))
> > +               return 0;
> > +
> >         ret = load_sandbox_scmi_test_devices(uts, &agent, &dev);
> >         if (ret)
> >                 return ret;
> > @@ -382,6 +388,9 @@ static int dm_test_scmi_resets(struct unit_test_state *uts)
> >         struct udevice *agent_dev, *reset_dev, *dev = NULL;
> >         int ret;
> >
> > +       if (!IS_ENABLED(CONFIG_RESET_SCMI))
> > +               return 0;
> > +
> >         ret = load_sandbox_scmi_test_devices(uts, &agent, &dev);
> >         if (ret)
> >                 return ret;
> > @@ -418,6 +427,9 @@ static int dm_test_scmi_voltage_domains(struct unit_test_state *uts)
> >         struct udevice *dev;
> >         struct udevice *regul0_dev;
> >
> > +       if (!IS_ENABLED(CONFIG_DM_REGULATOR_SCMI))
> > +               return 0;
> > +
> >         ut_assertok(load_sandbox_scmi_test_devices(uts, &agent, &dev));
> >
> >         scmi_devices = sandbox_scmi_devices_ctx(dev);
> > --
> > 2.34.1
> >
> 
> Regards,
> Simon
diff mbox series

Patch

diff --git a/test/dm/scmi.c b/test/dm/scmi.c
index da45314f2e4c..2f63f2da16fb 100644
--- a/test/dm/scmi.c
+++ b/test/dm/scmi.c
@@ -217,6 +217,9 @@  static int dm_test_scmi_power_domains(struct unit_test_state *uts)
 	u8 *name;
 	int ret;
 
+	if (!IS_ENABLED(CONFIG_SCMI_POWER_DOMAIN))
+		return 0;
+
 	/* preparation */
 	ut_assertok(load_sandbox_scmi_test_devices(uts, &agent, &dev));
 	ut_assertnonnull(agent);
@@ -317,6 +320,9 @@  static int dm_test_scmi_clocks(struct unit_test_state *uts)
 	int ret_dev;
 	int ret;
 
+	if (!IS_ENABLED(CONFIG_CLK_SCMI))
+		return 0;
+
 	ret = load_sandbox_scmi_test_devices(uts, &agent, &dev);
 	if (ret)
 		return ret;
@@ -382,6 +388,9 @@  static int dm_test_scmi_resets(struct unit_test_state *uts)
 	struct udevice *agent_dev, *reset_dev, *dev = NULL;
 	int ret;
 
+	if (!IS_ENABLED(CONFIG_RESET_SCMI))
+		return 0;
+
 	ret = load_sandbox_scmi_test_devices(uts, &agent, &dev);
 	if (ret)
 		return ret;
@@ -418,6 +427,9 @@  static int dm_test_scmi_voltage_domains(struct unit_test_state *uts)
 	struct udevice *dev;
 	struct udevice *regul0_dev;
 
+	if (!IS_ENABLED(CONFIG_DM_REGULATOR_SCMI))
+		return 0;
+
 	ut_assertok(load_sandbox_scmi_test_devices(uts, &agent, &dev));
 
 	scmi_devices = sandbox_scmi_devices_ctx(dev);