On 04/01/2023 12.07, Claudio Imbrenda wrote:
On Mon, 26 Dec 2022 19:41:12 +0100
Andrew Jones <andrew.jones@xxxxxxxxx> wrote:
On Wed, Dec 21, 2022 at 10:14:52AM +0100, Nico Boehr wrote:
Quoting Nico Boehr (2022-12-21 09:16:51)
Quoting Claudio Imbrenda (2022-12-20 18:55:08)
A recent patch broke make standalone. The function find_word is not
available when running make standalone, replace it with a simple grep.
Reported-by: Nina Schoetterl-Glausch <nsg@xxxxxxxxxxxxx>
Fixes: 743cacf7 ("s390x: don't run migration tests under PV")
Signed-off-by: Claudio Imbrenda <imbrenda@xxxxxxxxxxxxx>
I am confused why find_word would not be available in standalone, since run() in runtime.bash uses it quite a few times.
Not that I mind the grep, but I fear more might be broken in standalone?
standalone tests don't currently include scripts/$ARCH/func.bash, which
may be an issue for s390x. That could be fixed, though.
Anyways, to get this fixed ASAP:
Acked-by: Nico Boehr <nrb@xxxxxxxxxxxxx>
OK, I get it now, find_word is not available during _build time_.
That could be changed, but it'd need to be moved to somewhere that
mkstandalone.sh wants to source, which could be common.bash, but
then we'd need to include common.bash in the standalone tests. So,
a new file for find_word() would be cleaner, but that sounds like
overkill.
the hack I posted here was meant to be "clean enough" and
arch-only (since we are the only ones with this issue). To be
honest, I don't really care __how__ we fix the problem, only that we do
fix it :)
what do you think would be the cleanest solution?
I think your patch is good enough for fixing the issue, so I went ahead and
pushed it. If someone wants to figure out a nice way to make find_word
available to the standalone builds, too, feel free to send a patch on top of
this.
Thanks,
Thomas
