Changeset 51346 in vbox

Timestamp:

May 22, 2014 11:35:05 AM (11 years ago)

Author:

vboxsync

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

93832

Message:

rename Test Suite => Validation Kit

Location:

trunk

Files:

• Config.kmk (modified) (11 diffs)
• Makefile.kmk (modified) (6 diffs)
• debian/LocalConfig.kmk (modified) (1 diff)
• doc/VBox-doc.c (modified) (1 diff)
• src/Makefile.kmk (modified) (1 diff)
• src/VBox/Additions/Makefile.kmk (modified) (2 diffs)
• src/VBox/Additions/common/Makefile.kmk (modified) (2 diffs)
• src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk (modified) (2 diffs)
• src/VBox/HostDrivers/Makefile.kmk (modified) (2 diffs)
• src/VBox/HostDrivers/Support/Makefile.kmk (modified) (4 diffs)
• src/VBox/Installer/linux/debian/LocalConfig.kmk (modified) (1 diff)
• src/VBox/Installer/linux/rpm/LocalConfig.kmk (modified) (1 diff)
• src/VBox/Makefile.kmk (modified) (2 diffs)
• src/VBox/Runtime/Makefile.kmk (modified) (3 diffs)
• src/libs/Makefile.kmk (modified) (3 diffs)
• src/libs/libxml2-2.6.31/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -138 +138 @@
 
 
-INST_TESTSUITE        = testsuite/
+INST_VALIDATIONKIT    = testsuite/
 INST_TESTBOXSCRIPT    = testboxscript/
 
@@ -149 +149 @@
 VBOX_PATH_SDK         = $(patsubst %/,%,$(PATH_STAGE)/$(INST_SDK))
 VBOX_PATH_DIST        = $(patsubst %/,%,$(PATH_STAGE)/$(INST_DIST))
-VBOX_PATH_TESTSUITE   = $(patsubst %/,%,$(PATH_STAGE)/$(INST_TESTSUITE))
+VBOX_PATH_VALIDATIONKIT = $(patsubst %/,%,$(PATH_STAGE)/$(INST_VALIDATIONKIT))
 VBOX_PATH_ADDITIONS   = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS))
 VBOX_PATH_ADDITIONS_ISO = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS_ISO))
@@ -508 +508 @@
 ## @}
 
+# legacy
+ifdef VBOX_ONLY_TESTSUITE
+ $(warning VBOX_ONLY_TESTSUITE was renamed to VBOX_ONLY_VALIDATIONKIT)
+ VBOX_ONLY_VALIDATIONKIT = $(VBOX_ONLY_TESTSUITE)
+endif
 
 ## @name Other Component
@@ -519 +524 @@
 # Whether to also ship 32-bit main API on 64-bit systems.
 if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), solaris.amd64 win.amd64)
- if !defined(VBOX_ONLY_TESTSUITE) && !defined(VBOX_ONLY_ADDITIONS) && !defined(VBOX_ONLY_DOCS)
+ if !defined(VBOX_ONLY_VALIDATIONKIT) && !defined(VBOX_ONLY_ADDITIONS) && !defined(VBOX_ONLY_DOCS)
   VBOX_WITH_32_ON_64_MAIN_API = 1
  endif
@@ -579 +584 @@
 # Enable the kchmviewer.
 VBOX_WITH_KCHMVIEWER = 1
-# Build the testsuite.
-VBOX_WITH_TESTSUITE = 1
+# Build the Validation Kit.
+VBOX_WITH_VALIDATIONKIT = 1
 # Build the testcases.
 VBOX_WITH_TESTCASES = 1
@@ -863 +868 @@
 ifdef VBOX_QUICK
  # undefine variables by assigning blank.
- VBOX_WITH_TESTSUITE=
+ VBOX_WITH_VALIDATIONKIT=
  VBOX_WITH_TESTCASES=
  VBOX_WITH_MAIN =
@@ -917 +922 @@
  VBOX_WITH_VRDP_AUTHMOD=
  VBOX_WITH_VRDP_RDESKTOP=
- VBOX_WITH_TESTSUITE=
+ VBOX_WITH_VALIDATIONKIT=
  VBOX_WITH_QTGUI=
  VBOX_WITH_USB=
@@ -957 +962 @@
  VBOX_WITH_RAW_MODE=
  VBOX_WITH_SECURELABEL=
- VBOX_WITH_TESTSUITE=
+ VBOX_WITH_VALIDATIONKIT=
  VBOX_WITH_USB=
  VBOX_WITH_VBOXDRV=
@@ -1014 +1019 @@
 # Indicate VBOX_ONLY build if any of the VBOX_ONLY_* variables are set.
 #
-VBOX_ONLY_BUILD := $(strip $(foreach x, ADDITIONS DOCS EXTPACKS SDK TESTSUITE\
+VBOX_ONLY_BUILD := $(strip $(foreach x, ADDITIONS DOCS EXTPACKS SDK VALIDATIONKIT\
         , $(if-expr defined(VBOX_ONLY_$(x)),VBOX_ONLY_$(x))))
 if $(words $(VBOX_ONLY_BUILD)) > 1
@@ -1049 +1054 @@
  # Enable any translations in OSE, even partial ones.
  VBOX_WITH_DOCS_TRANSLATIONS=1
- VBOX_WITH_TESTSUITE=
+ VBOX_WITH_VALIDATIONKIT=
  VBOX_WITH_INTEL_PXE=
  # Disable for OSE, requires snv_159+.
@@ -1172 +1177 @@
 ifdef VBOX_WITH_EXTPACK_PUEL_BUILD
  VBOX_WITH_EXTPACK_PUEL = 1
+endif
+
+ifdef VBOX_WITH_TESTSUITE
+ $(warning VBOX_WITH_TESTSUITE was renamed to VBOX_WITH_VALIDATIONKIT)
+ VBOX_WITH_VALIDATIONKIT = $(VBOX_WITH_TESTSUITE)
 endif
 

trunk/Makefile.kmk

@@ -60 +60 @@
  && !defined(VBOX_ONLY_DOCS) \
  && !defined(VBOX_ONLY_EXTPACKS) \
- && !defined(VBOX_ONLY_TESTSUITE) # -> line 426b ;-)
+ && !defined(VBOX_ONLY_VALIDATIONKIT) # -> line 426b ;-)
 
  if !defined(VBOX_OSE) && defined(VBOX_LICENSE_FILES)
@@ -396 +396 @@
 endif
 
-endif # !VBOX_ONLY_ADDITIONS && !VBOX_ONLY_DOCS && !VBOX_ONLY_EXTPACKS && !VBOX_ONLY_TESTSUITE
+endif # !VBOX_ONLY_ADDITIONS && !VBOX_ONLY_DOCS && !VBOX_ONLY_EXTPACKS && !VBOX_ONLY_VALIDATIONKIT
 
 
@@ -763 +763 @@
 
 #
-# Alias for kmk_time.  Used by both the additions and testsuite build setups.
+# Alias for kmk_time.  Used by both the additions and validation kit build setups.
 #
 VBOX_KMK_TIME = $(KBUILD_BIN_PATH)/kmk_time
@@ -1242 +1242 @@
 # the additions build above, which it in fact is a copy of.
 #
-testsuite-fetch:
-        + $(KMK) -C tools fetch VBOX_ONLY_TESTSUITE=1
-        + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=darwin  BUILD_TARGET_ARCH=amd64 BUILD_TARGET=darwin    VBOX_ONLY_TESTSUITE=1
-        + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=darwin  BUILD_TARGET_ARCH=x86   BUILD_TARGET=darwin    VBOX_ONLY_TESTSUITE=1
-#       + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=freebsd BUILD_TARGET_ARCH=amd64 BUILD_TARGET=freebsd   VBOX_ONLY_TESTSUITE=1
-#       + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=freebsd BUILD_TARGET_ARCH=x86   BUILD_TARGET=freebsd   VBOX_ONLY_TESTSUITE=1
-        + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=linux   BUILD_TARGET_ARCH=amd64 BUILD_TARGET=linux     VBOX_ONLY_TESTSUITE=1
-        + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=linux   BUILD_TARGET_ARCH=x86   BUILD_TARGET=linux     VBOX_ONLY_TESTSUITE=1
-        + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=os2     BUILD_TARGET_ARCH=x86   BUILD_TARGET=os2       VBOX_ONLY_TESTSUITE=1
-        + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=solaris BUILD_TARGET_ARCH=amd64 BUILD_TARGET=solaris   VBOX_ONLY_TESTSUITE=1
-        + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=solaris BUILD_TARGET_ARCH=x86   BUILD_TARGET=solaris   VBOX_ONLY_TESTSUITE=1
-        + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=win     BUILD_TARGET_ARCH=amd64 BUILD_TARGET=win       VBOX_ONLY_TESTSUITE=1
-        + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=win     BUILD_TARGET_ARCH=x86   BUILD_TARGET=win       VBOX_ONLY_TESTSUITE=1
-
-
-testsuite-build: \
-        testsuite-build-rsync-into-vms \
-        testsuite-build-solaris.amd64 \
-        testsuite-build-solaris.x86 \
-        testsuite-build-win.x86 \
-        testsuite-build-win.amd64 \
-        testsuite-build-os2.x86 \
-        testsuite-build-linux.amd64 \
-        testsuite-build-linux.x86 \
-        testsuite-build-freebsd.amd64 \
-        testsuite-build-freebsd.x86 \
-        testsuite-build-darwin.amd64 \
-        testsuite-build-darwin.x86
-
-testsuite-build-rsync-into-vms: \
-                testsuite-build-solaris.rsync-into-vm \
-                testsuite-build-os2.rsync-into-vm
+validationkit-fetch:
+        + $(KMK) -C tools fetch VBOX_ONLY_VALIDATIONKIT=1
+        + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=darwin  BUILD_TARGET_ARCH=amd64 BUILD_TARGET=darwin    VBOX_ONLY_VALIDATIONKIT=1
+        + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=darwin  BUILD_TARGET_ARCH=x86   BUILD_TARGET=darwin    VBOX_ONLY_VALIDATIONKIT=1
+#       + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=freebsd BUILD_TARGET_ARCH=amd64 BUILD_TARGET=freebsd   VBOX_ONLY_VALIDATIONKIT=1
+#       + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=freebsd BUILD_TARGET_ARCH=x86   BUILD_TARGET=freebsd   VBOX_ONLY_VALIDATIONKIT=1
+        + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=linux   BUILD_TARGET_ARCH=amd64 BUILD_TARGET=linux     VBOX_ONLY_VALIDATIONKIT=1
+        + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=linux   BUILD_TARGET_ARCH=x86   BUILD_TARGET=linux     VBOX_ONLY_VALIDATIONKIT=1
+        + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=os2     BUILD_TARGET_ARCH=x86   BUILD_TARGET=os2       VBOX_ONLY_VALIDATIONKIT=1
+        + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=solaris BUILD_TARGET_ARCH=amd64 BUILD_TARGET=solaris   VBOX_ONLY_VALIDATIONKIT=1
+        + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=solaris BUILD_TARGET_ARCH=x86   BUILD_TARGET=solaris   VBOX_ONLY_VALIDATIONKIT=1
+        + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=win     BUILD_TARGET_ARCH=amd64 BUILD_TARGET=win       VBOX_ONLY_VALIDATIONKIT=1
+        + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=win     BUILD_TARGET_ARCH=x86   BUILD_TARGET=win       VBOX_ONLY_VALIDATIONKIT=1
+
+
+validationkit-build: \
+        validationkit-build-rsync-into-vms \
+        validationkit-build-solaris.amd64 \
+        validationkit-build-solaris.x86 \
+        validationkit-build-win.x86 \
+        validationkit-build-win.amd64 \
+        validationkit-build-os2.x86 \
+        validationkit-build-linux.amd64 \
+        validationkit-build-linux.x86 \
+        validationkit-build-freebsd.amd64 \
+        validationkit-build-freebsd.x86 \
+        validationkit-build-darwin.amd64 \
+        validationkit-build-darwin.x86
+
+validationkit-build-rsync-into-vms: \
+                validationkit-build-solaris.rsync-into-vm \
+                validationkit-build-os2.rsync-into-vm
         $(call MSG_L1,Rsynced the sources + tools into the VMs.)
-.NOTPARALLEL: testsuite-build-rsync-into-vms
-
-
-VBOX_TESTSUITE_BUILD.amd64 = VBOX_ONLY_TESTSUITE=1 \
+.NOTPARALLEL: validationkit-build-rsync-into-vms
+
+
+VBOX_VALIDATIONKIT_BUILD.amd64 = VBOX_ONLY_VALIDATIONKIT=1 \
         KBUILD_TYPE=$(KBUILD_TYPE) BUILD_TYPE=$(KBUILD_TYPE) \
         KBUILD_TARGET_ARCH=amd64 BUILD_TARGET_ARCH=amd64 \
         VBOX_SVN_REV=$(VBOX_SVN_REV)
 
-VBOX_TESTSUITE_BUILD.x86 = VBOX_ONLY_TESTSUITE=1 \
+VBOX_VALIDATIONKIT_BUILD.x86 = VBOX_ONLY_VALIDATIONKIT=1 \
         KBUILD_TYPE=$(KBUILD_TYPE) BUILD_TYPE=$(KBUILD_TYPE) \
         KBUILD_TARGET_ARCH=x86 BUILD_TARGET_ARCH=x86 \
         VBOX_SVN_REV=$(VBOX_SVN_REV)
 
-# Automatically determine the testsuite build subdir name. Used for figuring
+# Automatically determine the Validation Kit build subdir name. Used for figuring
 # out directory names inside the test suite building VMs.
-VBOX_TESTSUITE_BUILD_SUBDIRNAME := $(lastword $(subst /, ,$(PATH_ROOT)))
+VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME := $(lastword $(subst /, ,$(PATH_ROOT)))
 
 # When building in parallel on a Windows host, make sure we finish the host
 # bit before kicking off any UNIX guest or we'll run into file sharing issues.
 ifeq ($(KBUILD_TARGET),win)
-VBOX_TESTSUITE_BUILD_WIN_HOST_FIRST = testsuite-build-win.x86 testsuite-build-win.amd64
-else
-VBOX_TESTSUITE_BUILD_WIN_HOST_FIRST =
+VBOX_VALIDATIONKIT_BUILD_WIN_HOST_FIRST = validationkit-build-win.x86 validationkit-build-win.amd64
+else
+VBOX_VALIDATIONKIT_BUILD_WIN_HOST_FIRST =
 endif
 
 # ASSUMES the 32-bit edition has been built already. Also for serializing VM access.
-testsuite-build-win.amd64: testsuite-build-win.x86
+validationkit-build-win.amd64: validationkit-build-win.x86
 ifeq ($(KBUILD_TARGET),win)
-        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_TESTSUITE_BUILD.amd64) all $(VBOX_TESTSUITE_HOST_BUILD_TWEAK)
-else
-        $(call VBOX_BLD_VM_MSG_BEGIN,Windows/amd64 testsuite)
-        $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_WIN_X86_IP) " echo $@ && cd e:/$(VBOX_TESTSUITE_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_TESTSUITE_BUILD.amd64) all "
-        $(call VBOX_BLD_VM_MSG_END__,Windows/amd64 testsuite)
-endif
-
-testsuite-build-win.x86:
+        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_VALIDATIONKIT_BUILD.amd64) all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK)
+else
+        $(call VBOX_BLD_VM_MSG_BEGIN,Windows/amd64 Validation Kit)
+        $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_WIN_X86_IP) " echo $@ && cd e:/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_VALIDATIONKIT_BUILD.amd64) all "
+        $(call VBOX_BLD_VM_MSG_END__,Windows/amd64 Validation Kit)
+endif
+
+validationkit-build-win.x86:
 ifeq ($(KBUILD_TARGET),win)
-        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_TESTSUITE_BUILD.x86) all $(VBOX_TESTSUITE_HOST_BUILD_TWEAK)
-else
-        $(call VBOX_BLD_VM_MSG_BEGIN,Windows/x86 testsuite)
-        $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_WIN_AMD64_IP) " echo $@ && cd e:/$(VBOX_TESTSUITE_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_TESTSUITE_BUILD.x86) all"
-        $(call VBOX_BLD_VM_MSG_END__,Windows/x86 testsuite)
+        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_VALIDATIONKIT_BUILD.x86) all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK)
+else
+        $(call VBOX_BLD_VM_MSG_BEGIN,Windows/x86 Validation Kit)
+        $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_WIN_AMD64_IP) " echo $@ && cd e:/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_VALIDATIONKIT_BUILD.x86) all"
+        $(call VBOX_BLD_VM_MSG_END__,Windows/x86 Validation Kit)
 endif
 
 ifeq ($(KBUILD_TARGET),solaris)
-testsuite-build-solaris.amd64:
-        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_TESTSUITE_BUILD.amd64) all $(VBOX_TESTSUITE_HOST_BUILD_TWEAK)
-
-testsuite-build-solaris.x86:
-        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_TESTSUITE_BUILD.x86)   all $(VBOX_TESTSUITE_HOST_BUILD_TWEAK)
-
-else
-testsuite-build-solaris.rsync-into-vm: $(VBOX_TESTSUITE_BUILD_WIN_HOST_FIRST)
-        $(VBOX_KMK_TIME) rsync -a --delete --delete-excluded --exclude .svn --exclude=FetchDir --exclude=tinderclient.log --exclude=win.amd64 --exclude=win.x86 . $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_TESTSUITE_BUILD_SUBDIRNAME)
-
-testsuite-build-solaris.build-it: testsuite-build-solaris.rsync-into-vm
-        $(call VBOX_BLD_VM_MSG_BEGIN,Solaris/amd64 testsuite)
-        $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_SOLARIS_IP) " echo $@/amd64 && cd /mnt/tinderbox/$(VBOX_TESTSUITE_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_TESTSUITE_BUILD.amd64) all"
-        $(call VBOX_BLD_VM_MSG_END__,Solaris/amd64 testsuite)
-        $(call VBOX_BLD_VM_MSG_BEGIN,Solaris/x86 testsuite)
-        $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_SOLARIS_IP) " echo $@/x86   && cd /mnt/tinderbox/$(VBOX_TESTSUITE_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_TESTSUITE_BUILD.x86) all "
-        $(call VBOX_BLD_VM_MSG_END__,Solaris/x86 testsuite)
-
-testsuite-build-solaris.rsync-out-of-vm: testsuite-build-solaris.build-it
-        $(VBOX_KMK_TIME) rsync -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_TESTSUITE_BUILD_SUBDIRNAME)/out/solaris.x86   out/
-        $(VBOX_KMK_TIME) rsync -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_TESTSUITE_BUILD_SUBDIRNAME)/out/solaris.amd64 out/
-
-.NOTPARALLEL: testsuite-build-solaris.rsync-into-vm
-.PHONY:       testsuite-build-solaris.rsync-out-of-vm testsuite-build-solaris.rsync-into-vm testsuite-build-solaris.build-it
-
-testsuite-build-solaris.amd64: testsuite-build-solaris.rsync-out-of-vm
-testsuite-build-solaris.x86:   testsuite-build-solaris.rsync-out-of-vm
+validationkit-build-solaris.amd64:
+        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_VALIDATIONKIT_BUILD.amd64) all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK)
+
+validationkit-build-solaris.x86:
+        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_VALIDATIONKIT_BUILD.x86)   all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK)
+
+else
+validationkit-build-solaris.rsync-into-vm: $(VBOX_VALIDATIONKIT_BUILD_WIN_HOST_FIRST)
+        $(VBOX_KMK_TIME) rsync -a --delete --delete-excluded --exclude .svn --exclude=FetchDir --exclude=tinderclient.log --exclude=win.amd64 --exclude=win.x86 . $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)
+
+validationkit-build-solaris.build-it: validationkit-build-solaris.rsync-into-vm
+        $(call VBOX_BLD_VM_MSG_BEGIN,Solaris/amd64 Validation Kit)
+        $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_SOLARIS_IP) " echo $@/amd64 && cd /mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_VALIDATIONKIT_BUILD.amd64) all"
+        $(call VBOX_BLD_VM_MSG_END__,Solaris/amd64 Validation Kit)
+        $(call VBOX_BLD_VM_MSG_BEGIN,Solaris/x86 Validation Kit)
+        $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_SOLARIS_IP) " echo $@/x86   && cd /mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_VALIDATIONKIT_BUILD.x86) all "
+        $(call VBOX_BLD_VM_MSG_END__,Solaris/x86 Validation Kit)
+
+validationkit-build-solaris.rsync-out-of-vm: validationkit-build-solaris.build-it
+        $(VBOX_KMK_TIME) rsync -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)/out/solaris.x86   out/
+        $(VBOX_KMK_TIME) rsync -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)/out/solaris.amd64 out/
+
+.NOTPARALLEL: validationkit-build-solaris.rsync-into-vm
+.PHONY:       validationkit-build-solaris.rsync-out-of-vm validationkit-build-solaris.rsync-into-vm validationkit-build-solaris.build-it
+
+validationkit-build-solaris.amd64: validationkit-build-solaris.rsync-out-of-vm
+validationkit-build-solaris.x86:   validationkit-build-solaris.rsync-out-of-vm
 endif
 
 ifeq ($(KBUILD_TARGET),os2)
-testsuite-build-os2.x86:
-        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_TESTSUITE_BUILD.x86) all $(VBOX_TESTSUITE_HOST_BUILD_TWEAK)
-testsuite-build-os2.rsync-into-vm:
+validationkit-build-os2.x86:
+        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_VALIDATIONKIT_BUILD.x86) all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK)
+validationkit-build-os2.rsync-into-vm:
 else # !OS/2
-testsuite-build-os2.rsync-into-vm:
+validationkit-build-os2.rsync-into-vm:
         $(VBOX_KMK_TIME) $(call VBOX_RSYNC_IN_FN,os2,*) \
                 '--exclude=src/VBox/Additions/x11/**' \
@@ -1360 +1360 @@
                 '--exclude=src/VBox/Frontends/**' \
                 '--exclude=src/VBox/VMM/**' \
-                . rsync://vbox@$(VBOX_BLD_VM_OS2_IP)/tinderbox/$(VBOX_TESTSUITE_BUILD_SUBDIRNAME)
-
-testsuite-build-os2.build-it: testsuite-build-os2.rsync-into-vm
-        $(call VBOX_BLD_VM_MSG_BEGIN,OS/2 TestSuite)
-        $(VBOX_KMK_TIME) rsh -l vbox $(VBOX_BLD_VM_OS2_IP) "cd e:\\tinderbox\\$(VBOX_TESTSUITE_BUILD_SUBDIRNAME) && e: && kbuild\\bin\\os2.x86\\kmk_ash tools\\env.sh --no-wine kmk $(VBOX_TESTSUITE_BUILD.x86) all packing"
-        $(call VBOX_BLD_VM_MSG_END__,OS/2 TestSuite)
-
-testsuite-build-os2.rsync-out-of-vm: testsuite-build-os2.build-it
-        $(VBOX_KMK_TIME) rsync -v -a --delete rsync://vbox@$(VBOX_BLD_VM_OS2_IP)/tinderbox/$(VBOX_TESTSUITE_BUILD_SUBDIRNAME)/out/os2.x86 ./out
-
-.NOTPARALLEL: testsuite-build-os2.rsync-into-vm
-.PHONY:       testsuite-build-os2.rsync-into-vm testsuite-build-os2.rsync-out-of-vm testsuite-build-os2.build-it
-
-testsuite-build-os2.x86: testsuite-build-os2.rsync-out-of-vm
+                . rsync://vbox@$(VBOX_BLD_VM_OS2_IP)/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)
+
+validationkit-build-os2.build-it: validationkit-build-os2.rsync-into-vm
+        $(call VBOX_BLD_VM_MSG_BEGIN,OS/2 Validation Kit)
+        $(VBOX_KMK_TIME) rsh -l vbox $(VBOX_BLD_VM_OS2_IP) "cd e:\\tinderbox\\$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME) && e: && kbuild\\bin\\os2.x86\\kmk_ash tools\\env.sh --no-wine kmk $(VBOX_VALIDATIONKIT_BUILD.x86) all packing"
+        $(call VBOX_BLD_VM_MSG_END__,OS/2 Validation Kit)
+
+validationkit-build-os2.rsync-out-of-vm: validationkit-build-os2.build-it
+        $(VBOX_KMK_TIME) rsync -v -a --delete rsync://vbox@$(VBOX_BLD_VM_OS2_IP)/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)/out/os2.x86 ./out
+
+.NOTPARALLEL: validationkit-build-os2.rsync-into-vm
+.PHONY:       validationkit-build-os2.rsync-into-vm validationkit-build-os2.rsync-out-of-vm validationkit-build-os2.build-it
+
+validationkit-build-os2.x86: validationkit-build-os2.rsync-out-of-vm
 endif # !OS/2
 
-testsuite-build-linux.amd64:   $(VBOX_TESTSUITE_BUILD_WIN_HOST_FIRST)
+validationkit-build-linux.amd64:   $(VBOX_VALIDATIONKIT_BUILD_WIN_HOST_FIRST)
 ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.amd64)
-        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_TESTSUITE_BUILD.amd64) all $(VBOX_TESTSUITE_HOST_BUILD_TWEAK)
-else
-        $(call VBOX_BLD_VM_MSG_BEGIN,Linux/amd64 testsuite)
-        $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_LNX_AMD64_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_TESTSUITE_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_TESTSUITE_BUILD.amd64) all"
-        $(call VBOX_BLD_VM_MSG_END__,Linux/amd64 testsuite)
-endif
-
-testsuite-build-linux.x86:   $(VBOX_TESTSUITE_BUILD_WIN_HOST_FIRST)
+        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_VALIDATIONKIT_BUILD.amd64) all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK)
+else
+        $(call VBOX_BLD_VM_MSG_BEGIN,Linux/amd64 Validation Kit)
+        $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_LNX_AMD64_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_VALIDATIONKIT_BUILD.amd64) all"
+        $(call VBOX_BLD_VM_MSG_END__,Linux/amd64 Validation Kit)
+endif
+
+validationkit-build-linux.x86:   $(VBOX_VALIDATIONKIT_BUILD_WIN_HOST_FIRST)
 ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.x86)
-        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_TESTSUITE_BUILD.x86) all $(VBOX_TESTSUITE_HOST_BUILD_TWEAK)
-else
-        $(call VBOX_BLD_VM_MSG_BEGIN,Linux/x86 testsuite)
-        $(VBOX_KMK_TIME) ssh 'vbox@$(VBOX_BLD_VM_LNX_NEW_X86_IP) "echo $@ && dchroot -c rhel3-i386 \"cd /mnt/tinderbox/$(VBOX_TESTSUITE_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_TESTSUITE_BUILD.x86) all\""'
-        $(call VBOX_BLD_VM_MSG_END__,Linux/x86 testsuite)
-endif
-
-testsuite-build-freebsd.amd64:   $(VBOX_TESTSUITE_BUILD_WIN_HOST_FIRST)
+        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_VALIDATIONKIT_BUILD.x86) all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK)
+else
+        $(call VBOX_BLD_VM_MSG_BEGIN,Linux/x86 Validation Kit)
+        $(VBOX_KMK_TIME) ssh 'vbox@$(VBOX_BLD_VM_LNX_NEW_X86_IP) "echo $@ && dchroot -c rhel3-i386 \"cd /mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_VALIDATIONKIT_BUILD.x86) all\""'
+        $(call VBOX_BLD_VM_MSG_END__,Linux/x86 Validation Kit)
+endif
+
+validationkit-build-freebsd.amd64:   $(VBOX_VALIDATIONKIT_BUILD_WIN_HOST_FIRST)
 #ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),freebsd.amd64)
-#       + $(VBOX_KMK_TIME) $(KMK) $(VBOX_TESTSUITE_BUILD.amd64) all $(VBOX_TESTSUITE_HOST_BUILD_TWEAK)
+#       + $(VBOX_KMK_TIME) $(KMK) $(VBOX_VALIDATIONKIT_BUILD.amd64) all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK)
 #else
-#       $(call VBOX_BLD_VM_MSG_BEGIN,Freebsd/amd64 testsuite)
-#       $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_FBSD_AMD64_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_TESTSUITE_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_TESTSUITE_BUILD.amd64) all"
-#       $(call VBOX_BLD_VM_MSG_END__,Freebsd/amd64 testsuite)
+#       $(call VBOX_BLD_VM_MSG_BEGIN,Freebsd/amd64 Validation Kit)
+#       $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_FBSD_AMD64_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_VALIDATIONKIT_BUILD.amd64) all"
+#       $(call VBOX_BLD_VM_MSG_END__,Freebsd/amd64 Validation Kit)
 #endif
 
-testsuite-build-freebsd.x86:   $(VBOX_TESTSUITE_BUILD_WIN_HOST_FIRST)
+validationkit-build-freebsd.x86:   $(VBOX_VALIDATIONKIT_BUILD_WIN_HOST_FIRST)
 #ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),freebsd.x86)
-#       + $(VBOX_KMK_TIME) $(KMK) $(VBOX_TESTSUITE_BUILD.x86) all $(VBOX_TESTSUITE_HOST_BUILD_TWEAK)
+#       + $(VBOX_KMK_TIME) $(KMK) $(VBOX_VALIDATIONKIT_BUILD.x86) all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK)
 #else
-#       $(call VBOX_BLD_VM_MSG_BEGIN,Freebsd/x86 testsuite)
-#       $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_FBSD_X86_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_TESTSUITE_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_TESTSUITE_BUILD.x86) all"
-#       $(call VBOX_BLD_VM_MSG_END__,Freebsd/x86 testsuite)
+#       $(call VBOX_BLD_VM_MSG_BEGIN,Freebsd/x86 Validation Kit)
+#       $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_FBSD_X86_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_VALIDATIONKIT_BUILD.x86) all"
+#       $(call VBOX_BLD_VM_MSG_END__,Freebsd/x86 Validation Kit)
 #endif
 
-testsuite-build-darwin.amd64:   $(VBOX_TESTSUITE_BUILD_WIN_HOST_FIRST)
+validationkit-build-darwin.amd64:   $(VBOX_VALIDATIONKIT_BUILD_WIN_HOST_FIRST)
 ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),darwin.amd64)
-        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_TESTSUITE_BUILD.amd64) all $(VBOX_TESTSUITE_HOST_BUILD_TWEAK)
-else
-        $(call VBOX_BLD_VM_MSG_BEGIN,Darwin/amd64 testsuite)
+        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_VALIDATIONKIT_BUILD.amd64) all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK)
+else
+        $(call VBOX_BLD_VM_MSG_BEGIN,Darwin/amd64 Validation Kit)
         $(VBOX_KMK_TIME) $(call VBOX_RSYNC_IN_FN,darwin,amd64) . $(VBOX_BLD_VM_DARWIN_AMD64_IP):/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)
-        $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_DARWIN_AMD64_IP) " echo $@ && cd /Users/vbox/tinderbox/$(VBOX_TESTSUITE_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_TESTSUITE_BUILD.amd64) all"
+        $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_DARWIN_AMD64_IP) " echo $@ && cd /Users/vbox/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_VALIDATIONKIT_BUILD.amd64) all"
         $(VBOX_KMK_TIME) rsync -am -v --delete $(VBOX_BLD_VM_DARWIN_AMD64_IP):/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/darwin.amd64 out/
-        $(call VBOX_BLD_VM_MSG_END__,Darwin/amd64 testsuite)
-endif
-
-testsuite-build-darwin.x86:   $(VBOX_TESTSUITE_BUILD_WIN_HOST_FIRST)
+        $(call VBOX_BLD_VM_MSG_END__,Darwin/amd64 Validation Kit)
+endif
+
+validationkit-build-darwin.x86:   $(VBOX_VALIDATIONKIT_BUILD_WIN_HOST_FIRST)
 ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),darwin.x86)
-        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_TESTSUITE_BUILD.x86) all $(VBOX_TESTSUITE_HOST_BUILD_TWEAK)
-else
-        $(call VBOX_BLD_VM_MSG_BEGIN,Darwin/x86 testsuite)
+        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_VALIDATIONKIT_BUILD.x86) all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK)
+else
+        $(call VBOX_BLD_VM_MSG_BEGIN,Darwin/x86 Validation Kit)
         $(VBOX_KMK_TIME) $(call VBOX_RSYNC_IN_FN,darwin,x86) . $(VBOX_BLD_VM_DARWIN_X86_IP):/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)
-        $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_DARWIN_X86_IP) " echo $@ && cd /Users/vbox/tinderbox/$(VBOX_TESTSUITE_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_TESTSUITE_BUILD.x86) all"
+        $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_DARWIN_X86_IP) " echo $@ && cd /Users/vbox/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_VALIDATIONKIT_BUILD.x86) all"
         $(VBOX_KMK_TIME) rsync -am -v --delete $(VBOX_BLD_VM_DARWIN_X86_IP):/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/darwin.x86 out/
-        $(call VBOX_BLD_VM_MSG_END__,Darwin/x86 testsuite)
-endif
-
-
-testsuite-packing:
-        + $(KMK) VBOX_ONLY_TESTSUITE=1 \
-                VBOX_WITH_TESTSUITE_PACKING.darwin.amd64=1 \
-                VBOX_WITH_TESTSUITE_PACKING.darwin.x86=2 \
-                VBOX_WITH_TESTSUITE_PACKING.freebsd.amd64= \
-                VBOX_WITH_TESTSUITE_PACKING.freebsd.x86= \
-                VBOX_WITH_TESTSUITE_PACKING.linux.amd64=1 \
-                VBOX_WITH_TESTSUITE_PACKING.linux.x86=1 \
-                VBOX_WITH_TESTSUITE_PACKING.os2.x86=1 \
-                VBOX_WITH_TESTSUITE_PACKING.solaris.amd64=1 \
-                VBOX_WITH_TESTSUITE_PACKING.solaris.x86=1 \
-                VBOX_WITH_TESTSUITE_PACKING.win.amd64=1 \
-                VBOX_WITH_TESTSUITE_PACKING.win.x86=1 \
+        $(call VBOX_BLD_VM_MSG_END__,Darwin/x86 Validation Kit)
+endif
+
+
+validationkit-packing:
+        + $(KMK) VBOX_ONLY_VALIDATIONKIT=1 \
+                VBOX_WITH_VALIDATIONKIT_PACKING.darwin.amd64=1 \
+                VBOX_WITH_VALIDATIONKIT_PACKING.darwin.x86=2 \
+                VBOX_WITH_VALIDATIONKIT_PACKING.freebsd.amd64= \
+                VBOX_WITH_VALIDATIONKIT_PACKING.freebsd.x86= \
+                VBOX_WITH_VALIDATIONKIT_PACKING.linux.amd64=1 \
+                VBOX_WITH_VALIDATIONKIT_PACKING.linux.x86=1 \
+                VBOX_WITH_VALIDATIONKIT_PACKING.os2.x86=1 \
+                VBOX_WITH_VALIDATIONKIT_PACKING.solaris.amd64=1 \
+                VBOX_WITH_VALIDATIONKIT_PACKING.solaris.x86=1 \
+                VBOX_WITH_VALIDATIONKIT_PACKING.win.amd64=1 \
+                VBOX_WITH_VALIDATIONKIT_PACKING.win.x86=1 \
                 -C src/VBox/Testsuite \
                 $(PATH_OUT)/VBoxTestSuite.zip \
@@ -1453 +1453 @@
 
 .PHONY: \
-        testsuite-build-win.x86 \
-        testsuite-build-win.amd64 \
-        testsuite-build-solaris.amd64 \
-        testsuite-build-solaris.x86 \
-        testsuite-build-os2.x86 \
-        testsuite-build-linux.amd64 \
-        testsuite-build-linux.x86 \
-        testsuite-build-freebsd.amd64 \
-        testsuite-build-freebsd.x86 \
-        testsuite-build-darwin.amd64 \
-        testsuite-build-darwin.x86 \
-        testsuite-packing
+        validationkit-build-win.x86 \
+        validationkit-build-win.amd64 \
+        validationkit-build-solaris.amd64 \
+        validationkit-build-solaris.x86 \
+        validationkit-build-os2.x86 \
+        validationkit-build-linux.amd64 \
+        validationkit-build-linux.x86 \
+        validationkit-build-freebsd.amd64 \
+        validationkit-build-freebsd.x86 \
+        validationkit-build-darwin.amd64 \
+        validationkit-build-darwin.x86 \
+        validationkit-packing
 
 

trunk/debian/LocalConfig.kmk

@@ -18 +18 @@
 # don't build testcases to save time, they are not needed for the package
 VBOX_WITH_TESTCASES        :=
-VBOX_WITH_TESTSUITE        :=
+VBOX_WITH_VALIDATIONKIT    :=
 
 # required for VBOX_WITH_RUNPATH

trunk/doc/VBox-doc.c

@@ -145 +145 @@
  *        maintained atm).
  *  - IPRT - Runtime Library for hiding host OS differences.
- *  - Testsuite:
+ *  - Validation Kit:
  *      - @ref pg_testsuite_guideline
  *

trunk/src/Makefile.kmk

@@ -37 +37 @@
   include $(PATH_SUB_CURRENT)/apps/Makefile.kmk
  endif
- ifdef VBOX_WITH_TESTSUITE
+ ifdef VBOX_WITH_VALIDATIONKIT
   include $(PATH_SUB_CURRENT)/tests/Makefile.kmk
  endif

trunk/src/VBox/Additions/Makefile.kmk

@@ -48 +48 @@
 include $(PATH_SUB_CURRENT)/common/Makefile.kmk
 
-ifndef VBOX_ONLY_TESTSUITE
+ifndef VBOX_ONLY_VALIDATIONKIT
  ifdef VBOX_WITH_X11_ADDITIONS
   include $(PATH_SUB_CURRENT)/x11/Makefile.kmk
@@ -161 +161 @@
   PACKING += $(VBOX_PATH_ADDITIONS_ISO)/VBoxGuestAdditions.zip
  endif
-endif # !VBOX_ONLY_TESTSUITE
+endif # !VBOX_ONLY_VALIDATIONKIT
 
 include $(FILE_KBUILD_SUB_FOOTER)

trunk/src/VBox/Additions/common/Makefile.kmk

@@ -20 +20 @@
 
 # Include sub-makefile.
-ifndef VBOX_ONLY_TESTSUITE
+ifndef VBOX_ONLY_VALIDATIONKIT
  include $(PATH_SUB_CURRENT)/VBoxGuestLib/Makefile.kmk
  include $(PATH_SUB_CURRENT)/VBoxControl/Makefile.kmk
@@ -31 +31 @@
   include $(PATH_SUB_CURRENT)/pam/Makefile.kmk
  endif
-endif # !VBOX_ONLY_TESTSUITE
+endif # !VBOX_ONLY_VALIDATIONKIT
 
 include $(FILE_KBUILD_SUB_FOOTER)

trunk/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk

@@ -31 +31 @@
 # Target config.
 #
-if defined(VBOX_WITH_ADDITION_DRIVERS) && !defined(VBOX_ONLY_TESTSUITE)
+if defined(VBOX_WITH_ADDITION_DRIVERS) && !defined(VBOX_ONLY_VALIDATIONKIT)
  LIBRARIES += \
         VBoxGuestR0Lib \
@@ -39 +39 @@
         VBoxGuestR3Lib \
         VBoxGuestR3LibShared
-ifndef VBOX_ONLY_TESTSUITE
+ifndef VBOX_ONLY_VALIDATIONKIT
  if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
   LIBRARIES += \

trunk/src/VBox/HostDrivers/Makefile.kmk

@@ -24 +24 @@
 if  !defined(VBOX_ONLY_DOCS) \
  && !defined(VBOX_ONLY_EXTPACKS) \
- && !defined(VBOX_ONLY_TESTSUITE)
+ && !defined(VBOX_ONLY_VALIDATIONKIT)
  if1of ($(KBUILD_TARGET),win)
   include $(PATH_SUB_CURRENT)/win/Makefile.kmk
@@ -52 +52 @@
  endif
 
-endif # !defined(VBOX_ONLY_DOCS) && !defined(VBOX_ONLY_TESTSUITE)
+endif # !defined(VBOX_ONLY_DOCS) && !defined(VBOX_ONLY_VALIDATIONKIT)
 
 # Let kBuild generate the rules.

trunk/src/VBox/HostDrivers/Support/Makefile.kmk

@@ -42 +42 @@
 if  !defined(VBOX_ONLY_DOCS) \
  && !defined(VBOX_ONLY_EXTPACKS) \
- && !defined(VBOX_ONLY_TESTSUITE)
+ && !defined(VBOX_ONLY_VALIDATIONKIT)
  ifdef VBOX_WITH_SUPSVC
   PROGRAMS += VBoxSupSvc
@@ -68 +68 @@
   include $(PATH_SUB_CURRENT)/freebsd/files_vboxdrv
  endif
-endif # !VBOX_ONLY_DOCS && !VBOX_ONLY_EXTPACKS && !VBOX_ONLY_TESTSUITE
+endif # !VBOX_ONLY_DOCS && !VBOX_ONLY_EXTPACKS && !VBOX_ONLY_VALIDATIONKIT
 
 
@@ -170 +170 @@
 if  !defined(VBOX_ONLY_DOCS) \
  && !defined(VBOX_ONLY_EXTPACKS) \
- && !defined(VBOX_ONLY_TESTSUITE)
+ && !defined(VBOX_ONLY_VALIDATIONKIT)
 
 ifeq ($(KBUILD_TARGET),os2)
@@ -432 +432 @@
 
 
-endif # !VBOX_ONLY_DOCS && !VBOX_ONLY_EXTPACKS && !VBOX_ONLY_TESTSUITE
+endif # !VBOX_ONLY_DOCS && !VBOX_ONLY_EXTPACKS && !VBOX_ONLY_VALIDATIONKIT
 include $(FILE_KBUILD_SUB_FOOTER)
 

trunk/src/VBox/Installer/linux/debian/LocalConfig.kmk

@@ -18 +18 @@
 # don't build testcases to save time, they are not needed for the package
 VBOX_WITH_TESTCASES        :=
-VBOX_WITH_TESTSUITE        :=
+VBOX_WITH_VALIDATIONKIT    :=
 
 # required for VBOX_WITH_RUNPATH

trunk/src/VBox/Installer/linux/rpm/LocalConfig.kmk

@@ -18 +18 @@
 # don't build testcases to save time, they are not needed for the package
 VBOX_WITH_TESTCASES        :=
-VBOX_WITH_TESTSUITE        :=
+VBOX_WITH_VALIDATIONKIT    :=
 
 # required for VBOX_WITH_RUNPATH

trunk/src/VBox/Makefile.kmk

@@ -55 +55 @@
  include $(PATH_SUB_CURRENT)/Frontends/VBoxShell/Makefile.kmk
 
-else ifdef VBOX_ONLY_TESTSUITE
+else ifdef VBOX_ONLY_VALIDATIONKIT
  include $(PATH_SUB_CURRENT)/Runtime/Makefile.kmk
  include $(PATH_SUB_CURRENT)/HostDrivers/Makefile.kmk
@@ -87 +87 @@
   include $(PATH_SUB_CURRENT)/Additions/Makefile.kmk
  endif
- ifdef VBOX_WITH_TESTSUITE
+ ifdef VBOX_WITH_VALIDATIONKIT
   include $(PATH_SUB_CURRENT)/Testsuite/Makefile.kmk
  endif

trunk/src/VBox/Runtime/Makefile.kmk

@@ -40 +40 @@
  endif
 
-else ifdef VBOX_ONLY_TESTSUITE
+else ifdef VBOX_ONLY_VALIDATIONKIT
  #
- # Only build the testsuite.
+ # Only build the Validation Kit.
  #
  LIBRARIES += RuntimeGuestR3 RuntimeGuestR3Shared RuntimeR3 RuntimeR0
@@ -64 +64 @@
  include $(PATH_SUB_CURRENT)/tools/Makefile.kmk
 
-else # !VBOX_ONLY_ADDITIONS && !VBOX_ONLY_TESTSUITE && !VBOX_ONLY_DOCS
+else # !VBOX_ONLY_ADDITIONS && !VBOX_ONLY_VALIDATIONKIT && !VBOX_ONLY_DOCS
 
  #
@@ -2593 +2593 @@
         $(QUIET)$(APPEND) -t $@
 
-if !defined(VBOX_ONLY_ADDITIONS) && !defined(VBOX_ONLY_TESTSUITE) && !defined(VBOX_ONLY_DOCS)
+if !defined(VBOX_ONLY_ADDITIONS) && !defined(VBOX_ONLY_VALIDATIONKIT) && !defined(VBOX_ONLY_DOCS)
 #
 # Windows build tool.

trunk/src/libs/Makefile.kmk

@@ -33 +33 @@
 
 # PNG support (for screenshots).
-if !defined(VBOX_ONLY_DOCS) && !defined(VBOX_ONLY_SDK) && !defined(VBOX_ONLY_TESTSUITE) \
+if !defined(VBOX_ONLY_DOCS) && !defined(VBOX_ONLY_SDK) && !defined(VBOX_ONLY_VALIDATIONKIT) \
  && "$(SDK_VBOX_LIBPNG_INCS)" == "$(PATH_ROOT)/src/libs/libpng-1.2.8"
  include $(PATH_SUB_CURRENT)/libpng-1.2.8/Makefile.kmk
@@ -39 +39 @@
 
 # Libcurl for inet access
-if defined(VBOX_WITH_LIBCURL) && !defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS) && !defined(VBOX_ONLY_SDK) && !defined(VBOX_ONLY_TESTSUITE) \
+if defined(VBOX_WITH_LIBCURL) && !defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS) && !defined(VBOX_ONLY_SDK) && !defined(VBOX_ONLY_VALIDATIONKIT) \
  && "$(SDK_VBOX_LIBCURL_INCS)" == "$(PATH_ROOT)/src/libs/curl-7.27.0/include"
  include $(PATH_SUB_CURRENT)/curl-7.27.0/Makefile.kmk
@@ -64 +64 @@
 if defined(VBOX_WITH_MAIN) \
  && !defined(VBOX_ONLY_EXTPACKS) \
- && !defined(VBOX_ONLY_TESTSUITE)
+ && !defined(VBOX_ONLY_VALIDATIONKIT)
  if defined(VBOX_WITH_XPCOM) && !defined(VBOX_ONLY_DOCS)
   include $(PATH_SUB_CURRENT)/xpcom18a4/Makefile.kmk

trunk/src/libs/libxml2-2.6.31/Makefile.kmk

@@ -19 +19 @@
 include $(KBUILD_PATH)/subheader.kmk
 
-ifndef VBOX_ONLY_TESTSUITE
+ifndef VBOX_ONLY_VALIDATIONKIT
  LIBRARIES += VBox-libxml2
 endif