tests/data/acpi: disassemble-aml: rename and change interpreter line

[PATCH] tests/data/acpi: disassemble-aml: rename and change interpreter line

Posted by Mohamed Mediouni 1 week, 1 day ago

/usr/bin/bash isn't guaranteed to be present. Switch
to /usr/bin/env bash.

Rename disassemle to disassemble in the same commit.

Adapt the correponding message in rebuild-expected-aml.

Signed-off-by: Mohamed Mediouni <mohamed@unpredictable.fr>
---
 tests/data/acpi/disassemle-aml.sh       | 4 ++--
 tests/data/acpi/rebuild-expected-aml.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/data/acpi/disassemle-aml.sh b/tests/data/acpi/disassemle-aml.sh
index 89561d233d..62e1991ace 100755
--- a/tests/data/acpi/disassemle-aml.sh
+++ b/tests/data/acpi/disassemle-aml.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/bash
+#!/usr/bin/env bash
 
 outdir=
 while getopts "o:" arg; do
@@ -7,7 +7,7 @@ while getopts "o:" arg; do
         outdir=$OPTARG
         ;;
     \? )
-        echo "Usage: ./tests/data/acpi/disassemle-aml.sh [-o <output-directory>]"
+        echo "Usage: ./tests/data/acpi/disassemble-aml.sh [-o <output-directory>]"
         exit 1
         ;;
 
diff --git a/tests/data/acpi/rebuild-expected-aml.sh b/tests/data/acpi/rebuild-expected-aml.sh
index cbf9ffe0dd..af45cf3007 100755
--- a/tests/data/acpi/rebuild-expected-aml.sh
+++ b/tests/data/acpi/rebuild-expected-aml.sh
@@ -57,7 +57,7 @@ old_allowed_dif=`grep -v -e 'List of comma-separated changed AML files to ignore
 echo '/* List of comma-separated changed AML files to ignore */' > ${SRC_PATH}/tests/qtest/bios-tables-test-allowed-diff.h
 
 echo "The files were rebuilt and can be added to git."
-echo "You can use ${SRC_PATH}/tests/data/acpi/disassemle-aml.sh to disassemble them to ASL."
+echo "You can use ${SRC_PATH}/tests/data/acpi/disassemble-aml.sh to disassemble them to ASL."
 
 if [ -z "$old_allowed_dif" ]; then
     echo "Note! Please do not commit expected files with source changes"
-- 
2.50.1 (Apple Git-155)

Re: [PATCH] tests/data/acpi: disassemble-aml: rename and change interpreter line

Posted by Michael S. Tsirkin 1 week, 1 day ago

On Thu, Jan 29, 2026 at 05:40:04PM +0100, Mohamed Mediouni wrote:
> /usr/bin/bash isn't guaranteed to be present. Switch
> to /usr/bin/env bash.
> 
> Rename disassemle to disassemble in the same commit.
> 
> Adapt the correponding message in rebuild-expected-aml.
> 
> Signed-off-by: Mohamed Mediouni <mohamed@unpredictable.fr>

/bin/bash then - that's in the posix standard I think.


> ---
>  tests/data/acpi/disassemle-aml.sh       | 4 ++--
>  tests/data/acpi/rebuild-expected-aml.sh | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/tests/data/acpi/disassemle-aml.sh b/tests/data/acpi/disassemle-aml.sh
> index 89561d233d..62e1991ace 100755
> --- a/tests/data/acpi/disassemle-aml.sh
> +++ b/tests/data/acpi/disassemle-aml.sh
> @@ -1,4 +1,4 @@
> -#!/usr/bin/bash
> +#!/usr/bin/env bash
>  
>  outdir=
>  while getopts "o:" arg; do
> @@ -7,7 +7,7 @@ while getopts "o:" arg; do
>          outdir=$OPTARG
>          ;;
>      \? )
> -        echo "Usage: ./tests/data/acpi/disassemle-aml.sh [-o <output-directory>]"
> +        echo "Usage: ./tests/data/acpi/disassemble-aml.sh [-o <output-directory>]"
>          exit 1
>          ;;
>  
> diff --git a/tests/data/acpi/rebuild-expected-aml.sh b/tests/data/acpi/rebuild-expected-aml.sh
> index cbf9ffe0dd..af45cf3007 100755
> --- a/tests/data/acpi/rebuild-expected-aml.sh
> +++ b/tests/data/acpi/rebuild-expected-aml.sh
> @@ -57,7 +57,7 @@ old_allowed_dif=`grep -v -e 'List of comma-separated changed AML files to ignore
>  echo '/* List of comma-separated changed AML files to ignore */' > ${SRC_PATH}/tests/qtest/bios-tables-test-allowed-diff.h
>  
>  echo "The files were rebuilt and can be added to git."
> -echo "You can use ${SRC_PATH}/tests/data/acpi/disassemle-aml.sh to disassemble them to ASL."
> +echo "You can use ${SRC_PATH}/tests/data/acpi/disassemble-aml.sh to disassemble them to ASL."
>  
>  if [ -z "$old_allowed_dif" ]; then
>      echo "Note! Please do not commit expected files with source changes"
> -- 
> 2.50.1 (Apple Git-155)

Re: [PATCH] tests/data/acpi: disassemble-aml: rename and change interpreter line

Posted by Pierrick Bouvier 1 week, 1 day ago

On 1/29/26 9:58 AM, Michael S. Tsirkin wrote:
> On Thu, Jan 29, 2026 at 05:40:04PM +0100, Mohamed Mediouni wrote:
>> /usr/bin/bash isn't guaranteed to be present. Switch
>> to /usr/bin/env bash.
>>
>> Rename disassemle to disassemble in the same commit.
>>
>> Adapt the correponding message in rebuild-expected-aml.
>>
>> Signed-off-by: Mohamed Mediouni <mohamed@unpredictable.fr>
> 
> /bin/bash then - that's in the posix standard I think.
>

Using /usr/bin/env bash is a pretty "standard" and good practice.
https://stackoverflow.com/questions/21612980/why-is-usr-bin-env-bash-superior-to-bin-bash

Regards,
Pierrick

Re: [PATCH] tests/data/acpi: disassemble-aml: rename and change interpreter line

Posted by Philippe Mathieu-Daudé 1 week, 1 day ago

On 29/1/26 19:52, Pierrick Bouvier wrote:
> On 1/29/26 9:58 AM, Michael S. Tsirkin wrote:
>> On Thu, Jan 29, 2026 at 05:40:04PM +0100, Mohamed Mediouni wrote:
>>> /usr/bin/bash isn't guaranteed to be present. Switch
>>> to /usr/bin/env bash.
>>>
>>> Rename disassemle to disassemble in the same commit.
>>>
>>> Adapt the correponding message in rebuild-expected-aml.
>>>
>>> Signed-off-by: Mohamed Mediouni <mohamed@unpredictable.fr>
>>
>> /bin/bash then - that's in the posix standard I think.
>>
> 
> Using /usr/bin/env bash is a pretty "standard" and good practice.
> https://stackoverflow.com/questions/21612980/why-is-usr-bin-env-bash- 
> superior-to-bin-bash

On Darwin/macOS:

$ which bash
/opt/homebrew/bin/bash

WRT QEMU source tree:

$ git grep -E '#!.?/bin/bash' | wc -l
       43
$ git grep -E '#!.?/usr/bin/env bash' | wc -l
      242

Re: [PATCH] tests/data/acpi: disassemble-aml: rename and change interpreter line

Posted by Mohamed Mediouni 1 week, 1 day ago


> On 29. Jan 2026, at 22:48, Philippe Mathieu-Daudé <philmd@linaro.org> wrote:
> 
> On 29/1/26 19:52, Pierrick Bouvier wrote:
>> On 1/29/26 9:58 AM, Michael S. Tsirkin wrote:
>>> On Thu, Jan 29, 2026 at 05:40:04PM +0100, Mohamed Mediouni wrote:
>>>> /usr/bin/bash isn't guaranteed to be present. Switch
>>>> to /usr/bin/env bash.
>>>> 
>>>> Rename disassemle to disassemble in the same commit.
>>>> 
>>>> Adapt the correponding message in rebuild-expected-aml.
>>>> 
>>>> Signed-off-by: Mohamed Mediouni <mohamed@unpredictable.fr>
>>> 
>>> /bin/bash then - that's in the posix standard I think.
>>> 
>> Using /usr/bin/env bash is a pretty "standard" and good practice.
>> https://stackoverflow.com/questions/21612980/why-is-usr-bin-env-bash- superior-to-bin-bash
> 
> On Darwin/macOS:
> 
> $ which bash
> /opt/homebrew/bin/bash
> 
> WRT QEMU source tree:
> 
> $ git grep -E '#!.?/bin/bash' | wc -l
>      43
> $ git grep -E '#!.?/usr/bin/env bash' | wc -l
>     242

For reference macOS has a /bin/bash but it’s only there for legacy reasons as it’s the last pre-GPLv3 release:

% /bin/bash --version
GNU bash, version 3.2.57(1)-release (arm64-apple-darwin25)
Copyright (C) 2007 Free Software Foundation, Inc.