Changeset 27070 in vbox

Timestamp:

Mar 5, 2010 11:13:36 AM (15 years ago)

Author:

vboxsync

Message:

/Makefile.kmk: don't pack anything when building the testsuite.

File:

• trunk/Makefile.kmk (modified) (8 diffs)

trunk/Makefile.kmk

@@ -858 +858 @@
         testsuite-build-linux.x86
 
-VBOX_TESTSUITE_BUILD.amd64 = VBOX_ONLY_TESTSUITE=1 VBOX_WITHOUT_TESTSUITE_ISO=1 \
+VBOX_TESTSUITE_BUILD.amd64 = VBOX_ONLY_TESTSUITE=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_WITHOUT_TESTSUITE_ISO=1 \
+VBOX_TESTSUITE_BUILD.x86 = VBOX_ONLY_TESTSUITE=1 \
         KBUILD_TYPE=$(KBUILD_TYPE) BUILD_TYPE=$(KBUILD_TYPE) \
         KBUILD_TARGET_ARCH=x86 BUILD_TARGET_ARCH=x86 \
@@ -884 +884 @@
 ifeq ($(KBUILD_TARGET),win)
         + $(VBOX_KMK_TIME) $(KMK) $(VBOX_TESTSUITE_BUILD.amd64) all $(VBOX_TESTSUITE_HOST_BUILD_TWEAK)
-        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_TESTSUITE_BUILD.amd64) packing
 else
         $(call MSG_L1,Building Windows/amd64 testsuite)
-        $(VBOX_KMK_TIME) ssh [email protected] " echo $@ && cd e:/$(VBOX_TESTSUITE_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_TESTSUITE_BUILD.amd64) all packing "
+        $(VBOX_KMK_TIME) ssh [email protected] " echo $@ && cd e:/$(VBOX_TESTSUITE_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_TESTSUITE_BUILD.amd64) all "
 endif
 
@@ -893 +892 @@
 ifeq ($(KBUILD_TARGET),win)
         + $(VBOX_KMK_TIME) $(KMK) $(VBOX_TESTSUITE_BUILD.x86) all $(VBOX_TESTSUITE_HOST_BUILD_TWEAK)
-        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_TESTSUITE_BUILD.x86) packing
 else
         $(call MSG_L1,Building Windows/x86 testsuite)
-        $(VBOX_KMK_TIME) ssh [email protected] " echo $@ && cd e:/$(VBOX_TESTSUITE_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_TESTSUITE_BUILD.x86) all packing"
-endif
-
-# ASSUMES the 64-bit edition are built first. This also serializes VM access.
+        $(VBOX_KMK_TIME) ssh [email protected] " echo $@ && cd e:/$(VBOX_TESTSUITE_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_TESTSUITE_BUILD.x86) all"
+endif
+
 ifeq ($(KBUILD_TARGET),solaris)
 testsuite-build-solaris.amd64:
         + $(VBOX_KMK_TIME) $(KMK) $(VBOX_TESTSUITE_BUILD.amd64) all $(VBOX_TESTSUITE_HOST_BUILD_TWEAK)
-        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_TESTSUITE_BUILD.amd64) packing
-
-testsuite-build-solaris.x86: testsuite-build-solaris.amd64
-        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_TESTSUITE_BUILD.x86) VBOX_WITH_COMBINED_SOLARIS_GUEST_PACKAGE=1 all $(VBOX_TESTSUITE_HOST_BUILD_TWEAK)
-        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_TESTSUITE_BUILD.x86) VBOX_WITH_COMBINED_SOLARIS_GUEST_PACKAGE=1 packing
+
+testsuite-build-solaris.x86:
+        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_TESTSUITE_BUILD.x86)   all $(VBOX_TESTSUITE_HOST_BUILD_TWEAK)
 
 else
@@ -915 +910 @@
 testsuite-build-solaris.build-it: testsuite-build-solaris.rsync-into-vm
         $(call MSG_L1,Building Solaris/amd64 testsuite)
-        $(VBOX_KMK_TIME) ssh [email protected] " echo $@/amd64 && cd /mnt/tinderbox/$(VBOX_TESTSUITE_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_TESTSUITE_BUILD.amd64) all packing"
+        $(VBOX_KMK_TIME) ssh [email protected] " echo $@/amd64 && cd /mnt/tinderbox/$(VBOX_TESTSUITE_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_TESTSUITE_BUILD.amd64) all"
         $(call MSG_L1,Building Solaris/x86 testsuite)
-        $(VBOX_KMK_TIME) ssh [email protected] " echo $@/x86   && cd /mnt/tinderbox/$(VBOX_TESTSUITE_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_TESTSUITE_BUILD.x86) all packing VBOX_WITH_COMBINED_SOLARIS_GUEST_PACKAGE=1"
+        $(VBOX_KMK_TIME) ssh [email protected] " echo $@/x86   && cd /mnt/tinderbox/$(VBOX_TESTSUITE_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_TESTSUITE_BUILD.x86) all "
 
 testsuite-build-solaris.rsync-out-of-vm: testsuite-build-solaris.build-it
-        $(VBOX_KMK_TIME) rsync -a --delete 192.168.27.4:/mnt/tinderbox/$(VBOX_TESTSUITE_BUILD_SUBDIRNAME)/out/solaris.x86 out/
+        $(VBOX_KMK_TIME) rsync -a --delete 192.168.27.4:/mnt/tinderbox/$(VBOX_TESTSUITE_BUILD_SUBDIRNAME)/out/solaris.x86   out/
         $(VBOX_KMK_TIME) rsync -a --delete 192.168.27.4:/mnt/tinderbox/$(VBOX_TESTSUITE_BUILD_SUBDIRNAME)/out/solaris.amd64 out/
 
@@ -927 +922 @@
 
 testsuite-build-solaris.amd64: testsuite-build-solaris.rsync-out-of-vm
-testsuite-build-solaris.x86: testsuite-build-solaris.rsync-out-of-vm
+testsuite-build-solaris.x86:   testsuite-build-solaris.rsync-out-of-vm
 endif
 
@@ -933 +928 @@
 #ifeq ($(KBUILD_TARGET),os2)
 #       + $(VBOX_KMK_TIME) $(KMK) $(VBOX_TESTSUITE_BUILD.x86) all $(VBOX_TESTSUITE_HOST_BUILD_TWEAK)
-#       + $(VBOX_KMK_TIME) $(KMK) $(VBOX_TESTSUITE_BUILD.x86) packing
 #else
 #       $(VBOX_KMK_TIME) ssh [email protected] " cd /mnt/tinderbox/$(VBOX_TESTSUITE_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_TESTSUITE_BUILD.x86) "
@@ -941 +935 @@
 ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.amd64)
         + $(VBOX_KMK_TIME) $(KMK) $(VBOX_TESTSUITE_BUILD.amd64) all $(VBOX_TESTSUITE_HOST_BUILD_TWEAK)
-        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_TESTSUITE_BUILD.amd64) packing
 else
         $(call MSG_L1,Building Linux/amd64 testsuite)
-        $(VBOX_KMK_TIME) ssh [email protected] " echo $@ && cd /mnt/tinderbox/$(VBOX_TESTSUITE_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_TESTSUITE_BUILD.amd64) all packing"
+        $(VBOX_KMK_TIME) ssh [email protected] " echo $@ && cd /mnt/tinderbox/$(VBOX_TESTSUITE_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_TESTSUITE_BUILD.amd64) all"
 endif
 
@@ -950 +943 @@
 ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.x86)
         + $(VBOX_KMK_TIME) $(KMK) $(VBOX_TESTSUITE_BUILD.x86) all $(VBOX_TESTSUITE_HOST_BUILD_TWEAK)
-        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_TESTSUITE_BUILD.x86) packing
 else
         $(call MSG_L1,Building Linux/x86 testsuite)
-        $(VBOX_KMK_TIME) ssh [email protected] " echo $@ && cd /mnt/tinderbox/$(VBOX_TESTSUITE_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_TESTSUITE_BUILD.x86) all packing"
+        $(VBOX_KMK_TIME) ssh [email protected] " echo $@ && cd /mnt/tinderbox/$(VBOX_TESTSUITE_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_TESTSUITE_BUILD.x86) all"
 endif