Changeset 43851 in vbox

Timestamp:

Nov 9, 2012 2:37:14 PM (12 years ago)

Author:

vboxsync

Message:

vditool / vbox-img: allow to build them even if the testcases are disabled

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Storage/testcase/Makefile.kmk (modified) (3 diffs)

trunk/Config.kmk

@@ -555 +555 @@
 # Build the testcases.
 VBOX_WITH_TESTCASES = 1
+# Enable this to build vditool even if VBOX_WITH_TESTCASES is disabled
+VBOX_WITH_VDITOOL =
+# Enable this to build vbox-img even if VBOX_WITH_TESTCASES is disabled
+VBOX_WITH_VBOX_IMG =
 # Enables the ffmpeg module for recording test runs.
 # TODO: Enable this for normal build server builds?

trunk/src/VBox/Storage/testcase/Makefile.kmk

@@ -23 +23 @@
 # probably will go away soon. Testcase only now.
 #
-ifdef VBOX_WITH_TESTCASES
+if defined(VBOX_WITH_TESTCASES) || defined(VBOX_WITH_VDITOOL)
  PROGRAMS += vditool
   vditool_TEMPLATE = VBOXR3TSTEXE
@@ -34 +34 @@
 #
 ifdef VBOX_WITH_TESTCASES
- PROGRAMS += tstVD tstVD-2 tstVDCopy tstVDSnap tstVDShareable vbox-img
+ PROGRAMS += tstVD tstVD-2 tstVDCopy tstVDSnap tstVDShareable
 
  tstVD_TEMPLATE = VBOXR3TSTEXE
@@ -71 +71 @@
  tstVDSnap_LIBS = $(LIB_DDU)
  tstVDSnap_SOURCES  = tstVDSnap.cpp
+endif
+
+if defined(VBOX_WITH_TESTCASES) || defined(VBOX_WITH_VBOX_IMG)
+ PROGRAMS += vbox-img
 
  #