diff mbox series

[v1,11/15] tests/tcg: Replace /bin/true by true (required on macOS)

Message ID 20210202134001.25738-12-alex.bennee@linaro.org
State New
Headers show
Series testing/gdbstub/docs pre-PR | expand

Commit Message

Alex Bennée Feb. 2, 2021, 1:39 p.m. UTC 
From: Stefan Weil <sw@weilnetz.de>

/bin/true is missing on macOS, but simply "true" is available as a shell builtin.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20210128135627.2067003-1-sw@weilnetz.de>
---
 tests/tcg/Makefile.qemu | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Philippe Mathieu-Daudé Feb. 2, 2021, 2:23 p.m. UTC | #1 
On 2/2/21 2:39 PM, Alex Bennée wrote:
> From: Stefan Weil <sw@weilnetz.de>
> 
> /bin/true is missing on macOS, but simply "true" is available as a shell builtin.
> 
> Signed-off-by: Stefan Weil <sw@weilnetz.de>

Reviewed ... :
https://www.mail-archive.com/qemu-devel@nongnu.org/msg777004.html
... before Peter:
https://www.mail-archive.com/qemu-devel@nongnu.org/msg777010.html

> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

His tag is and mine isn't... Is it possible this is a b4 bug when
names use UTF-8 encoding?

Again:
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> Message-Id: <20210128135627.2067003-1-sw@weilnetz.de>
> ---
>  tests/tcg/Makefile.qemu | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/tcg/Makefile.qemu b/tests/tcg/Makefile.qemu
> index c096c611a2..a56564660c 100644
> --- a/tests/tcg/Makefile.qemu
> +++ b/tests/tcg/Makefile.qemu
> @@ -90,11 +90,11 @@ run-guest-tests: guest-tests
>  
>  else
>  guest-tests:
> -	$(call quiet-command, /bin/true, "BUILD", \
> +	$(call quiet-command, true, "BUILD", \
>  		"$(TARGET) guest-tests SKIPPED")
>  
>  run-guest-tests:
> -	$(call quiet-command, /bin/true, "RUN", \
> +	$(call quiet-command, true, "RUN", \
>  		"tests for $(TARGET) SKIPPED")
>  endif
>  
>
Philippe Mathieu-Daudé Feb. 2, 2021, 2:24 p.m. UTC | #2 
On Tue, Feb 2, 2021 at 3:23 PM Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
> On 2/2/21 2:39 PM, Alex Bennée wrote:
> > From: Stefan Weil <sw@weilnetz.de>
> >
> > /bin/true is missing on macOS, but simply "true" is available as a shell builtin.
> >
> > Signed-off-by: Stefan Weil <sw@weilnetz.de>
>
> Reviewed ... :
> https://www.mail-archive.com/qemu-devel@nongnu.org/msg777004.html
> ... before Peter:
> https://www.mail-archive.com/qemu-devel@nongnu.org/msg777010.html
>
> > Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
>
> His tag is and mine isn't... Is it possible this is a b4 bug when
> names use UTF-8 encoding?

FWIW the version I'm using works:

$ b4 --version
0.5.2

$ b4 am 20210128135627.2067003-1-sw@weilnetz.de
Looking up https://lore.kernel.org/r/20210128135627.2067003-1-sw%40weilnetz.de
Grabbing thread from lore.kernel.org/qemu-devel
Analyzing 4 messages in the thread
---
Writing ./20210128_sw_tests_tcg_replace_bin_true_by_true_required_on_macos.mbx
 [PATCH] tests/tcg: Replace /bin/true by true (required on macOS)
   + Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
   + Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
Total patches: 1
---
Link: https://lore.kernel.org/r/20210128135627.2067003-1-sw@weilnetz.de
Base: not found
      git am ./20210128_sw_tests_tcg_replace_bin_true_by_true_required_on_macos.mbx

> Again:
> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>
> > Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> > Message-Id: <20210128135627.2067003-1-sw@weilnetz.de>
> > ---
> >  tests/tcg/Makefile.qemu | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
Alex Bennée Feb. 2, 2021, 6:34 p.m. UTC | #3 
Philippe Mathieu-Daudé <f4bug@amsat.org> writes:

> On Tue, Feb 2, 2021 at 3:23 PM Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>> On 2/2/21 2:39 PM, Alex Bennée wrote:
>> > From: Stefan Weil <sw@weilnetz.de>
>> >
>> > /bin/true is missing on macOS, but simply "true" is available as a shell builtin.
>> >
>> > Signed-off-by: Stefan Weil <sw@weilnetz.de>
>>
>> Reviewed ... :
>> https://www.mail-archive.com/qemu-devel@nongnu.org/msg777004.html
>> ... before Peter:
>> https://www.mail-archive.com/qemu-devel@nongnu.org/msg777010.html
>>
>> > Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
>>
>> His tag is and mine isn't... Is it possible this is a b4 bug when
>> names use UTF-8 encoding?
>
> FWIW the version I'm using works:
>
> $ b4 --version
> 0.5.2

Same here... the only thing I can think of was I applied it old style
and your email hadn't been indexed yet (I have Peter's rb in my
review.org). I do generally use b4 to apply series now (as I will this
one when I roll). Sometimes however individual patches get applied
directly if I don't see anything in my email.

It would be nice if b4 could run on across an existing git tree to see
if things can be applied based on tags that may have arrived in the
interim. I think there is a potential race there while a series is
prepared.

> $ b4 am 20210128135627.2067003-1-sw@weilnetz.de
> Looking up https://lore.kernel.org/r/20210128135627.2067003-1-sw%40weilnetz.de
> Grabbing thread from lore.kernel.org/qemu-devel
> Analyzing 4 messages in the thread
> ---
> Writing ./20210128_sw_tests_tcg_replace_bin_true_by_true_required_on_macos.mbx
>  [PATCH] tests/tcg: Replace /bin/true by true (required on macOS)
>    + Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
>    + Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> Total patches: 1
> ---
> Link: https://lore.kernel.org/r/20210128135627.2067003-1-sw@weilnetz.de
> Base: not found
>       git am ./20210128_sw_tests_tcg_replace_bin_true_by_true_required_on_macos.mbx
>
>> Again:
>> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>>
>> > Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>> > Message-Id: <20210128135627.2067003-1-sw@weilnetz.de>
>> > ---
>> >  tests/tcg/Makefile.qemu | 4 ++--
>> >  1 file changed, 2 insertions(+), 2 deletions(-)
Alex Bennée Feb. 2, 2021, 9:14 p.m. UTC | #4 
Philippe Mathieu-Daudé <f4bug@amsat.org> writes:

> On Tue, Feb 2, 2021 at 3:23 PM Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>> On 2/2/21 2:39 PM, Alex Bennée wrote:
>> > From: Stefan Weil <sw@weilnetz.de>
>> >
>> > /bin/true is missing on macOS, but simply "true" is available as a shell builtin.
>> >
>> > Signed-off-by: Stefan Weil <sw@weilnetz.de>
>>
>> Reviewed ... :
>> https://www.mail-archive.com/qemu-devel@nongnu.org/msg777004.html
>> ... before Peter:
>> https://www.mail-archive.com/qemu-devel@nongnu.org/msg777010.html
>>
>> > Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
<snip>

It turns out there isn't an easy way to extract the information direct
from b4 so I just scripted it into Emacs:

  (defun my-git-check-for-updates-with-b4 (id subject)
    "Fetch `id' via the b4 tool and check for new tags."
    (let ((tags)
          (add-dco (rx (: "+ " (group (regexp my-bare-dco-tag-re))))))
      (with-temp-buffer
        (call-process "b4" nil t t "am" id "-o" "-")
        (goto-char 0)
        (when (re-search-forward subject nil t)
          (forward-line)
          (beginning-of-line)
          (while (string-match add-dco (thing-at-point 'line))
            (push (match-string-no-properties 1 (thing-at-point 'line)) tags)
            (forward-line))))
      tags))

  (defun my-commit-update-with-b4 ()
    "Check if the current commit has tags from it's last posting.

  This only works if there is a message id in the buffer to search for."
    (interactive)
    (let ((subj) (id))
      (save-excursion
        (goto-char 0)
        (setq subj (substring-no-properties (thing-at-point 'line)))
        (if (re-search-forward my-capture-msgid-re nil t)
            (setq id (match-string-no-properties 1))))
      (when (and subj id)
        (let ((tags (my-git-check-for-updates-with-b4 id subj)))
          (--map
           (save-excursion
             (goto-char 0)
             (when (not (re-search-forward it nil t))
               (re-search-forward my-capture-msgid-re nil t)
               (beginning-of-line)
               (insert it ?\n))) tags)))))
diff mbox series

Patch

diff --git a/tests/tcg/Makefile.qemu b/tests/tcg/Makefile.qemu
index c096c611a2..a56564660c 100644
--- a/tests/tcg/Makefile.qemu
+++ b/tests/tcg/Makefile.qemu
@@ -90,11 +90,11 @@  run-guest-tests: guest-tests
 
 else
 guest-tests:
-	$(call quiet-command, /bin/true, "BUILD", \
+	$(call quiet-command, true, "BUILD", \
 		"$(TARGET) guest-tests SKIPPED")
 
 run-guest-tests:
-	$(call quiet-command, /bin/true, "RUN", \
+	$(call quiet-command, true, "RUN", \
 		"tests for $(TARGET) SKIPPED")
 endif