Changeset 8727 in vbox for trunk/src/VBox/Runtime

Timestamp:

May 8, 2008 10:58:01 PM (17 years ago)

Author:

vboxsync

Message:

sorted the stuff.

File:

• trunk/src/VBox/Runtime/testcase/Makefile.kmk (modified) (8 diffs)

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

@@ -33 +33 @@
 
 ifdef VBOX_WITH_TESTCASES
+
+#
+# Globals
+#
+# WARNING: Careful with this wrt to the other sub-makefiles this joins.
+#
+TEMPLATE = VBOXR3TSTEXE
+
+
+#
+# Target lists
+#
 PROGRAMS = \
         tstAvl \
@@ -70 +82 @@
         tstUtf8 \
         tstUuid
+# tstSems
 PROGRAMS.win = \
         tstRTProcWait \
@@ -85 +98 @@
         tstLdrObj \
         tstLdrObjR0
-ifeq ($(filter-out lx pe,$(VBOX_LDR_FMT)), )
+if1of ($(VBOX_LDR_FMT)), lx pe)
 LIBRARIES += \
         tstLdr-4Imp
 endif
 
-# tstSems
-endif # VBOX_WITH_TESTCASES
-
-
-TEMPLATE = VBOXR3TSTEXE
-
-tstTime_SOURCES = tstTime.cpp
-
-tstTime-2_SOURCES = tstTime-2.cpp
-
-tstTime-3_SOURCES = tstTime-3.cpp
-
-tstTime-4_SOURCES = tstTime-4.cpp
-
-tstTimeSpec_SOURCES = tstTimeSpec.cpp
-
-tstTimer_SOURCES = tstTimer.cpp
-
-tstTSC_SOURCES = tstTSC.cpp
-tstTSC_CXXFLAGS.linux += -O3
-
-tstStrFormat_SOURCES = tstStrFormat.cpp
+
+
+#
+# Target configs in almost alphabetical order.
+#
+
+tstAvl_SOURCES = tstAvl.cpp
+
+tstBitOperations_TEMPLATE = VBOXR3TSTEXE
+tstBitOperations_SOURCES = tstBitOperations.cpp
+
+tstBitOperationsPIC3_SOURCES = tstBitOperations.cpp
+tstBitOperationsPIC3_CXXFLAGS = -fPIC -fomit-frame-pointer -O3
+tstBitOperationsPIC3_DEFS = PIC
 
 tstCidr_SOURCES = tstCidr.cpp
 
-tstLog_SOURCES  = tstLog.cpp
-
-tstPath_SOURCES = tstPath.cpp
-
-tstSems_SOURCES = tstSems.cpp
-
-tstSemMutex_SOURCES = tstSemMutex.cpp
-
-tstAvl_SOURCES  = tstAvl.cpp
+tstCritSect_SOURCES = tstCritSect.cpp
+
+tstCritSectW32_SOURCES = tstCritSect.cpp
+tstCritSectW32_DEFS = TRY_WIN32_CRIT
+
+tstDeadlock_SOURCES = tstDeadlock.cpp
+
+tstDir_SOURCES = tstDir.cpp
+
+tstDir-2_SOURCES = tstDir-2.cpp
+
+tstEnv_SOURCES = tstEnv.cpp
+
+# Note: tstErrUnique.cpp depends on a header generated by the makefile above us.
+tstErrUnique_SOURCES = tstErrUnique.cpp
+tstErrUnique_INCS = $(PATH_TARGET)/..
+tstErrUnique.cpp_DEPS = $(PATH_TARGET)/../errmsgdata.h
 
 tstFile_SOURCES = tstFile.cpp
@@ -129 +142 @@
 tstFileLock_SOURCES = tstFileLock.cpp
 
-tstBitOperations_SOURCES = tstBitOperations.cpp
-
-tstBitOperationsPIC3_SOURCES  = tstBitOperations.cpp
-tstBitOperationsPIC3_CXXFLAGS = -fPIC -fomit-frame-pointer -O3
-tstBitOperationsPIC3_DEFS     = PIC
-
-tstInlineAsm_SOURCES     = tstInlineAsm.cpp
-
-tstInlineAsmPIC_SOURCES  = tstInlineAsm.cpp
+tstGetOpt_SOURCES = tstGetOpt.cpp
+
+tstHeapSimple_SOURCES = tstHeapSimple.cpp
+
+tstIoCtl_SOURCES = tstIoCtl.cpp
+
+tstInlineAsm_SOURCES = tstInlineAsm.cpp
+
+tstInlineAsmPIC_SOURCES = tstInlineAsm.cpp
 tstInlineAsmPIC_CXXFLAGS = -fPIC
-tstInlineAsmPIC_DEFS     = PIC
-
-tstInlineAsmPIC3_SOURCES  = tstInlineAsm.cpp
+tstInlineAsmPIC_DEFS = PIC
+
+tstInlineAsmPIC3_SOURCES = tstInlineAsm.cpp
 tstInlineAsmPIC3_CXXFLAGS = -fPIC -fomit-frame-pointer -O3
-tstInlineAsmPIC3_DEFS     = PIC
-
-tstCritSect_SOURCES     = tstCritSect.cpp
-
-tstCritSectW32_SOURCES  = tstCritSect.cpp
-tstCritSectW32_DEFS     = TRY_WIN32_CRIT
+tstInlineAsmPIC3_DEFS = PIC
 
 tstLdr_SOURCES = tstLdr.cpp
 
 tstLdr-2_SOURCES = tstLdr-2.cpp
-tstLdr-2_DEFS    = IN_DIS_R3
-tstLdr-2_LIBS    = \
+tstLdr-2_DEFS = IN_DIS_R3
+tstLdr-2_LIBS = \
         $(PATH_LIB)/DisasmR3$(VBOX_SUFF_LIB)
 
 tstLdrObj_TEMPLATE = VBOXGC
-tstLdrObj_INST     = $(INST_TESTCASE)
-tstLdrObj_SYSSUFF  = .gc
-tstLdrObj_SOURCES  = tstLdrObj.cpp
-tstLdrObj_DEFS     = IN_DIS_GC IN_RT_GC DIS_CORE_ONLY
+tstLdrObj_INST = $(INST_TESTCASE)
+tstLdrObj_SYSSUFF = .gc
+tstLdrObj_SOURCES = tstLdrObj.cpp
+tstLdrObj_DEFS = IN_DIS_GC IN_RT_GC DIS_CORE_ONLY
 ifeq ($(VBOX_LDR_FMT32),elf)
-tstLdrObj_DEFS    += VBOX_SOME_IMPORT_FUNCTION
-endif
-tstLdrObj_LIBS     = \
+tstLdrObj_DEFS += VBOX_SOME_IMPORT_FUNCTION
+endif
+tstLdrObj_LIBS = \
         $(PATH_LIB)/DisasmGC$(VBOX_SUFF_LIB) \
         $(PATH_LIB)/RuntimeGC$(VBOX_SUFF_LIB)
 ifeq ($(VBOX_LDR_FMT32),pe)
-tstLdrObj_LDFLAGS  = -Entry:Entrypoint
-tstLdrObj_LIBS    += \
+tstLdrObj_LDFLAGS = -Entry:Entrypoint
+tstLdrObj_LIBS += \
         $(PATH_LIB)/VMMGCBuiltin$(VBOX_SUFF_LIB)
 endif # PE
@@ -177 +185 @@
 endif
 ifeq ($(VBOX_LDR_FMT32),lx)
-tstLdrObj_LIBS    += \
+tstLdrObj_LIBS += \
         $(PATH_LIB)/VMMGCBuiltin$(VBOX_SUFF_LIB)
 endif
 
-
 tstLdr-3_SOURCES = tstLdr-3.cpp
-tstLdr-3_DEFS    = IN_DIS_R3
-tstLdr-3_LIBS    = \
+tstLdr-3_DEFS = IN_DIS_R3
+tstLdr-3_LIBS = \
         $(PATH_LIB)/DisasmR3$(VBOX_SUFF_LIB)
 
@@ -195 +202 @@
 
 tstLdrObjR0_TEMPLATE = VBOXR0
-tstLdrObjR0_INST     = $(INST_TESTCASE)
-tstLdrObjR0_SYSSUFF  = .r0
-tstLdrObjR0_SOURCES  = tstLdrObjR0.cpp tstLdrDisasmTest.cpp
-tstLdrObjR0_DEFS     = IN_DIS_R0 IN_RT_R0 DIS_CORE_ONLY
+tstLdrObjR0_INST = $(INST_TESTCASE)
+tstLdrObjR0_SYSSUFF = .r0
+tstLdrObjR0_SOURCES = tstLdrObjR0.cpp tstLdrDisasmTest.cpp
+tstLdrObjR0_DEFS = IN_DIS_R0 IN_RT_R0 DIS_CORE_ONLY
 ifeq ($(VBOX_LDR_FMT32),elf)
- tstLdrObjR0_DEFS   += VBOX_SOME_IMPORT_FUNCTION
-endif
-tstLdrObjR0_LIBS     = \
+ tstLdrObjR0_DEFS += VBOX_SOME_IMPORT_FUNCTION
+endif
+tstLdrObjR0_LIBS = \
         $(PATH_LIB)/DisasmR0$(VBOX_SUFF_LIB) \
         $(PATH_LIB)/RuntimeR0$(VBOX_SUFF_LIB)
 ifeq ($(VBOX_LDR_FMT),pe)
  tstLdrObjR0_LDFLAGS = -Entry:Entrypoint
- tstLdrObjR0_LIBS   += \
+ tstLdrObjR0_LIBS += \
         $(PATH_LIB)/SUPR0$(VBOX_SUFF_LIB) \
         $(TARGET_tstLdr-4Imp)
 endif
 ifeq ($(VBOX_LDR_FMT),elf)
-  tstLdrObjR0_LDFLAGS = -e Entrypoint
+ tstLdrObjR0_LDFLAGS = -e Entrypoint
 endif
 ifeq ($(VBOX_LDR_FMT),lx)
- tstLdrObjR0_LIBS   += \
+ tstLdrObjR0_LIBS += \
         $(PATH_LIB)/SUPR0$(VBOX_SUFF_LIB) \
         $(TARGET_tstLdr-4Imp)
@@ -221 +228 @@
 
 tstLdr-4_SOURCES = tstLdr-4.cpp tstLdrDisasmTest.cpp
-tstLdr-4_DEFS    = IN_DIS_R3
-tstLdr-4_LIBS    = \
+tstLdr-4_DEFS = IN_DIS_R3
+tstLdr-4_LIBS = \
         $(PATH_LIB)/DisasmR3$(VBOX_SUFF_LIB)
 
 tstLdrLoad_SOURCES = tstLdrLoad.cpp
 
-tstPrfRT_SOURCES = tstPrfRT.cpp
-
-tstRTProcWait_SOURCES = tstRTProcWait.cpp
-
-tstStrToNum_SOURCES = tstStrToNum.cpp
-
-tstUtf8_SOURCES     = tstUtf8.cpp
-
-tstDir_SOURCES      = tstDir.cpp
-
-tstDir-2_SOURCES    = tstDir-2.cpp
-
-tstRTFsQueries_SOURCES = tstRTFsQueries.cpp
-
-tstMove_SOURCES     = tstMove.cpp
+tstLog_SOURCES = tstLog.cpp
+
+tstMove_SOURCES = tstMove.cpp
 
 tstNoCrt-1_DEFS = RT_WITHOUT_NOCRT_WRAPPER_ALIASES
@@ -255 +250 @@
         ../common/string/strcmp.asm
 
+tstPath_SOURCES = tstPath.cpp
+
+tstPrfRT_SOURCES = tstPrfRT.cpp
+
+tstRTFsQueries_SOURCES = tstRTFsQueries.cpp
+
+tstRTProcWait_SOURCES = tstRTProcWait.cpp
+
+tstSemMutex_SOURCES = tstSemMutex.cpp
+
+tstSems_SOURCES = tstSems.cpp
+
+tstStrFormat_SOURCES = tstStrFormat.cpp
+
+tstStrToNum_SOURCES = tstStrToNum.cpp
+
+tstTime_SOURCES = tstTime.cpp
+
+tstTime-2_SOURCES = tstTime-2.cpp
+
+tstTime-3_SOURCES = tstTime-3.cpp
+
+tstTime-4_SOURCES = tstTime-4.cpp
+
+tstTimer_SOURCES = tstTimer.cpp
+
+tstTimeSpec_SOURCES = tstTimeSpec.cpp
+
+tstTSC_SOURCES = tstTSC.cpp
+tstTSC_CXXFLAGS.linux += -O3
+
+tstUuid_SOURCES = tstUuid.cpp
+
+tstUtf8_SOURCES = tstUtf8.cpp
+
 ntGetTimerResolution_SOURCES = ntGetTimerResolution.cpp
-ntGetTimerResolution_SDKS.win = WINPSDK W2K3DDK  VBOX_NTDLL
-
-tstIoCtl_SOURCES = tstIoCtl.cpp
-
-tstDeadlock_SOURCES = tstDeadlock.cpp
-
-tstUuid_SOURCES = tstUuid.cpp
-
-tstEnv_SOURCES = tstEnv.cpp
-
-tstErrUnique_SOURCES = tstErrUnique.cpp
-tstErrUnique_INCS    = $(PATH_TARGET)/..
-## tstErrUnique.cpp depends on a generated header.
-tstErrUnique.cpp_DEPS = $(PATH_TARGET)/../errmsgdata.h
-
-tstGetOpt_SOURCES = tstGetOpt.cpp
-
-tstHeapSimple_SOURCES = tstHeapSimple.cpp
+ntGetTimerResolution_SDKS.win = WINPSDK W2K3DDK VBOX_NTDLL
+
+endif # VBOX_WITH_TESTCASES
 
 include $(PATH_KBUILD)/footer.kmk