Re: [kvm-unit-tests PATCH] Use a prefix for the STANDALONE environment variable

[Claudio Imbrenda <imbrenda@linux.ibm.com>]

On Thu, 20 Jan 2022 19:22:00 +0100
Thomas Huth <thuth@redhat.com> wrote:

> Seems like "STANDALONE" is too generic and causes a conflict in
> certain environments (see bug link below). Add a prefix here to
> decrease the possibility of a conflict here.
> 
> Resolves: https://gitlab.com/kvm-unit-tests/kvm-unit-tests/-/issues/3
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Acked-by: Claudio Imbrenda <imbrenda@linux.ibm.com>

> ---
>  arm/run                 | 2 +-
>  powerpc/run             | 2 +-
>  s390x/run               | 2 +-
>  scripts/mkstandalone.sh | 2 +-
>  scripts/runtime.bash    | 4 ++--
>  x86/run                 | 2 +-
>  6 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/arm/run b/arm/run
> index a390ca5..a94e1c7 100755
> --- a/arm/run
> +++ b/arm/run
> @@ -1,6 +1,6 @@
>  #!/usr/bin/env bash
>  
> -if [ -z "$STANDALONE" ]; then
> +if [ -z "$KUT_STANDALONE" ]; then
>  	if [ ! -f config.mak ]; then
>  		echo "run ./configure && make first. See ./configure -h"
>  		exit 2
> diff --git a/powerpc/run b/powerpc/run
> index 597ab96..ee38e07 100755
> --- a/powerpc/run
> +++ b/powerpc/run
> @@ -1,6 +1,6 @@
>  #!/usr/bin/env bash
>  
> -if [ -z "$STANDALONE" ]; then
> +if [ -z "$KUT_STANDALONE" ]; then
>  	if [ ! -f config.mak ]; then
>  		echo "run ./configure && make first. See ./configure -h"
>  		exit 2
> diff --git a/s390x/run b/s390x/run
> index c615caa..064ecd1 100755
> --- a/s390x/run
> +++ b/s390x/run
> @@ -1,6 +1,6 @@
>  #!/usr/bin/env bash
>  
> -if [ -z "$STANDALONE" ]; then
> +if [ -z "$KUT_STANDALONE" ]; then
>  	if [ ! -f config.mak ]; then
>  		echo "run ./configure && make first. See ./configure -h"
>  		exit 2
> diff --git a/scripts/mkstandalone.sh b/scripts/mkstandalone.sh
> index cefdec3..86c7e54 100755
> --- a/scripts/mkstandalone.sh
> +++ b/scripts/mkstandalone.sh
> @@ -35,7 +35,7 @@ generate_test ()
>  	done
>  
>  	echo "#!/usr/bin/env bash"
> -	echo "export STANDALONE=yes"
> +	echo "export KUT_STANDALONE=yes"
>  	echo "export ENVIRON_DEFAULT=$ENVIRON_DEFAULT"
>  	echo "export HOST=\$(uname -m | sed -e 's/i.86/i386/;s/arm.*/arm/;s/ppc64.*/ppc64/')"
>  	echo "export PRETTY_PRINT_STACKS=no"
> diff --git a/scripts/runtime.bash b/scripts/runtime.bash
> index c513761..6d5fced 100644
> --- a/scripts/runtime.bash
> +++ b/scripts/runtime.bash
> @@ -36,7 +36,7 @@ get_cmdline()
>  skip_nodefault()
>  {
>      [ "$run_all_tests" = "yes" ] && return 1
> -    [ "$STANDALONE" != "yes" ] && return 0
> +    [ "$KUT_STANDALONE" != "yes" ] && return 0
>  
>      while true; do
>          read -r -p "Test marked not to be run by default, are you sure (y/N)? " yn
> @@ -155,7 +155,7 @@ function run()
>      summary=$(eval $cmdline 2> >(RUNTIME_log_stderr $testname) \
>                               > >(tee >(RUNTIME_log_stdout $testname $kernel) | extract_summary))  
>      ret=$?
> -    [ "$STANDALONE" != "yes" ] && echo > >(RUNTIME_log_stdout $testname $kernel)
> +    [ "$KUT_STANDALONE" != "yes" ] && echo > >(RUNTIME_log_stdout $testname $kernel)
>  
>      if [ $ret -eq 0 ]; then
>          print_result "PASS" $testname "$summary"
> diff --git a/x86/run b/x86/run
> index ab91753..582d1ed 100755
> --- a/x86/run
> +++ b/x86/run
> @@ -1,6 +1,6 @@
>  #!/usr/bin/env bash
>  
> -if [ -z "$STANDALONE" ]; then
> +if [ -z "$KUT_STANDALONE" ]; then
>  	if [ ! -f config.mak ]; then
>  		echo "run ./configure && make first. See ./configure -h"
>  		exit 2