Changeset 5898 in vbox for trunk/src/VBox/VMM/testcase

Timestamp:

Dec 2, 2007 6:08:26 AM (17 years ago)

Author:

vboxsync

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

26428

Message:

kBuild 0.1.2 preps: Avoid the shell at all costs because cygwin is messing up on smp boxes and screwing up the tinderbox.

File:

• trunk/src/VBox/VMM/testcase/Makefile.kmk (modified) (5 diffs)

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

@@ -229 +229 @@
 ifndef DONT_USE_YASM
         $(QUIET)$(TOOL_YASM_AS) $(MY_ASA_ASM_STUFF) -o [email protected] -l [email protected] $<
+ifdef KMK_NEW_SED
+        $(SED) -f $(VBOX_PATH_VMM_SRC)/testcase/tstAsmStructsAsm-lst.sed --output $@ [email protected]
+else
         $(SED) -f $(VBOX_PATH_VMM_SRC)/testcase/tstAsmStructsAsm-lst.sed [email protected] > $@
+endif
 else
         $(QUIET)$(TOOL_NASM_AS) -g $(MY_ASA_ASM_STUFF) -o [email protected] -l [email protected] $<
@@ -255 +259 @@
         $(call MSG_GENERATE,tstVMStructSize,$@,$<)
         $(QUIET)$(RM) -f $@ [email protected] [email protected]
+ifdef KMK_USE_REDIRECT
+        $(QUIET)$(REDIRECT) -wo [email protected] -- $(VBOX_NM) $<
+else
         $(VBOX_NM) $< > [email protected]
+endif
+ifdef KMK_NEW_SED
+        $(QUIET)$(SED) -e '/STAMPROFILEADV/d' \
+               -e '/00[0-9a-fA-F]* [aA] [^_.]*\./!d'       -e 's/\(00[0-9a-fA-F]*\) [aA] \([^.]*\)\.\(.*$$\)/    CHECK_OFF(\2, 0x0\1, \3);/' \
+               --output [email protected] [email protected] 
+        $(QUIET)$(SED) -e '/VM_size$$/d' \
+               -e '/00[0-9a-fA-F]* [aA] [^_.]*_size$$/!d'  -e 's/\(00[0-9a-fA-F]*\) [aA] \([^_.]*\)_size/    CHECK_SIZE(\2, 0x0\1);/' \
+               --append [email protected] [email protected]
+else
         $(QUIET)$(SED) -e '/STAMPROFILEADV/d' \
                -e '/00[0-9a-fA-F]* [aA] [^_.]*\./!d'       -e 's/\(00[0-9a-fA-F]*\) [aA] \([^.]*\)\.\(.*$$\)/    CHECK_OFF(\2, 0x0\1, \3);/' \
@@ -262 +278 @@
                -e '/00[0-9a-fA-F]* [aA] [^_.]*_size$$/!d'  -e 's/\(00[0-9a-fA-F]*\) [aA] \([^_.]*\)_size/    CHECK_SIZE(\2, 0x0\1);/' \
                [email protected] >> [email protected]
+endif
         $(QUIET)$(MV) -f [email protected] $@
         $(QUIET)$(RM) -f [email protected]
@@ -268 +285 @@
 $(PATH_TARGET)/tstAsmStructsGC.h: $(PATH_TARGET)/tstAsmStructsHC.h
         $(call MSG_GENERATE,tstVMStructSize,$@,$<)
+ifdef KMK_NEW_SED
+        $(QUIET)$(SED) -e '/VMMSWITCHERDEF/d' --output $@ $^
+else
         $(QUIET)$(SED) -e '/VMMSWITCHERDEF/d' \
                 $^ > $@
+endif
 
 ## @todo make this default kBuild behaviour.
@@ -290 +311 @@
 $(PATH_TARGET)/tstVMStructGC.h: $$(INSTARGET_tstVMStructGC)
         $(call MSG_GENERATE,tstVMStructSize,$@)
+ifdef KMK_USE_REDIRECT
+        $(QUIET)$(REDIRECT) -wo $@ -- $(INSTARGET_tstVMStructGC)
+else
         $(QUIET)$(INSTARGET_tstVMStructGC) > $@
+endif
 
 # 2. run it.