Changeset 85014 in vbox for trunk/src/VBox/ValidationKit/testboxscript

Timestamp:

Jun 30, 2020 6:17:53 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

138915

Message:

bugref:9662 changes in testboxscript which kick --spb option to work on linux

Location:

trunk/src/VBox/ValidationKit/testboxscript

Files:

• linux/testboxscript-service.sh (modified) (1 diff)
• setup.sh (modified) (5 diffs)

trunk/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh

@@ -403 +403 @@
         if [ "${TESTBOXSCRIPT_IOMMU}"         = "yes" ]; then PARAMS="${PARAMS} --io-mmu"; fi
         if [ "${TESTBOXSCRIPT_IOMMU}"         = "no"  ]; then PARAMS="${PARAMS} --no-io-mmu"; fi
+        if [ "${TESTBOXSCRIPT_SPB}"           = "yes" ]; then PARAMS="${PARAMS} --spb"; fi
         if [ -n "${TESTBOXSCRIPT_SYSTEM_UUID}"     ]; then PARAMS="${PARAMS} --system-uuid '${TESTBOXSCRIPT_SYSTEM_UUID}'"; fi
         if [ -n "${TESTBOXSCRIPT_TEST_MANAGER}"    ]; then PARAMS="${PARAMS} --test-manager '${TESTBOXSCRIPT_TEST_MANAGER}'"; fi

trunk/src/VBox/ValidationKit/testboxscript/setup.sh

@@ -441 +441 @@
             my_opt=TESTBOXSCRIPT_OPT_${var}
             if [ -n "${!my_opt}" ]; then
-                if [ "${!my_opt}"  != "--skip" ]; then
+                if [ "${!my_opt}"  == "--spb" ]; then
+                    os_add_args "${!my_opt}"
+                elif [ "${!my_opt}"  != "--skip" ]; then
                     os_add_args "${!my_opt}" "${!varcfg}"
                 fi
@@ -464 +466 @@
         fi
     done
-    if [ -n "${TESTBOXSCRIPT_SPB}" ]; then
-        os_add_args "--spb"
-    fi
 
     i=0
@@ -506 +505 @@
 TESTBOXSCRIPT_CFG_NAMES="${TESTBOXSCRIPT_CFG_NAMES} BUILDS_PATH   BUILDS_TYPE   BUILDS_NAME   BUILDS_SHARE   BUILDS_USER"
 TESTBOXSCRIPT_CFG_NAMES="${TESTBOXSCRIPT_CFG_NAMES} BUILDS_PASSWD BUILDS_MOUNTOPT TESTRSRC_PATH TESTRSRC_TYPE TESTRSRC_NAME"
-TESTBOXSCRIPT_CFG_NAMES="${TESTBOXSCRIPT_CFG_NAMES} TESTRSRC_SHARE TESTRSRC_USER TESTRSRC_PASSWD TESTRSRC_MOUNTOPT"
+TESTBOXSCRIPT_CFG_NAMES="${TESTBOXSCRIPT_CFG_NAMES} TESTRSRC_SHARE TESTRSRC_USER TESTRSRC_PASSWD TESTRSRC_MOUNTOPT SPB"
 
 # testboxscript.py option to config mappings.
@@ -518 +517 @@
 TESTBOXSCRIPT_OPT_IOMMU_YES="--io-mmu"
 TESTBOXSCRIPT_OPT_IOMMU_NO="--no-io-mmu"
+TESTBOXSCRIPT_OPT_SPB="--spb"
 TESTBOXSCRIPT_OPT_SYSTEM_UUID="--system-uuid"
 TESTBOXSCRIPT_OPT_TEST_MANAGER="--test-manager"
@@ -543 +543 @@
 TESTBOXSCRIPT_DEFAULT_IOMMU=""
 TESTBOXSCRIPT_DEFAULT_NESTED_PAGING=""
+TESTBOXSCRIPT_DEFAULT_SPB=""
 TESTBOXSCRIPT_DEFAULT_SYSTEM_UUID=""
 TESTBOXSCRIPT_DEFAULT_PATH_TESTRSRC=""