Skip to contentSkip to conversation

Use a prefix for the STANDALONE environment variable

PATCH In review Thomas Huth 4 participants 4 messages Jan 20, 2022 – Jan 26, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

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
index a390ca5..a94e1c7 100755
@@ -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
index 597ab96..ee38e07 100755
@@ -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
index c615caa..064ecd1 100755
@@ -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
index cefdec3..86c7e54 100755
@@ -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
index c513761..6d5fced 100644
@@ -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
index ab91753..582d1ed 100755
@@ -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
Acked-by on v1 1/1
#1 lore raw
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

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
index a390ca5..a94e1c7 100755
@@ -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
index 597ab96..ee38e07 100755
@@ -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
index c615caa..064ecd1 100755
@@ -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
index cefdec3..86c7e54 100755
@@ -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
index c513761..6d5fced 100644
@@ -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
index ab91753..582d1ed 100755
@@ -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
Reviewed-by on v1 1/1
#2 lore raw
In reply to Thomas Huth
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

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(-)
Acked-by on v1 1/1
#3 lore raw
In reply to Thomas Huth
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

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
index a390ca5..a94e1c7 100755
@@ -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
index 597ab96..ee38e07 100755
@@ -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
index c615caa..064ecd1 100755
@@ -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
index cefdec3..86c7e54 100755
@@ -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
index c513761..6d5fced 100644
@@ -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
index ab91753..582d1ed 100755
@@ -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