Use a prefix for the STANDALONE environment variable
PATCH 1/1 Use a prefix for the STANDALONE environment variable
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
--- 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(-)
arm/run +1 -1
@@ -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
powerpc/run +1 -1
@@ -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
s390x/run +1 -1
@@ -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
scripts/mkstandalone.sh +1 -1
@@ -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"
scripts/runtime.bash +2 -2
@@ -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"
x86/run +1 -1
@@ -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
Signature · 1 line
2.27.0
Quoted 6 lines · On Thu, 20 Jan 2022 19:22:00 +0100 Thomas Huth <[email protected]> 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 <[email protected]>
Quoted 92 lines
--- 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(-)arm/run +1
-1@@ -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 2powerpc/run +1
-1@@ -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 2s390x/run +1
-1@@ -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 2scripts/mkstandalone.sh +1
-1@@ -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"scripts/runtime.bash +2
-2@@ -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"x86/run +1
-1@@ -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
Quoted 6 lines · Thomas Huth
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 <[email protected]>
Quoted 8 lines
--- 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(-)
Quoted 6 lines · Thomas Huth
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 <[email protected]>
Doesn't look like this would impact our ci in a meaningful way, so:
Quoted 93 lines
--- 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(-)arm/run +1
-1@@ -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 2powerpc/run +1
-1@@ -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 2s390x/run +1
-1@@ -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 2scripts/mkstandalone.sh +1
-1@@ -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"scripts/runtime.bash +2
-2@@ -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"x86/run +1
-1@@ -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