diff options
Diffstat (limited to 'tests')
286 files changed, 12281 insertions, 10491 deletions
diff --git a/tests/Aio_Platform_Test.bpr b/tests/Aio_Platform_Test.bpr new file mode 100644 index 00000000000..27888a16835 --- /dev/null +++ b/tests/Aio_Platform_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Aio_Platform_Test.exe +OBJFILES = objs\Aio_Platform_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/Aio_Platform_Test.icc b/tests/Aio_Platform_Test.icc deleted file mode 100644 index 7d09ea6653e..00000000000 --- a/tests/Aio_Platform_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Aio_Platform_Test.exe" - { - source type (cpp) "Aio_Platform_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Atomic_Op_Test.bpr b/tests/Atomic_Op_Test.bpr new file mode 100644 index 00000000000..ad9a52149b9 --- /dev/null +++ b/tests/Atomic_Op_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Atomic_Op_Test.exe +OBJFILES = objs\Atomic_Op_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/Atomic_Op_Test.dsp b/tests/Atomic_Op_Test.dsp index 9098ee70eee..3d7ee83e3ad 100644 --- a/tests/Atomic_Op_Test.dsp +++ b/tests/Atomic_Op_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Atomic_Op_Test - Win32 PharLap ETS Debug
+CFG=Atomic_Op_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,17 @@ CFG=Atomic_Op_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Atomic_Op_Test.mak" CFG="Atomic_Op_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "Atomic_Op_Test.mak" CFG="Atomic_Op_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Atomic_Op_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Atomic_Op_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "Atomic_Op_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Atomic_Op_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Atomic_Op_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +70,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +83,12 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Atomic_Op_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Atomic_O"
-# PROP BASE Intermediate_Dir "Atomic_O"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"Atomic_Op_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "Atomic_Op_Test - Win32 Debug"
# Name "Atomic_Op_Test - Win32 Alpha Debug"
-# Name "Atomic_Op_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter ".cpp"
@@ -156,6 +125,7 @@ DEP_CPP_ATOMI=\ "..\ace\OS.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\SV_Semaphore_Complex.h"\
"..\ace\SV_Semaphore_Complex.i"\
"..\ace\SV_Semaphore_Simple.h"\
@@ -172,11 +142,6 @@ DEP_CPP_ATOMI=\ "..\ace\ws2tcpip.h"\
".\test_config.h"\
-NODEP_CPP_ATOMI=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "Atomic_Op_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/Atomic_Op_Test.icc b/tests/Atomic_Op_Test.icc deleted file mode 100644 index 0ea8582491a..00000000000 --- a/tests/Atomic_Op_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Atomic_Op_Test.exe" - { - source type (cpp) "Atomic_Op_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Barrier_Test.bpr b/tests/Barrier_Test.bpr new file mode 100644 index 00000000000..deb0e0304d0 --- /dev/null +++ b/tests/Barrier_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Barrier_Test.exe +OBJFILES = objs\Barrier_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/Barrier_Test.dsp b/tests/Barrier_Test.dsp index 1182befc752..b1f1aa35f74 100644 --- a/tests/Barrier_Test.dsp +++ b/tests/Barrier_Test.dsp @@ -18,13 +18,13 @@ CFG=Barrier_Test - Win32 Debug !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Barrier_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Barrier_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "Barrier_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Barrier_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Barrier_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +70,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Barrier_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +83,12 @@ LINK32=link.exe # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Barrier_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Barrier"
-# PROP BASE Intermediate_Dir "Barrier"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"Barrier_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "Barrier_Test - Win32 Debug"
# Name "Barrier_Test - Win32 Alpha Debug"
-# Name "Barrier_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -173,6 +142,7 @@ DEP_CPP_BARRI=\ "..\ace\Signal.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\SV_Semaphore_Complex.h"\
"..\ace\SV_Semaphore_Complex.i"\
"..\ace\SV_Semaphore_Simple.h"\
@@ -191,11 +161,6 @@ DEP_CPP_BARRI=\ "..\ace\ws2tcpip.h"\
".\test_config.h"\
-NODEP_CPP_BARRI=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "Barrier_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/Barrier_Test.icc b/tests/Barrier_Test.icc deleted file mode 100644 index 0c93db4235a..00000000000 --- a/tests/Barrier_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Barrier_Test.exe" - { - source type (cpp) "Barrier_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Basic_Types_Test.bpr b/tests/Basic_Types_Test.bpr new file mode 100644 index 00000000000..33c81dd44c8 --- /dev/null +++ b/tests/Basic_Types_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Basic_Types_Test.exe +OBJFILES = objs\Basic_Types_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/Basic_Types_Test.dsp b/tests/Basic_Types_Test.dsp index 3d74b532a57..493cab39c42 100644 --- a/tests/Basic_Types_Test.dsp +++ b/tests/Basic_Types_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Basic_Types_Test - Win32 PharLap ETS Debug
+CFG=Basic_Types_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,23 +13,19 @@ CFG=Basic_Types_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Basic_Types_Test.mak" CFG="Basic_Types_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "Basic_Types_Test.mak" CFG="Basic_Types_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Basic_Types_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Basic_Types_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Basic_Types_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
-
-!IF "$(CFG)" == "Basic_Types_Test - Win32 Debug"
-
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Basic_Ty"
@@ -53,49 +49,12 @@ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF "$(CFG)" == "Basic_Types_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Basic_Types_Test___Win32_PharLap_ETS_Debug"
-# PROP BASE Intermediate_Dir "Basic_Types_Test___Win32_PharLap_ETS_Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D ACE_HAS_DLL=0 /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"Basic_Types_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF
-
# Begin Target
# Name "Basic_Types_Test - Win32 Debug"
-# Name "Basic_Types_Test - Win32 PharLap ETS Debug"
# Begin Source File
SOURCE=.\Basic_Types_Test.cpp
# End Source File
-# Begin Source File
-
-SOURCE=.\tests_pharlap_msvc.lnk
-# End Source File
# End Target
# End Project
diff --git a/tests/Basic_Types_Test.icc b/tests/Basic_Types_Test.icc deleted file mode 100644 index e5f8ee7d26a..00000000000 --- a/tests/Basic_Types_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Basic_Types_Test.exe" - { - source type (cpp) "Basic_Types_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Buffer_Stream_Test.bpr b/tests/Buffer_Stream_Test.bpr new file mode 100644 index 00000000000..07f6d1e5376 --- /dev/null +++ b/tests/Buffer_Stream_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Buffer_Stream_Test.exe +OBJFILES = objs\Buffer_Stream_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/Buffer_Stream_Test.dsp b/tests/Buffer_Stream_Test.dsp index d2517bbaaa9..bf2f8f27f2a 100644 --- a/tests/Buffer_Stream_Test.dsp +++ b/tests/Buffer_Stream_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Buffer_Stream_Test - Win32 PharLap ETS Debug
+CFG=Buffer_Stream_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,18 @@ CFG=Buffer_Stream_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Buffer_Stream_Test.mak" CFG="Buffer_Stream_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "Buffer_Stream_Test.mak"\
+ CFG="Buffer_Stream_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Buffer_Stream_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Buffer_Stream_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "Buffer_Stream_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Buffer_Stream_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Buffer_Stream_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +71,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Buffer_Stream_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +84,12 @@ LINK32=link.exe # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Buffer_Stream_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Buffer_Stream_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "Buffer_Stream_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Buffer_Stream_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Buffer_Stream_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Buffer_Stream_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "Buffer_Stream_Test - Win32 Debug"
# Name "Buffer_Stream_Test - Win32 Alpha Debug"
-# Name "Buffer_Stream_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -197,6 +167,7 @@ DEP_CPP_BUFFE=\ "..\ace\Signal.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\Strategies.h"\
"..\ace\Strategies_T.cpp"\
"..\ace\Strategies_T.h"\
@@ -238,11 +209,6 @@ DEP_CPP_BUFFE=\ "..\ace\ws2tcpip.h"\
".\test_config.h"\
-NODEP_CPP_BUFFE=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "Buffer_Stream_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/Buffer_Stream_Test.icc b/tests/Buffer_Stream_Test.icc deleted file mode 100644 index a96bd80dd17..00000000000 --- a/tests/Buffer_Stream_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Buffer_Stream_Test.exe" - { - source type (cpp) "Buffer_Stream_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/CDR_Test.cpp b/tests/CDR_Test.cpp index 377c73e2f16..daf453aaa3c 100644 --- a/tests/CDR_Test.cpp +++ b/tests/CDR_Test.cpp @@ -113,8 +113,8 @@ short_stream (void) if (in_mb->length () != len) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("buffer length not preserved")), + "%p\n", + "buffer length not preserved"), 1); u_long in_chunk, out_chunk; @@ -125,8 +125,8 @@ short_stream (void) out_chunk = u_long (* (out_mb->rd_ptr () + i)); if (in_chunk != out_chunk ) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("buffer contents not preserved")), + "%p\n", + "buffer contents not preserved"), 1); } @@ -147,7 +147,7 @@ short_stream (void) ACE_CDR::Double d_array1[3]; ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("Checking operators and arrays\n\n"))); + "Checking operators and arrays\n\n")); ACE_InputCDR::to_char tc (ch1); is >> tc; @@ -165,78 +165,78 @@ short_stream (void) if (ch1 != ch) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("char transfer error")), + "%p\n", + "char transfer error"), 1); if (str1 != str) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("string transfer error")), + "%p\n", + "string transfer error"), 1); if (s1 != s) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("short transfer error")), + "%p\n", + "short transfer error"), 1); if (us1 != us) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("ushort transfer error")), + "%p\n", + "ushort transfer error"), 1); if (l1 != l) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("long transfer error")), + "%p\n", + "long transfer error"), 1); if (ul1 != ul) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("ulong transfer error")), + "%p\n", + "ulong transfer error"), 1); if (f1 != f) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("float transfer error")), + "%p\n", + "float transfer error"), 1); if (d1 != d) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("double transfer error")), + "%p\n", + "double transfer error"), 1); for (i = 0 ; i < 3; i++) if (s_array1[i] != s_array[i]) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("short array transfer error")), + "%p\n", + "short array transfer error"), 1); for (i = 0 ; i < 3; i++) if (l_array1[i] != l_array[i]) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("long array transfer error")), + "%p\n", + "long array transfer error"), 1); for (i = 0 ; i < 3; i++) if (f_array1[i] != f_array[i]) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("float array transfer error")), + "%p\n", + "float array transfer error"), 1); for (i = 0 ; i < 3; i++) if (d_array1[i] != d_array[i]) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("double array transfer error")), + "%p\n", + "double array transfer error"), 1); return 0; @@ -252,7 +252,7 @@ main (int argc, ASYS_TCHAR *argv[]) ACE::minor_version(), ACE::beta_version())); - ACE_Get_Opt get_opt (argc, argv, ASYS_TEXT ("dn:l:")); + ACE_Get_Opt get_opt (argc, argv, "dn:l:"); int opt, debug = 0; while ((opt = get_opt ()) != EOF) @@ -271,25 +271,25 @@ main (int argc, ASYS_TCHAR *argv[]) case '?': default: ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("Usage: %s ") - ASYS_TEXT ("-d debug") - ASYS_TEXT ("-n <num> ") - ASYS_TEXT ("-l <loops> ") - ASYS_TEXT ("\n"), + "Usage: %s " + "-d debug" + "-n <num> " + "-l <loops> " + "\n", argv[0])); return -1; } } ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("Testing ACE CDR functions - short stream\n\n"))); + "Testing ACE CDR functions - short stream\n\n")); if (short_stream () != 0 ) return 1; ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("Short stream - no errors\n\n") - ASYS_TEXT ("Testing basic types - long stream\n\n"))); + "Short stream - no errors\n\n" + "Testing basic types - long stream\n\n")); for (int i = 0; i < nloops; ++i) { @@ -303,12 +303,12 @@ main (int argc, ASYS_TCHAR *argv[]) if (debug > 0) { ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("Output CDR: \n"))); + "Output CDR: \n")); ACE_HEX_DUMP ((LM_DEBUG, input.rd_ptr(), 64)); ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("Input CDR: \n"))); + "Input CDR: \n")); ACE_HEX_DUMP ((LM_DEBUG, input.rd_ptr(), 64)); @@ -319,8 +319,8 @@ main (int argc, ASYS_TCHAR *argv[]) } ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("Long stream - no errors\n\n") - ASYS_TEXT ("Testing basic types - long stream[2]\n\n"))); + "Long stream - no errors\n\n" + "Testing basic types - long stream[2]\n\n")); for (int j = 0; j < nloops; ++j) { @@ -334,12 +334,12 @@ main (int argc, ASYS_TCHAR *argv[]) if (debug > 0) { ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("Output CDR: \n"))); + "Output CDR: \n")); ACE_HEX_DUMP ((LM_DEBUG, input.rd_ptr(), 64)); ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("Input CDR: \n"))); + "Input CDR: \n")); ACE_HEX_DUMP ((LM_DEBUG, input.rd_ptr(), 64)); @@ -350,7 +350,7 @@ main (int argc, ASYS_TCHAR *argv[]) } ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("Long stream[2] - no errors\n\n"))); + "Long stream[2] - no errors\n\n")); ACE_END_TEST; @@ -366,33 +366,33 @@ CDR_Test_Types::test_put (ACE_OutputCDR &cdr) { if (cdr.write_octet (this->o) == 0) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("write_octet[%d] failed\n"), + "write_octet[%d] failed\n", i), 1); if (cdr.write_short (this->s) == 0) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("write_short[%d] failed\n"), + "write_short[%d] failed\n", i), 1); if (cdr.write_octet (this->o) == 0) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("write_octet-2[%d] failed\n"), + "write_octet-2[%d] failed\n", i), 1); if (cdr.write_long (this->l) == 0) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("write_long[%d] failed\n"), + "write_long[%d] failed\n", i), 1); if (cdr.write_long (this->l) == 0) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("write_long-2[%d] failed\n"), + "write_long-2[%d] failed\n", i), 1); if (cdr.write_string (this->str) == 0) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("write_string[%d] failed\n"), + "write_string[%d] failed\n", i), 1); @@ -412,64 +412,64 @@ CDR_Test_Types::test_get (ACE_InputCDR &cdr) const { if (cdr.read_octet (xo) == 0) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("read_octet[%d] failed\n"), + "read_octet[%d] failed\n", i), 1); if (xo != this->o) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("octet[%d] differs\n"), + "octet[%d] differs\n", i), 1); if (cdr.read_short (xs) == 0) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("read_short[%d] failed\n"), + "read_short[%d] failed\n", i), 1); if (xs != this->s) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("short[%d] differs\n"), + "short[%d] differs\n", i), 1); if (cdr.read_octet (xo) == 0) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("read_octet-2[%d] failed\n"), + "read_octet-2[%d] failed\n", i), 1); if (xo != this->o) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("octet-2[%d] differs\n"), + "octet-2[%d] differs\n", i), 1); if (cdr.read_long (xl) == 0) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("read_long[%d] failed\n"), + "read_long[%d] failed\n", i), 1); if (xl != this->l) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("long[%d] differs\n"), + "long[%d] differs\n", i), 1); if (cdr.read_long (xl) == 0) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("read_long-2[%d] failed\n"), + "read_long-2[%d] failed\n", i), 1); if (xl != this->l) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("long-2[%d] differs\n"), + "long-2[%d] differs\n", i), 1); ACE_CDR::Char *xstr; if (cdr.read_string (xstr) == 0) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("read_string2[%d] failed\n"), + "read_string2[%d] failed\n", i), 1); ACE_Auto_Basic_Array_Ptr<ACE_CDR::Char> auto_xstr (xstr); if (ACE_OS::strcmp (auto_xstr.get (), this->str) != 0) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("string[%d] differs\n"), + "string[%d] differs\n", i), 1); } diff --git a/tests/CDR_Test.dsp b/tests/CDR_Test.dsp index 8e4c4e4891e..960058c371a 100644 --- a/tests/CDR_Test.dsp +++ b/tests/CDR_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=CDR_Test - Win32 PharLap ETS Debug
+CFG=CDR_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,16 @@ CFG=CDR_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "CDR_Test.mak" CFG="CDR_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "CDR_Test.mak" CFG="CDR_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "CDR_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "CDR_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "CDR_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "CDR_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +69,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "CDR_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +82,12 @@ LINK32=link.exe # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "CDR_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "CDR_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "CDR_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "CDR_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "CDR_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"CDR_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "CDR_Test - Win32 Debug"
# Name "CDR_Test - Win32 Alpha Debug"
-# Name "CDR_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -195,8 +163,6 @@ NODEP_CPP_CDR_T=\ "..\ace\stdcpp.h"\
-!ELSEIF "$(CFG)" == "CDR_Test - Win32 PharLap ETS Debug"
-
!ENDIF
# End Source File
diff --git a/tests/CDR_Test.icc b/tests/CDR_Test.icc deleted file mode 100644 index 90e35af9bbe..00000000000 --- a/tests/CDR_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "CDR_Test.exe" - { - source type (cpp) "CDR_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/CLASSIX/CLASSIX_Addr_Test.icc b/tests/CLASSIX/CLASSIX_Addr_Test.icc deleted file mode 100644 index e8bb296faca..00000000000 --- a/tests/CLASSIX/CLASSIX_Addr_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "CLASSIX_Addr_Test.exe" - { - source type (cpp) "CLASSIX_Addr_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/CLASSIX/CLASSIX_CLD_Connector_Test.icc b/tests/CLASSIX/CLASSIX_CLD_Connector_Test.icc deleted file mode 100644 index 0e6616500a0..00000000000 --- a/tests/CLASSIX/CLASSIX_CLD_Connector_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "CLASSIX_CLD_Connector_Test.exe" - { - source type (cpp) "CLASSIX_CLD_Connector_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/CLASSIX/CLASSIX_Con_Acc_Test.icc b/tests/CLASSIX/CLASSIX_Con_Acc_Test.icc deleted file mode 100644 index d17e9fd3189..00000000000 --- a/tests/CLASSIX/CLASSIX_Con_Acc_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "CLASSIX_Con_Acc_Test.exe" - { - source type (cpp) "CLASSIX_Con_Acc_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/CLASSIX/CLASSIX_Group_Test.icc b/tests/CLASSIX/CLASSIX_Group_Test.icc deleted file mode 100644 index 2dc3fd5b678..00000000000 --- a/tests/CLASSIX/CLASSIX_Group_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "CLASSIX_Group_Test.exe" - { - source type (cpp) "CLASSIX_Group_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/CLASSIX/CLASSIX_Notify_Test.icc b/tests/CLASSIX/CLASSIX_Notify_Test.icc deleted file mode 100644 index f3c29c97ce4..00000000000 --- a/tests/CLASSIX/CLASSIX_Notify_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "CLASSIX_Notify_Test.exe" - { - source type (cpp) "CLASSIX_Notify_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/CLASSIX/CLASSIX_OS_Test.icc b/tests/CLASSIX/CLASSIX_OS_Test.icc deleted file mode 100644 index 2896c5b3ef3..00000000000 --- a/tests/CLASSIX/CLASSIX_OS_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "CLASSIX_OS_Test.exe" - { - source type (cpp) "CLASSIX_OS_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/CLASSIX/CLASSIX_Reactor_Test.icc b/tests/CLASSIX/CLASSIX_Reactor_Test.icc deleted file mode 100644 index 8982535cec4..00000000000 --- a/tests/CLASSIX/CLASSIX_Reactor_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "CLASSIX_Reactor_Test.exe" - { - source type (cpp) "CLASSIX_Reactor_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/CLASSIX/CLASSIX_Select_Reactor_Test.icc b/tests/CLASSIX/CLASSIX_Select_Reactor_Test.icc deleted file mode 100644 index b7f06f11b5e..00000000000 --- a/tests/CLASSIX/CLASSIX_Select_Reactor_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "CLASSIX_Select_Reactor_Test.exe" - { - source type (cpp) "CLASSIX_Select_Reactor_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/CLASSIX/CLASSIX_Stream_Test.icc b/tests/CLASSIX/CLASSIX_Stream_Test.icc deleted file mode 100644 index 6811d6fdb0b..00000000000 --- a/tests/CLASSIX/CLASSIX_Stream_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "CLASSIX_Stream_Test.exe" - { - source type (cpp) "CLASSIX_Stream_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/CLASSIX_Addr_Test.icc b/tests/CLASSIX_Addr_Test.icc deleted file mode 100644 index e8bb296faca..00000000000 --- a/tests/CLASSIX_Addr_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "CLASSIX_Addr_Test.exe" - { - source type (cpp) "CLASSIX_Addr_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/CLASSIX_CLD_Connector_Test.icc b/tests/CLASSIX_CLD_Connector_Test.icc deleted file mode 100644 index 0e6616500a0..00000000000 --- a/tests/CLASSIX_CLD_Connector_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "CLASSIX_CLD_Connector_Test.exe" - { - source type (cpp) "CLASSIX_CLD_Connector_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/CLASSIX_Con_Acc_Test.icc b/tests/CLASSIX_Con_Acc_Test.icc deleted file mode 100644 index d17e9fd3189..00000000000 --- a/tests/CLASSIX_Con_Acc_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "CLASSIX_Con_Acc_Test.exe" - { - source type (cpp) "CLASSIX_Con_Acc_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/CLASSIX_Group_Test.icc b/tests/CLASSIX_Group_Test.icc deleted file mode 100644 index 2dc3fd5b678..00000000000 --- a/tests/CLASSIX_Group_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "CLASSIX_Group_Test.exe" - { - source type (cpp) "CLASSIX_Group_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/CLASSIX_Notify_Test.icc b/tests/CLASSIX_Notify_Test.icc deleted file mode 100644 index f3c29c97ce4..00000000000 --- a/tests/CLASSIX_Notify_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "CLASSIX_Notify_Test.exe" - { - source type (cpp) "CLASSIX_Notify_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/CLASSIX_OS_Test.icc b/tests/CLASSIX_OS_Test.icc deleted file mode 100644 index 2896c5b3ef3..00000000000 --- a/tests/CLASSIX_OS_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "CLASSIX_OS_Test.exe" - { - source type (cpp) "CLASSIX_OS_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/CLASSIX_Reactor_Test.icc b/tests/CLASSIX_Reactor_Test.icc deleted file mode 100644 index 8982535cec4..00000000000 --- a/tests/CLASSIX_Reactor_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "CLASSIX_Reactor_Test.exe" - { - source type (cpp) "CLASSIX_Reactor_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/CLASSIX_Select_Reactor_Test.icc b/tests/CLASSIX_Select_Reactor_Test.icc deleted file mode 100644 index b7f06f11b5e..00000000000 --- a/tests/CLASSIX_Select_Reactor_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "CLASSIX_Select_Reactor_Test.exe" - { - source type (cpp) "CLASSIX_Select_Reactor_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/CLASSIX_Stream_Test.icc b/tests/CLASSIX_Stream_Test.icc deleted file mode 100644 index 6811d6fdb0b..00000000000 --- a/tests/CLASSIX_Stream_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "CLASSIX_Stream_Test.exe" - { - source type (cpp) "CLASSIX_Stream_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/CPP_Test.cpp b/tests/CPP_Test.cpp deleted file mode 100644 index 4c0bd291a50..00000000000 --- a/tests/CPP_Test.cpp +++ /dev/null @@ -1,261 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// tests -// -// = FILENAME -// CPP_Test.cpp -// -// = DESCRIPTION -// This is a simple test of the ACE_SOCK_Acceptor and -// AC_SOCK_Connector classes. The test forks two processes or -// spawns two threads (depending upon the platform) and then executes -// client and server allowing them to connect and exchange -// data. No user input is required as far as command line -// arguments are concerned. -// -// = AUTHOR -// Prashant Jain and Doug Schmidt -// -// ============================================================================ - -#include "ace/OS.h" -#include "ace/Thread.h" -#include "ace/Service_Config.h" -#include "ace/SOCK_Connector.h" -#include "ace/SOCK_Acceptor.h" -#include "ace/SOCK_Stream.h" -#include "ace/INET_Addr.h" -#include "ace/Handle_Set.h" -#include "test_config.h" - -static void * -client (void *arg) -{ -#if (defined (ACE_WIN32) || defined (VXWORKS)) && defined (ACE_HAS_THREADS) - // Insert thread into thr_mgr - ACE_Thread_Control thread_control (ACE_Service_Config::thr_mgr ()); - ACE_NEW_THREAD; -#endif /* (defined (ACE_WIN32) || defined (VXWORKS)) && defined (ACE_HAS_THREADS) */ - - ACE_INET_Addr *remote_addr = (ACE_INET_Addr *) arg; - ACE_INET_Addr server_addr (remote_addr->get_port_number (), "localhost"); - ACE_SOCK_Stream cli_stream; - ACE_SOCK_Connector con; - - ACE_DEBUG ((LM_DEBUG, "(%P|%t) starting non-blocking connect\n")); - // Initiate timed, non-blocking connection with server. - - // Attempt a non-blocking connect to the server, reusing the local - // addr if necessary. - if (con.connect (cli_stream, server_addr, - (ACE_Time_Value *) &ACE_Time_Value::zero) == -1) - { - if (errno != EWOULDBLOCK) - ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "connection failed")); - - ACE_DEBUG ((LM_DEBUG, "(%P|%t) starting timed connect\n")); - - // Check if non-blocking connection is in progress, - // and wait up to ACE_DEFAULT_TIMEOUT seconds for it to complete. - ACE_Time_Value tv (ACE_DEFAULT_TIMEOUT); - - if (con.complete (cli_stream, &server_addr, &tv) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "connection failed"), 0); - else - ACE_DEBUG ((LM_DEBUG, "(%P|%t) connected to %s\n", - server_addr.get_host_name ())); - } - - if (cli_stream.disable (ACE_NONBLOCK) == -1) - ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "disable")); - - // Send data to server (correctly handles "incomplete writes"). - - for (char c = 'a'; c <= 'z'; c++) - if (cli_stream.send_n (&c, 1) == -1) - ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "send_n")); - - // Explicitly close the writer-side of the connection. - if (cli_stream.close_writer () == -1) - ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "close_writer")); - - char buf[1]; - - // Wait for handshake with server. - if (cli_stream.recv_n (buf, 1) != 1) - ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "recv_n")); - - // Close the connection completely. - if (cli_stream.close () == -1) - ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "close")); - - return 0; -} - -static void * -server (void *arg) -{ -#if (defined (ACE_WIN32) || defined (VXWORKS)) && defined (ACE_HAS_THREADS) - // Insert thread into thr_mgr - ACE_Thread_Control thread_control (ACE_Service_Config::thr_mgr ()); - ACE_NEW_THREAD; -#endif /* (defined (ACE_WIN32) || defined (VXWORKS)) && defined (ACE_HAS_THREADS) */ - - ACE_SOCK_Acceptor *peer_acceptor = (ACE_SOCK_Acceptor *) arg; - - if (peer_acceptor->enable (ACE_NONBLOCK) == -1) - ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "enable")); - - // Keep these objects out here to prevent excessive constructor - // calls... - ACE_SOCK_Stream new_stream; - ACE_INET_Addr cli_addr; - ACE_Handle_Set handle_set; - ACE_Time_Value tv (ACE_DEFAULT_TIMEOUT); - // Performs the iterative server activities. - - for (;;) - { - char buf[BUFSIZ]; - char t = 'a'; - - handle_set.reset (); - handle_set.set_bit (peer_acceptor->get_handle ()); - - int result = ACE_OS::select (int (peer_acceptor->get_handle ()) + 1, - handle_set, - 0, 0, &tv); - if (result == -1) - ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "select"), 0); - else if (result == 0) - { - ACE_DEBUG ((LM_DEBUG, "(%P|%t) select timed out, shutting down\n")); - return 0; - } - - // Create a new ACE_SOCK_Stream endpoint (note automatic restart - // if errno == EINTR). - - while ((result = peer_acceptor->accept (new_stream, &cli_addr)) != -1) - { - ACE_DEBUG ((LM_DEBUG, "(%P|%t) client %s connected from %d\n", - cli_addr.get_host_name (), cli_addr.get_port_number ())); - - // Enable non-blocking I/O. - if (new_stream.enable (ACE_NONBLOCK) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "enable"), 0); - - handle_set.reset (); - handle_set.set_bit (new_stream.get_handle ()); - - // Read data from client (terminate on error). - - for (ssize_t r_bytes; ;) - { - if (ACE_OS::select (int (new_stream.get_handle ()) + 1, - handle_set, - 0, 0, 0) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "select"), 0); - - while ((r_bytes = new_stream.recv_n (buf, 1)) > 0) - { - ACE_ASSERT (t == buf[0]); - t++; - } - - if (r_bytes == 0) - { - ACE_DEBUG ((LM_DEBUG, - "(%P|%t) reached end of input, connection closed by client\n")); - - // Handshake back with client. - if (new_stream.send_n ("", 1) != 1) - ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "send_n")); - - // Close endpoint. - if (new_stream.close () == -1) - ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "close")); - return 0; - } - else if (r_bytes == -1) - { - if (errno == EWOULDBLOCK) - ACE_DEBUG ((LM_DEBUG, "(%P|%t) no input available, going back to reading\n")); - else - ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "recv_n"), 0); - } - } - } - - if (result == -1) - { - if (errno == EWOULDBLOCK) - ACE_DEBUG ((LM_DEBUG, "(%P|%t) no connections available, going back to accepting\n")); - else - ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "accept")); - } - } - return 0; -} - -static void -spawn (void) -{ - // Acceptor - ACE_SOCK_Acceptor peer_acceptor; - - // Create a server address. - ACE_INET_Addr server_addr; - - // Bind listener to any port and then find out what the port was. - if (peer_acceptor.open (ACE_Addr::sap_any) == -1 - || peer_acceptor.get_local_addr (server_addr) == -1) - ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "open")); - else - { - ACE_DEBUG ((LM_DEBUG, "(%P|%t) starting server at port %d\n", - server_addr.get_port_number ())); - -#if !defined (ACE_WIN32) && !defined (VXWORKS) - switch (ACE_OS::fork ()) - { - case -1: - ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n%a", "fork failed")); - exit (-1); - case 0: - ACE_LOG_MSG->sync ("child"); - client (&server_addr); - default: - server ((void *) &peer_acceptor); - ACE_OS::wait (); - } -#elif defined (ACE_HAS_THREADS) - if (ACE_Service_Config::thr_mgr ()->spawn - (ACE_THR_FUNC (server), (void *) &peer_acceptor, THR_NEW_LWP | THR_DETACHED) == -1) - ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n%a", "thread create failed")); - - if (ACE_Service_Config::thr_mgr ()->spawn - (ACE_THR_FUNC (client), (void *) &server_addr, THR_NEW_LWP | THR_DETACHED) == -1) - ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n%a", "thread create failed")); - - // Wait for the threads to exit. - ACE_Service_Config::thr_mgr ()->wait (); -#else - ACE_ERROR ((LM_ERROR, "(%P|%t) only one thread may be run in a process on this platform\n%a", 1)); -#endif /* ACE_HAS_THREADS */ - } -} - -int -main (int, char *[]) -{ - ACE_START_TEST ("CPP_Test"); - - spawn (); - - ACE_END_TEST; - return 0; -} diff --git a/tests/Cache_Map_Manager_Test.cpp b/tests/Cache_Map_Manager_Test.cpp deleted file mode 100644 index deaf62256d2..00000000000 --- a/tests/Cache_Map_Manager_Test.cpp +++ /dev/null @@ -1,731 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// tests -// -// = FILENAME -// Cache_Map_Manager_Test.cpp -// -// = DESCRIPTION -// This is a test of the <ACE_Cache_Map_Manager> and -// <ACE_Hash_Cache_Map_Manager> that illustrates how to use the -// forward and reverse iterators, as well as the purging and -// caching features. -// -// = AUTHOR -// Kirthika Parameswaran <kirthika@cs.wustl.edu> -// -// ============================================================================ - -#include "ace/OS.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "test_config.h" -#include "ace/Hash_Cache_Map_Manager_T.h" -#include "ace/Map_Manager.h" -#include "ace/Caching_Strategies_T.h" -#include "ace/Functor.h" -#include "ace/Pair_T.h" -#include "ace/Synch.h" -#include "ace/Get_Opt.h" - -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - -typedef ACE_UINT32 KEY; -typedef ACE_UINT32 VALUE; -typedef int ATTR; -typedef ACE_Pair<VALUE, ATTR> CACHE_VALUE; -typedef ACE_Hash<KEY> HASH_KEY; -typedef ACE_Equal_To<KEY> COMPARE_KEYS; - -typedef ACE_Hash_Map_Manager_Ex<KEY, CACHE_VALUE, ACE_Hash<KEY>, ACE_Equal_To<KEY>, ACE_Null_Mutex> - HASH_MAP_MANAGER; - -typedef ACE_Hash_Map_Iterator_Ex<KEY, CACHE_VALUE, ACE_Hash<KEY>, ACE_Equal_To<KEY>, ACE_Null_Mutex> - HASH_MAP_MANAGER_ITERATOR; - -typedef ACE_Map_Manager<KEY, CACHE_VALUE, ACE_Null_Mutex> - MAP_MANAGER; - -typedef ACE_Map_Iterator<KEY, CACHE_VALUE, ACE_Null_Mutex> - MAP_MANAGER_ITERATOR; - -typedef ACE_Map_Reverse_Iterator<KEY, CACHE_VALUE, ACE_Null_Mutex> - MAP_MANAGER_REVERSE_ITERATOR; - -typedef ACE_Pair_Caching_Utility<KEY, CACHE_VALUE, HASH_MAP_MANAGER, HASH_MAP_MANAGER_ITERATOR, ATTR> - HASH_MAP_CACHING_UTILITY; - -typedef ACE_Pair_Caching_Utility<KEY, CACHE_VALUE, MAP_MANAGER, MAP_MANAGER_ITERATOR, ATTR> - MAP_CACHING_UTILITY; - -// = Hash_Map_Manager related -typedef ACE_Caching_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY> - HASH_MAP_CACHING_STRATEGY; -typedef ACE_LRU_Caching_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY> - HASH_MAP_LRU; -typedef ACE_LFU_Caching_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY> - HASH_MAP_LFU; -typedef ACE_FIFO_Caching_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY> - HASH_MAP_FIFO; -typedef ACE_Null_Caching_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY> - HASH_MAP_NULL; -typedef ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_LRU> - HASH_MAP_LRU_ADAPTER; -typedef ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_LFU> - HASH_MAP_LFU_ADAPTER; -typedef ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_FIFO> - HASH_MAP_FIFO_ADAPTER; -typedef ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_NULL> - HASH_MAP_NULL_ADAPTER; - -// = Map_Manager related -typedef ACE_Caching_Strategy<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY> - MAP_CACHING_STRATEGY; -typedef ACE_LRU_Caching_Strategy<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY> - MAP_LRU; -typedef ACE_LFU_Caching_Strategy<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY> - MAP_LFU; -typedef ACE_FIFO_Caching_Strategy<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY> - MAP_FIFO; -typedef ACE_Null_Caching_Strategy<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY> - MAP_NULL; -typedef ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY, MAP_LRU> - MAP_LRU_ADAPTER; -typedef ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY, MAP_LFU> - MAP_LFU_ADAPTER; -typedef ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY, MAP_FIFO> - MAP_FIFO_ADAPTER; -typedef ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY, MAP_NULL> - MAP_NULL_ADAPTER; - -typedef ACE_Hash_Cache_Map_Manager<KEY, VALUE, ACE_Hash<KEY>, ACE_Equal_To<KEY>, HASH_MAP_CACHING_STRATEGY, ATTR> - HASH_MAP_CACHE; -typedef ACE_Cache_Map_Manager<KEY, VALUE, MAP_MANAGER, MAP_MANAGER_ITERATOR, MAP_MANAGER_REVERSE_ITERATOR, MAP_CACHING_STRATEGY, ATTR> - MAP_CACHE; - -static size_t iterations = ACE_MAX_ITERATIONS; -static size_t no_of_lookups = iterations / 2; -static int randomize_lookups = 1; -static int purge_percent = 10; -static LPCTSTR caching_strategy_type; -static int caching_strategy_count = 4; -static KEY pattern[ACE_MAX_ITERATIONS]; - -static void -run_iterator_cache (MAP_CACHE &cache) -{ - size_t iterations = cache.current_size (); - size_t counter = 0; - MAP_CACHE::iterator end = cache.end (); - - for (MAP_CACHE::iterator iter = cache.begin (); - iter != end; - ++iter) - { - // Debugging info. - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%d|%d)"), - (*iter).first (), - (*iter).second ())); - - ACE_ASSERT ((*iter).first () == (*iter).second ()); - ++counter; - } - - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("\n"))); - - ACE_UNUSED_ARG (iterations); - ACE_ASSERT (counter == iterations); -} - -static void -run_iterator_hash_cache (HASH_MAP_CACHE &cache) -{ - size_t iterations = cache.current_size (); - size_t counter = 0; - HASH_MAP_CACHE::iterator end = cache.end (); - - for (HASH_MAP_CACHE::iterator iter = cache.begin (); - iter != end; - ++iter) - { - // Debugging info. - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%d|%d)"), - (*iter).first (), - (*iter).second ())); - - ACE_ASSERT ((*iter).first () == (*iter).second ()); - ++counter; - } - - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("\n"))); - - ACE_UNUSED_ARG (iterations); - ACE_ASSERT (counter == iterations); -} - -static void -run_reverse_iterator_cache (MAP_CACHE &cache) -{ - size_t counter = cache.current_size (); - MAP_CACHE::reverse_iterator rend = cache.rend (); - - for (MAP_CACHE::reverse_iterator iter = cache.rbegin (); - iter != rend; - ++iter) - { - ACE_ASSERT ((*iter).first () == (*iter).second ()); - - // Debugging info. - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%d|%d)"), - (*iter).first (), - (*iter).second ())); - --counter; - } - - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("\n"))); - ACE_ASSERT (counter == 0); -} - -static void -run_reverse_iterator_hash_cache (HASH_MAP_CACHE &cache) -{ - size_t counter = cache.current_size (); - HASH_MAP_CACHE::reverse_iterator rend = cache.rend (); - - for (HASH_MAP_CACHE::reverse_iterator iter = cache.rbegin (); - iter != rend; - ++iter) - { - ACE_ASSERT ((*iter).first () == (*iter).second ()); - - // Debugging info. - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%d|%d)"), - (*iter).first (), - (*iter).second ())); - --counter; - } - - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("\n"))); - ACE_ASSERT (counter == 0); -} - -static void -find_test_cache (MAP_CACHE &cache) -{ - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("find\n"))); - - for (size_t i = 0; i < no_of_lookups; ++i) - { - VALUE j; - int result = cache.find (pattern[i], j); - - ACE_ASSERT (result != -1); - ACE_ASSERT (j == pattern[i]); - - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("%d "), - j)); - - ACE_UNUSED_ARG (result); - } - - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\n"))); -} - -static void -find_test_hash_cache (HASH_MAP_CACHE &cache) -{ - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("find\n"))); - - for (size_t i = 0; i < no_of_lookups; ++i) - { - VALUE j; - int result = cache.find (pattern[i], j); - - ACE_ASSERT (result != -1); - ACE_ASSERT (j == pattern[i]); - - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("%d "), - j)); - - ACE_UNUSED_ARG (result); - } - - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\n"))); -} - -static void -purge_test_cache (MAP_CACHE &cache) -{ - // Get the number of entries in the container. - size_t current_map_size = cache.current_size (); - - // Find the number of entries which will get purged. - size_t entries_to_remove = size_t ((double (purge_percent) / 100 * current_map_size) + 0.5); - - // Tell the caching strategy how much to purge. - cache.caching_strategy ().purge_percent (purge_percent); - - // Purge from cache. - int result = cache.purge (); - ACE_ASSERT (result != -1); - ACE_UNUSED_ARG (result); - - size_t resultant_size = 0; - if (caching_strategy_count == 0) - resultant_size = current_map_size; - else - resultant_size = current_map_size - entries_to_remove; - ACE_UNUSED_ARG (resultant_size); - - // Make sure the purge took out the appropriate number of entries. - ACE_ASSERT (cache.current_size () == resultant_size); -} - -static void -purge_test_hash_cache (HASH_MAP_CACHE &cache) -{ - // Get the number of entries in the container. - size_t current_map_size = cache.current_size (); - - // Find the number of entries which will get purged. - size_t entries_to_remove = size_t ((double (purge_percent) / 100 * current_map_size) + 0.5); - - // Tell the caching strategy how much to purge. - cache.caching_strategy ().purge_percent (purge_percent); - - // Purge from cache. - int result = cache.purge (); - ACE_ASSERT (result != -1); - ACE_UNUSED_ARG (result); - - size_t resultant_size = 0; - if (caching_strategy_count == 0) - resultant_size = current_map_size; - else - resultant_size = current_map_size - entries_to_remove; - ACE_UNUSED_ARG (resultant_size); - - // Make sure the purge took out the appropriate number of entries. - ACE_ASSERT (cache.current_size () == resultant_size); -} - -static void -functionality_test_cache (MAP_CACHING_STRATEGY &caching_strategy, - int same_pattern) -{ - //MAP_LRU lru; - MAP_CACHE cache (caching_strategy); - KEY i = 0; - VALUE j = 0; - - // Add it to the map now. - size_t counter = 0; - for (; - i < iterations; - ++i, ++j) - { - int result = cache.bind (i, j); - ACE_ASSERT (result != -1); - ACE_UNUSED_ARG (result); - - ACE_DEBUG ((LM_DEBUG, "keys[%d]=%d value=[%d]=%d\n", - i, i, j, j)); - ++counter; - ACE_ASSERT (cache.current_size () == counter); - } - - run_iterator_cache (cache); - run_reverse_iterator_cache (cache); - - if (same_pattern == 0) - { - // Obtain a pattern of lookups. - size_t total_entries = cache.current_size (); - - int k = 0; size_t i = 0; - for (k = 0; - k < (int) ACE_MAX_ITERATIONS; - ++k) - { - KEY key = i; - if (randomize_lookups != 0) - pattern[k] = ACE_OS::rand () % total_entries; - else - pattern[k] = i; - - ++i; - ACE_UNUSED_ARG (key); - } - } - - find_test_cache (cache); - - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("Number of entries in cache before purging : %d\n"), - cache.current_size ())); - - purge_test_cache (cache); - - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("Number of entries in cache after purging : %d\n"), - cache.current_size ())); - - run_iterator_cache (cache); - run_reverse_iterator_cache (cache); -} - -static void -functionality_test_hash_cache (HASH_MAP_CACHING_STRATEGY &caching_strategy, - int same_pattern) -{ - // HASH_MAP_LRU lru; - HASH_MAP_CACHE cache (caching_strategy); - KEY i = 0; - VALUE j = 0; - - // Add it to the map now. - size_t counter = 0; - for (; - i < iterations; - ++i, ++j) - { - int result = cache.bind (i, j); - ACE_ASSERT (result != -1); - ACE_UNUSED_ARG (result); - - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("keys[%d]=%d value=[%d]=%d\n"), - i, i, j, j)); - ++counter; - ACE_ASSERT (cache.current_size () == counter); - } - - run_iterator_hash_cache (cache); - run_reverse_iterator_hash_cache (cache); - - if (same_pattern == 0) - { - // Obtain a pattern of lookups. - size_t total_entries = cache.current_size (); - int k = 0; size_t i = 0; - for (k = 0; - k < (int) ACE_MAX_ITERATIONS; - ++k) - { - KEY key = i; - if (randomize_lookups != 0) - pattern[k] = ACE_OS::rand () % total_entries; - else - pattern[k] = i; - - ++i; - ACE_UNUSED_ARG (key); - } - } - - find_test_hash_cache (cache); - - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("Number of entries in cache before purging : %d\n"), - cache.current_size ())); - - purge_test_hash_cache (cache); - - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("Number of entries in cache after purging : %d\n"), - cache.current_size ())); - - run_iterator_hash_cache (cache); - run_reverse_iterator_hash_cache (cache); -} - -static int -parse_args (int argc, ASYS_TCHAR *argv[]) -{ - ACE_Get_Opt get_opt (argc, argv, ASYS_TEXT ("c:r:i:f:p:")); - - caching_strategy_type = "lru"; - - int cc; - while ((cc = get_opt ()) != -1) - { - switch (cc) - { - case 'c': - { - caching_strategy_type = get_opt.optarg; - - if (strcmp (caching_strategy_type, "null") == 0) - caching_strategy_count = 0; - if (strcmp (caching_strategy_type, "lru") == 0) - caching_strategy_count = 1; - if (strcmp (caching_strategy_type, "lfu") == 0) - caching_strategy_count = 2; - if (strcmp (caching_strategy_type, "fifo") == 0) - caching_strategy_count = 3; - break; - } - case 'i': - iterations = ACE_OS::atoi (get_opt.optarg); - break; - case 'f': - no_of_lookups = ACE_OS::atoi (get_opt.optarg); - break; - case 'r': - randomize_lookups = ACE_OS::atoi (get_opt.optarg); - break; - case 'p': - purge_percent = ACE_OS::atoi (get_opt.optarg); - break; - case '?': - case 'h': - default: - ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("usage: %s ") - ASYS_TEXT ("[-c (caching strategy : lru / lfu / fifo/ null [default = all])] ") - ASYS_TEXT ("[-r (randomize lookups)] ") - ASYS_TEXT ("[-i (iterations)] ") - ASYS_TEXT ("[-p (purge percent)] ") - ASYS_TEXT ("[-f (number of lookups)] \n"), - argv[0])); - return -1; - } - } - return 0; -} - -int -main (int argc, ASYS_TCHAR *argv[]) -{ - int result = parse_args (argc, argv); - if (result != 0) - return result; - - ACE_START_TEST (ASYS_TEXT ("Cache_Map_Manager_Test")); - ACE_LOG_MSG->clr_flags (ACE_Log_Msg::VERBOSE_LITE); - - ACE_OS::srand (ACE_static_cast (size_t, ACE_OS::time (0))); - - HASH_MAP_CACHING_STRATEGY *hash_map_caching_strategy = 0; - MAP_CACHING_STRATEGY *map_caching_strategy = 0; - - int same_pattern = 0; - switch (caching_strategy_count) - { - - case 0: - { - ACE_DEBUG ((LM_DEBUG, "Null_Caching_Strategy\n")); - map_caching_strategy = new MAP_NULL_ADAPTER; - hash_map_caching_strategy = new HASH_MAP_NULL_ADAPTER; - break; - } - - case 1: - { - ACE_DEBUG ((LM_DEBUG, "LRU_Caching_Strategy\n")); - map_caching_strategy = new MAP_LRU_ADAPTER; - hash_map_caching_strategy = new HASH_MAP_LRU_ADAPTER; - break; - } - - case 2: - { - ACE_DEBUG ((LM_DEBUG, "LFU_Caching_Strategy\n")); - map_caching_strategy = new MAP_LFU_ADAPTER; - hash_map_caching_strategy = new HASH_MAP_LFU_ADAPTER; - break; - } - - case 3: - { - ACE_DEBUG ((LM_DEBUG, "FIFO_Caching_Strategy\n")); - map_caching_strategy = new MAP_FIFO_ADAPTER; - hash_map_caching_strategy = new HASH_MAP_FIFO_ADAPTER; - break; - } - - case 4: - default: - { - ACE_DEBUG ((LM_DEBUG, "LRU_Caching_Strategy\n")); - caching_strategy_count = 1; - map_caching_strategy = new MAP_LRU_ADAPTER; - hash_map_caching_strategy = new HASH_MAP_LRU_ADAPTER; - functionality_test_cache (*map_caching_strategy, same_pattern); - - same_pattern = 1; - - functionality_test_hash_cache (*hash_map_caching_strategy, same_pattern); - delete map_caching_strategy; - delete hash_map_caching_strategy; - - ACE_DEBUG ((LM_DEBUG, "LFU_Caching_Strategy\n")); - caching_strategy_count = 2; - map_caching_strategy = new MAP_LFU_ADAPTER; - hash_map_caching_strategy = new HASH_MAP_LFU_ADAPTER; - functionality_test_cache (*map_caching_strategy, same_pattern); - functionality_test_hash_cache (*hash_map_caching_strategy, same_pattern); - delete map_caching_strategy; - delete hash_map_caching_strategy; - - ACE_DEBUG ((LM_DEBUG, "FIFO_Caching_Strategy\n")); - caching_strategy_count = 3; - map_caching_strategy = new MAP_FIFO_ADAPTER; - hash_map_caching_strategy = new HASH_MAP_FIFO_ADAPTER; - functionality_test_cache (*map_caching_strategy, same_pattern); - functionality_test_hash_cache (*hash_map_caching_strategy, same_pattern); - delete map_caching_strategy; - delete hash_map_caching_strategy; - - ACE_DEBUG ((LM_DEBUG, "Null_Caching_Strategy\n")); - caching_strategy_count = 0; - map_caching_strategy = new MAP_NULL_ADAPTER; - hash_map_caching_strategy = new HASH_MAP_NULL_ADAPTER; - } - - } - - functionality_test_cache (*map_caching_strategy, same_pattern); - functionality_test_hash_cache (*hash_map_caching_strategy, same_pattern); - delete map_caching_strategy; - delete hash_map_caching_strategy; - - ACE_LOG_MSG->set_flags (ACE_Log_Msg::VERBOSE_LITE); - ACE_END_TEST; - - return 0; -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Pair<VALUE, ATTR>; -template class ACE_Reference_Pair<KEY, VALUE>; -template class ACE_Equal_To<KEY>; - -template class ACE_Hash_Map_Manager_Ex<KEY, CACHE_VALUE, ACE_Hash<KEY>, ACE_Equal_To<KEY>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<KEY, CACHE_VALUE, ACE_Hash<KEY>, ACE_Equal_To<KEY>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<KEY, CACHE_VALUE, ACE_Hash<KEY>, ACE_Equal_To<KEY>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<KEY, CACHE_VALUE, ACE_Hash<KEY>, ACE_Equal_To<KEY>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Entry<KEY, CACHE_VALUE>; - -template class ACE_Map_Manager<KEY, CACHE_VALUE, ACE_Null_Mutex>; -template class ACE_Map_Iterator_Base<KEY, CACHE_VALUE, ACE_Null_Mutex>; -template class ACE_Map_Iterator<KEY, CACHE_VALUE, ACE_Null_Mutex>; -template class ACE_Map_Reverse_Iterator<KEY, CACHE_VALUE, ACE_Null_Mutex>; -template class ACE_Map_Entry<KEY, CACHE_VALUE>; - -template class ACE_Pair_Caching_Utility<KEY, CACHE_VALUE, HASH_MAP_MANAGER, HASH_MAP_MANAGER::iterator, ATTR>; -template class ACE_Pair_Caching_Utility<KEY, CACHE_VALUE, MAP_MANAGER, MAP_MANAGER::iterator, ATTR>; - -template class ACE_Caching_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY>; -template class ACE_Caching_Strategy<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY>; -template class ACE_LRU_Caching_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY>; -template class ACE_LRU_Caching_Strategy<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY>; -template class ACE_LFU_Caching_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY>; -template class ACE_LFU_Caching_Strategy<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY>; -template class ACE_FIFO_Caching_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY>; -template class ACE_FIFO_Caching_Strategy<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY>; -template class ACE_Null_Caching_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY>; -template class ACE_Null_Caching_Strategy<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY>; - -template class ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_LRU>; -template class ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY, MAP_LRU>; -template class ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_LFU>; -template class ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY, MAP_LFU>; -template class ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_FIFO>; -template class ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY, MAP_FIFO>; -template class ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_NULL>; -template class ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY, MAP_NULL>; - -template class ACE_Default_Cleanup_Strategy<KEY, ACE_Pair<KEY, ATTR>, HASH_MAP_MANAGER>; -template class ACE_Default_Cleanup_Strategy<KEY, ACE_Pair<KEY, ATTR>, MAP_MANAGER>; - -template class ACE_Cleanup_Strategy<KEY, ACE_Pair<KEY, ATTR>, HASH_MAP_MANAGER>; -template class ACE_Cleanup_Strategy<KEY, ACE_Pair<KEY, ATTR>, MAP_MANAGER>; - -template class ACE_Cache_Map_Manager<KEY, VALUE, MAP_MANAGER, MAP_MANAGER::iterator, MAP_MANAGER::reverse_iterator, MAP_CACHING_STRATEGY, ATTR>; -template class ACE_Cache_Map_Iterator<KEY, VALUE, MAP_MANAGER::iterator, MAP_CACHING_STRATEGY, ATTR>; -template class ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, MAP_MANAGER::reverse_iterator, MAP_CACHING_STRATEGY, ATTR>; - -template class ACE_Cache_Map_Manager<KEY, VALUE, HASH_MAP_MANAGER, HASH_MAP_MANAGER::iterator, HASH_MAP_MANAGER::reverse_iterator, HASH_MAP_CACHING_STRATEGY, ATTR>; -template class ACE_Cache_Map_Iterator<KEY, VALUE, HASH_MAP_MANAGER::iterator, HASH_MAP_CACHING_STRATEGY, ATTR>; -template class ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_MAP_MANAGER::reverse_iterator, HASH_MAP_CACHING_STRATEGY, ATTR>; -template class ACE_Hash_Cache_Map_Manager<KEY, VALUE, ACE_Hash<KEY>, ACE_Equal_To<KEY>, HASH_MAP_CACHING_STRATEGY, ATTR>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Pair<VALUE, ATTR> -#pragma instantiate ACE_Reference_Pair<KEY, VALUE> -#pragma instantiate ACE_Equal_To<KEY> - -#pragma instantiate ACE_Hash_Map_Manager_Ex<KEY, CACHE_VALUE, ACE_Hash<KEY>, ACE_Equal_To<KEY>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<KEY, CACHE_VALUE, ACE_Hash<KEY>, ACE_Equal_To<KEY>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<KEY, CACHE_VALUE, ACE_Hash<KEY>, ACE_Equal_To<KEY>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<KEY, CACHE_VALUE, ACE_Hash<KEY>, ACE_Equal_To<KEY>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Entry<KEY, CACHE_VALUE> - -#pragma instantiate ACE_Map_Manager<KEY, CACHE_VALUE, ACE_Null_Mutex> -#pragma instantiate ACE_Map_Iterator_Base<KEY, CACHE_VALUE, ACE_Null_Mutex> -#pragma instantiate ACE_Map_Iterator<KEY, CACHE_VALUE, ACE_Null_Mutex> -#pragma instantiate ACE_Map_Reverse_Iterator<KEY, CACHE_VALUE, ACE_Null_Mutex> -#pragma instantiate ACE_Map_Entry<KEY, CACHE_VALUE> - -#pragma instantiate ACE_Pair_Caching_Utility<KEY, CACHE_VALUE, HASH_MAP_MANAGER, HASH_MAP_MANAGER::iterator, ATTR> -#pragma instantiate ACE_Pair_Caching_Utility<KEY, CACHE_VALUE, MAP_MANAGER, MAP_MANAGER::iterator, ATTR> - -#pragma instantiate ACE_Caching_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY> -#pragma instantiate ACE_Caching_Strategy<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY> -#pragma instantiate ACE_LRU_Caching_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY> -#pragma instantiate ACE_LRU_Caching_Strategy<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY> -#pragma instantiate ACE_LFU_Caching_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY> -#pragma instantiate ACE_LFU_Caching_Strategy<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY> -#pragma instantiate ACE_FIFO_Caching_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY> -#pragma instantiate ACE_FIFO_Caching_Strategy<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY> -#pragma instantiate ACE_Null_Caching_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY> -#pragma instantiate ACE_Null_Caching_Strategy<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY> - -#pragma instantiate ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_LRU> -#pragma instantiate ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY, MAP_LRU> -#pragma instantiate ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_LFU> -#pragma instantiate ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY, MAP_LFU> -#pragma instantiate ACE_Caching_Strateg_Adaptery<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_FIFO> -#pragma instantiate ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY, MAP_FIFO> -#pragma instantiate ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, HASH_MAP_MANAGER, ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_NULL> -#pragma instantiate ACE_Caching_Strategy_Adapter<KEY, CACHE_VALUE, MAP_MANAGER, ATTR, MAP_CACHING_UTILITY, MAP_NULL> - -#pragma instantiate ACE_Default_Cleanup_Strategy<KEY, ACE_Pair<KEY, ATTR>, HASH_MAP_MANAGER> -#pragma instantiate ACE_Default_Cleanup_Strategy<KEY, ACE_Pair<KEY, ATTR>, MAP_MANAGER> - -#pragma instantiate ACE_Cleanup_Strategy<KEY, ACE_Pair<KEY, ATTR>, HASH_MAP_MANAGER> -#pragma instantiate ACE_Cleanup_Strategy<KEY, ACE_Pair<KEY, ATTR>, MAP_MANAGER> - -#pragma instantiate ACE_Cache_Map_Manager<KEY, VALUE, MAP_MANAGER, MAP_MANAGER::iterator, MAP_MANAGER::reverse_iterator, MAP_CACHIN_STRATEGY, ATTR> -#pragma instantiate ACE_Cache_Map_Iterator<KEY, VALUE, MAP_MANAGER::iterator, MAP_CACHIN_STRATEGY, ATTR> -#pragma instantiate ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, MAP_MANAGER::reverse_iterator, MAP_CACHIN_STRATEGY, ATTR> - -#pragma instantiate ACE_Cache_Map_Manager<KEY, VALUE, HASH_MAP_MANAGER, HASH_MAP_MANAGER::iterator, HASH_MAP_MANAGER::reverse_iterator, HASH_MAP_CACHING_STRATEGY, ATTR> -#pragma instantiate ACE_Cache_Map_Iterator<KEY, VALUE, HASH_MAP_MANAGER::iterator, HASH_MAP_CACHING_STRATEGY, ATTR> -#pragma instantiate ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_MAP_MANAGER::reverse_iterator, HASH_MAP_CACHING_STRATEGY, ATTR> -#pragma instantiate ACE_Hash_Cache_Map_Manager<KEY, VALUE, ACE_Hash<KEY>, ACE_Equal_To<KEY>, HASH_MAP_CACHING_STRATEGY, ATTR> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/tests/Cache_Map_Manager_Test.dsp b/tests/Cache_Map_Manager_Test.dsp deleted file mode 100644 index 9bcf8eca8e8..00000000000 --- a/tests/Cache_Map_Manager_Test.dsp +++ /dev/null @@ -1,194 +0,0 @@ -# Microsoft Developer Studio Project File - Name="Cache_Map_Manager_Test" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=Cache_Map_Manager_Test - Win32 PharLap ETS Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "Cache_Map_Manager_Test.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "Cache_Map_Manager_Test.mak" CFG="Cache_Map_Manager_Test - Win32 PharLap ETS Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "Cache_Map_Manager_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Cache_Map_Manager_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "Cache_Map_Manager_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF "$(CFG)" == "Cache_Map_Manager_Test - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Atomic_O"
-# PROP BASE Intermediate_Dir "Atomic_O"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\DLL\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Cache_Map_Manager_Test - Win32 Alpha Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Atomic_O"
-# PROP BASE Intermediate_Dir "Atomic_O"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ""
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Cache_Map_Manager_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Atomic_O"
-# PROP BASE Intermediate_Dir "Atomic_O"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"Cache_Map_Manager_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF
-
-# Begin Target
-
-# Name "Cache_Map_Manager_Test - Win32 Debug"
-# Name "Cache_Map_Manager_Test - Win32 Alpha Debug"
-# Name "Cache_Map_Manager_Test - Win32 PharLap ETS Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ".cpp"
-# Begin Source File
-
-SOURCE=.\Cache_Map_Manager_Test.cpp
-
-!IF "$(CFG)" == "Cache_Map_Manager_Test - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "Cache_Map_Manager_Test - Win32 Alpha Debug"
-
-DEP_CPP_CACHE=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-NODEP_CPP_CACHE=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "Cache_Map_Manager_Test - Win32 PharLap ETS Debug"
-
-!ENDIF
-
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter ".h"
-# Begin Source File
-
-SOURCE=.\test_config.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/tests/Cached_Conn_Test.cpp b/tests/Cached_Conn_Test.cpp deleted file mode 100644 index e125d8cce97..00000000000 --- a/tests/Cached_Conn_Test.cpp +++ /dev/null @@ -1,525 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// tests -// -// = FILENAME -// Cached_Conn_Test.cpp -// -// = DESCRIPTION -// The test illustrates how the <ACE_Strategy_Connector> works by -// showing how you can cache connections on the client using -// different caching strategies. Also how connections can be purged -// explicitly if needed from the connection cache maintained by the -// connector. -// -// = AUTHOR -// Kirthika Parameswaran <kirthika@cs.wustl.edu> -// -// ============================================================================ - -#ifndef CACHED_CONNECT_TEST -#define CACHED_CONNECT_TEST - -#include "test_config.h" -#include "ace/INET_Addr.h" -#include "ace/Strategies.h" -#include "ace/Auto_Ptr.h" -#include "ace/SOCK_Connector.h" -#include "ace/SOCK_Acceptor.h" -#include "ace/Svc_Handler.h" -#include "ace/SOCK_Stream.h" -#include "ace/Acceptor.h" -#include "ace/Connector.h" -#include "ace/Get_Opt.h" -#include "ace/Caching_Utility_T.h" -#include "ace/Cached_Connect_Strategy_T.h" - -ACE_RCSID(tests, Cached_Conn_Test, "$Id$") - -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - -// Default number of clients/servers. -static int n_servers = 2000; -static double purge_percentage = 20; -static int caching_strategy_type = 1; - -typedef size_t ATTRIBUTES; -typedef ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> - Svc_Handler; -typedef ACE_Pair<Svc_Handler *, ATTRIBUTES> - CACHED_HANDLER; -typedef ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> - REFCOUNTED_HASH_RECYCLABLE_ADDR; -typedef ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR> H_KEY; -typedef ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR> C_KEYS; - -typedef ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>,\ - ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Null_Mutex> - HASH_MAP; -typedef ACE_Hash_Map_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, \ - ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Null_Mutex> - HASH_MAP_ITERATOR; -typedef ACE_Hash_Map_Reverse_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>,\ - ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Null_Mutex> - HASH_MAP_REVERSE_ITERATOR; -typedef ACE_Svc_Cleanup_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP> - CLEANUP_STRATEGY; -typedef ACE_Pair_Caching_Utility<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, HASH_MAP_ITERATOR, ATTRIBUTES> - CACHING_UTILITY; - -typedef ACE_Caching_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY> - CACHING_STRATEGY; -typedef ACE_LRU_Caching_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY> - LRU_CACHING_STRATEGY; -typedef ACE_LFU_Caching_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY> - LFU_CACHING_STRATEGY; -typedef ACE_FIFO_Caching_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY> - FIFO_CACHING_STRATEGY; -typedef ACE_Null_Caching_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY> - NULL_CACHING_STRATEGY; -typedef ACE_Caching_Strategy_Adapter<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY, LRU_CACHING_STRATEGY > - LRU_CACHING_STRATEGY_ADAPTER; -typedef ACE_Caching_Strategy_Adapter<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY, LFU_CACHING_STRATEGY> - LFU_CACHING_STRATEGY_ADAPTER; -typedef ACE_Caching_Strategy_Adapter<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY, FIFO_CACHING_STRATEGY> - FIFO_CACHING_STRATEGY_ADAPTER; -typedef ACE_Caching_Strategy_Adapter<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY, NULL_CACHING_STRATEGY> - NULL_CACHING_STRATEGY_ADAPTER; - -typedef ACE_Oneshot_Acceptor<Svc_Handler, ACE_SOCK_ACCEPTOR> - ACCEPTOR; - -typedef ACE_Strategy_Connector<Svc_Handler, ACE_SOCK_CONNECTOR> - STRATEGY_CONNECTOR; - -typedef ACE_NOOP_Creation_Strategy<Svc_Handler> - NULL_CREATION_STRATEGY; - -typedef ACE_NOOP_Concurrency_Strategy<Svc_Handler> - NULL_ACTIVATION_STRATEGY; - -typedef ACE_Cached_Connect_Strategy_Ex<Svc_Handler, ACE_SOCK_CONNECTOR, CACHING_STRATEGY, ATTRIBUTES, ACE_SYNCH_NULL_MUTEX> - CACHED_CONNECT_STRATEGY; - -//==================================================================== - - -static int -cached_connect (STRATEGY_CONNECTOR &con, - const ACE_INET_Addr &server_addr) -{ - Svc_Handler *svc_handler = 0; - - // Perform a blocking connect to the server using the Strategy - // Connector with a connection caching strategy. Since we are - // connecting to the same <server_addr> these calls will return - // the same dynamically allocated <Svc_Handler> for each - // <connect>. - int result = con.connect (svc_handler, - server_addr); - if (result == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("(%P|%t) %p\n"), - ASYS_TEXT ("connection failed")), - -1); - - // Send the data to the server. - for (char *c = ACE_ALPHABET; *c != '\0'; c++) - if (svc_handler->peer ().send_n (c, 1) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("(%P|%t) %p\n"), - ASYS_TEXT ("send_n")), - -1); - - // Svc_Handler is now idle, so mark it as such and let the cache - // recycle it. - svc_handler->idle (1); - return 0; -} - -static int -server (ACCEPTOR *acceptor) -{ - ACE_INET_Addr cli_addr; - - // Create a new <Svc_Handler> to consume the data. - Svc_Handler svc_handler; - - int result = acceptor->accept (&svc_handler, - &cli_addr); - if (result == -1) - { - if (errno == EMFILE) - return 1; - - return -1; - } - - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%P|%t) client %s connected from %d\n"), - cli_addr.get_host_name (), - cli_addr.get_port_number ())); - - char c; - char *t = ACE_ALPHABET; - ssize_t r_bytes = 0; - - // Read data from client (terminate on error). - while ((r_bytes == svc_handler.peer ().recv_n (&c, 1)) > 0) - { - ACE_ASSERT (*t == c); - - // We need to guard against cached connections, which - // will send multiple sequences of letters from 'a' -> - // 'z' through the same connection. - if (*t == 'z') - t = ACE_ALPHABET; - else - t++; - } - - if (r_bytes == 0) - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%P|%t) reached end of input, connection cached by client\n"))); - else if (r_bytes == -1) - { - if (errno == EWOULDBLOCK) - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%P|%t) no input available, going back to reading\n"))); - else - ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("(%P|%t) %p\n"), - ASYS_TEXT ("recv_n")), - -1); - } - - return 0; -} - - -static void -test_connection_management (CACHING_STRATEGY &caching_strategy) -{ - NULL_CREATION_STRATEGY creation_strategy; - NULL_ACTIVATION_STRATEGY activation_strategy; - - // Configure the Strategy Connector with a strategy that caches - // connection. - CACHED_CONNECT_STRATEGY caching_connect_strategy (caching_strategy); - - STRATEGY_CONNECTOR strategy_connector (0, - &creation_strategy, - &caching_connect_strategy, - &activation_strategy); - - // Set the purging percentage explicitly. By default it is 10%. - // Note: The purge_percent could have been set before itself but, - // the following has been done just to show how one would explicitly - // set the purge_percent at any moment. - CACHED_CONNECT_STRATEGY *connect_strategy = - ACE_dynamic_cast (CACHED_CONNECT_STRATEGY *, - strategy_connector.connect_strategy ()); - - connect_strategy->caching_strategy ().purge_percent (purge_percentage); - - for (int i = 0; i < n_servers; ++i) - { - // Acceptor - ACCEPTOR acceptor; - ACE_INET_Addr server_addr; - - // Bind acceptor to any port and then find out what the port - // was. - if (acceptor.open (ACE_sap_any_cast (const ACE_INET_Addr &)) == -1 - || acceptor.acceptor ().get_local_addr (server_addr) == -1) - { - ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("(%P|%t) %p\n"), - ASYS_TEXT ("open"))); - return; - } - else - { - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%P|%t) starting server at port %d\n"), - server_addr.get_port_number ())); - } - - // Run the cached blocking test. - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%P|%t) *starting cached blocking connect\n"))); - - int result = cached_connect (strategy_connector, - server_addr); - ACE_ASSERT (result != -1); - - result = server (&acceptor); - if (result == 1) - { - // Close connections which are cached by explicitly purging - // the connection cache maintained by the connector. - ACE_DEBUG ((LM_DEBUG, "Purging connections from Connection Cache...\n")); - - int retval = connect_strategy->purge_connections (purge_percentage); - ACE_ASSERT (retval != -1); - } - - ACE_ASSERT (result != -1); - } -} - - - -int -parse_args (int argc, char *argv[]) -{ - ACE_Get_Opt get_opt (argc, argv, "s:p:c:"); - - int cc; - - while ((cc = get_opt ()) != -1) - switch (cc) - { - case 's': - n_servers = atoi (get_opt.optarg); - break; - case 'p': - purge_percentage = atoi (get_opt.optarg); - break; - case 'c': // If Null Caching Strategy then this test will fail! - caching_strategy_type = atoi (get_opt.optarg); - break; - case '?': - case 'h': - default: - ACE_ERROR ((LM_ERROR, - "usage: %s " - "[-s (number of servers to connect to)] " - "[-p (purge percent)] " - "[-c (caching_strategy_type 0=NULL , 1=LRU, 2=LFU, 3=FIFO default=LRU)]\n", - argv[0])); - return -1; - } - - return 0; -} - -int -main (int argc, - ASYS_TCHAR *argv[]) -{ - ACE_START_TEST (ASYS_TEXT ("Cached_Conn_Test")); - ACE_LOG_MSG->clr_flags (ACE_Log_Msg::VERBOSE_LITE); - - // Obtain the <number of servers> to connect to. Also the purge - // percentage using which the entries in the connection cache of - // the connector will be removed. - int result = parse_args (argc, argv); - ACE_ASSERT (result == 0); - - CACHING_STRATEGY *caching_strategy = 0; - switch (caching_strategy_type) - { - case 0: - { - caching_strategy = new NULL_CACHING_STRATEGY_ADAPTER; - test_connection_management (*caching_strategy); - break; - } - case 2: - { - caching_strategy = new LFU_CACHING_STRATEGY_ADAPTER; - test_connection_management (*caching_strategy); - break; - } - case 3: - { - caching_strategy = new FIFO_CACHING_STRATEGY_ADAPTER; - test_connection_management (*caching_strategy); - break; - } - case 1: - default: - { - ACE_DEBUG ((LM_DEBUG, "*************LRU Caching Strategy*****************\n")); - caching_strategy = new LRU_CACHING_STRATEGY_ADAPTER; - test_connection_management (*caching_strategy); - delete caching_strategy; - - ACE_DEBUG ((LM_DEBUG, "*************LFU Caching Strategy*****************\n")); - caching_strategy = new LFU_CACHING_STRATEGY_ADAPTER; - test_connection_management (*caching_strategy); - delete caching_strategy; - - ACE_DEBUG ((LM_DEBUG, "*************FIFO Caching Strategy*****************\n")); - caching_strategy = new FIFO_CACHING_STRATEGY_ADAPTER; - test_connection_management (*caching_strategy); - break; - } - } - - delete caching_strategy; - ACE_LOG_MSG->set_flags (ACE_Log_Msg::VERBOSE_LITE); - ACE_END_TEST; - return 0; -} - - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>; -template class ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>; -template class ACE_NOOP_Creation_Strategy<Svc_Handler>; -template class ACE_Concurrency_Strategy<Svc_Handler>; -template class ACE_Connect_Strategy<Svc_Handler, ACE_SOCK_CONNECTOR>; -template class ACE_Connector<Svc_Handler, ACE_SOCK_CONNECTOR>; -template class ACE_Creation_Strategy<Svc_Handler>; -template class ACE_Hash_Map_Entry<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *>; -template class ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>; -template class ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>; -template class ACE_Hash_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_SYNCH_RW_MUTEX>; -template class ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, C_KEYS, ACE_SYNCH_RW_MUTEX>; -template class ACE_Hash_Map_Iterator_Base_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, C_KEYS, ACE_SYNCH_RW_MUTEX>; -template class ACE_Hash_Map_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_SYNCH_RW_MUTEX>; -template class ACE_Hash_Map_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, C_KEYS, ACE_SYNCH_RW_MUTEX>; -template class ACE_Hash_Map_Reverse_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_SYNCH_RW_MUTEX>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, C_KEYS, ACE_SYNCH_RW_MUTEX>; -template class ACE_Map_Entry<ACE_HANDLE, ACE_Svc_Tuple<Svc_Handler> *>; -template class ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<Svc_Handler> *, ACE_SYNCH_RW_MUTEX>; -template class ACE_Map_Iterator_Base<ACE_HANDLE, ACE_Svc_Tuple<Svc_Handler> *, ACE_SYNCH_RW_MUTEX>; -template class ACE_Map_Iterator<ACE_HANDLE, ACE_Svc_Tuple<Svc_Handler> *, ACE_SYNCH_RW_MUTEX>; -template class ACE_Map_Reverse_Iterator<ACE_HANDLE, ACE_Svc_Tuple<Svc_Handler> *, ACE_SYNCH_RW_MUTEX>; -template class ACE_NOOP_Concurrency_Strategy<Svc_Handler>; -template class ACE_Recycling_Strategy<Svc_Handler>; -template class ACE_Strategy_Connector<Svc_Handler, ACE_SOCK_CONNECTOR>; -template class ACE_Svc_Tuple<Svc_Handler>; -template class ACE_Oneshot_Acceptor<Svc_Handler, ACE_SOCK_ACCEPTOR>; - -template class ACE_Pair<Svc_Handler *, ATTRIBUTES>; -template class ACE_Reference_Pair<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *>; -template class ACE_Hash_Map_Entry<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER>; - -template class ACE_Hash_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>; - -template class ACE_Hash_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>; - -// = Caching_Strategy -template class ACE_Hash_Cache_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, H_KEY, C_KEYS, CACHING_STRATEGY, ATTRIBUTES>; -template class ACE_Cache_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, HASH_MAP, HASH_MAP::iterator, HASH_MAP::reverse_iterator, CACHING_STRATEGY, ATTRIBUTES>; -template class ACE_Cache_Map_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, HASH_MAP::iterator, CACHING_STRATEGY, ATTRIBUTES>; -template class ACE_Cache_Map_Reverse_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, HASH_MAP::reverse_iterator, CACHING_STRATEGY, ATTRIBUTES>; -template class ACE_Cached_Connect_Strategy_Ex<Svc_Handler, ACE_SOCK_CONNECTOR, CACHING_STRATEGY, ATTRIBUTES, ACE_SYNCH_NULL_MUTEX>; -template class ACE_Cached_Connect_Strategy<Svc_Handler, ACE_SOCK_CONNECTOR, ACE_SYNCH_NULL_MUTEX>; - -template class ACE_Cleanup_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP>; -template class ACE_Default_Cleanup_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP>; -template class ACE_Pair_Caching_Utility<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, HASH_MAP::iterator, ATTRIBUTES>; -template class ACE_Svc_Cleanup_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP>; - -template class ACE_Caching_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY>; -template class ACE_LRU_Caching_Strategy <REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY>; -template class ACE_LFU_Caching_Strategy <REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY>; -template class ACE_FIFO_Caching_Strategy <REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY>; -template class ACE_Null_Caching_Strategy <REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY>; - -template class ACE_Caching_Strategy_Adapter<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY, LRU_CACHING_STRATEGY >; -template class ACE_Caching_Strategy_Adapter<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY, LFU_CACHING_STRATEGY >; -template class ACE_Caching_Strategy_Adapter<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY, FIFO_CACHING_STRATEGY >; -template class ACE_Caching_Strategy_Adapter<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY, NULL_CACHING_STRATEGY >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> -#pragma instantiate ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> -#pragma instantiate ACE_NOOP_Creation_Strategy<Svc_Handler> -#pragma instantiate ACE_Concurrency_Strategy<Svc_Handler> -#pragma instantiate ACE_Connect_Strategy<Svc_Handler, ACE_SOCK_CONNECTOR> -#pragma instantiate ACE_Connector<Svc_Handler, ACE_SOCK_CONNECTOR> -#pragma instantiate ACE_Creation_Strategy<Svc_Handler> -#pragma instantiate ACE_Hash_Map_Entry<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *> -#pragma instantiate ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR> -#pragma instantiate ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR> -#pragma instantiate ACE_Hash_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Entry<ACE_HANDLE, ACE_Svc_Tuple<Svc_Handler> *> -#pragma instantiate ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<Svc_Handler> *, ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Iterator_Base<ACE_HANDLE, ACE_Svc_Tuple<Svc_Handler> *, ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Iterator<ACE_HANDLE, ACE_Svc_Tuple<Svc_Handler> *, ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Reverse_Iterator<ACE_HANDLE, ACE_Svc_Tuple<Svc_Handler> *, ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_NOOP_Concurrency_Strategy<Svc_Handler> -#pragma instantiate ACE_Recycling_Strategy<Svc_Handler> -#pragma instantiate ACE_Strategy_Connector<Svc_Handler, ACE_SOCK_CONNECTOR> - -#pragma instantiate ACE_Svc_Tuple<Svc_Handler> -#pragma instantiate ACE_Oneshot_Acceptor<Svc_Handler, ACE_SOCK_ACCEPTOR> - -#pragma instantiate ACE_Pair<Svc_Handler *, ATTRIBUTES> -#pragma instantiate ACE_Reference_Pair<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *> -#pragma instantiate ACE_Hash_Map_Entry<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER> - -#pragma instantiate ACE_Hash_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex> - -#pragma instantiate ACE_Hash_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex> - -// = Caching_Strategy -#pragma instantiate ACE_Hash_Cache_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, H_KEY, C_KEYS, CACHING_STRATEGY, ATTRIBUTES> -#pragma instantiate ACE_Cache_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, HASH_MAP, HASH_MAP::iterator, HASH_MAP::reverse_iterator, CACHING_STRATEGY, ATTRIBUTES> -#pragma instantiate ACE_Cache_Map_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, HASH_MAP::iterator, CACHING_STRATEGY, ATTRIBUTES> -#pragma instantiate ACE_Cache_Map_Reverse_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, HASH_MAP::reverse_iterator, CACHING_STRATEGY, ATTRIBUTES> -#pragma instantiate ACE_Cached_Connect_Strategy_Ex<Svc_Handler, ACE_SOCK_CONNECTOR, CACHING_STRATEGY, ATTRIBUTES, ACE_SYNCH_NULL_MUTEX> -#pragma instantiate ACE_Cached_Connect_Strategy<Svc_Handler, ACE_SOCK_CONNECTOR, ACE_SYNCH_NULL_MUTEX> - -#pragma instantiate ACE_Cleanup_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP> -#pragma instantiate ACE_Default_Cleanup_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP> -#pragma instantiate ACE_Pair_Caching_Utility<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, HASH_MAP::iterator, ATTRIBUTES> -#pragma instantiate ACE_Svc_Cleanup_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP> - -#pragma instantiate ACE_Caching_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY> -#pragma instantiate ACE_LRU_Caching_Strategy <REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY> -#pragma instantiate ACE_LFU_Caching_Strategy <REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY> -#pragma instantiate ACE_FIFO_Caching_Strategy <REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY> -#pragma instantiate ACE_Null_Caching_Strategy <REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY> - -#pragma instantiate ACE_Caching_Strategy_Adapter<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY, LRU_CACHING_STRATEGY > -#pragma instantiate ACE_Caching_Strategy_Adapter<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY, LFU_CACHING_STRATEGY > -#pragma instantiate ACE_Caching_Strategy_Adapter<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY, FIFO_CACHING_STRATEGY > -#pragma instantiate ACE_Caching_Strategy_Adapter<REFCOUNTED_HASH_RECYCLABLE_ADDR, CACHED_HANDLER, HASH_MAP, ATTRIBUTES, CACHING_UTILITY, NULL_CACHING_STRATEGY > - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -#endif /* CACHED_CONNECT_TEST */ diff --git a/tests/Collection_Test.cpp b/tests/Collection_Test.cpp index d30b7cd3d12..bdbd04c5ede 100644 --- a/tests/Collection_Test.cpp +++ b/tests/Collection_Test.cpp @@ -30,7 +30,7 @@ USELIB("..\ace\aced.lib"); typedef int DATA; -int main (int, ASYS_TCHAR *[]) +int main (int, char *[]) { ACE_START_TEST (ASYS_TEXT ("Collection_Test")); @@ -48,7 +48,7 @@ int main (int, ASYS_TCHAR *[]) iterator != unbounded_set.end (); ++iterator) { - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("%d\n"), + ACE_DEBUG ((LM_DEBUG, "%d\n", (*iterator))); } } @@ -59,7 +59,7 @@ int main (int, ASYS_TCHAR *[]) { DATA *data = 0; iterator.next (data); - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("%d\n"), + ACE_DEBUG ((LM_DEBUG, "%d\n", (*data))); iterator.advance (); } @@ -99,7 +99,7 @@ int main (int, ASYS_TCHAR *[]) i != array1.size (); ++i) { - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("%d\n"), + ACE_DEBUG ((LM_DEBUG, "%d\n", array1[i])); ACE_ASSERT (array1[i] == 4); } @@ -111,7 +111,7 @@ int main (int, ASYS_TCHAR *[]) { DATA *data = 0; iterator.next (data); - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("%d\n"), + ACE_DEBUG ((LM_DEBUG, "%d\n", (*data))); ACE_ASSERT (*data == 4); iterator.advance (); diff --git a/tests/Collection_Test.dsp b/tests/Collection_Test.dsp index ed0a0a09d86..f5370014d6c 100644 --- a/tests/Collection_Test.dsp +++ b/tests/Collection_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Collection_Test - Win32 PharLap ETS Debug
+CFG=Collection_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,23 +13,19 @@ CFG=Collection_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Collection_Test.mak" CFG="Collection_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "Collection_Test.mak" CFG="Collection_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Collection_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Collection_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Collection_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
-
-!IF "$(CFG)" == "Collection_Test - Win32 Debug"
-
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
@@ -52,41 +48,9 @@ BSC32=bscmake.exe LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Collection_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Collection_Test___Win32_PharLap_ETS_Debug"
-# PROP BASE Intermediate_Dir "Collection_Test___Win32_PharLap_ETS_Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Collection_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF
-
# Begin Target
# Name "Collection_Test - Win32 Debug"
-# Name "Collection_Test - Win32 PharLap ETS Debug"
# Begin Source File
SOURCE=.\Collection_Test.cpp
diff --git a/tests/Collection_Test.icc b/tests/Collection_Test.icc deleted file mode 100644 index b36c67bb625..00000000000 --- a/tests/Collection_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Collection_Test.exe" - { - source type (cpp) "Collection_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Conn_Test.bpr b/tests/Conn_Test.bpr new file mode 100644 index 00000000000..f460b2c2829 --- /dev/null +++ b/tests/Conn_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Conn_Test.exe +OBJFILES = objs\Conn_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/Conn_Test.cpp b/tests/Conn_Test.cpp index 678155b666a..79c48c3ac1e 100644 --- a/tests/Conn_Test.cpp +++ b/tests/Conn_Test.cpp @@ -40,16 +40,8 @@ USELIB("..\ace\aced.lib"); #endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ // Default number of clients/servers. -#if defined (ACE_HAS_PHARLAP) -// PharLap is, by default, resource contrained. Test for something that works -// on the default configuration. -static int n_servers = 2; -static int n_clients = 4; -#else static int n_servers = 4; static int n_clients = 10; -#endif /* ACE_HAS_PHARLAP */ - static int n_client_iterations = 2; Svc_Handler::Svc_Handler (ACE_Thread_Manager *) @@ -466,7 +458,7 @@ server (void *arg) if (result == -1) { - // svc_handler->close (); The ACE_Onsehot_Acceptor closed it. + svc_handler->close (); if (errno == ETIMEDOUT) { diff --git a/tests/Conn_Test.dsp b/tests/Conn_Test.dsp index 5c7e76e493a..14296bea6e4 100644 --- a/tests/Conn_Test.dsp +++ b/tests/Conn_Test.dsp @@ -5,26 +5,25 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Conn_Test - Win32 PharLap ETS Debug
+CFG=Conn_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "Conn_Test.mak".
-!MESSAGE
+!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "Conn_Test.mak" CFG="Conn_Test - Win32 PharLap ETS Debug"
-!MESSAGE
+!MESSAGE
+!MESSAGE NMAKE /f "Conn_Test.mak" CFG="Conn_Test - Win32 Debug"
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE
!MESSAGE "Conn_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Conn_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "Conn_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
+!MESSAGE "Conn_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
+!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +69,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Conn_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +82,12 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Conn_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Conn_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "Conn_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Conn_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Conn_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Conn_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF
+!ENDIF
# Begin Target
# Name "Conn_Test - Win32 Debug"
# Name "Conn_Test - Win32 Alpha Debug"
-# Name "Conn_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -267,14 +235,12 @@ DEP_CPP_CONN_=\ "..\ace\ws2tcpip.h"\
".\Conn_Test.h"\
".\test_config.h"\
-
+
NODEP_CPP_CONN_=\
"..\ace\stdcpp.h"\
-
-!ELSEIF "$(CFG)" == "Conn_Test - Win32 PharLap ETS Debug"
-!ENDIF
+!ENDIF
# End Source File
# End Group
diff --git a/tests/Conn_Test.icc b/tests/Conn_Test.icc deleted file mode 100644 index 1ae4651b51f..00000000000 --- a/tests/Conn_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Conn_Test.exe" - { - source type (cpp) "Conn_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/DLL_Test.cpp b/tests/DLL_Test.cpp index a35b9b19a76..73d503e27e6 100644 --- a/tests/DLL_Test.cpp +++ b/tests/DLL_Test.cpp @@ -42,36 +42,20 @@ USELIB("..\ace\aced.lib"); #if defined (ACE_WIN32) # define OBJ_SUFFIX ".exe" -# if defined (__BORLANDC__) -# define OBJ_PREFIX ".\\bor\\bin\\" -# else -# define OBJ_PREFIX "" -# endif /* defined (__BORLANDC__) */ +# define OBJ_PREFIX "" #else # define OBJ_SUFFIX ACE_DLL_SUFFIX # define OBJ_PREFIX "./" ACE_DLL_PREFIX #endif /*ACE_WIN32*/ -char const * -cdecl_decoration(char const * func_name) -{ -#if defined(__BORLANDC__) - static char decorated_func_name[10*1024]; - ACE_OS::sprintf(decorated_func_name, "_%s", func_name); - return decorated_func_name; -#else - return func_name; -#endif -} - // This function returns the Hello object pointer. extern "C" ACE_Svc_Export Hello *get_hello (void); Hello *get_hello (void) { - Hello *hello = 0; + Hello *hello; ACE_NEW_RETURN (hello, Hello, @@ -83,38 +67,40 @@ Hello *get_hello (void) typedef Hello *(*TC) (void); int -main (int argc, ASYS_TCHAR *argv[]) +main (int argc, char *argv[]) { ACE_UNUSED_ARG (argc); ACE_UNUSED_ARG (argv); - ACE_START_TEST (ASYS_TEXT ("DLL_Test")); + ACE_START_TEST ("DLL_Test"); // Protection against this test being run on platforms not supporting Dlls. #if defined (ACE_WIN32) || defined (ACE_HAS_SVR4_DYNAMIC_LINKING) || \ defined (__hpux) ACE_DLL dll; + int retval = dll.open (OBJ_PREFIX "DLL_Test" OBJ_SUFFIX); if (retval != 0) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%p\n"), + "%p\n", dll.error ()), -1); // Just becos the ANSI C++ spec says you can no longer cast a void* to a - // function pointer. Doesnt allow:TC f = (TC) dll.symbol ("get_hello"); + // function pointer. Doesnt allow:TC f = (TC) dll.symbol ("get_hello"); void * foo; - char const *cdecl_str = cdecl_decoration("get_hello"); - foo = dll.symbol (cdecl_str); + foo = dll.symbol ("get_hello"); // Cast the void* to long first. - long tmp = ACE_reinterpret_cast (long, foo); + long tmp = ACE_reinterpret_cast (long, foo); + TC f = ACE_reinterpret_cast (Hello * (*)(void), tmp); + if (f == 0) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%p\n"), + "%p\n", dll.error ()), -1); diff --git a/tests/DLL_Test.h b/tests/DLL_Test.h index bbdc085c520..c319f0fdc57 100644 --- a/tests/DLL_Test.h +++ b/tests/DLL_Test.h @@ -27,13 +27,13 @@ public: void say_hello (void) { ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("Hello\n"))); + "Hello\n")); } void say_next (void) { ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("How are you?\n"))); + "How are you?\n")); } }; diff --git a/tests/DLL_Test.icc b/tests/DLL_Test.icc deleted file mode 100644 index 783af1bd1d3..00000000000 --- a/tests/DLL_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "DLL_Test.exe" - { - source type (cpp) "DLL_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/DLList_Test.cpp b/tests/DLList_Test.cpp index e018d3307d0..6450378c6d9 100644 --- a/tests/DLList_Test.cpp +++ b/tests/DLList_Test.cpp @@ -26,26 +26,23 @@ USELIB("..\ace\aced.lib"); //--------------------------------------------------------------------------- #endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ +static LPCTSTR string_table[] = +{ + ASYS_TEXT ("hello"), + ASYS_TEXT ("guten Tag"), + ASYS_TEXT ("goodbye"), + ASYS_TEXT ("auf wiedersehen"), + ASYS_TEXT ("funny"), + ASYS_TEXT ("lustig"), + 0 +}; + static ACE_Static_Allocator<8192> alloc; typedef ASYS_TCHAR * STRING; typedef ACE_DLList<STRING> STRLIST; typedef ACE_DLList_Iterator<STRING> STRLIST_ITERATOR; -static STRING string_table[] = -{ - // Note: all these casts are to appease SC 5.0 which is not pleased - // with using string literals (i.e. const char *'s) as char - // *'s. It's ugly, but necessary. - ACE_const_cast (ASYS_TCHAR *, ASYS_TEXT ("hello")), - ACE_const_cast (ASYS_TCHAR *, ASYS_TEXT ("guten Tag")), - ACE_const_cast (ASYS_TCHAR *, ASYS_TEXT ("goodbye")), - ACE_const_cast (ASYS_TCHAR *, ASYS_TEXT ("auf wiedersehen")), - ACE_const_cast (ASYS_TCHAR *, ASYS_TEXT ("funny")), - ACE_const_cast (ASYS_TCHAR *, ASYS_TEXT ("lustig")), - 0 -}; - static void run_iterate (STRLIST &list) { diff --git a/tests/DLList_Test.dsp b/tests/DLList_Test.dsp index 16ea84fe827..b59cab8c329 100644 --- a/tests/DLList_Test.dsp +++ b/tests/DLList_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=DLList_Test - Win32 PharLap ETS Debug
+CFG=DLList_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,17 @@ CFG=DLList_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "DLList_Test.mak" CFG="DLList_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "DLList_Test.mak" CFG="DLList_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "DLList_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "DLList_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "DLList_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "DLList_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "DLList_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +70,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "DLList_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +83,12 @@ LINK32=link.exe # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "DLList_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "DLList_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "DLList_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "DLList_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "DLList_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./DLList_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "DLList_Test - Win32 Debug"
# Name "DLList_Test - Win32 Alpha Debug"
-# Name "DLList_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -131,7 +100,7 @@ SOURCE=.\DLList_Test.cpp !ELSEIF "$(CFG)" == "DLList_Test - Win32 Alpha Debug"
-DEP_CPP_DLLIS=\
+DEP_CPP_BARRI=\
"..\ace\ACE.h"\
"..\ace\ACE.i"\
"..\ace\Atomic_Op.i"\
@@ -173,6 +142,7 @@ DEP_CPP_DLLIS=\ "..\ace\Signal.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\SV_Semaphore_Complex.h"\
"..\ace\SV_Semaphore_Complex.i"\
"..\ace\SV_Semaphore_Simple.h"\
@@ -191,11 +161,6 @@ DEP_CPP_DLLIS=\ "..\ace\ws2tcpip.h"\
".\test_config.h"\
-NODEP_CPP_DLLIS=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "DLList_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/DLList_Test.icc b/tests/DLList_Test.icc deleted file mode 100644 index 010a2e759ea..00000000000 --- a/tests/DLList_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "DLList_Test.exe" - { - source type (cpp) "DLList_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Dynamic_Priority_Test.bpr b/tests/Dynamic_Priority_Test.bpr new file mode 100644 index 00000000000..e8cf904574e --- /dev/null +++ b/tests/Dynamic_Priority_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Dynamic_Priority_Test.exe +OBJFILES = objs\Dynamic_Priority_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/Dynamic_Priority_Test.cpp b/tests/Dynamic_Priority_Test.cpp index 900f2b39dba..8348b1cbda4 100644 --- a/tests/Dynamic_Priority_Test.cpp +++ b/tests/Dynamic_Priority_Test.cpp @@ -357,7 +357,7 @@ performance_consumer (void * args) timer.stop (); ACE_Time_Value tv; timer.elapsed_time (tv); - ACE_DEBUG ((LM_INFO, ASYS_TEXT ("%6u, %6u, %f"), + ACE_DEBUG ((LM_INFO, "%6u, %6u, %f", local_count, tv.msec (), (ACE_timer_t) tv.msec () / local_count)); @@ -415,7 +415,7 @@ performance_producer (void *args) timer.stop (); ACE_Time_Value tv; timer.elapsed_time (tv); - ACE_DEBUG ((LM_INFO, ASYS_TEXT ("%6u, %6u, %f, "), + ACE_DEBUG ((LM_INFO, "%6u, %6u, %f, ", local_count, tv.msec (), (ACE_timer_t) tv.msec () / local_count)); @@ -465,35 +465,35 @@ run_performance_test (u_int min_load, { case BEST: ACE_DEBUG ((LM_INFO, - ASYS_TEXT ("\n\nenqueued, best static time, best static avg, ") - ASYS_TEXT ("dequeued, best static time, best static avg, ") - ASYS_TEXT ("enqueued, best deadline time, best deadline avg, ") - ASYS_TEXT ("dequeued, best deadline time, best deadline avg, ") - ASYS_TEXT ("enqueued, best laxity time, best laxity avg, ") - ASYS_TEXT ("dequeued, best laxity time, best laxity avg\n"))); + "\n\nenqueued, best static time, best static avg, " + "dequeued, best static time, best static avg, " + "enqueued, best deadline time, best deadline avg, " + "dequeued, best deadline time, best deadline avg, " + "enqueued, best laxity time, best laxity avg, " + "dequeued, best laxity time, best laxity avg\n")); break; case WORST: ACE_DEBUG ((LM_INFO, - ASYS_TEXT ("\n\nenqueued, worst static time, worst static avg, ") - ASYS_TEXT ("dequeued, worst static time, worst static avg, ") - ASYS_TEXT ("enqueued, worst deadline time, worst deadline avg, ") - ASYS_TEXT ("dequeued, worst deadline time, worst deadline avg, ") - ASYS_TEXT ("enqueued, worst laxity time, worst laxity avg, ") - ASYS_TEXT ("dequeued, worst laxity time, worst laxity avg\n"))); + "\n\nenqueued, worst static time, worst static avg, " + "dequeued, worst static time, worst static avg, " + "enqueued, worst deadline time, worst deadline avg, " + "dequeued, worst deadline time, worst deadline avg, " + "enqueued, worst laxity time, worst laxity avg, " + "dequeued, worst laxity time, worst laxity avg\n")); break; case RANDOM: ACE_DEBUG ((LM_INFO, - ASYS_TEXT ("\n\nenqueued, random static time, random static avg, ") - ASYS_TEXT ("dequeued, random static time, random static avg, ") - ASYS_TEXT ("enqueued, random deadline time, random deadline avg, ") - ASYS_TEXT ("dequeued, random deadline time, random deadline avg, ") - ASYS_TEXT ("enqueued, random laxity time, random laxity avg, ") - ASYS_TEXT ("dequeued, random laxity time, random laxity avg\n"))); + "\n\nenqueued, random static time, random static avg, " + "dequeued, random static time, random static avg, " + "enqueued, random deadline time, random deadline avg, " + "dequeued, random deadline time, random deadline avg, " + "enqueued, random laxity time, random laxity avg, " + "dequeued, random laxity time, random laxity avg\n")); break; default: ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("unknown test type %d"), + "unknown test type %d", test_type), -1); } @@ -598,7 +598,7 @@ run_performance_test (u_int min_load, // This should only happen for a *very* large messages // relative to the system's representation size. ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("Insufficient range of random numbers")), + "Insufficient range of random numbers"), -1); shuffle_index = random_int % load; @@ -617,7 +617,7 @@ run_performance_test (u_int min_load, break; default: ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("unknown test type %d"), + "unknown test type %d", test_type), -1); } @@ -637,7 +637,7 @@ run_performance_test (u_int min_load, // Add a comma delimiter for most recent outputs. ACE_DEBUG ((LM_INFO, - ASYS_TEXT (", "))); + ", ")); // Run the performance test producer and consumer on the // deadline queue. @@ -648,7 +648,7 @@ run_performance_test (u_int min_load, // Add a comma delimiter for most recent outputs. ACE_DEBUG ((LM_INFO, - ASYS_TEXT (", "))); + ", ")); // Run the performance test producer and consumer on the laxity // queue. @@ -659,7 +659,7 @@ run_performance_test (u_int min_load, // Move to the next line of output. ACE_DEBUG ((LM_INFO, - ASYS_TEXT ("\n"))); + "\n")); delete [] time_offsets; @@ -693,15 +693,15 @@ main (int, ASYS_TCHAR *[]) { if (ACE_OS::last_error () == EPERM) ACE_DEBUG ((LM_MAX, - ASYS_TEXT ("user is not superuser, ") - ASYS_TEXT ("so remain in time-sharing class\n"))); + "user is not superuser, " + "so remain in time-sharing class\n")); else if (ACE_OS::last_error () == ENOTSUP) ACE_DEBUG ((LM_MAX, - ASYS_TEXT ("process scope scheduling is not available, ") - ASYS_TEXT ("so remain in time-sharing class\n"))); + "process scope scheduling is not available, " + "so remain in time-sharing class\n")); else ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%n: ACE_OS::sched_params failed\n%a")), + "%n: ACE_OS::sched_params failed\n%a"), -1); } diff --git a/tests/Dynamic_Priority_Test.dsp b/tests/Dynamic_Priority_Test.dsp index 30a53be7dd7..47d176c184f 100644 --- a/tests/Dynamic_Priority_Test.dsp +++ b/tests/Dynamic_Priority_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Dynamic_Priority_Test - Win32 PharLap ETS Debug
+CFG=Dynamic_Priority_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,23 +13,20 @@ CFG=Dynamic_Priority_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Dynamic_Priority_Test.mak" CFG="Dynamic_Priority_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "Dynamic_Priority_Test.mak"\
+ CFG="Dynamic_Priority_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Dynamic_Priority_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Dynamic_Priority_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Dynamic_Priority_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
-
-!IF "$(CFG)" == "Dynamic_Priority_Test - Win32 Debug"
-
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
@@ -52,41 +49,10 @@ BSC32=bscmake.exe LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Dynamic_Priority_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Dynamic_Priority_Test___Win32_PharLap_ETS_Debug"
-# PROP BASE Intermediate_Dir "Dynamic_Priority_Test___Win32_PharLap_ETS_Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Dynamic_Priority_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF
-
+# SUBTRACT LINK32 /pdbtype:<none>
# Begin Target
# Name "Dynamic_Priority_Test - Win32 Debug"
-# Name "Dynamic_Priority_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter ".cpp .i"
diff --git a/tests/Dynamic_Priority_Test.icc b/tests/Dynamic_Priority_Test.icc deleted file mode 100644 index 2e32c40956f..00000000000 --- a/tests/Dynamic_Priority_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Dynamic_Priority_Test.exe" - { - source type (cpp) "Dynamic_Priority_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Enum_Interfaces_Test.bpr b/tests/Enum_Interfaces_Test.bpr new file mode 100644 index 00000000000..8d8221e78ed --- /dev/null +++ b/tests/Enum_Interfaces_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Enum_Interfaces_Test.exe +OBJFILES = objs\Enum_Interfaces_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/Enum_Interfaces_Test.dsp b/tests/Enum_Interfaces_Test.dsp index be49c4656a8..353318c69c2 100644 --- a/tests/Enum_Interfaces_Test.dsp +++ b/tests/Enum_Interfaces_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Enum_Interfaces_Test - Win32 PharLap ETS Debug
+CFG=Enum_Interfaces_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,18 @@ CFG=Enum_Interfaces_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Enum_Interfaces_Test.mak" CFG="Enum_Interfaces_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "Enum_Interfaces_Test.mak"\
+ CFG="Enum_Interfaces_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Enum_Interfaces_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Enum_Interfaces_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "Enum_Interfaces_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Enum_Interfaces_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Enum_Interfaces_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +71,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +84,12 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Enum_Interfaces_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Enum_Interfaces_Test___Win32_PharLap_ETS_Debug"
-# PROP BASE Intermediate_Dir "Enum_Interfaces_Test___Win32_PharLap_ETS_Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Enum_Interfaces_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "Enum_Interfaces_Test - Win32 Debug"
# Name "Enum_Interfaces_Test - Win32 Alpha Debug"
-# Name "Enum_Interfaces_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -157,16 +127,12 @@ DEP_CPP_ENUM_=\ "..\ace\OS.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\Trace.h"\
"..\ace\Version.h"\
"..\ace\ws2tcpip.h"\
".\test_config.h"\
-NODEP_CPP_ENUM_=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "Enum_Interfaces_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/Enum_Interfaces_Test.icc b/tests/Enum_Interfaces_Test.icc deleted file mode 100644 index e02e53debf8..00000000000 --- a/tests/Enum_Interfaces_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Enum_Interfaces_Test.exe" - { - source type (cpp) "Enum_Interfaces_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Env_Value_Test.bpr b/tests/Env_Value_Test.bpr new file mode 100644 index 00000000000..765f66affb7 --- /dev/null +++ b/tests/Env_Value_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Env_Value_Test.exe +OBJFILES = objs\Env_Value_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/Env_Value_Test.cpp b/tests/Env_Value_Test.cpp index e9d0a79b1c0..44a9c94e80a 100644 --- a/tests/Env_Value_Test.cpp +++ b/tests/Env_Value_Test.cpp @@ -31,7 +31,7 @@ do { \ ACE_Env_Value<type> val (varname, (defval)); \ if (val != (expval)) { \ ACE_ERROR ((LM_ERROR, \ - ASYS_TEXT ("val %d does not match expected value of %d\n"), \ + "val %d does not match expected value of %d\n", \ (int) (type) val, (int) (expval))); \ } \ ACE_ASSERT (val == (expval)); \ @@ -46,8 +46,8 @@ int main (int argc, ASYS_TCHAR* []) { ACE_UNUSED_ARG (argc); - ACE_OS::putenv (ASYS_TEXT ("TEST_VALUE_POSITIVE=10.2")); - ACE_OS::putenv (ASYS_TEXT ("TEST_VALUE_NEGATIVE=-10.2")); + ACE_OS::putenv ("TEST_VALUE_POSITIVE=10.2"); + ACE_OS::putenv ("TEST_VALUE_NEGATIVE=-10.2"); #else /* ! ACE_HAS_NONSTATIC_OBJECT_MANAGER */ main (int argc, LPTSTR [], LPTSTR envp[]) { @@ -81,28 +81,28 @@ main (int argc, LPTSTR [], LPTSTR envp[]) #endif /* ! ACE_HAS_NONSTATIC_OBJECT_MANAGER */ { // In this case we're the child - ACE_START_TEST (ASYS_TEXT ("Env_Value_Test")); + ACE_START_TEST ("Env_Value_Test"); - TEST_THIS (int, ASYS_TEXT ("TEST_VALUE_POSITIVE"), 4, 10); + TEST_THIS (int, "TEST_VALUE_POSITIVE", 4, 10); #if !defined (ACE_LACKS_FLOATING_POINT) - TEST_THIS (double, ASYS_TEXT ("TEST_VALUE_POSITIVE"), -1.0, 10.2); + TEST_THIS (double, "TEST_VALUE_POSITIVE", -1.0, 10.2); #endif /* ! ACE_LACKS_FLOATING_POINT */ - TEST_THIS (long, ASYS_TEXT ("TEST_VALUE_POSITIVE"), 0, 10); - TEST_THIS (unsigned long, ASYS_TEXT ("TEST_VALUE_POSITIVE"), 0, 10); - TEST_THIS (short, ASYS_TEXT ("TEST_VALUE_POSITIVE"), 0, 10); - TEST_THIS (unsigned short, ASYS_TEXT ("TEST_VALUE_POSITIVE"), 0, 10); + TEST_THIS (long, "TEST_VALUE_POSITIVE", 0, 10); + TEST_THIS (unsigned long, "TEST_VALUE_POSITIVE", 0, 10); + TEST_THIS (short, "TEST_VALUE_POSITIVE", 0, 10); + TEST_THIS (unsigned short, "TEST_VALUE_POSITIVE", 0, 10); - TEST_THIS (int, ASYS_TEXT ("TEST_VALUE_NEGATIVE"), 4, -10); + TEST_THIS (int, "TEST_VALUE_NEGATIVE", 4, -10); #if !defined (ACE_LACKS_FLOATING_POINT) - TEST_THIS (double, ASYS_TEXT ("TEST_VALUE_NEGATIVE"), -1.0, -10.2); + TEST_THIS (double, "TEST_VALUE_NEGATIVE", -1.0, -10.2); #endif /* ! ACE_LACKS_FLOATING_POINT */ - TEST_THIS (long, ASYS_TEXT ("TEST_VALUE_NEGATIVE"), 0, -10L); - TEST_THIS (unsigned long, ASYS_TEXT ("TEST_VALUE_NEGATIVE"), 0, (unsigned long) -10); - TEST_THIS (short, ASYS_TEXT ("TEST_VALUE_NEGATIVE"), 0, -10); - TEST_THIS (unsigned short, ASYS_TEXT ("TEST_VALUE_NEGATIVE"), 0, (unsigned short) -10); + TEST_THIS (long, "TEST_VALUE_NEGATIVE", 0, -10L); + TEST_THIS (unsigned long, "TEST_VALUE_NEGATIVE", 0, (unsigned long) -10); + TEST_THIS (short, "TEST_VALUE_NEGATIVE", 0, -10); + TEST_THIS (unsigned short, "TEST_VALUE_NEGATIVE", 0, (unsigned short) -10); - const ASYS_TCHAR *defstr = ASYS_TEXT ("Sarah Cleeland is Two!"); - ACE_Env_Value<const ASYS_TCHAR *> sval (ASYS_TEXT ("This_Shouldnt_Be_Set_Hopefully"), + const char *defstr = "Sarah Cleeland is Two!"; + ACE_Env_Value<const char *> sval ("This_Shouldnt_Be_Set_Hopefully", defstr); ACE_ASSERT (ACE_OS::strcmp (sval, defstr) == 0); ACE_END_TEST; diff --git a/tests/Env_Value_Test.dsp b/tests/Env_Value_Test.dsp index 3ce8eb921e6..3adea71ef3e 100644 --- a/tests/Env_Value_Test.dsp +++ b/tests/Env_Value_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Env_Value_Test - Win32 PharLap ETS Debug
+CFG=Env_Value_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,17 @@ CFG=Env_Value_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Env_Value_Test.mak" CFG="Env_Value_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "Env_Value_Test.mak" CFG="Env_Value_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Env_Value_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Env_Value_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "Env_Value_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Env_Value_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Env_Value_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +70,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Env_Value_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +83,12 @@ LINK32=link.exe # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Env_Value_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Env_Value_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "Env_Value_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Env_Value_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Env_Value_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Env_Value_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "Env_Value_Test - Win32 Debug"
# Name "Env_Value_Test - Win32 Alpha Debug"
-# Name "Env_Value_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -131,7 +100,7 @@ SOURCE=.\Env_Value_Test.cpp !ELSEIF "$(CFG)" == "Env_Value_Test - Win32 Alpha Debug"
-DEP_CPP_ENV_V=\
+DEP_CPP_BARRI=\
"..\ace\ACE.h"\
"..\ace\ACE.i"\
"..\ace\Atomic_Op.i"\
@@ -173,6 +142,7 @@ DEP_CPP_ENV_V=\ "..\ace\Signal.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\SV_Semaphore_Complex.h"\
"..\ace\SV_Semaphore_Complex.i"\
"..\ace\SV_Semaphore_Simple.h"\
@@ -191,11 +161,6 @@ DEP_CPP_ENV_V=\ "..\ace\ws2tcpip.h"\
".\test_config.h"\
-NODEP_CPP_ENV_V=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "Env_Value_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/Env_Value_Test.icc b/tests/Env_Value_Test.icc deleted file mode 100644 index 63665aee4a9..00000000000 --- a/tests/Env_Value_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Env_Value_Test.exe" - { - source type (cpp) "Env_Value_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Future_Set_Test.cpp b/tests/Future_Set_Test.cpp deleted file mode 100644 index 2c9ba7ca212..00000000000 --- a/tests/Future_Set_Test.cpp +++ /dev/null @@ -1,645 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// tests -// -// = FILENAME -// Future_Set_Test.cpp -// -// = DESCRIPTION -// This example tests the ACE Future Set and illustrates an -// implementation of the Active Object pattern, which is available -// at <http://www.cs.wustl.edu/~schmidt/Act-Obj.ps.gz>. The -// Active Object itself is very simple -- it determines if numbers -// are prime. -// -// = AUTHOR -// Andres Kruse <Andres.Kruse@cern.ch>, Douglas C. Schmidt -// <schmidt@cs.wustl.edu>, and Per Andersson <pera@ipso.se> -// -// ============================================================================ - -#include "test_config.h" -#include "ace/ACE.h" -#include "ace/Task.h" -#include "ace/Synch.h" -#include "ace/Message_Queue.h" -#include "ace/Future.h" -#include "ace/Future_Set.h" -#include "ace/Method_Request.h" -#include "ace/Activation_Queue.h" -#include "ace/Auto_Ptr.h" - -ACE_RCSID(tests, Future_Set_Test, "$Id$") - -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 - USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - -#if defined (ACE_HAS_THREADS) - -typedef ACE_Atomic_Op<ACE_Thread_Mutex, int> ATOMIC_INT; - -// A counter for the tasks.. -static ATOMIC_INT task_count (0); - -class Prime_Scheduler : public ACE_Task_Base -{ - // = TITLE - // Prime number scheduler for the Active Object. - // - // = DESCRIPTION - // This class also plays the role of the Proxy and the Servant - // in the Active Object pattern. Naturally, these roles could - // be split apart from the Prime_Scheduler. - - friend class Method_Request_work; - friend class Method_Request_name; - friend class Method_Request_end; -public: - // = Initialization and termination methods. - Prime_Scheduler (const ASYS_TCHAR *, - Prime_Scheduler * = 0); - // Constructor. - - virtual int open (void *args = 0); - // Initializer. - - virtual int close (u_long flags = 0); - // Terminator. - - virtual ~Prime_Scheduler (void); - // Destructor. - - // = These methods are part of the Active Object Proxy interface. - ACE_Future<u_long> work (u_long param, int count = 1); - ACE_Future<const ASYS_TCHAR*> name (void); - void end (void); - -protected: - virtual int svc (void); - // Runs the Prime_Scheduler's event loop, which dequeues - // <Method_Requests> and dispatches them. - - // = These are the Servant methods that do the actual work. - u_long work_i (u_long, int); - const ASYS_TCHAR *name_i (void); - -private: - // = These are the <Prime_Scheduler> implementation details. - ASYS_TCHAR *name_; - ACE_Activation_Queue activation_queue_; - Prime_Scheduler *scheduler_; -}; - -class Method_Request_work : public ACE_Method_Request -{ - // = TITLE - // Reification of the <work> method. -public: - Method_Request_work (Prime_Scheduler *, - u_long, - int, - ACE_Future<u_long> &); - virtual ~Method_Request_work (void); - - virtual int call (void); - // This is the entry point into the Active Object method. - -private: - Prime_Scheduler *scheduler_; - - u_long param_; - // Parameter to the method that's used to determine if a number if - // prime. - - int count_; - // Unused. - - ACE_Future<u_long> future_result_; - // Store the result of the Future. -}; - -Method_Request_work::Method_Request_work (Prime_Scheduler *new_Prime_Scheduler, - u_long new_param, - int new_count, - ACE_Future<u_long> &new_result) - : scheduler_ (new_Prime_Scheduler), - param_ (new_param), - count_ (new_count), - future_result_ (new_result) -{ - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%t) Method_Request_work created\n"))); -} - -Method_Request_work::~Method_Request_work (void) -{ - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%t) Method_Request_work will be deleted.\n"))); -} - -int -Method_Request_work::call (void) -{ - // Dispatch the Servant's operation and store the result into the - // Future. - return this->future_result_.set (this->scheduler_->work_i - (this->param_, - this->count_)); -} - -class Method_Request_name : public ACE_Method_Request -{ - // = TITLE - // Reification of the <name> method. -public: - Method_Request_name (Prime_Scheduler *, - ACE_Future<const ASYS_TCHAR*> &); - virtual ~Method_Request_name (void); - - virtual int call (void); - // This is the entry point into the Active Object method. - -private: - Prime_Scheduler *scheduler_; - ACE_Future<const ASYS_TCHAR*> future_result_; -}; - -Method_Request_name::Method_Request_name (Prime_Scheduler *new_scheduler, - ACE_Future<const ASYS_TCHAR*> &new_result) - : scheduler_ (new_scheduler), - future_result_ (new_result) -{ - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%t) Method_Request_name created\n"))); -} - -Method_Request_name::~Method_Request_name (void) -{ - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%t) Method_Request_name will be deleted.\n"))); -} - -int -Method_Request_name::call (void) -{ - // Dispatch the Servant's operation and store the result into the - // Future. - return future_result_.set (scheduler_->name_i ()); -} - -class Method_Request_end : public ACE_Method_Request -{ - // = TITLE - // Reification of the <end> method. -public: - Method_Request_end (Prime_Scheduler *new_Prime_Scheduler); - virtual ~Method_Request_end (void); - virtual int call (void); - -private: - Prime_Scheduler *scheduler_; -}; - -Method_Request_end::Method_Request_end (Prime_Scheduler *scheduler) - : scheduler_ (scheduler) -{ -} - -Method_Request_end::~Method_Request_end (void) -{ -} - -int -Method_Request_end::call (void) -{ - // Shut down the scheduler. - this->scheduler_->close (); - return -1; -} - -// Constructor -Prime_Scheduler::Prime_Scheduler (const ASYS_TCHAR *newname, - Prime_Scheduler *new_scheduler) - : scheduler_ (new_scheduler) -{ - ACE_NEW (this->name_, - ASYS_TCHAR[ACE_OS::strlen (newname) + 1]); - ACE_OS::strcpy ((ASYS_TCHAR *) this->name_, - newname); - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%t) Prime_Scheduler %s created\n"), - this->name_)); -} - -// Destructor - -Prime_Scheduler::~Prime_Scheduler (void) -{ - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%t) Prime_Scheduler %s will be destroyed\n"), - this->name_)); - delete [] this->name_; -} - -// open - -int -Prime_Scheduler::open (void *) -{ - task_count++; - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%t) Prime_Scheduler %s open\n"), - this->name_)); - // Become an Active Object. - return this->activate (THR_BOUND | THR_DETACHED); -} - -// close - -int -Prime_Scheduler::close (u_long) -{ - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%t) Prime_Scheduler %s close\n"), - this->name_)); - task_count--; - return 0; -} - -// Service.. - -int -Prime_Scheduler::svc (void) -{ - for (;;) - { - // Dequeue the next method request (we use an auto pointer in - // case an exception is thrown in the <call>). - auto_ptr<ACE_Method_Request> mo (this->activation_queue_.dequeue ()); - - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%t) calling method request\n"))); - // Call it. - if (mo->call () == -1) - break; - // Destructor automatically deletes it. - } - - /* NOTREACHED */ - return 0; -} - -void -Prime_Scheduler::end (void) -{ - this->activation_queue_.enqueue (new Method_Request_end (this)); -} - -// Here's where the Work takes place. We compute if the parameter is -// a prime number. - -u_long -Prime_Scheduler::work_i (u_long param, - int count) -{ - ACE_UNUSED_ARG (count); - - return ACE::is_prime (param, 2, param / 2); -} - -const ASYS_TCHAR * -Prime_Scheduler::name_i (void) -{ - return this->name_; -} - -ACE_Future<const ASYS_TCHAR *> -Prime_Scheduler::name (void) -{ - if (this->scheduler_) - // Delegate to the Prime_Scheduler. - return this->scheduler_->name (); - else - { - ACE_Future<const ASYS_TCHAR*> new_future; - - // @@ What happens if new fails here? - this->activation_queue_.enqueue - (new Method_Request_name (this, - new_future)); - return new_future; - } -} - -ACE_Future<u_long> -Prime_Scheduler::work (u_long newparam, - int newcount) -{ - if (this->scheduler_) { - return this->scheduler_->work (newparam, newcount); - } - else { - ACE_Future<u_long> new_future; - - this->activation_queue_.enqueue - (new Method_Request_work (this, - newparam, - newcount, - new_future)); - return new_future; - } -} - -// @@ These values should be set by the command line options! - -// Total number of loops. -static int n_loops = 100; - -typedef ACE_Future_Rep<u_long> *u_long_key; -typedef ACE_Future_Holder<u_long> *u_long_value; - -typedef ACE_Future_Rep<const ASYS_TCHAR *> *char_star_key; -typedef ACE_Future_Holder<const ASYS_TCHAR *> *char_star_value; - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Atomic_Op<ACE_Thread_Mutex, int>; -template class ACE_Future_Holder<const ASYS_TCHAR *>; -template class ACE_Future_Holder<u_long>; -template class ACE_Future_Observer<const ASYS_TCHAR *>; -template class ACE_Future_Observer<u_long>; -template class ACE_Future<const ASYS_TCHAR *>; -template class ACE_Future<u_long>; -template class ACE_Future_Rep<const ASYS_TCHAR *>; -template class ACE_Future_Rep<u_long>; -template class ACE_Future_Set<const ASYS_TCHAR *>; -template class ACE_Future_Set<u_long>; -template class auto_ptr<ACE_Method_Request>; -template class ACE_Auto_Basic_Ptr<ACE_Method_Request>; -template class ACE_Node<ACE_Future_Observer<const ASYS_TCHAR *> *>; -template class ACE_Node<ACE_Future_Observer<u_long> *>; -template class ACE_Unbounded_Set<ACE_Future_Observer<const ASYS_TCHAR *> *>; -template class ACE_Unbounded_Set<ACE_Future_Observer<u_long> *>; -template class ACE_Unbounded_Set_Iterator<ACE_Future_Observer<const ASYS_TCHAR *> *>; -template class ACE_Unbounded_Set_Iterator<ACE_Future_Observer<u_long> *>; -template class ACE_Pointer_Hash<u_long_key>; -template class ACE_Equal_To<u_long_key>; -template class ACE_Hash_Map_Entry<u_long_key, u_long_value>; -template class ACE_Hash_Map_Manager_Ex<u_long_key, u_long_value, ACE_Pointer_Hash<u_long_key>, ACE_Equal_To<u_long_key>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<u_long_key, u_long_value, ACE_Pointer_Hash<u_long_key>, ACE_Equal_To<u_long_key>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<u_long_key, u_long_value, ACE_Pointer_Hash<u_long_key>, ACE_Equal_To<u_long_key>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<u_long_key, u_long_value, ACE_Pointer_Hash<u_long_key>, ACE_Equal_To<u_long_key>, ACE_Null_Mutex>; -template class ACE_Pointer_Hash<char_star_key>; -template class ACE_Equal_To<char_star_key>; -template class ACE_Hash_Map_Entry<char_star_key, char_star_value>; -template class ACE_Hash_Map_Manager_Ex<char_star_key, char_star_value, ACE_Pointer_Hash<char_star_key>, ACE_Equal_To<char_star_key>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<char_star_key, char_star_value, ACE_Pointer_Hash<char_star_key>, ACE_Equal_To<char_star_key>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<char_star_key, char_star_value, ACE_Pointer_Hash<char_star_key>, ACE_Equal_To<char_star_key>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<char_star_key, char_star_value, ACE_Pointer_Hash<char_star_key>, ACE_Equal_To<char_star_key>, ACE_Null_Mutex>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Atomic_Op<ACE_Thread_Mutex, int> -#pragma instantiate ACE_Future_Holder<const ASYS_TCHAR *> -#pragma instantiate ACE_Future_Holder<u_long> -#pragma instantiate ACE_Future_Observer<const ASYS_TCHAR *> -#pragma instantiate ACE_Future_Observer<u_long> -#pragma instantiate ACE_Future<const ASYS_TCHAR *> -#pragma instantiate ACE_Future<u_long> -#pragma instantiate ACE_Future_Rep<const ASYS_TCHAR *> -#pragma instantiate ACE_Future_Rep<u_long> -#pragma instantiate ACE_Future_Set<const ASYS_TCHAR *> -#pragma instantiate ACE_Future_Set<u_long> -#pragma instantiate auto_ptr<ACE_Method_Request> -#pragma instantiate ACE_Auto_Basic_Ptr<ACE_Method_Request> -#pragma instantiate ACE_Node<ACE_Future_Observer<const ASYS_TCHAR *> *> -#pragma instantiate ACE_Node<ACE_Future_Observer<u_long> *> -#pragma instantiate ACE_Unbounded_Set<ACE_Future_Observer<const ASYS_TCHAR *> *> -#pragma instantiate ACE_Unbounded_Set<ACE_Future_Observer<u_long> *> -#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Future_Observer<const ASYS_TCHAR *> *> -#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Future_Observer<u_long> *> -#pragma instantiate ACE_Pointer_Hash<u_long_key> -#pragma instantiate ACE_Equal_To<u_long_key> -#pragma instantiate ACE_Hash_Map_Entry<u_long_key, u_long_value> -#pragma instantiate ACE_Hash_Map_Manager_Ex<u_long_key, u_long_value, ACE_Pointer_Hash<u_long_key>, ACE_Equal_To<u_long_key>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<u_long_key, u_long_value, ACE_Pointer_Hash<u_long_key>, ACE_Equal_To<u_long_key>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<u_long_key, u_long_value, ACE_Pointer_Hash<u_long_key>, ACE_Equal_To<u_long_key>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<u_long_key, u_long_value, ACE_Pointer_Hash<u_long_key>, ACE_Equal_To<u_long_key>, ACE_Null_Mutex> -#pragma instantiate ACE_Pointer_Hash<char_star_key> -#pragma instantiate ACE_Equal_To<char_star_key> -#pragma instantiate ACE_Hash_Map_Entry<char_star_key, char_star_value> -#pragma instantiate ACE_Hash_Map_Manager_Ex<char_star_key, char_star_value, ACE_Pointer_Hash<char_star_key>, ACE_Equal_To<char_star_key>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<char_star_key, char_star_value, ACE_Pointer_Hash<char_star_key>, ACE_Equal_To<char_star_key>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<char_star_key, char_star_value, ACE_Pointer_Hash<char_star_key>, ACE_Equal_To<char_star_key>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<char_star_key, char_star_value, ACE_Pointer_Hash<char_star_key>, ACE_Equal_To<char_star_key>, ACE_Null_Mutex> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -#endif /* ACE_HAS_THREADS */ - -int -main (int, ASYS_TCHAR *[]) -{ - ACE_START_TEST (ASYS_TEXT ("Future_Set_Test")); - -#if defined (ACE_HAS_THREADS) - // @@ Should make these be <auto_ptr>s... - Prime_Scheduler *andres, *peter, *helmut, *matias; - - // Create active objects.. - ACE_NEW_RETURN (andres, - Prime_Scheduler (ASYS_TEXT ("andres")), - -1); - ACE_ASSERT (andres->open () != -1); - ACE_NEW_RETURN (peter, - Prime_Scheduler (ASYS_TEXT ("peter")), - -1); - ACE_ASSERT (peter->open () != -1); - ACE_NEW_RETURN (helmut, - Prime_Scheduler (ASYS_TEXT ("helmut")), - -1); - ACE_ASSERT (helmut->open () != -1); - - // Matias passes all asynchronous method calls on to Andres... - ACE_NEW_RETURN (matias, - Prime_Scheduler (ASYS_TEXT ("matias"), - andres), - -1); - ACE_ASSERT (matias->open () != -1); - - ACE_Future<u_long> fresulta; - ACE_Future<u_long> fresultb; - ACE_Future<u_long> fresultc; - ACE_Future<u_long> fresultd; - ACE_Future<const ASYS_TCHAR *> fname; - - ACE_Future_Set<u_long> fseta; - ACE_Future_Set<u_long> fsetb; - ACE_Future_Set<u_long> fsetc; - ACE_Future_Set<u_long> fsetd; - ACE_Future_Set<const ASYS_TCHAR *> fsetname; - - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%t) initializing future sets with non-blocking call\n"))); - - for (int i = 0; i < n_loops; i++) - { - // Spawn off the methods, which run in a separate thread as - // active object invocations. - fresulta = andres->work (9013); - fresultb = peter->work (9013); - fresultc = helmut->work (9013); - fresultd = matias->work (9013); - fname = andres->name (); - - fseta.insert (fresulta); - fsetb.insert (fresultb); - fsetc.insert (fresultc); - fsetd.insert (fresultd); - fsetname.insert (fname); - } - - - // See if the result is available... - - if (!fseta.is_empty ()) - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%t) wow.. set a is not empty.....\n"))); - - if (!fsetb.is_empty ()) - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%t) wow.. set b is not empty.....\n"))); - - if (!fsetc.is_empty ()) - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%t) wow.. set c is not empty.....\n"))); - - if (!fsetd.is_empty ()) - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%t) wow.. set d is not empty.....\n"))); - - if (!fsetname.is_empty ()) - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%t) wow.. set name is not empty.....\n"))); - - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%t) non-blocking calls done... now blocking...\n"))); - - // Save the result of fresulta. - - u_long resulta = 0; - u_long resultb = 0; - u_long resultc = 0; - u_long resultd = 0; - - u_int count = 0; - while (fseta.next_readable (fresulta)) - { - fresulta.get (resulta); - - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%t) result(%u) a %u\n"), - count, - (u_int) resulta)); - } - - count = 0; - while (fsetb.next_readable (fresultb)) - { - fresultb.get (resultb); - - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%t) result(%u) b %u\n"), - count, - (u_int) resultb)); - } - - count = 0; - while (fsetc.next_readable (fresultc)) - { - fresultc.get (resultc); - - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%t) result(%u) c %u\n"), - count, - (u_int) resultc)); - } - - count = 0; - while (fsetd.next_readable (fresultd)) - { - fresultd.get (resultd); - - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%t) result(%u) d %u\n"), - count, - (u_int) resultd)); - } - - const ASYS_TCHAR *name; - count = 0; - while (fsetname.next_readable (fname)) - { - fname.get (name); - - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%t) result(%u) name %s\n"), - count, - name)); - } - - if (fseta.is_empty ()) - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%t) wow.. set a is empty.....\n"))); - - if (fsetb.is_empty ()) - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%t) wow.. set b is empty.....\n"))); - - if (fsetc.is_empty ()) - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%t) wow.. set c is empty.....\n"))); - - if (fsetd.is_empty ()) - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%t) wow.. set d is empty.....\n"))); - - if (fsetname.is_empty ()) - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%t) wow.. set name is empty.....\n"))); - - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%t) task_count %d\n"), - task_count.value () )); - - // Close things down. - andres->end (); - peter->end (); - helmut->end (); - matias->end (); - - ACE_OS::sleep (2); - - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%t) task_count %d\n"), - task_count.value () )); - - ACE_OS::sleep (5); - - delete andres; - delete peter; - delete helmut; - delete matias; - -#else - ACE_ERROR ((LM_INFO, - ASYS_TEXT ("threads not supported on this platform\n"))); -#endif /* ACE_HAS_THREADS */ - ACE_END_TEST; - return 0; -} diff --git a/tests/Future_Set_Test.dsp b/tests/Future_Set_Test.dsp deleted file mode 100644 index 80681040d84..00000000000 --- a/tests/Future_Set_Test.dsp +++ /dev/null @@ -1,264 +0,0 @@ -# Microsoft Developer Studio Project File - Name="Future_Set_Test" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=Future_Set_Test - Win32 PharLap ETS Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "Future_Set_Test.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "Future_Set_Test.mak" CFG="Future_Set_Test - Win32 PharLap ETS Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "Future_Set_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Future_Set_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "Future_Set_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF "$(CFG)" == "Future_Set_Test - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Future_Set_Test\Debug"
-# PROP BASE Intermediate_Dir ".\Future_Set_Test\Debug"
-# PROP BASE Target_Dir ".\Future_Set_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\DLL\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Future_Set_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Future_Set_Test - Win32 Alpha Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Future_Set_Test\Alpha Debug"
-# PROP BASE Intermediate_Dir "Future_Set_Test\Alpha Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Future_Set_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ""
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Future_Set_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Future_Set_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Future_Set_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "Future_Set_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Future_Set_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Future_Set_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Future_Set_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF
-
-# Begin Target
-
-# Name "Future_Set_Test - Win32 Debug"
-# Name "Future_Set_Test - Win32 Alpha Debug"
-# Name "Future_Set_Test - Win32 PharLap ETS Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
-# Begin Source File
-
-SOURCE=.\Future_Set_Test.cpp
-
-!IF "$(CFG)" == "Future_Set_Test - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "Future_Set_Test - Win32 Alpha Debug"
-
-DEP_CPP_FUTUR=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Activation_Queue.h"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Future.cpp"\
- "..\ace\Future.h"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\Hash_Map_Manager.cpp"\
- "..\ace\Hash_Map_Manager.h"\
- "..\ace\IO_Cntl_Msg.h"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Message_Block.h"\
- "..\ace\Message_Block.i"\
- "..\ace\Message_Queue.cpp"\
- "..\ace\Message_Queue.h"\
- "..\ace\Message_Queue.i"\
- "..\ace\Method_Request.h"\
- "..\ace\Module.cpp"\
- "..\ace\Module.h"\
- "..\ace\Module.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Service_Config.h"\
- "..\ace\Service_Config.i"\
- "..\ace\Service_Object.h"\
- "..\ace\Service_Object.i"\
- "..\ace\Service_Types.h"\
- "..\ace\Service_Types.i"\
- "..\ace\Shared_Object.h"\
- "..\ace\Shared_Object.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\Strategies.h"\
- "..\ace\Strategies_T.cpp"\
- "..\ace\Strategies_T.h"\
- "..\ace\Stream_Modules.cpp"\
- "..\ace\Stream_Modules.h"\
- "..\ace\Stream_Modules.i"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Svc_Conf_Tokens.h"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_Options.h"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Task.h"\
- "..\ace\Task.i"\
- "..\ace\Task_T.cpp"\
- "..\ace\Task_T.h"\
- "..\ace\Task_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\WFMO_Reactor.h"\
- "..\ace\WFMO_Reactor.i"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-NODEP_CPP_FUTUR=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "Future_Set_Test - Win32 PharLap ETS Debug"
-
-!ENDIF
-
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# Begin Source File
-
-SOURCE=.\test_config.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/tests/Future_Test.bpr b/tests/Future_Test.bpr new file mode 100644 index 00000000000..3c694e5d92f --- /dev/null +++ b/tests/Future_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Future_Test.exe +OBJFILES = objs\Future_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/Future_Test.cpp b/tests/Future_Test.cpp index 73502edff87..4f61f5c56bc 100644 --- a/tests/Future_Test.cpp +++ b/tests/Future_Test.cpp @@ -70,7 +70,7 @@ class Prime_Scheduler : public ACE_Task_Base public: // = Initialization and termination methods. Prime_Scheduler (const ASYS_TCHAR *, - Prime_Scheduler * = 0); + Prime_Scheduler * = 0); // Constructor. virtual int open (void *args = 0); @@ -232,7 +232,7 @@ Method_Request_end::call (void) // Constructor Prime_Scheduler::Prime_Scheduler (const ASYS_TCHAR *newname, - Prime_Scheduler *new_scheduler) + Prime_Scheduler *new_scheduler) : scheduler_ (new_scheduler) { ACE_NEW (this->name_, @@ -373,39 +373,21 @@ template class ACE_Atomic_Op<ACE_Thread_Mutex, int>; template class ACE_Future<const ASYS_TCHAR *>; template class ACE_Future<int>; template class ACE_Future<u_long>; -template class ACE_Future_Rep<const ASYS_TCHAR *>; +template class ACE_Future_Rep<ASYS_TCHAR const *>; template class ACE_Future_Rep<int>; template class ACE_Future_Rep<u_long>; template class auto_ptr<ACE_Method_Request>; template class ACE_Auto_Basic_Ptr<ACE_Method_Request>; -template class ACE_Node<ACE_Future_Observer<const ASYS_TCHAR *> *>; -template class ACE_Node<ACE_Future_Observer<int> *>; -template class ACE_Node<ACE_Future_Observer<u_long> *>; -template class ACE_Unbounded_Set<ACE_Future_Observer<const ASYS_TCHAR *> *>; -template class ACE_Unbounded_Set<ACE_Future_Observer<int> *>; -template class ACE_Unbounded_Set<ACE_Future_Observer<u_long> *>; -template class ACE_Unbounded_Set_Iterator<ACE_Future_Observer<const ASYS_TCHAR *> *>; -template class ACE_Unbounded_Set_Iterator<ACE_Future_Observer<int> *>; -template class ACE_Unbounded_Set_Iterator<ACE_Future_Observer<u_long> *>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate ACE_Atomic_Op<ACE_Thread_Mutex, int> #pragma instantiate ACE_Future<const ASYS_TCHAR *> #pragma instantiate ACE_Future<int> #pragma instantiate ACE_Future<u_long> -#pragma instantiate ACE_Future_Rep<const ASYS_TCHAR *> +#pragma instantiate ACE_Future_Rep<ASYS_TCHAR const *> #pragma instantiate ACE_Future_Rep<int> #pragma instantiate ACE_Future_Rep<u_long> #pragma instantiate auto_ptr<ACE_Method_Request> #pragma instantiate ACE_Auto_Basic_Ptr<ACE_Method_Request> -#pragma instantiate ACE_Node<ACE_Future_Observer<const ASYS_TCHAR *> *> -#pragma instantiate ACE_Node<ACE_Future_Observer<int> *> -#pragma instantiate ACE_Node<ACE_Future_Observer<u_long> *> -#pragma instantiate ACE_Unbounded_Set<ACE_Future_Observer<const ASYS_TCHAR *> *> -#pragma instantiate ACE_Unbounded_Set<ACE_Future_Observer<int> *> -#pragma instantiate ACE_Unbounded_Set<ACE_Future_Observer<u_long> *> -#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Future_Observer<const ASYS_TCHAR *> *> -#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Future_Observer<int> *> -#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Future_Observer<u_long> *> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ #endif /* ACE_HAS_THREADS */ @@ -543,8 +525,7 @@ main (int, ASYS_TCHAR *[]) ACE_Future<int> f1; f1.set (100); - // Note you need to use absolute time, not relative time. - ACE_Time_Value timeout (ACE_OS::gettimeofday () + ACE_Time_Value (10)); + ACE_Time_Value timeout (1); int value = 0; if (f1.get (value, &timeout) == 0 @@ -556,7 +537,6 @@ main (int, ASYS_TCHAR *[]) ASYS_TEXT ("ACE_Future<T>::Set followed by Ace_Future<T>::Get does ") ASYS_TEXT ("not work, broken Ace_Future<> implementation.\n"))); } - { ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("Checking if Ace_Future<T>::operator= is implemented ") @@ -579,10 +559,9 @@ main (int, ASYS_TCHAR *[]) // instance at this moment // The stuff below might crash the process if the <operator=> - // implementation was bad. + // implementation was bad int value = 0; - - ACE_Time_Value timeout (ACE_OS::gettimeofday () + ACE_Time_Value (10)); + ACE_Time_Value timeout (1); f1.set (100); f1.get (value, &timeout); diff --git a/tests/Future_Test.dsp b/tests/Future_Test.dsp index fcae3d09de3..61169ba3aa6 100644 --- a/tests/Future_Test.dsp +++ b/tests/Future_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Future_Test - Win32 PharLap ETS Debug
+CFG=Future_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,17 @@ CFG=Future_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Future_Test.mak" CFG="Future_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "Future_Test.mak" CFG="Future_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Future_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Future_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "Future_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Future_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Future_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +70,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Future_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +83,12 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Future_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Future_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "Future_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Future_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Future_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Future_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "Future_Test - Win32 Debug"
# Name "Future_Test - Win32 Alpha Debug"
-# Name "Future_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -201,6 +170,7 @@ DEP_CPP_FUTUR=\ "..\ace\Signal.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\Strategies.h"\
"..\ace\Strategies_T.cpp"\
"..\ace\Strategies_T.h"\
@@ -238,11 +208,6 @@ DEP_CPP_FUTUR=\ "..\ace\ws2tcpip.h"\
".\test_config.h"\
-NODEP_CPP_FUTUR=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "Future_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/Future_Test.icc b/tests/Future_Test.icc deleted file mode 100644 index 6b62f1d82df..00000000000 --- a/tests/Future_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Future_Test.exe" - { - source type (cpp) "Future_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Handle_Set_Test.bpr b/tests/Handle_Set_Test.bpr new file mode 100644 index 00000000000..43cb3771f42 --- /dev/null +++ b/tests/Handle_Set_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Handle_Set_Test.exe +OBJFILES = objs\Handle_Set_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/Handle_Set_Test.cpp b/tests/Handle_Set_Test.cpp index ee4c6c25f7a..0fbf86f8da0 100644 --- a/tests/Handle_Set_Test.cpp +++ b/tests/Handle_Set_Test.cpp @@ -104,8 +104,8 @@ test_boundaries (void) const int SET_IS_EMPTY_SO_SHOULD_NOT_SEE_THIS = 1; ACE_ASSERT (0 == SET_IS_EMPTY_SO_SHOULD_NOT_SEE_THIS); #else /* ! defined (ACE_PSOS_DIAB) */ - ACE_ASSERT (0 == ASYS_TEXT ("this shouldn't get called since ") - ASYS_TEXT ("the set is empty!\n")); + ACE_ASSERT (0 == ASYS_TEXT ("this shouldn't get called since " + "the set is empty!\n")); #endif /* defined (ACE_PSOS_DIAB) */ } diff --git a/tests/Handle_Set_Test.dsp b/tests/Handle_Set_Test.dsp index 2f0bedc5649..7770749432d 100644 --- a/tests/Handle_Set_Test.dsp +++ b/tests/Handle_Set_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Handle_Set_Test - Win32 PharLap ETS Debug
+CFG=Handle_Set_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,17 @@ CFG=Handle_Set_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Handle_Set_Test.mak" CFG="Handle_Set_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "Handle_Set_Test.mak" CFG="Handle_Set_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Handle_Set_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Handle_Set_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "Handle_Set_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Handle_Set_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Handle_Set_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +70,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Handle_Set_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +83,12 @@ LINK32=link.exe # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Handle_Set_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Handle_Set_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "Handle_Set_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Handle_Set_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Handle_Set_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Handle_Set_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "Handle_Set_Test - Win32 Debug"
# Name "Handle_Set_Test - Win32 Alpha Debug"
-# Name "Handle_Set_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -179,6 +148,7 @@ DEP_CPP_HANDL=\ "..\ace\Signal.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\SV_Semaphore_Complex.h"\
"..\ace\SV_Semaphore_Complex.i"\
"..\ace\SV_Semaphore_Simple.h"\
@@ -196,11 +166,6 @@ DEP_CPP_HANDL=\ "..\ace\ws2tcpip.h"\
".\test_config.h"\
-NODEP_CPP_HANDL=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "Handle_Set_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/Handle_Set_Test.icc b/tests/Handle_Set_Test.icc deleted file mode 100644 index c3b7f53f8ea..00000000000 --- a/tests/Handle_Set_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Handle_Set_Test.exe" - { - source type (cpp) "Handle_Set_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Hash_Map_Manager_Test.bpr b/tests/Hash_Map_Manager_Test.bpr new file mode 100644 index 00000000000..bc596c53ad0 --- /dev/null +++ b/tests/Hash_Map_Manager_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Hash_Map_Manager_Test.exe +OBJFILES = objs\Hash_Map_Manager_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/Hash_Map_Manager_Test.cpp b/tests/Hash_Map_Manager_Test.cpp index e320f910072..8e91fe5eba7 100644 --- a/tests/Hash_Map_Manager_Test.cpp +++ b/tests/Hash_Map_Manager_Test.cpp @@ -15,7 +15,7 @@ // conjunction with the <ACE_Hash_Map_Manager>. // // = AUTHOR -// James Hu <jxh@cs.wustl.edu> and +// James Hu <jxh@cs.wustl.edu> and // Douglas C. Schmidt <schmidt@cs.wustl.edu> // // ============================================================================ @@ -32,25 +32,25 @@ USELIB("..\ace\aced.lib"); //--------------------------------------------------------------------------- #endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ -typedef ACE_Hash_Map_Entry<LPCTSTR, +typedef ACE_Hash_Map_Entry<LPCTSTR, LPCTSTR> HASH_STRING_ENTRY; -typedef ACE_Hash_Map_Manager_Ex<LPCTSTR, - LPCTSTR, - ACE_Hash<LPCTSTR>, - ACE_Equal_To<LPCTSTR>, +typedef ACE_Hash_Map_Manager_Ex<LPCTSTR, + LPCTSTR, + ACE_Hash<LPCTSTR>, + ACE_Equal_To<LPCTSTR>, ACE_Null_Mutex> HASH_STRING_MAP; -typedef ACE_Hash_Map_Iterator_Ex<LPCTSTR, - LPCTSTR, - ACE_Hash<LPCTSTR>, - ACE_Equal_To<LPCTSTR>, +typedef ACE_Hash_Map_Iterator_Ex<LPCTSTR, + LPCTSTR, + ACE_Hash<LPCTSTR>, + ACE_Equal_To<LPCTSTR>, ACE_Null_Mutex> HASH_STRING_ITER; -typedef ACE_Hash_Map_Reverse_Iterator_Ex<LPCTSTR, - LPCTSTR, - ACE_Hash<LPCTSTR>, - ACE_Equal_To<LPCTSTR>, +typedef ACE_Hash_Map_Reverse_Iterator_Ex<LPCTSTR, + LPCTSTR, + ACE_Hash<LPCTSTR>, + ACE_Equal_To<LPCTSTR>, ACE_Null_Mutex> HASH_STRING_REVERSE_ITER; struct String_Table @@ -61,19 +61,19 @@ struct String_Table static String_Table string_table[] = { - { - ACE_TEXT ("hello"), - ACE_TEXT ("guten Tag") + { + ASYS_TEXT ("hello"), + ASYS_TEXT ("guten Tag") }, - { - ACE_TEXT ("goodbye"), - ACE_TEXT ("auf wiedersehen") + { + ASYS_TEXT ("goodbye"), + ASYS_TEXT ("auf wiedersehen") }, - { - ACE_TEXT ("funny"), - ACE_TEXT ("lustig") + { + ASYS_TEXT ("funny"), + ASYS_TEXT ("lustig") }, - { + { 0, 0 } @@ -105,7 +105,7 @@ run_test (void) ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p failed for %s \n"), ASYS_TEXT ("bind"), - ASYS_MULTIBYTE_STRING (string_table[i].key_)), -1); + string_table[i].key_), -1); LPCTSTR entry; @@ -115,12 +115,12 @@ run_test (void) entry) == 0) ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("`%s' found `%s'\n"), - ASYS_MULTIBYTE_STRING (string_table[i].key_), + string_table[i].key_, entry)); else ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("`%s' not found\n"), - ASYS_MULTIBYTE_STRING (string_table[i].key_)), + string_table[i].key_), -1); // Check the <trybind> operation. @@ -149,8 +149,8 @@ run_test (void) ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("iterating (%d): [%s, %s]\n"), i, - ASYS_MULTIBYTE_STRING ((LPCTSTR) entry->ext_id_), - ASYS_MULTIBYTE_STRING ((LPCTSTR) entry->int_id_))); + (LPCTSTR) entry->ext_id_, + (LPCTSTR) entry->int_id_)); i++; } } @@ -163,12 +163,12 @@ run_test (void) entry) == 0) ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("`%s' found `%s'\n"), - ASYS_MULTIBYTE_STRING (string_table[i].key_), - ASYS_MULTIBYTE_STRING (entry))); + string_table[i].key_, + entry)); else if (i != 2) ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("`%s' not found\n"), - ASYS_MULTIBYTE_STRING (string_table[i].key_)), + string_table[i].key_), -1); // Let's test the iterator backwards. @@ -183,8 +183,8 @@ run_test (void) ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("iterating (%d): [%s, %s]\n"), i, - ASYS_MULTIBYTE_STRING ((LPCTSTR) entry->ext_id_), - ASYS_MULTIBYTE_STRING ((LPCTSTR) entry->int_id_))); + (LPCTSTR) entry->ext_id_, + (LPCTSTR) entry->int_id_)); i++; } } diff --git a/tests/Hash_Map_Manager_Test.dsp b/tests/Hash_Map_Manager_Test.dsp index b2fb5a1ab47..7f4a301458e 100644 --- a/tests/Hash_Map_Manager_Test.dsp +++ b/tests/Hash_Map_Manager_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Hash_Map_Manager_Test - Win32 PharLap ETS Debug
+CFG=Hash_Map_Manager_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,18 @@ CFG=Hash_Map_Manager_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Hash_Map_Manager_Test.mak" CFG="Hash_Map_Manager_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "Hash_Map_Manager_Test.mak"\
+ CFG="Hash_Map_Manager_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Hash_Map_Manager_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Hash_Map_Manager_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "Hash_Map_Manager_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Hash_Map_Manager_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Hash_Map_Manager_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +71,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +84,12 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Hash_Map_Manager_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Hash_Map_Manager_Test___Win32_PharLap_ETS_Debug"
-# PROP BASE Intermediate_Dir "Hash_Map_Manager_Test___Win32_PharLap_ETS_Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Hash_Map_Manager_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "Hash_Map_Manager_Test - Win32 Debug"
# Name "Hash_Map_Manager_Test - Win32 Alpha Debug"
-# Name "Hash_Map_Manager_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -186,6 +156,7 @@ DEP_CPP_HASH_=\ "..\ace\Signal.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\SV_Semaphore_Complex.h"\
"..\ace\SV_Semaphore_Complex.i"\
"..\ace\SV_Semaphore_Simple.h"\
@@ -205,15 +176,10 @@ DEP_CPP_HASH_=\ "..\ace\Trace.h"\
"..\ace\Version.h"\
"..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-NODEP_CPP_HASH_=\
- "..\ace\stdcpp.h"\
".\Hash_Map_Manager_Test.h"\
+ ".\test_config.h"\
-!ELSEIF "$(CFG)" == "Hash_Map_Manager_Test - Win32 PharLap ETS Debug"
-
!ENDIF
# End Source File
diff --git a/tests/Hash_Map_Manager_Test.icc b/tests/Hash_Map_Manager_Test.icc deleted file mode 100644 index a9245ae17ed..00000000000 --- a/tests/Hash_Map_Manager_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Hash_Map_Manager_Test.exe" - { - source type (cpp) "Hash_Map_Manager_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/High_Res_Timer_Test.cpp b/tests/High_Res_Timer_Test.cpp index b20f86304d4..804d7da0ba4 100644 --- a/tests/High_Res_Timer_Test.cpp +++ b/tests/High_Res_Timer_Test.cpp @@ -47,8 +47,8 @@ check (const u_int interval, const u_int measured) else { ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("The measured time of %u differs from ") - ASYS_TEXT ("the interval of %u by %u percent.\n"), + ASYS_TEXT ("The measured time of %u differs from " + "the interval of %u by %u percent.\n"), measured, interval, percentage_difference)); return 1; } @@ -78,8 +78,8 @@ main (int argc, ASYS_TCHAR *argv[]) { ACE_START_TEST (ASYS_TEXT ("High_Res_Timer_Test")); - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("The ACE_High_Res_Timer scale factor is %u ") - ASYS_TEXT ("1/microsecond\n"), + ACE_DEBUG ((LM_DEBUG, "The ACE_High_Res_Timer scale factor is %u " + "1/microsecond\n", ACE_High_Res_Timer::global_scale_factor ())); u_int errors = 0; @@ -105,11 +105,11 @@ main (int argc, ASYS_TCHAR *argv[]) { const ACE_Time_Value interval (0, intervals[i]); const ACE_Time_Value measured = time_interval (interval); - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("interval: %u usec, measured: %u usec%s\n"), + ACE_DEBUG ((LM_DEBUG, "interval: %u usec, measured: %u usec%s\n", interval.sec () * 1000000 + interval.usec (), measured.sec () * 1000000 + measured.usec (), intervals[i] <= TIMER_RESOLUTION ? - ASYS_TEXT (" (interval and measured may differ)") : ASYS_TEXT (""))); + " (interval and measured may differ)" : "")); if (intervals[i] > TIMER_RESOLUTION) { diff --git a/tests/High_Res_Timer_Test.dsp b/tests/High_Res_Timer_Test.dsp index cacae79bd3d..66e0a101307 100644 --- a/tests/High_Res_Timer_Test.dsp +++ b/tests/High_Res_Timer_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=High_Res_Timer_Test - Win32 PharLap ETS Debug
+CFG=High_Res_Timer_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,17 @@ CFG=High_Res_Timer_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "High_Res_Timer_Test.mak" CFG="High_Res_Timer_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "High_Res_Timer_Test.mak" CFG="High_Res_Timer_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "High_Res_Timer_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "High_Res_Timer_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "High_Res_Timer_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "High_Res_Timer_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "High_Res_Timer_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +70,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "High_Res_Timer_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +83,12 @@ LINK32=link.exe # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "High_Res_Timer_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "High_Res_Timer_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "High_Res_Timer_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "High_Res_Timer_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "High_Res_Timer_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./High_Res_Timer_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "High_Res_Timer_Test - Win32 Debug"
# Name "High_Res_Timer_Test - Win32 Alpha Debug"
-# Name "High_Res_Timer_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -131,7 +100,7 @@ SOURCE=.\High_Res_Timer_Test.cpp !ELSEIF "$(CFG)" == "High_Res_Timer_Test - Win32 Alpha Debug"
-DEP_CPP_HIGH_=\
+DEP_CPP_BARRI=\
"..\ace\ACE.h"\
"..\ace\ACE.i"\
"..\ace\Atomic_Op.i"\
@@ -173,6 +142,7 @@ DEP_CPP_HIGH_=\ "..\ace\Signal.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\SV_Semaphore_Complex.h"\
"..\ace\SV_Semaphore_Complex.i"\
"..\ace\SV_Semaphore_Simple.h"\
@@ -191,11 +161,6 @@ DEP_CPP_HIGH_=\ "..\ace\ws2tcpip.h"\
".\test_config.h"\
-NODEP_CPP_HIGH_=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "High_Res_Timer_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/High_Res_Timer_Test.icc b/tests/High_Res_Timer_Test.icc deleted file mode 100644 index f703ae217df..00000000000 --- a/tests/High_Res_Timer_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "High_Res_Timer_Test.exe" - { - source type (cpp) "High_Res_Timer_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/IOStream_Test.bpr b/tests/IOStream_Test.bpr new file mode 100644 index 00000000000..ddfccd82dfb --- /dev/null +++ b/tests/IOStream_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = IOStream_Test.exe +OBJFILES = objs\IOStream_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/IOStream_Test.cpp b/tests/IOStream_Test.cpp index b7867aa97dc..b9673a8a00c 100644 --- a/tests/IOStream_Test.cpp +++ b/tests/IOStream_Test.cpp @@ -184,14 +184,13 @@ client (void *arg = 0) if (connector.connect (server, addr) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT (" (%t) %p\n"), - ASYS_TEXT ("Failed to connect to server thread")), + " (%t) %p\n", + "Failed to connect to server thread"), 0); // Send a string to the server which it can interpret as a qchar[] const char *str = "\"This is a test string.\""; - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT (" (%P|%t) Client Sending: (%s)\n"), - ASYS_WIDE_STRING (str))); + ACE_DEBUG ((LM_DEBUG, " (%P|%t) Client Sending: (%s)\n", str)); server << str << endl; // Allow the server to get the string and echo it to the user. (The @@ -204,8 +203,8 @@ client (void *arg = 0) str = "\"THIS IS A TEST STRING.\""; ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT (" (%P|%t) Client Sending: (%s)\n"), - ASYS_WIDE_STRING (str))); + " (%P|%t) Client Sending: (%s)\n", + str)); server << str << endl; // Again, give the server time to display the happenings to the @@ -217,7 +216,7 @@ client (void *arg = 0) // the server. ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT (" (%P|%t) Client Receiving\n"))); + " (%P|%t) Client Receiving\n")); ACE_Time_Value timeout (2); ACE_Time_Value *timeoutp = &timeout; @@ -235,13 +234,13 @@ client (void *arg = 0) if (eof) { ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT (" (%P|%t) Unrecoverable stream error/eof\n"))); + " (%P|%t) Unrecoverable stream error/eof\n")); break; } else { ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT (" (%P|%t) Recoverable stream error/timed out)\n"))); + " (%P|%t) Recoverable stream error/timed out)\n")); server.clear (0); } } @@ -252,7 +251,7 @@ client (void *arg = 0) server >> d; ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT (" (%P|%t) Client Received: int %d float %f long %d float %f double %f\n"), + " (%P|%t) Client Received: int %d float %f long %d float %f double %f\n", i, f1, (int) l, @@ -299,8 +298,8 @@ server (void *arg = 0) if (acceptor->get_local_addr (server_addr) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("get_local_addr")), + "%p\n", + "get_local_addr"), 0); #if defined (ACE_HAS_THREADS) @@ -308,14 +307,14 @@ server (void *arg = 0) (void *) &server_addr, THR_NEW_LWP | THR_DETACHED) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT (" (%t) %p\n"), - ASYS_TEXT ("spawing client thread")), + " (%t) %p\n", + "spawing client thread"), 0); #endif /* ACE_HAS_THREADS */ if (acceptor->accept (client_handler) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT (" (%P|%t) Failed to accept new client_handler")), + " (%P|%t) Failed to accept new client_handler"), 0); // Read a qbuf[] from the client. Notice that all of the client's @@ -325,8 +324,8 @@ server (void *arg = 0) client_handler >> qbuf; ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT (" (%P|%t) Server Received: (\"%s\")\n"), - ASYS_WIDE_STRING ((char *) qbuf))); + " (%P|%t) Server Received: (\"%s\")\n", + qbuf)); // Give the client time to announce the next test to the user. ACE_OS::sleep (2); @@ -349,7 +348,7 @@ server (void *arg = 0) if (buf.length () > 0) ACE_DEBUG ((LM_DEBUG, "%s ", - ASYS_WIDE_STRING (buf.c_str ()))); + buf.c_str ())); } ACE_DEBUG ((LM_DEBUG, @@ -358,7 +357,7 @@ server (void *arg = 0) char buf[BUFSIZ]; ACE_OS::memset (buf, 0, sizeof buf); ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT (" (%P|%t) Server Received: ("))); + " (%P|%t) Server Received: (")); while (ACE_OS::strlen (buf) == 0 || buf[ACE_OS::strlen (buf) - 1] != '"') @@ -366,12 +365,12 @@ server (void *arg = 0) if (! (client_handler >> buf)) break; ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("%s "), - ASYS_WIDE_STRING (buf))); + "%s ", + buf)); } ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT (")\n"))); + ")\n")); #endif /* ACE_HAS_STRING_CLASS */ // Send some non-textual data to the client. We use a single @@ -381,11 +380,11 @@ server (void *arg = 0) // command or the implicit <<endl. ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT (" (%P|%t) Server sleeping\n"))); + " (%P|%t) Server sleeping\n")); ACE_OS::sleep (5); ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT (" (%P|%t) Server Sending: 1 .12342134 666555444 23.45 -46.5e9 \n"))); + " (%P|%t) Server Sending: 1 .12342134 666555444 23.45 -46.5e9 \n")); client_handler << 1 << " "; client_handler << .12342134 << " "; client_handler << 666555444 << " "; @@ -404,7 +403,7 @@ server (void *arg = 0) client_handler >> i >> f1 >> l >> f2 >> d; ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT (" (%P|%t) Server Received: int %d float %g long %d float %g double %g\n"), + " (%P|%t) Server Received: int %d float %g long %d float %g double %g\n", i, f1, (int) l, @@ -429,16 +428,15 @@ spawn (void) if (acceptor.open (ACE_sap_any_cast (const ACE_INET_Addr &)) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT (" (%P|%t) %p\n"), - ASYS_TEXT ("open")), + " (%P|%t) %p\n", + "open"), -1); #if defined (ACE_HAS_THREADS) else if (ACE_Thread_Manager::instance ()->spawn (ACE_THR_FUNC (server), &acceptor, THR_NEW_LWP | THR_DETACHED) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("spawning server thread")), + "%p\n", "spawning server thread"), -1); // Wait for the client and server thread to exit. @@ -450,8 +448,8 @@ spawn (void) { case -1: ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("%p\n%a"), - ASYS_TEXT ("fork failed"))); + "%p\n%a", + "fork failed")); ACE_OS::_exit (-1); case 0: // In child { @@ -460,8 +458,8 @@ spawn (void) if (acceptor.get_local_addr (server_addr) == -1) ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("get_local_addr"))); + "%p\n", + "get_local_addr")); else client ((void *) &server_addr); ACE_END_LOG; @@ -476,7 +474,7 @@ spawn (void) } #else ACE_ERROR_RETURN ((LM_INFO, - ASYS_TEXT ("threads *and* processes not supported on this platform\n")), + "threads *and* processes not supported on this platform\n"), -1); #endif /* ACE_HAS_THREADS */ @@ -487,16 +485,16 @@ spawn (void) #endif /* !ACE_LACKS_ACE_IOSTREAM */ int -main (int, ASYS_TCHAR *[]) +main (int, char *[]) { - ACE_START_TEST (ASYS_TEXT ("IOStream_Test")); + ACE_START_TEST ("IOStream_Test"); #if !defined (ACE_LACKS_ACE_IOSTREAM) - ACE_INIT_LOG (ASYS_TEXT ("IOStream_Test-children")); + ACE_INIT_LOG ("IOStream_Test-children"); spawn (); #else ACE_ERROR ((LM_INFO, - ASYS_TEXT ("ACE_IOSTREAM not supported on this platform\n"))); + "ACE_IOSTREAM not supported on this platform\n")); #endif /* !ACE_LACKS_ACE_IOSTREAM */ ACE_END_TEST; return 0; diff --git a/tests/IOStream_Test.dsp b/tests/IOStream_Test.dsp index 587d5507ccf..8f157a849b0 100644 --- a/tests/IOStream_Test.dsp +++ b/tests/IOStream_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=IOStream_Test - Win32 PharLap ETS Debug
+CFG=IOStream_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,17 @@ CFG=IOStream_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "IOStream_Test.mak" CFG="IOStream_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "IOStream_Test.mak" CFG="IOStream_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "IOStream_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "IOStream_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "IOStream_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "IOStream_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "IOStream_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +70,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "IOStream_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +83,12 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "IOStream_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "IOStream_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "IOStream_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "IOStream_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "IOStream_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./IOStream_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "IOStream_Test - Win32 Debug"
# Name "IOStream_Test - Win32 Alpha Debug"
-# Name "IOStream_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -222,6 +191,7 @@ DEP_CPP_IOSTR=\ "..\ace\SOCK_Stream.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\Strategies.h"\
"..\ace\Strategies_T.cpp"\
"..\ace\Strategies_T.h"\
@@ -263,11 +233,6 @@ DEP_CPP_IOSTR=\ "..\ace\ws2tcpip.h"\
".\test_config.h"\
-NODEP_CPP_IOSTR=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "IOStream_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/IOStream_Test.icc b/tests/IOStream_Test.icc deleted file mode 100644 index a02572c7eca..00000000000 --- a/tests/IOStream_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "IOStream_Test.exe" - { - source type (cpp) "IOStream_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/MM_Shared_Memory_Test.bpr b/tests/MM_Shared_Memory_Test.bpr new file mode 100644 index 00000000000..9d7acdedd0e --- /dev/null +++ b/tests/MM_Shared_Memory_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = MM_Shared_Memory_Test.exe +OBJFILES = objs\MM_Shared_Memory_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/MM_Shared_Memory_Test.dsp b/tests/MM_Shared_Memory_Test.dsp index 9623c77b2ee..46a4a6dda29 100644 --- a/tests/MM_Shared_Memory_Test.dsp +++ b/tests/MM_Shared_Memory_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=MM_Shared_Memory_Test - Win32 PharLap ETS Debug
+CFG=MM_Shared_Memory_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,18 @@ CFG=MM_Shared_Memory_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "MM_Shared_Memory_Test.mak" CFG="MM_Shared_Memory_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "MM_Shared_Memory_Test.mak"\
+ CFG="MM_Shared_Memory_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "MM_Shared_Memory_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "MM_Shared_Memory_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "MM_Shared_Memory_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "MM_Shared_Memory_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "MM_Shared_Memory_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +71,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "MM_Shared_Memory_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +84,12 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "MM_Shared_Memory_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "MM_Shared_Memory_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "MM_Shared_Memory_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "MM_Shared_Memory_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "MM_Shared_Memory_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./MM_Shared_Memory_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "MM_Shared_Memory_Test - Win32 Debug"
# Name "MM_Shared_Memory_Test - Win32 Alpha Debug"
-# Name "MM_Shared_Memory_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -176,6 +146,7 @@ DEP_CPP_MM_SH=\ "..\ace\Signal.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\SV_Semaphore_Complex.h"\
"..\ace\SV_Semaphore_Complex.i"\
"..\ace\SV_Semaphore_Simple.h"\
@@ -194,11 +165,6 @@ DEP_CPP_MM_SH=\ "..\ace\ws2tcpip.h"\
".\test_config.h"\
-NODEP_CPP_MM_SH=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "MM_Shared_Memory_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/MM_Shared_Memory_Test.icc b/tests/MM_Shared_Memory_Test.icc deleted file mode 100644 index 5cb87f2c105..00000000000 --- a/tests/MM_Shared_Memory_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "MM_Shared_Memory_Test.exe" - { - source type (cpp) "MM_Shared_Memory_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/MT_Reactor_Timer_Test.bpr b/tests/MT_Reactor_Timer_Test.bpr new file mode 100644 index 00000000000..f5190627c5d --- /dev/null +++ b/tests/MT_Reactor_Timer_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = MT_Reactor_Timer_Test.exe +OBJFILES = objs\MT_Reactor_Timer_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/MT_Reactor_Timer_Test.cpp b/tests/MT_Reactor_Timer_Test.cpp index 2118f309808..398a863645e 100644 --- a/tests/MT_Reactor_Timer_Test.cpp +++ b/tests/MT_Reactor_Timer_Test.cpp @@ -133,7 +133,7 @@ Time_Handler::handle_timeout (const ACE_Time_Value &tv, ACE_GUARD_RETURN (ACE_Thread_Mutex, id_lock, this->lock_, 0); ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("%T (%t): Timer #%d (id #%d) expired\n"), + "%T (%t): Timer #%d (id #%d) expired\n", time_tag, this->timer_id_[time_tag])); diff --git a/tests/MT_Reactor_Timer_Test.dsp b/tests/MT_Reactor_Timer_Test.dsp index 394e76b8ba1..5e349f72108 100644 --- a/tests/MT_Reactor_Timer_Test.dsp +++ b/tests/MT_Reactor_Timer_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=MT_Reactor_Timer_Test - Win32 PharLap ETS Debug
+CFG=MT_Reactor_Timer_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,17 @@ CFG=MT_Reactor_Timer_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "MT_Reactor_Timer_Test.mak" CFG="MT_Reactor_Timer_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "MT_Reactor_Timer_Test.mak" CFG="MT_Reactor_Timer_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "MT_Reactor_Timer_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "MT_Reactor_Timer_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "MT_Reactor_Timer_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "MT_Reactor_Timer_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "MT_Reactor_Timer_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +70,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "MT_Reactor_Timer_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +83,12 @@ LINK32=link.exe # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "MT_Reactor_Timer_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "MT_Reactor_Timer_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "MT_Reactor_Timer_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "MT_Reactor_Timer_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "MT_Reactor_Timer_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./MT_Reactor_Timer_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "MT_Reactor_Timer_Test - Win32 Debug"
# Name "MT_Reactor_Timer_Test - Win32 Alpha Debug"
-# Name "MT_Reactor_Timer_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -131,7 +100,7 @@ SOURCE=.\MT_Reactor_Timer_Test.cpp !ELSEIF "$(CFG)" == "MT_Reactor_Timer_Test - Win32 Alpha Debug"
-DEP_CPP_MT_RE=\
+DEP_CPP_BARRI=\
"..\ace\ACE.h"\
"..\ace\ACE.i"\
"..\ace\Atomic_Op.i"\
@@ -173,6 +142,7 @@ DEP_CPP_MT_RE=\ "..\ace\Signal.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\SV_Semaphore_Complex.h"\
"..\ace\SV_Semaphore_Complex.i"\
"..\ace\SV_Semaphore_Simple.h"\
@@ -191,11 +161,6 @@ DEP_CPP_MT_RE=\ "..\ace\ws2tcpip.h"\
".\test_config.h"\
-NODEP_CPP_MT_RE=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "MT_Reactor_Timer_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/MT_Reactor_Timer_Test.icc b/tests/MT_Reactor_Timer_Test.icc deleted file mode 100644 index d391eaf0b86..00000000000 --- a/tests/MT_Reactor_Timer_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "MT_Reactor_Timer_Test.exe" - { - source type (cpp) "MT_Reactor_Timer_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/MT_SOCK_Test.bpr b/tests/MT_SOCK_Test.bpr new file mode 100644 index 00000000000..b9ccb4f06cb --- /dev/null +++ b/tests/MT_SOCK_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = MT_SOCK_Test.exe +OBJFILES = objs\MT_SOCK_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/MT_SOCK_Test.dsp b/tests/MT_SOCK_Test.dsp index 0ccee16001f..5962024d646 100644 --- a/tests/MT_SOCK_Test.dsp +++ b/tests/MT_SOCK_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=MT_SOCK_Test - Win32 PharLap ETS Debug
+CFG=MT_SOCK_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,17 @@ CFG=MT_SOCK_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "MT_SOCK_Test.mak" CFG="MT_SOCK_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "MT_SOCK_Test.mak" CFG="MT_SOCK_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "MT_SOCK_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "MT_SOCK_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "MT_SOCK_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "MT_SOCK_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "MT_SOCK_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +70,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +83,12 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "MT_SOCK_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "MT_SOCK_Test___Win32_PharLap_ETS_Debug"
-# PROP BASE Intermediate_Dir "MT_SOCK_Test___Win32_PharLap_ETS_Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./MT_SOCK_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "MT_SOCK_Test - Win32 Debug"
# Name "MT_SOCK_Test - Win32 Alpha Debug"
-# Name "MT_SOCK_Test - Win32 PharLap ETS Debug"
# Begin Source File
SOURCE=.\MT_SOCK_Test.cpp
@@ -211,8 +180,6 @@ NODEP_CPP_MT_SO=\ "..\ace\stdcpp.h"\
-!ELSEIF "$(CFG)" == "MT_SOCK_Test - Win32 PharLap ETS Debug"
-
!ENDIF
# End Source File
diff --git a/tests/MT_SOCK_Test.icc b/tests/MT_SOCK_Test.icc deleted file mode 100644 index 5c1ef1c81d0..00000000000 --- a/tests/MT_SOCK_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "MT_SOCK_Test.exe" - { - source type (cpp) "MT_SOCK_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Makefile b/tests/Makefile index c8cc327f25b..c5d627dc120 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -14,7 +14,6 @@ BIN = Aio_Platform_Test \ Barrier_Test \ Basic_Types_Test \ Buffer_Stream_Test \ - Cache_Map_Manager_Test \ CDR_Test \ Collection_Test \ Conn_Test \ @@ -23,14 +22,12 @@ BIN = Aio_Platform_Test \ Enum_Interfaces_Test \ Env_Value_Test \ Future_Test \ - Future_Set_Test \ Handle_Set_Test \ High_Res_Timer_Test \ OrdMultiSet_Test \ Hash_Map_Manager_Test \ IOStream_Test \ Map_Test \ - Map_Manager_Test \ Mem_Map_Test \ MM_Shared_Memory_Test \ MT_Reactor_Timer_Test \ @@ -79,6 +76,8 @@ BIN = Aio_Platform_Test \ UPIPE_SAP_Test \ Upgradable_RW_Test +# Map_Manager_Test \ + BIN2 = Naming_Test \ Thread_Pool_Reactor_Test \ XtReactor_Test \ @@ -87,7 +86,7 @@ BIN2 = Naming_Test \ #### If the ACE library wasn't built with all components, don't #### try to build certain tests. -ACE_BUILD_COMPONENTS := $(shell sh $(ACE_ROOT)/bin/ace_components --ace) +ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace) ifeq (Other,$(findstring Other,$(ACE_BUILD_COMPONENTS))) BIN += $(BIN2) endif # ! Other @@ -290,8 +289,7 @@ realclean: clean $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Version.h \ - test_config.h \ + $(ACE_ROOT)/ace/Version.h test_config.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -439,114 +437,6 @@ realclean: clean $(ACE_ROOT)/ace/Stream_Modules.cpp \ $(ACE_ROOT)/ace/Stream.i \ $(ACE_ROOT)/ace/Stream.cpp -.obj/Cache_Map_Manager_Test.o .obj/Cache_Map_Manager_Test.so .shobj/Cache_Map_Manager_Test.o .shobj/Cache_Map_Manager_Test.so: Cache_Map_Manager_Test.cpp \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - test_config.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Hash_Cache_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Cache_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Pair_T.h \ - $(ACE_ROOT)/ace/Pair.h \ - $(ACE_ROOT)/ace/Pair.i \ - $(ACE_ROOT)/ace/Pair_T.i \ - $(ACE_ROOT)/ace/Pair_T.cpp \ - $(ACE_ROOT)/ace/Cache_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Cache_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Hash_Cache_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Cache_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Caching_Strategies_T.h \ - $(ACE_ROOT)/ace/Caching_Utility_T.h \ - $(ACE_ROOT)/ace/Caching_Utility_T.i \ - $(ACE_ROOT)/ace/Caching_Utility_T.cpp \ - $(ACE_ROOT)/ace/Cleanup_Strategies_T.h \ - $(ACE_ROOT)/ace/Cleanup_Strategies_T.i \ - $(ACE_ROOT)/ace/Cleanup_Strategies_T.cpp \ - $(ACE_ROOT)/ace/Caching_Strategies_T.i \ - $(ACE_ROOT)/ace/Caching_Strategies_T.cpp \ - $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/Get_Opt.i .obj/CDR_Test.o .obj/CDR_Test.so .shobj/CDR_Test.o .shobj/CDR_Test.so: CDR_Test.cpp test_config.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/OS.h \ @@ -831,8 +721,7 @@ realclean: clean $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/Get_Opt.i \ - Conn_Test.h + $(ACE_ROOT)/ace/Get_Opt.i Conn_Test.h .obj/DLList_Test.o .obj/DLList_Test.so .shobj/DLList_Test.o .shobj/DLList_Test.so: DLList_Test.cpp test_config.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/OS.h \ @@ -927,8 +816,7 @@ realclean: clean $(ACE_ROOT)/ace/Managed_Object.h \ $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Managed_Object.cpp \ - DLL_Test.h \ - $(ACE_ROOT)/ace/DLL.h \ + DLL_Test.h $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp @@ -1145,137 +1033,6 @@ realclean: clean $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp -.obj/Future_Set_Test.o .obj/Future_Set_Test.so .shobj/Future_Set_Test.o .shobj/Future_Set_Test.so: Future_Set_Test.cpp test_config.h \ - $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/WFMO_Reactor.i \ - $(ACE_ROOT)/ace/Strategies.i \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.i \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(ACE_ROOT)/ace/Future.h \ - $(ACE_ROOT)/ace/Future.cpp \ - $(ACE_ROOT)/ace/Future_Set.h \ - $(ACE_ROOT)/ace/Future_Set.cpp \ - $(ACE_ROOT)/ace/Method_Request.h \ - $(ACE_ROOT)/ace/Activation_Queue.h \ - $(ACE_ROOT)/ace/Activation_Queue.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp .obj/Handle_Set_Test.o .obj/Handle_Set_Test.so .shobj/Handle_Set_Test.o .shobj/Handle_Set_Test.so: Handle_Set_Test.cpp test_config.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/OS.h \ @@ -1383,8 +1140,7 @@ realclean: clean $(ACE_ROOT)/ace/Get_Opt.i .obj/OrdMultiSet_Test.o .obj/OrdMultiSet_Test.so .shobj/OrdMultiSet_Test.o .shobj/OrdMultiSet_Test.so: OrdMultiSet_Test.cpp \ $(ACE_ROOT)/ace/inc_user_config.h \ - test_config.h \ - $(ACE_ROOT)/ace/OS.h \ + test_config.h $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -1889,9 +1645,9 @@ realclean: clean $(ACE_ROOT)/ace/Hash_Cache_Map_Manager_T.i \ $(ACE_ROOT)/ace/Hash_Cache_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Caching_Strategies_T.h \ - $(ACE_ROOT)/ace/Caching_Utility_T.h \ - $(ACE_ROOT)/ace/Caching_Utility_T.i \ - $(ACE_ROOT)/ace/Caching_Utility_T.cpp \ + $(ACE_ROOT)/ace/Caching_Strategy_Utility_T.h \ + $(ACE_ROOT)/ace/Caching_Strategy_Utility_T.i \ + $(ACE_ROOT)/ace/Caching_Strategy_Utility_T.cpp \ $(ACE_ROOT)/ace/Cleanup_Strategies_T.h \ $(ACE_ROOT)/ace/Cleanup_Strategies_T.i \ $(ACE_ROOT)/ace/Cleanup_Strategies_T.cpp \ @@ -3549,8 +3305,7 @@ realclean: clean $(ACE_ROOT)/ace/Mem_Map.h \ $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/RB_Tree.cpp \ - RB_Tree_Test.h + $(ACE_ROOT)/ace/RB_Tree.cpp .obj/Reactors_Test.o .obj/Reactors_Test.so .shobj/Reactors_Test.o .shobj/Reactors_Test.so: Reactors_Test.cpp test_config.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/OS.h \ @@ -3746,8 +3501,7 @@ realclean: clean $(ACE_ROOT)/ace/INET_Addr.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.i \ - test_config.h \ - $(ACE_ROOT)/ace/Singleton.h \ + test_config.h $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp .obj/Reactor_Notify_Test.o .obj/Reactor_Notify_Test.so .shobj/Reactor_Notify_Test.o .shobj/Reactor_Notify_Test.so: Reactor_Notify_Test.cpp test_config.h \ @@ -5462,8 +5216,7 @@ realclean: clean $(ACE_ROOT)/ace/Process.i .obj/Time_Value_Test.o .obj/Time_Value_Test.so .shobj/Time_Value_Test.o .shobj/Time_Value_Test.so: Time_Value_Test.cpp \ $(ACE_ROOT)/ace/inc_user_config.h \ - test_config.h \ - $(ACE_ROOT)/ace/OS.h \ + test_config.h $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ diff --git a/tests/Makefile.am b/tests/Makefile.am index 6c0d9ba5f09..fcc11f677b0 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -56,7 +56,6 @@ check_PROGRAMS = \ Barrier_Test \ Basic_Types_Test \ Buffer_Stream_Test \ - Cache_Map_Manager_Test \ CDR_Test \ Collection_Test \ Conn_Test \ @@ -133,7 +132,7 @@ Buffer_Stream_Test_SOURCES = Buffer_Stream_Test.cpp CDR_Test_SOURCES = CDR_Test.cpp -Cache_Map_Manager_Test_SOURCES = Cache_Map_Manager_Test.cpp +# Cache_Manager_Test_SOURCES = Cache_Manager_Test.cpp Collection_Test_SOURCES = Collection_Test.cpp @@ -244,7 +243,8 @@ TSS_Test_SOURCES = TSS_Test.cpp \ Task_Test_SOURCES = Task_Test.cpp -Thread_Manager_Test_SOURCES = Thread_Manager_Test.cpp +Thread_Manager_Test_SOURCES = Thread_Manager_Test.cpp \ + Thread_Manager_Test.h Thread_Mutex_Test_SOURCES = Thread_Mutex_Test.cpp diff --git a/tests/Makefile.bor b/tests/Makefile.bor deleted file mode 100644 index d895c168c90..00000000000 --- a/tests/Makefile.bor +++ /dev/null @@ -1,95 +0,0 @@ -# -# Makefile for building the ACE tests -# - -!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> - -TESTS = \ - Aio_Platform_Test \ - Atomic_Op_Test \ - Barrier_Test \ - Basic_Types_Test \ - Buffer_Stream_Test \ - CDR_Test \ - Collection_Test \ - Conn_Test \ - DLList_Test \ - DLL_Test \ - Dynamic_Priority_Test \ - Enum_Interfaces_Test \ - Env_Value_Test \ - Future_Test \ - Handle_Set_Test \ - High_Res_Timer_Test \ - Hash_Map_Manager_Test \ - IOStream_Test \ - Map_Test \ - Mem_Map_Test \ - MM_Shared_Memory_Test \ - MT_Reactor_Timer_Test \ - MT_SOCK_Test \ - Mem_Map_Test \ - Message_Block_Test \ - Message_Queue_Notifications_Test \ - Message_Queue_Test \ - Naming_Test \ - New_Fail_Test \ - Notify_Performance_Test \ - OrdMultiSet_Test \ - Pipe_Test \ - Priority_Buffer_Test \ - Priority_Reactor_Test \ - Priority_Task_Test \ - Process_Mutex_Test \ - Process_Strategy_Test \ - RB_Tree_Test \ - Reactor_Exceptions_Test \ - Reactor_Notify_Test \ - Reactor_Performance_Test \ - Reactor_Timer_Test \ - Reactors_Test \ - Reader_Writer_Test \ - Recursive_Mutex_Test \ - Reverse_Lock_Test \ - SOCK_Connector_Test \ - SOCK_Send_Recv_Test \ - SOCK_Test \ - SPIPE_Test \ - SString_Test \ - SV_Shared_Memory_Test \ - Semaphore_Test \ - Service_Config_Test \ - Sigset_Ops_Test \ - Simple_Message_Block_Test \ - Svc_Handler_Test \ - TSS_Test \ - Task_Test \ - Thread_Manager_Test \ - Thread_Mutex_Test \ - Thread_Pool_Test \ - Time_Service_Test \ - Time_Value_Test \ - Timeprobe_Test \ - Timer_Queue_Test \ - Tokens_Test \ - UPIPE_SAP_Test \ - Upgradable_RW_Test \ - XtReactor_Test - -# Map_Manager_Test \ - -all_tests: $(TESTS) - -$(TESTS): - $(MAKE) -fMakefile.bor -DNAME=$@ $(MAKE_FLAGS) $(BINDIR)\$@.exe - -OBJFILES = $(OBJDIR)\$(NAME).obj - -CFLAGS = $(ACE_CFLAGS) - -CPPDIR = . - -LIBFILES = $(ACE_LIB) - -!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor> - diff --git a/tests/Map_Manager_Test.bpr b/tests/Map_Manager_Test.bpr new file mode 100644 index 00000000000..fb1c5de2b92 --- /dev/null +++ b/tests/Map_Manager_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Map_Manager_Test.exe +OBJFILES = objs\Map_Manager_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/Map_Manager_Test.cpp b/tests/Map_Manager_Test.cpp index 0b6fb1dae66..b316cd7b260 100644 --- a/tests/Map_Manager_Test.cpp +++ b/tests/Map_Manager_Test.cpp @@ -37,31 +37,31 @@ USELIB("..\ace\aced.lib"); #endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ typedef ACE_Null_Mutex MUTEX; -typedef ACE_UINT32 TYPE; -typedef ACE_Active_Map_Manager_Key +typedef size_t TYPE; +typedef ACE_Active_Map_Manager_Key ACTIVE_KEY; -typedef ACE_Hash<TYPE> +typedef ACE_Hash<TYPE> HASH_KEY; -typedef ACE_Equal_To<TYPE> +typedef ACE_Equal_To<TYPE> COMPARE_KEYS; -typedef ACE_Map_Manager <TYPE, TYPE, MUTEX> +typedef ACE_Map_Manager <TYPE, TYPE, MUTEX> MAP_MANAGER; -typedef ACE_Map_Iterator <TYPE, TYPE, MUTEX> +typedef ACE_Map_Iterator <TYPE, TYPE, MUTEX> ITERATOR; -typedef ACE_Map_Reverse_Iterator <TYPE, TYPE, MUTEX> +typedef ACE_Map_Reverse_Iterator <TYPE, TYPE, MUTEX> REVERSE_ITERATOR; -typedef ACE_Map_Entry <TYPE, TYPE> +typedef ACE_Map_Entry <TYPE, TYPE> ENTRY; -typedef ACE_Hash_Map_Manager_Ex <TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX> +typedef ACE_Hash_Map_Manager_Ex <TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX> HASH_MAP_MANAGER; -typedef ACE_Hash_Map_Iterator_Ex <TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX> +typedef ACE_Hash_Map_Iterator_Ex <TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX> HASH_ITERATOR; -typedef ACE_Hash_Map_Reverse_Iterator_Ex <TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX> +typedef ACE_Hash_Map_Reverse_Iterator_Ex <TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX> HASH_REVERSE_ITERATOR; -typedef ACE_Hash_Map_Entry <TYPE, TYPE> +typedef ACE_Hash_Map_Entry <TYPE, TYPE> HASH_ENTRY; -typedef ACE_Active_Map_Manager <TYPE> +typedef ACE_Active_Map_Manager <TYPE> ACTIVE_MAP_MANAGER; typedef ACE_Hash_Map_Manager_Ex<TYPE, ACE_Pair<TYPE, int>, HASH_KEY, COMPARE_KEYS, MUTEX> @@ -71,7 +71,7 @@ typedef ACE_Hash_Map_Iterator_Ex<TYPE, ACE_Pair<TYPE, int>, HASH_KEY, COMPARE_KE typedef ACE_Hash_Map_Reverse_Iterator_Ex<TYPE, ACE_Pair<TYPE, int>, HASH_KEY, COMPARE_KEYS, MUTEX> CACHE_REV_ITER_IMPL; typedef int ATTR; -typedef ACE_Null_Caching_Utility <TYPE, TYPE, CACHE_MAP_IMPL, CACHE_ITER_IMPL, ATTR> +typedef ACE_Null_Caching_Strategy_Utility <TYPE, TYPE, CACHE_MAP_IMPL, ATTR> NULL_UTILITY; typedef ACE_Null_Caching_Strategy<TYPE, TYPE, CACHE_MAP_IMPL, ATTR, NULL_UTILITY> NULL_CACHING_STRATEGY; @@ -85,9 +85,7 @@ test_cache_map_manager (size_t table_size, size_t iterations, int test_iterators) { - NULL_CACHING_STRATEGY null_caching_strategy; - CACHE_MAP_MANAGER map (null_caching_strategy, - table_size); + CACHE_MAP_MANAGER map (table_size); TYPE i; TYPE j; ssize_t k; @@ -212,9 +210,7 @@ test_hash_cache_map_manager (size_t table_size, size_t iterations, int test_iterators) { - NULL_CACHING_STRATEGY null_caching_strategy; - HASH_CACHE_MAP_MANAGER map (null_caching_strategy, - table_size); + HASH_CACHE_MAP_MANAGER map (table_size); TYPE i; TYPE j; ssize_t k; @@ -843,16 +839,14 @@ run_test (void (*ptf) (size_t, size_t, int), timer.elapsed_time (et); - ASYS_TCHAR *test_iterators_string = 0; + LPCTSTR test_iterators_string = 0; if (test_iterators) test_iterators_string = - ACE_const_cast (ASYS_TCHAR*, - ASYS_TEXT ( "includes executing iterators")); + ASYS_TEXT ("includes executing iterators"); else test_iterators_string = - ACE_const_cast (ASYS_TCHAR*, - ASYS_TEXT ("doesn't include executing iterators")); + ASYS_TEXT ("doesn't include executing iterators"); ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("time to test a map of size %d for %d iterations using %s (%s)\n"), @@ -931,14 +925,13 @@ main (int argc, ASYS_TCHAR *argv[]) } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Equal_To<TYPE>; -template class ACE_Pair<TYPE, ATTR >; -template class ACE_Reference_Pair<TYPE, TYPE>; +template class ACE_Pair<TYPE, ATTR>; template class ACE_Hash_Map_Manager_Ex<TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX>; template class ACE_Hash_Map_Iterator_Base_Ex<TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX>; template class ACE_Hash_Map_Iterator_Ex<TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX>; template class ACE_Hash_Map_Reverse_Iterator_Ex<TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX>; template class ACE_Hash_Map_Entry<TYPE, TYPE>; +template class ACE_Equal_To<TYPE>; template class ACE_Map_Manager<TYPE, TYPE, MUTEX>; template class ACE_Map_Iterator_Base<TYPE, TYPE, MUTEX>; template class ACE_Map_Iterator<TYPE, TYPE, MUTEX>; @@ -950,26 +943,27 @@ template class ACE_Map_Iterator_Base<ACE_Active_Map_Manager_Key, TYPE, MUTEX>; template class ACE_Map_Iterator<ACE_Active_Map_Manager_Key, TYPE, MUTEX>; template class ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, TYPE, MUTEX>; template class ACE_Map_Entry<ACE_Active_Map_Manager_Key, TYPE>; -template class ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX>; -template class ACE_Hash_Map_Iterator_Base_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX>; -template class ACE_Hash_Map_Iterator_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX>; -template class ACE_Hash_Map_Reverse_Iterator_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX>; +template class ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >; +template class ACE_Hash_Map_Iterator_Base_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >; +template class ACE_Hash_Map_Iterator_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >; +template class ACE_Hash_Map_Reverse_Iterator_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >; template class ACE_Hash_Map_Entry<TYPE, ACE_Pair<TYPE, ATTR> >; -template class ACE_Null_Caching_Utility <TYPE, TYPE, CACHE_MAP_IMPL, CACHE_ITER_IMPL, ATTR>; -template class ACE_Null_Caching_Strategy <TYPE, TYPE, CACHE_MAP_IMPL, ATTR, NULL_UTILITY>; -template class ACE_Hash_Cache_Map_Manager <TYPE, TYPE, HASH_KEY, COMPARE_KEYS, NULL_CACHING_STRATEGY, ATTR> ; -template class ACE_Cache_Map_Manager <TYPE, TYPE, CACHE_MAP_IMPL, CACHE_ITER_IMPL, CACHE_REV_ITER_IMPL, NULL_CACHING_STRATEGY, ATTR> ; -template class ACE_Cache_Map_Iterator <TYPE, TYPE, CACHE_ITER_IMPL, NULL_CACHING_STRATEGY, ATTR> ; -template class ACE_Cache_Map_Reverse_Iterator<TYPE,TYPE, CACHE_REV_ITER_IMPL, NULL_CACHING_STRATEGY, ATTR>; +template class ACE_Caching_Strategy_Utility <TYPE, TYPE,ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ATTR>; +template class ACE_Null_Caching_Strategy_Utility <TYPE, TYPE,ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ATTR>; +template class ACE_Null_Caching_Strategy <TYPE, TYPE,ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ATTR, ACE_Null_Caching_Strategy_Utility <TYPE, TYPE,ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ATTR> >; +template class ACE_Hash_Cache_Map_Manager <TYPE, TYPE, HASH_KEY, COMPARE_KEYS, ACE_Null_Caching_Strategy <TYPE, TYPE,ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ATTR, ACE_Null_Caching_Strategy_Utility <TYPE, TYPE,ACE_Hash_Map_Manager_Ex<TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ATTR> >, ATTR > ; +template class ACE_Cache_Map_Manager <TYPE, TYPE, ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ACE_Hash_Map_Iterator_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ACE_Hash_Map_Reverse_Iterator_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ACE_Null_Caching_Strategy <TYPE, TYPE,ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ATTR, ACE_Null_Caching_Strategy_Utility <TYPE, TYPE,ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ATTR> >, ATTR> ; +template class ACE_Cache_Map_Iterator <TYPE, TYPE, ACE_Hash_Map_Iterator_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ACE_Null_Caching_Strategy <TYPE, TYPE,ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ATTR, ACE_Null_Caching_Strategy_Utility <TYPE, TYPE,ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ATTR> >, ATTR> ; +template class ACE_Reference_Pair<size_t, size_t>; +template class ACE_Cache_Map_Reverse_Iterator<size_t,size_t,ACE_Hash_Map_Reverse_Iterator_Ex<size_t,ACE_Pair<size_t,int>,ACE_Hash<size_t>,ACE_Equal_To<size_t>,ACE_Null_Mutex>,ACE_Null_Caching_Strategy<size_t,size_t,ACE_Hash_Map_Manager_Ex<size_t,ACE_Pair<size_t,int>,ACE_Hash<size_t>,ACE_Equal_To<size_t>,ACE_Null_Mutex>,int,ACE_Null_Caching_Strategy_Utility<size_t,size_t,ACE_Hash_Map_Manager_Ex<size_t,ACE_Pair<size_t,int>,ACE_Hash<size_t>,ACE_Equal_To<size_t>,ACE_Null_Mutex>,int> >,int>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Equal_To<TYPE> #pragma instantiate ACE_Pair<TYPE, ATTR > -#pragma instantiate ACE_Reference_Pair<TYPE, TYPE> #pragma instantiate ACE_Hash_Map_Manager_Ex<TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX> #pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX> #pragma instantiate ACE_Hash_Map_Iterator_Ex<TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX> #pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX> #pragma instantiate ACE_Hash_Map_Entry<TYPE, TYPE> +#pragma instantiate ACE_Equal_To<TYPE> #pragma instantiate ACE_Map_Manager<TYPE, TYPE, MUTEX> #pragma instantiate ACE_Map_Iterator_Base<TYPE, TYPE, MUTEX> #pragma instantiate ACE_Map_Iterator<TYPE, TYPE, MUTEX> @@ -981,15 +975,17 @@ template class ACE_Cache_Map_Reverse_Iterator<TYPE,TYPE, CACHE_REV_ITER_IMPL, NU #pragma instantiate ACE_Map_Iterator<ACE_Active_Map_Manager_Key, TYPE, MUTEX> #pragma instantiate ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, TYPE, MUTEX> #pragma instantiate ACE_Map_Entry<ACE_Active_Map_Manager_Key, TYPE> -#pragma instantiate ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX> +#pragma instantiate ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX > +#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX > +#pragma instantiate ACE_Hash_Map_Iterator_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX > +#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX > #pragma instantiate ACE_Hash_Map_Entry<TYPE, ACE_Pair<TYPE, ATTR> > -#pragma instantiate ACE_Null_Caching_Utility <TYPE, TYPE, CACHE_MAP_IMPL, CACHE_ITER_IMPL, ATTR> -#pragma instantiate ACE_Null_Caching_Strategy <TYPE, TYPE, CACHE_MAP_IMPL, ATTR, NULL_UTILITY> -#pragma instantiate ACE_Hash_Cache_Map_Manager <TYPE, TYPE, HASH_KEY, COMPARE_KEYS, NULL_CACHING_STRATEGY, ATTR> -#pragma instantiate ACE_Cache_Map_Manager <TYPE, TYPE, CACHE_MAP_IMPL, CACHE_ITER_IMPL, CACHE_REV_ITER_IMPL, NULL_CACHING_STRATEGY, ATTR> -#pragma instantiate ACE_Cache_Map_Iterator <TYPE, TYPE, CACHE_ITER_IMPL, NULL_CACHING_STRATEGY, ATTR> -#pragma instantiate ACE_Cache_Map_Reverse_Iterator<TYPE,TYPE, CACHE_REV_ITER_IMPL, NULL_CACHING_STRATEGY, ATTR> +#pragma instantiate ACE_Caching_Strategy_Utility <TYPE, TYPE,ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ATTR> +#pragma instantiate ACE_Null_Caching_Strategy_Utility <TYPE, TYPE,ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ATTR> +#pragma instantiate ACE_Null_Caching_Strategy <TYPE, TYPE,ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ATTR, ACE_Null_Caching_Strategy_Utility <TYPE, TYPE,ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ATTR> > +#pragma instantiate ACE_Hash_Cache_Map_Manager <TYPE, TYPE, HASH_KEY, COMPARE_KEYS, ACE_Null_Caching_Strategy <TYPE, TYPE,ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ATTR, ACE_Null_Caching_Strategy_Utility <TYPE, TYPE,ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ATTR> >, ATTR > +#pragma instantiate ACE_Cache_Map_Manager <TYPE, TYPE, ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ACE_Hash_Map_Iterator_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ACE_Hash_Map_Reverse_Iterator_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ACE_Null_Caching_Strategy <TYPE, TYPE,ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ATTR , ACE_Null_Caching_Strategy_Utility <TYPE, TYPE,ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ATTR> >, ATTR> +#pragma instantiate ACE_Cache_Map_Iterator <TYPE, TYPE, ACE_Hash_Map_Iterator_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ACE_Null_Caching_Strategy <TYPE, TYPE,ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ATTR, ACE_Null_Caching_Strategy_Utility <TYPE, TYPE,ACE_Hash_Map_Manager_Ex <TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX >, ATTR> >, ATTR> +#pragma instantiate ACE_Reference_Pair<size_t,size_t> +#pragma instantiate ACE_Cache_Map_Reverse_Iterator<size_t,size_t,ACE_Hash_Map_Reverse_Iterator_Ex<size_t,ACE_Pair<size_t,int>,ACE_Hash<size_t>,ACE_Equal_To<size_t>,ACE_Null_Mutex>,ACE_Null_Caching_Strategy<size_t,size_t,ACE_Hash_Map_Manager_Ex<size_t,ACE_Pair<size_t,int>,ACE_Hash<size_t>,ACE_Equal_To<size_t>,ACE_Null_Mutex>,int,ACE_Null_Caching_Strategy_Utility<size_t,size_t,ACE_Hash_Map_Manager_Ex<size_t,ACE_Pair<size_t,int>,ACE_Hash<size_t>,ACE_Equal_To<size_t>,ACE_Null_Mutex>,int> >,int> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/tests/Map_Manager_Test.dsp b/tests/Map_Manager_Test.dsp index a5bf1d051ba..1dc3c8ef04f 100644 --- a/tests/Map_Manager_Test.dsp +++ b/tests/Map_Manager_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Map_Manager_Test - Win32 PharLap ETS Debug
+CFG=Map_Manager_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,17 @@ CFG=Map_Manager_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Map_Manager_Test.mak" CFG="Map_Manager_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "Map_Manager_Test.mak" CFG="Map_Manager_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Map_Manager_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Map_Manager_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "Map_Manager_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Map_Manager_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Map_Manager_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +70,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Map_Manager_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +83,12 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Map_Manager_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Map_Manager_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "Map_Manager_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Map_Manager_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Map_Manager_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Map_Manager_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "Map_Manager_Test - Win32 Debug"
# Name "Map_Manager_Test - Win32 Alpha Debug"
-# Name "Map_Manager_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -193,6 +162,7 @@ DEP_CPP_MAP_M=\ "..\ace\Signal.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\SV_Semaphore_Complex.h"\
"..\ace\SV_Semaphore_Complex.i"\
"..\ace\SV_Semaphore_Simple.h"\
@@ -215,11 +185,6 @@ DEP_CPP_MAP_M=\ "..\ace\ws2tcpip.h"\
".\test_config.h"\
-NODEP_CPP_MAP_M=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "Map_Manager_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/Map_Manager_Test.icc b/tests/Map_Manager_Test.icc deleted file mode 100644 index af813897c7d..00000000000 --- a/tests/Map_Manager_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Map_Manager_Test.exe" - { - source type (cpp) "Map_Manager_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Map_Test.cpp b/tests/Map_Test.cpp index 4dd11067862..f59178295ee 100644 --- a/tests/Map_Test.cpp +++ b/tests/Map_Test.cpp @@ -48,25 +48,25 @@ typedef ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, Hash_Key, ACE_Equal_To<KEY>, typedef ACE_Active_Map_Manager_Adapter<KEY, VALUE, Key_Adapter> ACTIVE_MAP_MANAGER_ADAPTER; static void -functionality_test (MAP &map, +functionality_test (MAP &map, size_t iterations) { size_t counter; VALUE i; KEY *original_keys = new KEY[iterations]; KEY *modified_keys = new KEY[iterations]; - + // Setup the keys to have some initial data. - for (i = 0; - i < iterations; + for (i = 0; + i < iterations; ++i) { original_keys[i].size (sizeof i / sizeof (KEY::TYPE)); ACE_OS::memcpy (&original_keys[i][0], - &i, - sizeof i); + &i, + sizeof i); } - + // Make a copy of the keys so that we can compare with the original // keys later. for (i = 0; i < iterations; ++i) @@ -82,7 +82,7 @@ functionality_test (MAP &map, ++counter; ACE_ASSERT (map.current_size () == counter); } - + // Forward iteration... { counter = 0; @@ -98,7 +98,7 @@ functionality_test (MAP &map, KEY original_key; ACE_ASSERT (map.recover_key (entry.first (), original_key) == 0); - + // Make sure recovering keys work. ACE_ASSERT (original_keys[entry.second ()] == original_key); @@ -123,9 +123,9 @@ functionality_test (MAP &map, // Reverse iteration... { - counter = iterations; + counter = iterations; MAP::reverse_iterator end = map.rend (); - + for (MAP::reverse_iterator iter = map.rbegin (); iter != end; ++iter) @@ -137,7 +137,7 @@ functionality_test (MAP &map, KEY original_key; ACE_ASSERT (map.recover_key (entry.first (), original_key) == 0); - + // Make sure recovering keys work. ACE_ASSERT (original_keys[entry.second ()] == original_key); @@ -154,7 +154,7 @@ functionality_test (MAP &map, original_value, entry.second ())); } - + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\n"))); ACE_ASSERT (counter == 0); @@ -183,7 +183,7 @@ functionality_test (MAP &map, } static void -insert_test (MAP &map, +insert_test (MAP &map, size_t iterations, KEY *keys) { @@ -198,7 +198,7 @@ insert_test (MAP &map, } static void -find_test (MAP &map, +find_test (MAP &map, size_t iterations, KEY *keys) { @@ -212,7 +212,7 @@ find_test (MAP &map, } static void -unbind_test (MAP &map, +unbind_test (MAP &map, size_t iterations, KEY *keys) { @@ -288,90 +288,45 @@ main (int argc, ASYS_TCHAR *argv[]) if (functionality_tests) { // Functionality test of the maps. - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nMap Manager functionality test\n"))); + ACE_DEBUG ((LM_DEBUG, "\nMap Manager functionality test\n")); functionality_test (map1, iterations); - - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nHash Map Manager functionality test\n"))); + + ACE_DEBUG ((LM_DEBUG, "\nHash Map Manager functionality test\n")); functionality_test (map2, iterations); - - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nActive Map Manager functionality test\n"))); + + ACE_DEBUG ((LM_DEBUG, "\nActive Map Manager functionality test\n")); functionality_test (map3, iterations); - - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\n"))); + + ACE_DEBUG ((LM_DEBUG, "\n")); } // Performance test of the maps. KEY *keys = new KEY[iterations]; - + // Map Manager - performance_test (&insert_test, - map1, - iterations, - keys, - table_size, - ASYS_TEXT ("Map Manager (insert test)")); - performance_test (&find_test, - map1, - iterations, - keys, - table_size, - ASYS_TEXT ("Map Manager (find test)")); - performance_test (&unbind_test, - map1, - iterations, - keys, - table_size, - ASYS_TEXT ("Map Manager (unbind test)")); - - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\n"))); + performance_test (&insert_test, map1, iterations, keys, table_size, "Map Manager (insert test)"); + performance_test (&find_test, map1, iterations, keys, table_size, "Map Manager (find test)"); + performance_test (&unbind_test, map1, iterations, keys, table_size, "Map Manager (unbind test)"); + + ACE_DEBUG ((LM_DEBUG, "\n")); // Hash Map Manager - performance_test (&insert_test, - map2, - iterations, - keys, - table_size, - ASYS_TEXT ("Hash Map Manager (insert test)")); - performance_test (&find_test, - map2, - iterations, - keys, - table_size, - ASYS_TEXT ("Hash Map Manager (find test)")); - performance_test (&unbind_test, - map2, - iterations, - keys, - table_size, - ASYS_TEXT ("Hash Map Manager (unbind test)")); - - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\n"))); + performance_test (&insert_test, map2, iterations, keys, table_size, "Hash Map Manager (insert test)"); + performance_test (&find_test, map2, iterations, keys, table_size, "Hash Map Manager (find test)"); + performance_test (&unbind_test, map2, iterations, keys, table_size, "Hash Map Manager (unbind test)"); + + ACE_DEBUG ((LM_DEBUG, "\n")); // Active Map Manager - performance_test (&insert_test, - map3, - iterations, - keys, - table_size, - ASYS_TEXT ("Active Map Manager (insert test)")); - performance_test (&find_test, - map3, - iterations, - keys, - table_size, - ASYS_TEXT ("Active Map Manager (find test)")); - performance_test (&unbind_test, - map3, - iterations, - keys, - table_size, - ASYS_TEXT ("Active Map Manager (unbind test)")); + performance_test (&insert_test, map3, iterations, keys, table_size, "Active Map Manager (insert test)"); + performance_test (&find_test, map3, iterations, keys, table_size, "Active Map Manager (find test)"); + performance_test (&unbind_test, map3, iterations, keys, table_size, "Active Map Manager (unbind test)"); delete[] keys; ACE_LOG_MSG->set_flags (ACE_Log_Msg::VERBOSE_LITE); ACE_END_TEST; - + return 0; } @@ -386,7 +341,7 @@ typedef ACE_Equal_To<KEY> COMPARE_KEYS; template class ACE_Array<char>; template class ACE_Array_Base<char>; -// Common +// Common template class ACE_Reference_Pair<const KEY, VALUE>; // Map and iterator classes. @@ -408,7 +363,7 @@ template class ACE_Map_Manager<ACE_Active_Map_Manager_Key, expanded_value, ACE_N template class ACE_Map_Iterator_Base<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex>; template class ACE_Map_Iterator<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex>; template class ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex>; -template class ACE_Map_Entry<ACE_Active_Map_Manager_Key, expanded_value>; +template class ACE_Map_Entry<ACE_Active_Map_Manager_Key, expanded_value>; // Hash Map Manager related. template class ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, Hash_Key, COMPARE_KEYS, Key_Generator>; @@ -442,7 +397,7 @@ typedef ACE_Equal_To<KEY> COMPARE_KEYS; #pragma instantiate ACE_Array<char> #pragma instantiate ACE_Array_Base<char> -// Common +// Common #pragma instantiate ACE_Reference_Pair<const KEY, VALUE> // Map and iterator classes. @@ -464,7 +419,7 @@ typedef ACE_Equal_To<KEY> COMPARE_KEYS; #pragma instantiate ACE_Map_Iterator_Base<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex> #pragma instantiate ACE_Map_Iterator<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex> #pragma instantiate ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex> -#pragma instantiate ACE_Map_Entry<ACE_Active_Map_Manager_Key, expanded_value> +#pragma instantiate ACE_Map_Entry<ACE_Active_Map_Manager_Key, expanded_value> // Hash Map Manager related. #pragma instantiate ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, Hash_Key, COMPARE_KEYS, Key_Generator> diff --git a/tests/Map_Test.dsp b/tests/Map_Test.dsp index 77d933de1fe..e2d8e7fe05d 100644 --- a/tests/Map_Test.dsp +++ b/tests/Map_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Map_Test - Win32 PharLap ETS Debug
+CFG=Map_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,17 @@ CFG=Map_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Map_Test.mak" CFG="Map_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "Map_Test.mak" CFG="Map_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Map_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Map_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "Map_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Map_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Map_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +70,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Map_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +83,12 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Map_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Map_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "Map_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Map_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Map_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Map_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "Map_Test - Win32 Debug"
# Name "Map_Test - Win32 Alpha Debug"
-# Name "Map_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -131,7 +100,7 @@ SOURCE=.\Map_Test.cpp !ELSEIF "$(CFG)" == "Map_Test - Win32 Alpha Debug"
-DEP_CPP_MAP_T=\
+DEP_CPP_MAP_M=\
"..\ace\ACE.h"\
"..\ace\ACE.i"\
"..\ace\Atomic_Op.i"\
@@ -151,6 +120,8 @@ DEP_CPP_MAP_T=\ "..\ace\Free_List.i"\
"..\ace\Handle_Set.h"\
"..\ace\Handle_Set.i"\
+ "..\ace\Hash_Map.cpp"\
+ "..\ace\Hash_Map.h"\
"..\ace\High_Res_Timer.h"\
"..\ace\High_Res_Timer.i"\
"..\ace\Log_Msg.h"\
@@ -191,6 +162,7 @@ DEP_CPP_MAP_T=\ "..\ace\Signal.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\SV_Semaphore_Complex.h"\
"..\ace\SV_Semaphore_Complex.i"\
"..\ace\SV_Semaphore_Simple.h"\
@@ -213,13 +185,6 @@ DEP_CPP_MAP_T=\ "..\ace\ws2tcpip.h"\
".\test_config.h"\
-NODEP_CPP_MAP_T=\
- "..\ace\Hash_Map.cpp"\
- "..\ace\Hash_Map.h"\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "Map_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/Map_Test.icc b/tests/Map_Test.icc deleted file mode 100644 index 1ac3b09db52..00000000000 --- a/tests/Map_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Map_Test.exe" - { - source type (cpp) "Map_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Mem_Map_Test.bpr b/tests/Mem_Map_Test.bpr new file mode 100644 index 00000000000..d346ac21888 --- /dev/null +++ b/tests/Mem_Map_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Mem_Map_Test.exe +OBJFILES = objs\Mem_Map_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/Mem_Map_Test.cpp b/tests/Mem_Map_Test.cpp index bfb390d3120..7c45b928480 100644 --- a/tests/Mem_Map_Test.cpp +++ b/tests/Mem_Map_Test.cpp @@ -63,7 +63,7 @@ reverse_file (ACE_HANDLE file_handle, static int create_test_file (int line_length, int num_lines) { - char *mybuf = 0; + char *mybuf; ACE_NEW_RETURN (mybuf, char[line_length + 1], -1); char *c = ACE_ALPHABET; diff --git a/tests/Mem_Map_Test.dsp b/tests/Mem_Map_Test.dsp index b89066391f5..46536ca5f3e 100644 --- a/tests/Mem_Map_Test.dsp +++ b/tests/Mem_Map_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Mem_Map_Test - Win32 PharLap ETS Debug
+CFG=Mem_Map_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,17 @@ CFG=Mem_Map_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Mem_Map_Test.mak" CFG="Mem_Map_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "Mem_Map_Test.mak" CFG="Mem_Map_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Mem_Map_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Mem_Map_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "Mem_Map_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Mem_Map_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Mem_Map_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +70,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Mem_Map_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +83,12 @@ LINK32=link.exe # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Mem_Map_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Mem_Map_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "Mem_Map_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Mem_Map_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Mem_Map_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Mem_Map_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "Mem_Map_Test - Win32 Debug"
# Name "Mem_Map_Test - Win32 Alpha Debug"
-# Name "Mem_Map_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -155,16 +124,12 @@ DEP_CPP_MEM_M=\ "..\ace\OS.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\Trace.h"\
"..\ace\Version.h"\
"..\ace\ws2tcpip.h"\
".\test_config.h"\
-NODEP_CPP_MEM_M=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "Mem_Map_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/Mem_Map_Test.icc b/tests/Mem_Map_Test.icc deleted file mode 100644 index 00a3e8c9dc6..00000000000 --- a/tests/Mem_Map_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Mem_Map_Test.exe" - { - source type (cpp) "Mem_Map_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Message_Block_Test.bpr b/tests/Message_Block_Test.bpr new file mode 100644 index 00000000000..ac203124fa8 --- /dev/null +++ b/tests/Message_Block_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Message_Block_Test.exe +OBJFILES = objs\Message_Block_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/Message_Block_Test.cpp b/tests/Message_Block_Test.cpp index 74392c98e15..17cfad35927 100644 --- a/tests/Message_Block_Test.cpp +++ b/tests/Message_Block_Test.cpp @@ -264,12 +264,12 @@ ACE_Cached_Allocator<MEMORY_CHUNK, struct { ACE_Allocator *strategy_; - const ASYS_TCHAR *name_; + LPCTSTR name_; ACE_Profile_Timer::ACE_Elapsed_Time et_; } alloc_struct[ACE_ALLOC_STRATEGY_NO] = { - { NULL, ASYS_TEXT ("Default"), {0,0,0} }, - { &mem_allocator, ASYS_TEXT ("Cached Memory"), {0,0,0} } + { NULL, ASYS_TEXT ("Default") }, + { &mem_allocator, ASYS_TEXT ("Cached Memory") } }; #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/tests/Message_Block_Test.dsp b/tests/Message_Block_Test.dsp index 28c46aea16c..e22cfe4c147 100644 --- a/tests/Message_Block_Test.dsp +++ b/tests/Message_Block_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Message_Block_Test - Win32 PharLap ETS Debug
+CFG=Message_Block_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,18 @@ CFG=Message_Block_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Message_Block_Test.mak" CFG="Message_Block_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "Message_Block_Test.mak"\
+ CFG="Message_Block_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Message_Block_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Message_Block_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "Message_Block_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Message_Block_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Message_Block_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +71,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Message_Block_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +84,12 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Message_Block_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Message_Block_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "Message_Block_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Message_Block_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Message_Block_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Message_Block_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "Message_Block_Test - Win32 Debug"
# Name "Message_Block_Test - Win32 Alpha Debug"
-# Name "Message_Block_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -201,6 +171,7 @@ DEP_CPP_MESSA=\ "..\ace\Signal.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\Strategies.h"\
"..\ace\Strategies_T.cpp"\
"..\ace\Strategies_T.h"\
@@ -239,11 +210,6 @@ DEP_CPP_MESSA=\ "..\ace\ws2tcpip.h"\
".\test_config.h"\
-NODEP_CPP_MESSA=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "Message_Block_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/Message_Block_Test.icc b/tests/Message_Block_Test.icc deleted file mode 100644 index bc1d3d8508b..00000000000 --- a/tests/Message_Block_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Message_Block_Test.exe" - { - source type (cpp) "Message_Block_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Message_Queue_Notifications_Test.bpr b/tests/Message_Queue_Notifications_Test.bpr new file mode 100644 index 00000000000..d452a2a8667 --- /dev/null +++ b/tests/Message_Queue_Notifications_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Message_Queue_Notifications_Test.cpp.exe +OBJFILES = objs\Message_Queue_Notifications_Test.cpp.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/Message_Queue_Notifications_Test.dsp b/tests/Message_Queue_Notifications_Test.dsp index 98157288de9..c21abfccc0b 100644 --- a/tests/Message_Queue_Notifications_Test.dsp +++ b/tests/Message_Queue_Notifications_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Message_Queue_Notifications_Test - Win32 PharLap ETS Debug
+CFG=Message_Queue_Notifications_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,18 @@ CFG=Message_Queue_Notifications_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Message_Queue_Notifications_Test.mak" CFG="Message_Queue_Notifications_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "Message_Queue_Notifications_Test.mak"\
+ CFG="Message_Queue_Notifications_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Message_Queue_Notifications_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Message_Queue_Notifications_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "Message_Queue_Notifications_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Message_Queue_Notifications_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Message_Queue_Notifications_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +71,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Message_Queue_Notifications_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +84,12 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Message_Queue_Notifications_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Message_Queue_Notifications_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "Message_Queue_Notifications_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Message_Queue_Notifications_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Message_Queue_Notifications_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Message_Queue_Notifications_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "Message_Queue_Notifications_Test - Win32 Debug"
# Name "Message_Queue_Notifications_Test - Win32 Alpha Debug"
-# Name "Message_Queue_Notifications_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -201,6 +171,7 @@ DEP_CPP_MESSA=\ "..\ace\Signal.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\Strategies.h"\
"..\ace\Strategies_T.cpp"\
"..\ace\Strategies_T.h"\
@@ -239,11 +210,6 @@ DEP_CPP_MESSA=\ "..\ace\ws2tcpip.h"\
".\test_config.h"\
-NODEP_CPP_MESSA=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "Message_Queue_Notifications_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/Message_Queue_Notifications_Test.icc b/tests/Message_Queue_Notifications_Test.icc deleted file mode 100644 index 1b4f8b21ae2..00000000000 --- a/tests/Message_Queue_Notifications_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Message_Queue_Notifications_Test.exe" - { - source type (cpp) "Message_Queue_Notifications_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Message_Queue_Test.bpr b/tests/Message_Queue_Test.bpr new file mode 100644 index 00000000000..46e7f95026d --- /dev/null +++ b/tests/Message_Queue_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Message_Queue_Test.exe +OBJFILES = objs\Message_Queue_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/Message_Queue_Test.cpp b/tests/Message_Queue_Test.cpp index 3e27c5858ae..7e94c5ab486 100644 --- a/tests/Message_Queue_Test.cpp +++ b/tests/Message_Queue_Test.cpp @@ -45,7 +45,7 @@ static const int MAX_MESSAGES = 10000; static const int MAX_MESSAGE_SIZE = 32; static const char test_message[] = "ACE_Message_Queue Test Message"; -static int max_messages = MAX_MESSAGES; +static int messages = MAX_MESSAGES; // Dynamically allocate to avoid a static. static ACE_High_Res_Timer *timer = 0; @@ -197,7 +197,7 @@ single_thread_performance_test (int queue_type = 0) else { ACE_NEW_RETURN (msgq, - ACE_Message_Queue_Vx (max_messages, + ACE_Message_Queue_Vx (messages, MAX_MESSAGE_SIZE), -1); message = "ACE_Message_Queue_Vx, single thread test"; @@ -208,26 +208,26 @@ single_thread_performance_test (int queue_type = 0) ACE_NEW_RETURN (msgq, ACE_Message_Queue_NT, -1); - message = ASYS_TEXT ("ACE_Message_Queue_NT, single thread test"); + message = "ACE_Message_Queue_NT, single thread test"; } #endif /* VXWORKS */ // Create the messages. Allocate off the heap in case messages // is large relative to the amount of stack space available. - ACE_Message_Block **send_block = 0; + ACE_Message_Block **send_block; ACE_NEW_RETURN (send_block, - ACE_Message_Block *[max_messages], + ACE_Message_Block *[messages], -1); - for (i = 0; i < max_messages; ++i) + for (i = 0; i < messages; ++i) ACE_NEW_RETURN (send_block[i], ACE_Message_Block (test_message, MAX_MESSAGE_SIZE), -1); - ACE_Message_Block **receive_block_p = 0; + ACE_Message_Block **receive_block_p; ACE_NEW_RETURN (receive_block_p, - ACE_Message_Block *[max_messages], + ACE_Message_Block *[messages], -1); #if defined (VXWORKS) @@ -236,10 +236,10 @@ single_thread_performance_test (int queue_type = 0) // stack space available. ACE_Message_Block *receive_block; ACE_NEW_RETURN (receive_block, - ACE_Message_Block[max_messages], + ACE_Message_Block[messages], -1); - for (i = 0; i < max_messages; ++i) + for (i = 0; i < messages; ++i) { receive_block[i].init (MAX_MESSAGE_SIZE); @@ -252,7 +252,7 @@ single_thread_performance_test (int queue_type = 0) timer->start (); // Send/receive the messages. - for (i = 0; i < max_messages; ++i) + for (i = 0; i < messages; ++i) { if (msgq->enqueue_tail (send_block[i]) == -1) ACE_ERROR_RETURN ((LM_ERROR, @@ -274,9 +274,9 @@ single_thread_performance_test (int queue_type = 0) ACE_DEBUG ((LM_INFO, ASYS_TEXT ("%s: %u messages took %u msec (%f msec/message)\n"), message, - max_messages, + messages, tv.msec (), - (double) tv.msec () / max_messages)); + (double) tv.msec () / messages)); timer->reset (); delete [] receive_block_p; @@ -284,7 +284,7 @@ single_thread_performance_test (int queue_type = 0) delete [] receive_block; #endif /* VXWORKS */ - for (i = 0; i < max_messages; ++i) + for (i = 0; i < messages; ++i) delete send_block[i]; delete [] send_block; delete msgq; @@ -300,9 +300,9 @@ receiver (void *arg) arg); int i; - ACE_Message_Block **receive_block_p = 0; + ACE_Message_Block **receive_block_p; ACE_NEW_RETURN (receive_block_p, - ACE_Message_Block *[max_messages], + ACE_Message_Block *[messages], (void *) -1); #if defined (VXWORKS) @@ -311,10 +311,10 @@ receiver (void *arg) // space available. ACE_Message_Block *receive_block; ACE_NEW_RETURN (receive_block, - ACE_Message_Block[max_messages], + ACE_Message_Block[messages], (void *) -1); - for (i = 0; i < max_messages; ++i) + for (i = 0; i < messages; ++i) { receive_block[i].init (MAX_MESSAGE_SIZE); @@ -324,7 +324,7 @@ receiver (void *arg) } #endif /* VXWORKS */ - for (i = 0; i < max_messages; ++i) + for (i = 0; i < messages; ++i) if (queue_wrapper->q_->dequeue_head (receive_block_p[i]) == -1) ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), @@ -350,7 +350,7 @@ sender (void *arg) timer->start (); // Send the messages. - for (i = 0; i < max_messages; ++i) + for (i = 0; i < messages; ++i) if (queue_wrapper->q_-> enqueue_tail (queue_wrapper->send_block_[i]) == -1) ACE_ERROR_RETURN ((LM_ERROR, @@ -375,10 +375,10 @@ performance_test (int queue_type = 0) // the _receiver_ is done. ACE_Message_Block **send_block = 0; ACE_NEW_RETURN (send_block, - ACE_Message_Block *[max_messages], + ACE_Message_Block *[messages], -1); - for (i = 0; i < max_messages; ++i) + for (i = 0; i < messages; ++i) ACE_NEW_RETURN (send_block[i], ACE_Message_Block (test_message, MAX_MESSAGE_SIZE), @@ -394,7 +394,7 @@ performance_test (int queue_type = 0) else { ACE_NEW_RETURN (queue_wrapper.q_, - ACE_Message_Queue_Vx (max_messages, + ACE_Message_Queue_Vx (messages, MAX_MESSAGE_SIZE), -1); message = "ACE_Message_Queue_Vx"; @@ -430,15 +430,15 @@ performance_test (int queue_type = 0) timer->elapsed_time (tv); ACE_DEBUG ((LM_INFO, ASYS_TEXT ("%s: %u messages took %u msec (%f msec/message)\n"), message, - max_messages, + messages, tv.msec (), - (double) tv.msec () / max_messages)); + (double) tv.msec () / messages)); timer->reset (); delete queue_wrapper.q_; queue_wrapper.q_ = 0; - for (i = 0; i < max_messages; ++i) + for (i = 0; i < messages; ++i) delete send_block[i]; delete [] send_block; @@ -459,7 +459,7 @@ main (int argc, ASYS_TCHAR *argv[]) ASYS_TEXT ("%s/n"), usage)); else - max_messages = ACE_OS::atoi (argv[1]); + messages = ACE_OS::atoi (argv[1]); #if !defined (VXWORKS) // The iterator test occasionally causes a page fault or a hang on diff --git a/tests/Message_Queue_Test.dsp b/tests/Message_Queue_Test.dsp index e003350194d..305c9ac5bc9 100644 --- a/tests/Message_Queue_Test.dsp +++ b/tests/Message_Queue_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Message_Queue_Test - Win32 PharLap ETS Debug
+CFG=Message_Queue_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,18 @@ CFG=Message_Queue_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Message_Queue_Test.mak" CFG="Message_Queue_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "Message_Queue_Test.mak"\
+ CFG="Message_Queue_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Message_Queue_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Message_Queue_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "Message_Queue_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Message_Queue_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Message_Queue_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +71,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Message_Queue_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +84,12 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Message_Queue_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Message_Queue_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "Message_Queue_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Message_Queue_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Message_Queue_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Message_Queue_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "Message_Queue_Test - Win32 Debug"
# Name "Message_Queue_Test - Win32 Alpha Debug"
-# Name "Message_Queue_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -194,6 +164,7 @@ DEP_CPP_MESSA=\ "..\ace\Signal.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\Strategies.h"\
"..\ace\Strategies_T.cpp"\
"..\ace\Strategies_T.h"\
@@ -223,11 +194,6 @@ DEP_CPP_MESSA=\ "..\ace\ws2tcpip.h"\
".\test_config.h"\
-NODEP_CPP_MESSA=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "Message_Queue_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/Message_Queue_Test.icc b/tests/Message_Queue_Test.icc deleted file mode 100644 index 21674f92c35..00000000000 --- a/tests/Message_Queue_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Message_Queue_Test.exe" - { - source type (cpp) "Message_Queue_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Naming_Test.bpr b/tests/Naming_Test.bpr new file mode 100644 index 00000000000..77ba28a0916 --- /dev/null +++ b/tests/Naming_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Naming_Test.exe +OBJFILES = objs\Naming_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/Naming_Test.cpp b/tests/Naming_Test.cpp index 937a5411cf8..b1be2e29b13 100644 --- a/tests/Naming_Test.cpp +++ b/tests/Naming_Test.cpp @@ -4,7 +4,7 @@ // // = LIBRARY // tests -// +// // = FILENAME // Naming_Test.cpp // @@ -15,7 +15,7 @@ // // = AUTHOR // Prashant Jain and Irfan Pyarali -// +// // ============================================================================ #include "test_config.h" @@ -34,19 +34,18 @@ static char name[BUFSIZ]; static char value[BUFSIZ]; static char type[BUFSIZ]; -static void +static void print_time (ACE_Profile_Timer &timer, const char *test) { ACE_Profile_Timer::ACE_Elapsed_Time et; timer.stop (); timer.elapsed_time (et); - - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\n ***** %s ***** \n"), test)); - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("real time = %f secs, user time = %f secs, system time = %f secs\n"), + + ACE_DEBUG ((LM_DEBUG, "\n ***** %s ***** \n", test)); + ACE_DEBUG ((LM_DEBUG, "real time = %f secs, user time = %f secs, system time = %f secs\n", et.real_time, et.user_time, et.system_time)); - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("time per call = %f usecs\n\n"), + ACE_DEBUG ((LM_DEBUG, "time per call = %f usecs\n\n", (et.real_time / double (ACE_NS_MAX_ENTRIES)) * 1000000)); } @@ -57,14 +56,14 @@ test_bind (ACE_Naming_Context &ns_context) randomize (array, sizeof array / sizeof (int)); // do the binds - for (size_t i = 0; i < ACE_NS_MAX_ENTRIES; i++) + for (size_t i = 0; i < ACE_NS_MAX_ENTRIES; i++) { ACE_OS::sprintf (name, "%s%d", "name", array[i]); ACE_WString w_name (name); - + ACE_OS::sprintf (value, "%s%d", "value", array[i]); ACE_WString w_value (value); - + ACE_OS::sprintf (type, "%s%d", "type", array [i]); ACE_ASSERT (ns_context.bind (w_name, w_value, type) != -1); } @@ -77,9 +76,9 @@ test_find_failure (ACE_Naming_Context &ns_context) ACE_WString w_name (name); ACE_WString w_value; char *l_type = 0; - + // Do the finds. - for (size_t i = 0; i < ACE_NS_MAX_ENTRIES; i++) + for (size_t i = 0; i < ACE_NS_MAX_ENTRIES; i++) ACE_ASSERT (ns_context.resolve (w_name, w_value, l_type) == -1); } @@ -90,7 +89,7 @@ test_rebind (ACE_Naming_Context &ns_context) randomize (array, sizeof array / sizeof (int)); // do the rebinds - for (size_t i = 0; i < ACE_NS_MAX_ENTRIES; i++) + for (size_t i = 0; i < ACE_NS_MAX_ENTRIES; i++) { ACE_OS::sprintf (name, "%s%d", "name", array[i]); ACE_WString w_name (name); @@ -110,7 +109,7 @@ test_unbind (ACE_Naming_Context &ns_context) randomize (array, sizeof array / sizeof (int)); // do the unbinds - for (size_t i = 0; i < ACE_NS_MAX_ENTRIES; i++) + for (size_t i = 0; i < ACE_NS_MAX_ENTRIES; i++) { ACE_OS::sprintf (name, "%s%d", "name", array[i]); ACE_WString w_name (name); @@ -128,13 +127,13 @@ test_find (ACE_Naming_Context &ns_context, int sign, int result) randomize (array, sizeof array / sizeof (int)); // do the finds - for (size_t i = 0; i < ACE_NS_MAX_ENTRIES; i++) + for (size_t i = 0; i < ACE_NS_MAX_ENTRIES; i++) { if (sign == 1) { ACE_OS::sprintf (temp_val, "%s%d", "value", array[i]); ACE_OS::sprintf (temp_type, "%s%d", "type", array[i]); - } + } else { ACE_OS::sprintf (temp_val, "%s%d", "value", -array[i]); @@ -143,11 +142,11 @@ test_find (ACE_Naming_Context &ns_context, int sign, int result) ACE_OS::sprintf (name, "%s%d", "name", array[i]); - ACE_WString w_name (name); + ACE_WString w_name (name); ACE_WString w_value; char *type_out = 0; ACE_WString val (temp_val); - + ACE_ASSERT (ns_context.resolve (w_name, w_value, type_out) == result); char *l_value = w_value.char_rep (); @@ -158,11 +157,10 @@ test_find (ACE_Naming_Context &ns_context, int sign, int result) if (ns_context.name_options ()->debug ()) { if (type_out) - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("Name: %s\tValue: %s\tType: %s\n"), + ACE_DEBUG ((LM_DEBUG, "Name: %s\tValue: %s\tType: %s\n", name, l_value, type_out)); else - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("Name: %s\tValue: %s\n"), + ACE_DEBUG ((LM_DEBUG, "Name: %s\tValue: %s\n", name, l_value)); } @@ -174,14 +172,14 @@ test_find (ACE_Naming_Context &ns_context, int sign, int result) } delete[] l_value; - } + } } int -main (int argc, ASYS_TCHAR *argv[]) +main (int argc, char *argv[]) { TCHAR temp_file [BUFSIZ]; - ACE_START_TEST (ASYS_TEXT ("Naming_Test")); + ACE_START_TEST ("Naming_Test"); ACE_Naming_Context *ns_context; ACE_NEW_RETURN (ns_context, ACE_Naming_Context, -1); @@ -197,23 +195,22 @@ main (int argc, ASYS_TCHAR *argv[]) if (unicode && name_options->use_registry () == 1) { name_options->namespace_dir (ACE_TEXT ("Software\\ACE\\Name Service")); - name_options->database (ACE_TEXT ("Version 1")); + name_options->database (ACE_TEXT ("Version 1")); } else { ACE_OS::strcpy (temp_file, ACE::basename (name_options->process_name (), ACE_DIRECTORY_SEPARATOR_CHAR)); ACE_OS::strcat (temp_file, ACE_TEXT ("XXXXXX")); - + // Set the database name using mktemp to generate a unique file name name_options->database (ACE_OS::mktemp (temp_file)); } ACE_ASSERT (ns_context->open (ACE_Naming_Context::PROC_LOCAL, 1) != -1); - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("time to test %d iterations using %s\n"), - ACE_NS_MAX_ENTRIES, name_options->use_registry () ? - ASYS_TEXT ("Registry") : ASYS_TEXT ("ACE"))); + ACE_DEBUG ((LM_DEBUG, "time to test %d iterations using %s\n", + ACE_NS_MAX_ENTRIES, name_options->use_registry () ? "Registry" : "ACE")); ACE_Profile_Timer timer; @@ -244,7 +241,7 @@ main (int argc, ASYS_TCHAR *argv[]) timer.start (); // Remove all bindings from database - test_unbind (*ns_context); + test_unbind (*ns_context); print_time (timer, "Unbinds"); ACE_OS::sprintf (temp_file, ACE_TEXT ("%s%s%s"), @@ -256,7 +253,7 @@ main (int argc, ASYS_TCHAR *argv[]) // Remove any existing files. No need to check return value here // since we don't care if the file doesn't exist. - ACE_OS::unlink (temp_file); + ACE_OS::unlink (temp_file); ACE_END_TEST; return 0; diff --git a/tests/Naming_Test.dsp b/tests/Naming_Test.dsp index 7cd3a67f5eb..3cdd126c4a4 100644 --- a/tests/Naming_Test.dsp +++ b/tests/Naming_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Naming_Test - Win32 PharLap ETS Debug
+CFG=Naming_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,17 @@ CFG=Naming_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Naming_Test.mak" CFG="Naming_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "Naming_Test.mak" CFG="Naming_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Naming_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Naming_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "Naming_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Naming_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Naming_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +70,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Naming_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +83,12 @@ LINK32=link.exe # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Naming_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Naming_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "Naming_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Naming_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Naming_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Naming_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "Naming_Test - Win32 Debug"
# Name "Naming_Test - Win32 Alpha Debug"
-# Name "Naming_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -206,6 +175,7 @@ DEP_CPP_NAMIN=\ "..\ace\SOCK_Stream.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\SV_Semaphore_Complex.h"\
"..\ace\SV_Semaphore_Complex.i"\
"..\ace\SV_Semaphore_Simple.h"\
@@ -229,11 +199,6 @@ DEP_CPP_NAMIN=\ "..\ace\ws2tcpip.h"\
".\test_config.h"\
-NODEP_CPP_NAMIN=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "Naming_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/Naming_Test.icc b/tests/Naming_Test.icc deleted file mode 100644 index 82bef6c6916..00000000000 --- a/tests/Naming_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Naming_Test.exe" - { - source type (cpp) "Naming_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/New_Fail_Test.cpp b/tests/New_Fail_Test.cpp index 82b6d5db501..bec580eda47 100644 --- a/tests/New_Fail_Test.cpp +++ b/tests/New_Fail_Test.cpp @@ -76,8 +76,8 @@ main (int, ASYS_TCHAR *[]) // conditions, exceptions can be disabled when the port is complete. #if (defined (__SUNPRO_CC) || defined (__GNUG__)) && \ !defined (ACE_HAS_EXCEPTIONS) - ACE_DEBUG ((LM_NOTICE, ASYS_TEXT ("Out-of-memory will throw an unhandled exception\n"))); - ACE_DEBUG ((LM_NOTICE, ASYS_TEXT ("Rebuild with exceptions=1 to prevent this, but it may impair performance.\n"))); + ACE_DEBUG ((LM_NOTICE, "Out-of-memory will throw an unhandled exception\n")); + ACE_DEBUG ((LM_NOTICE, "Rebuild with exceptions=1 to prevent this, but it may impair performance.\n")); // Use the static function addresses, to prevent warnings about the // functions not being used. @@ -102,14 +102,14 @@ main (int, ASYS_TCHAR *[]) if (i == MAX_ALLOCS_IN_TEST) { ACE_ERROR((LM_WARNING, - ASYS_TEXT ("Test didn't exhaust all available memory\n"))); + "Test didn't exhaust all available memory\n")); --i; // Back up to valid pointer for deleting } else { ACE_ASSERT (blocks[i] == 0); ACE_ASSERT (errno == ENOMEM); - ACE_DEBUG((LM_DEBUG, ASYS_TEXT ("ACE_NEW failed properly at block %d\n"), i)); + ACE_DEBUG((LM_DEBUG, "ACE_NEW failed properly at block %d\n", i)); } // Free the memory to try ACE_NEW_RETURN @@ -126,14 +126,14 @@ main (int, ASYS_TCHAR *[]) if (i == MAX_ALLOCS_IN_TEST) { ACE_ERROR((LM_WARNING, - ASYS_TEXT ("Test didn't exhaust all available memory\n"))); + "Test didn't exhaust all available memory\n")); --i; // Back up to valid pointer } else { ACE_ASSERT (blocks[i] == 0); ACE_ASSERT (errno == ENOMEM); - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("ACE_NEW_RETURN failed properly at block %d\n"), + ACE_DEBUG ((LM_DEBUG, "ACE_NEW_RETURN failed properly at block %d\n", i)); } while (i >= 0) @@ -145,10 +145,10 @@ main (int, ASYS_TCHAR *[]) catch (...) { ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("Caught exception during test; ") - ASYS_TEXT ("ACE_bad_alloc not defined correctly, or\n"))); + "Caught exception during test; " + "ACE_bad_alloc not defined correctly, or\n")); ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("ACE_NEW_THROWS_EXCEPTIONS is not #defined (and should be).\n"))); + "ACE_NEW_THROWS_EXCEPTIONS is not #defined (and should be).\n")); status = 1; // Mark test failure } #endif /* ACE_HAS_EXCEPTIONS */ diff --git a/tests/New_Fail_Test.dsp b/tests/New_Fail_Test.dsp index 6df059c43e5..d7b105d4684 100644 --- a/tests/New_Fail_Test.dsp +++ b/tests/New_Fail_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=New_Fail_Test - Win32 PharLap ETS Debug
+CFG=New_Fail_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,23 +13,19 @@ CFG=New_Fail_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "New_Fail_Test.mak" CFG="New_Fail_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "New_Fail_Test.mak" CFG="New_Fail_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "New_Fail_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "New_Fail_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "New_Fail_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
-
-!IF "$(CFG)" == "New_Fail_Test - Win32 Debug"
-
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
@@ -52,41 +48,9 @@ BSC32=bscmake.exe LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "New_Fail_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "New_Fail_Test___Win32_PharLap_ETS_Debug"
-# PROP BASE Intermediate_Dir "New_Fail_Test___Win32_PharLap_ETS_Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./New_Fail_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF
-
# Begin Target
# Name "New_Fail_Test - Win32 Debug"
-# Name "New_Fail_Test - Win32 PharLap ETS Debug"
# Begin Source File
SOURCE=.\New_Fail_Test.cpp
diff --git a/tests/Notify_Performance_Test.bpr b/tests/Notify_Performance_Test.bpr new file mode 100644 index 00000000000..ba68871003c --- /dev/null +++ b/tests/Notify_Performance_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Notify_Performance_Test.exe +OBJFILES = objs\Notify_Performance_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/Notify_Performance_Test.cpp b/tests/Notify_Performance_Test.cpp index 1f752964c49..403fed63084 100644 --- a/tests/Notify_Performance_Test.cpp +++ b/tests/Notify_Performance_Test.cpp @@ -118,7 +118,7 @@ create_reactor (void) static void print_results (ACE_Profile_Timer::ACE_Elapsed_Time &et) { - const ASYS_TCHAR *reactor_type = 0; + LPCTSTR reactor_type = 0; if (opt_wfmo_reactor) reactor_type = ASYS_TEXT ("WFMO_Reactor"); else if (opt_select_reactor) diff --git a/tests/Notify_Performance_Test.dsp b/tests/Notify_Performance_Test.dsp index 27a264ce9e6..a25c0eac5ca 100644 --- a/tests/Notify_Performance_Test.dsp +++ b/tests/Notify_Performance_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Notify_Performance_Test - Win32 PharLap ETS Debug
+CFG=Notify_Performance_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,18 @@ CFG=Notify_Performance_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Notify_Performance_Test.mak" CFG="Notify_Performance_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "Notify_Performance_Test.mak"\
+ CFG="Notify_Performance_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Notify_Performance_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Notify_Performance_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "Notify_Performance_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Notify_Performance_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Notify_Performance_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +71,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +84,12 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Notify_Performance_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Notify_Performance_Test___Win32_PharLap_ETS_Debug"
-# PROP BASE Intermediate_Dir "Notify_Performance_Test___Win32_PharLap_ETS_Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Notify_Performance_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "Notify_Performance_Test - Win32 Debug"
# Name "Notify_Performance_Test - Win32 Alpha Debug"
-# Name "Notify_Performance_Test - Win32 PharLap ETS Debug"
# Begin Source File
SOURCE=.\Notify_Performance_Test.cpp
@@ -242,8 +212,6 @@ NODEP_CPP_NOTIF=\ "..\ace\stdcpp.h"\
-!ELSEIF "$(CFG)" == "Notify_Performance_Test - Win32 PharLap ETS Debug"
-
!ENDIF
# End Source File
diff --git a/tests/Notify_Performance_Test.icc b/tests/Notify_Performance_Test.icc deleted file mode 100644 index 2ff67813697..00000000000 --- a/tests/Notify_Performance_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Notify_Performance_Test.exe" - { - source type (cpp) "Notify_Performance_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/OrdMultiSet_Test.bpr b/tests/OrdMultiSet_Test.bpr new file mode 100644 index 00000000000..401ebfc3c6f --- /dev/null +++ b/tests/OrdMultiSet_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = OrdMultiSet_Test.exe +OBJFILES = objs\OrdMultiSet_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/OrdMultiSet_Test.dsp b/tests/OrdMultiSet_Test.dsp index 809b5c593c1..5cc8ee8e185 100644 --- a/tests/OrdMultiSet_Test.dsp +++ b/tests/OrdMultiSet_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=OrdMultiSet_Test - Win32 PharLap ETS Debug
+CFG=OrdMultiSet_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,17 @@ CFG=OrdMultiSet_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "OrdMultiSet_Test.mak" CFG="OrdMultiSet_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "OrdMultiSet_Test.mak" CFG="OrdMultiSet_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "OrdMultiSet_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "OrdMultiSet_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "OrdMultiSet_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "OrdMultiSet_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "OrdMultiSet_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +70,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "OrdMultiSet_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +83,12 @@ LINK32=link.exe # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "OrdMultiSet_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "OrdMultiSet_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "OrdMultiSet_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "OrdMultiSet_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "OrdMultiSet_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./OrdMultiSet_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "OrdMultiSet_Test - Win32 Debug"
# Name "OrdMultiSet_Test - Win32 Alpha Debug"
-# Name "OrdMultiSet_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -131,7 +100,7 @@ SOURCE=.\OrdMultiSet_Test.cpp !ELSEIF "$(CFG)" == "OrdMultiSet_Test - Win32 Alpha Debug"
-DEP_CPP_ORDMU=\
+DEP_CPP_BARRI=\
"..\ace\ACE.h"\
"..\ace\ACE.i"\
"..\ace\Atomic_Op.i"\
@@ -173,6 +142,7 @@ DEP_CPP_ORDMU=\ "..\ace\Signal.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\SV_Semaphore_Complex.h"\
"..\ace\SV_Semaphore_Complex.i"\
"..\ace\SV_Semaphore_Simple.h"\
@@ -191,11 +161,6 @@ DEP_CPP_ORDMU=\ "..\ace\ws2tcpip.h"\
".\test_config.h"\
-NODEP_CPP_ORDMU=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "OrdMultiSet_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/OrdMultiSet_Test.icc b/tests/OrdMultiSet_Test.icc deleted file mode 100644 index b74e8f468b4..00000000000 --- a/tests/OrdMultiSet_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "OrdMultiSet_Test.exe" - { - source type (cpp) "OrdMultiSet_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Pipe_Test.bpr b/tests/Pipe_Test.bpr new file mode 100644 index 00000000000..4e66963d621 --- /dev/null +++ b/tests/Pipe_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Pipe_Test.exe +OBJFILES = objs\Pipe_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/Pipe_Test.cpp b/tests/Pipe_Test.cpp index 8d4f1d9717e..84bbefad8ce 100644 --- a/tests/Pipe_Test.cpp +++ b/tests/Pipe_Test.cpp @@ -83,14 +83,14 @@ open (ACE_Pipe &pipe, #endif /* ! ACE_LACKS_FORK */ int -main (int argc, ASYS_TCHAR *argv[]) +main (int argc, char *argv[]) { #if defined (ACE_LACKS_FORK) ACE_UNUSED_ARG (argc); ACE_UNUSED_ARG (argv); - ACE_START_TEST (ASYS_TEXT ("Pipe_Test")); - ACE_ERROR ((LM_INFO, ASYS_TEXT ("fork is not supported on this platform\n"))); + ACE_START_TEST ("Pipe_Test"); + ACE_ERROR ((LM_INFO, "fork is not supported on this platform\n")); ACE_END_TEST; #else /* ! ACE_LACKS_FORK */ parse_args (argc, argv); diff --git a/tests/Pipe_Test.dsp b/tests/Pipe_Test.dsp index 27618a64644..3844eea981e 100644 --- a/tests/Pipe_Test.dsp +++ b/tests/Pipe_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Pipe_Test - Win32 PharLap ETS Debug
+CFG=Pipe_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,16 @@ CFG=Pipe_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Pipe_Test.mak" CFG="Pipe_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "Pipe_Test.mak" CFG="Pipe_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "Pipe_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Pipe_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "Pipe_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Pipe_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +69,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Pipe_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +82,12 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Pipe_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Pipe_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "Pipe_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Pipe_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Pipe_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Pipe_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "Pipe_Test - Win32 Debug"
# Name "Pipe_Test - Win32 Alpha Debug"
-# Name "Pipe_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -159,16 +127,12 @@ DEP_CPP_PIPE_=\ "..\ace\Process.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\Trace.h"\
"..\ace\Version.h"\
"..\ace\ws2tcpip.h"\
".\test_config.h"\
-NODEP_CPP_PIPE_=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "Pipe_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/Pipe_Test.icc b/tests/Pipe_Test.icc deleted file mode 100644 index bc6ad7d05d5..00000000000 --- a/tests/Pipe_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Pipe_Test.exe" - { - source type (cpp) "Pipe_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Priority_Buffer_Test.bpr b/tests/Priority_Buffer_Test.bpr new file mode 100644 index 00000000000..f62700b8586 --- /dev/null +++ b/tests/Priority_Buffer_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Priority_Buffer_Test.exe +OBJFILES = objs\Priority_Buffer_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/Priority_Buffer_Test.dsp b/tests/Priority_Buffer_Test.dsp index 008126d39b7..cd5553d6b2d 100644 --- a/tests/Priority_Buffer_Test.dsp +++ b/tests/Priority_Buffer_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Priority_Buffer_Test - Win32 PharLap ETS Debug
+CFG=Priority_Buffer_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,18 @@ CFG=Priority_Buffer_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Priority_Buffer_Test.mak" CFG="Priority_Buffer_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "Priority_Buffer_Test.mak"\
+ CFG="Priority_Buffer_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Priority_Buffer_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Priority_Buffer_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "Priority_Buffer_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Priority_Buffer_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Priority_Buffer_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +71,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Priority_Buffer_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +84,12 @@ LINK32=link.exe # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Priority_Buffer_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Priority_Buffer_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "Priority_Buffer_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Priority_Buffer_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Priority_Buffer_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Priority_Buffer_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "Priority_Buffer_Test - Win32 Debug"
# Name "Priority_Buffer_Test - Win32 Alpha Debug"
-# Name "Priority_Buffer_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -194,6 +164,7 @@ DEP_CPP_PRIOR=\ "..\ace\Signal.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\Strategies.h"\
"..\ace\Strategies_T.cpp"\
"..\ace\Strategies_T.h"\
@@ -223,11 +194,6 @@ DEP_CPP_PRIOR=\ "..\ace\ws2tcpip.h"\
".\test_config.h"\
-NODEP_CPP_PRIOR=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "Priority_Buffer_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/Priority_Buffer_Test.icc b/tests/Priority_Buffer_Test.icc deleted file mode 100644 index cfd3a72b880..00000000000 --- a/tests/Priority_Buffer_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Priority_Buffer_Test.exe" - { - source type (cpp) "Priority_Buffer_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Priority_Reactor_Test.bpr b/tests/Priority_Reactor_Test.bpr new file mode 100644 index 00000000000..9034417e64f --- /dev/null +++ b/tests/Priority_Reactor_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Priority_Reactor_Test.exe +OBJFILES = objs\Priority_Reactor_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/Priority_Reactor_Test.cpp b/tests/Priority_Reactor_Test.cpp index 08a91bb1f65..59b5f132e8b 100644 --- a/tests/Priority_Reactor_Test.cpp +++ b/tests/Priority_Reactor_Test.cpp @@ -92,14 +92,14 @@ Read_Handler::open (void *) { if (this->peer ().enable (ACE_NONBLOCK) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("(%P|%t) Read_Handler::open, ") - ASYS_TEXT ("cannot set non blocking mode")), + "(%P|%t) Read_Handler::open, " + "cannot set non blocking mode"), -1); if (reactor ()->register_handler (this, READ_MASK) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("(%P|%t) Read_Handler::open, ") - ASYS_TEXT ("cannot register handler")), + "(%P|%t) Read_Handler::open, " + "cannot register handler"), -1); // A number larger than the actual number of priorities, so some @@ -110,8 +110,8 @@ Read_Handler::open (void *) started_++; ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%P|%t) created svc_handler for handle %d ") - ASYS_TEXT ("with priority %d\n"), + "(%P|%t) created svc_handler for handle %d " + "with priority %d\n", get_handle (), priority ())); return 0; @@ -134,19 +134,19 @@ Read_Handler::handle_input (ACE_HANDLE h) return 0; if (result != 0) - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%P|%t) %p\n"), - ASYS_TEXT ("Read_Handler::handle_input"))); + ACE_DEBUG ((LM_DEBUG, "(%P|%t) %p\n", + "Read_Handler::handle_input")); waiting_--; if (waiting_ == 0) { ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("Last svc_handler closed, shutting down\n"))); + "Last svc_handler closed, shutting down\n")); ACE_Reactor::instance()->end_event_loop(); } ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%P|%t) Read_Handler::handle_input closing down\n"))); + "(%P|%t) Read_Handler::handle_input closing down\n")); return -1; } @@ -174,8 +174,8 @@ Write_Handler::svc (void) if (this->peer ().send_n (ACE_ALPHABET, sizeof (ACE_ALPHABET) - 1) == -1) ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("(%P|%t) %p\n"), - ASYS_TEXT ("send_n"))); + "(%P|%t) %p\n", + "send_n")); ACE_OS::sleep (pause); } @@ -189,7 +189,7 @@ client (void *arg) ACE_INET_Addr *connection_addr = ACE_reinterpret_cast (ACE_INET_Addr *, arg); ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%P|%t) running client\n"))); + "(%P|%t) running client\n")); CONNECTOR connector; Write_Handler *writer = 0; @@ -214,7 +214,7 @@ client (void *arg) options.timeout (tmp); writer = 0; ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%P|%t) still trying to connect\n"))); + "(%P|%t) still trying to connect\n")); } else { @@ -225,23 +225,23 @@ client (void *arg) writer->destroy (); ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%P|%t) finishing client\n"))); + "(%P|%t) finishing client\n")); return 0; } } ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("(%P|%t) failed to connect after %d retries\n"), + "(%P|%t) failed to connect after %d retries\n", max_retries)); return 0; } int -main (int argc, ASYS_TCHAR *argv[]) +main (int argc, char *argv[]) { - ACE_START_TEST (ASYS_TEXT ("Priority_Reactor_Test")); + ACE_START_TEST ("Priority_Reactor_Test"); - ACE_Get_Opt getopt (argc, argv, ASYS_TEXT ("dc:l:m:t:")); + ACE_Get_Opt getopt (argc, argv, "dc:l:m:t:"); for (int c; (c = getopt ()) != -1; ) switch (c) @@ -250,26 +250,26 @@ main (int argc, ASYS_TCHAR *argv[]) opt_priority_reactor = 0; break; case 'c': - opt_nchildren = ACE_OS::atoi (getopt.optarg); + opt_nchildren = atoi (getopt.optarg); break; case 'l': - opt_nloops = ACE_OS::atoi (getopt.optarg); + opt_nloops = atoi (getopt.optarg); break; case 'm': - max_retries = ACE_OS::atoi (getopt.optarg); + max_retries = atoi (getopt.optarg); break; case 't': - opt_max_duration = ACE_OS::atoi (getopt.optarg); + opt_max_duration = atoi (getopt.optarg); break; case '?': default: ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("Usage: Priority_Reactor_Test ") - ASYS_TEXT (" [-d] (disable priority reactor)\n") - ASYS_TEXT (" [-c nchildren] (number of threads/processes)\n") - ASYS_TEXT (" [-l loops] (number of loops per child)\n") - ASYS_TEXT (" [-m maxretries] (attempts to connect)\n") - ASYS_TEXT (" [-t max_time] (limits test duration)\n")), + "Usage: Priority_Reactor_Test " + " [-d] (disable priority reactor)\n" + " [-c nchildren] (number of threads/processes)\n" + " [-l loops] (number of loops per child)\n" + " [-m maxretries] (attempts to connect)\n" + " [-t max_time] (limits test duration)\n"), -1); ACE_NOTREACHED (break); } @@ -305,12 +305,12 @@ main (int argc, ASYS_TCHAR *argv[]) if (acceptor.open (ACE_sap_any_cast (const ACE_INET_Addr &)) == -1 || acceptor.acceptor ().get_local_addr (server_addr) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("(%P|%t) %p\n"), - ASYS_TEXT ("open")), + "(%P|%t) %p\n", + "open"), -1); ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%P|%t) starting server at port %d\n"), + "(%P|%t) starting server at port %d\n", server_addr.get_port_number ())); ACE_INET_Addr connection_addr (server_addr.get_port_number (), @@ -326,8 +326,8 @@ main (int argc, ASYS_TCHAR *argv[]) (void *) &connection_addr, THR_NEW_LWP | THR_DETACHED) == -1) ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("(%P|%t) %p\n%a"), - ASYS_TEXT ("thread create failed"))); + "(%P|%t) %p\n%a", + "thread create failed")); } #elif !defined (ACE_LACKS_FORK) for (i = 0; i < opt_nchildren; ++i) @@ -336,7 +336,7 @@ main (int argc, ASYS_TCHAR *argv[]) { case -1: ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("(%P|%t) %p\n%a"), ASYS_TEXT ("fork failed"))); + "(%P|%t) %p\n%a", "fork failed")); exit (-1); /* NOTREACHED */ case 0: @@ -351,7 +351,7 @@ main (int argc, ASYS_TCHAR *argv[]) } #else ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("(%P|%t) only one thread may be run in a process on this platform\n%a"), 1)); + "(%P|%t) only one thread may be run in a process on this platform\n%a", 1)); #endif /* ACE_HAS_THREADS */ ACE_Time_Value tv (opt_max_duration); @@ -363,12 +363,12 @@ main (int argc, ASYS_TCHAR *argv[]) if (Read_Handler::get_countdown () != 0) { ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%P|%t) running out of time, ") - ASYS_TEXT ("probably due to failed connections.\n"))); + "(%P|%t) running out of time, " + "probably due to failed connections.\n")); } ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%P|%t) waiting for the children...\n"))); + "(%P|%t) waiting for the children...\n")); #if defined (ACE_HAS_THREADS) ACE_Thread_Manager::instance ()->wait (); @@ -377,7 +377,7 @@ main (int argc, ASYS_TCHAR *argv[]) { pid_t pid = ACE_OS::wait(); ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%P|%t) child %d terminated\n"), + "(%P|%t) child %d terminated\n", pid)); } #else diff --git a/tests/Priority_Reactor_Test.dsp b/tests/Priority_Reactor_Test.dsp index 432971f992b..e1c34f6804b 100644 --- a/tests/Priority_Reactor_Test.dsp +++ b/tests/Priority_Reactor_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Priority_Reactor_Test - Win32 PharLap ETS Debug
+CFG=Priority_Reactor_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,18 @@ CFG=Priority_Reactor_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Priority_Reactor_Test.mak" CFG="Priority_Reactor_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "Priority_Reactor_Test.mak"\
+ CFG="Priority_Reactor_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Priority_Reactor_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Priority_Reactor_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "Priority_Reactor_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Priority_Reactor_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Priority_Reactor_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +71,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +84,12 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Priority_Reactor_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Priority_Reactor_Test___Win32_PharLap_ETS_Debug"
-# PROP BASE Intermediate_Dir "Priority_Reactor_Test___Win32_PharLap_ETS_Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Priority_Reactor_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "Priority_Reactor_Test - Win32 Debug"
# Name "Priority_Reactor_Test - Win32 Alpha Debug"
-# Name "Priority_Reactor_Test - Win32 PharLap ETS Debug"
# Begin Source File
SOURCE=.\Priority_Reactor_Test.cpp
@@ -279,8 +249,6 @@ NODEP_CPP_PRIOR=\ "..\ace\stdcpp.h"\
-!ELSEIF "$(CFG)" == "Priority_Reactor_Test - Win32 PharLap ETS Debug"
-
!ENDIF
# End Source File
diff --git a/tests/Priority_Reactor_Test.icc b/tests/Priority_Reactor_Test.icc deleted file mode 100644 index 46831825cc0..00000000000 --- a/tests/Priority_Reactor_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Priority_Reactor_Test.exe" - { - source type (cpp) "Priority_Reactor_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Priority_Task_Test.bpr b/tests/Priority_Task_Test.bpr new file mode 100644 index 00000000000..b33850de2ef --- /dev/null +++ b/tests/Priority_Task_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Priority_Task_Test.exe +OBJFILES = objs\Priority_Task_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/Priority_Task_Test.cpp b/tests/Priority_Task_Test.cpp index cebda8e419c..2e28752babe 100644 --- a/tests/Priority_Task_Test.cpp +++ b/tests/Priority_Task_Test.cpp @@ -29,7 +29,7 @@ USELIB("..\ace\aced.lib"); //--------------------------------------------------------------------------- #endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ -static const ASYS_TCHAR *usage = ASYS_TEXT ("usage: %s [-d]\n"); +static LPCTSTR usage = ASYS_TEXT ("usage: %s [-d]\n"); #if defined (ACE_HAS_THREADS) @@ -235,7 +235,7 @@ main (int argc, ASYS_TCHAR *argv[]) #endif /* ACE_HAS_THREADS */ // Re-enable LM_DEBUG messages. - ACE_Log_Msg::instance ()->priority_mask + ACE_Log_Msg::instance ()->priority_mask (ACE_Log_Msg::instance ()->priority_mask () | LM_DEBUG); ACE_END_TEST; diff --git a/tests/Priority_Task_Test.dsp b/tests/Priority_Task_Test.dsp index 39d76d8c2df..4ead2caa20c 100644 --- a/tests/Priority_Task_Test.dsp +++ b/tests/Priority_Task_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Priority_Task_Test - Win32 PharLap ETS Debug
+CFG=Priority_Task_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,18 @@ CFG=Priority_Task_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Priority_Task_Test.mak" CFG="Priority_Task_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "Priority_Task_Test.mak"\
+ CFG="Priority_Task_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Priority_Task_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Priority_Task_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "Priority_Task_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Priority_Task_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Priority_Task_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +71,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Priority_Task_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +84,12 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Priority_Task_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Priority_Task_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "Priority_Task_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Priority_Task_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Priority_Task_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Priority_Task_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "Priority_Task_Test - Win32 Debug"
# Name "Priority_Task_Test - Win32 Alpha Debug"
-# Name "Priority_Task_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -199,6 +169,7 @@ DEP_CPP_PRIOR=\ "..\ace\Signal.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\Strategies.h"\
"..\ace\Strategies_T.cpp"\
"..\ace\Strategies_T.h"\
@@ -236,11 +207,6 @@ DEP_CPP_PRIOR=\ "..\ace\ws2tcpip.h"\
".\test_config.h"\
-NODEP_CPP_PRIOR=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "Priority_Task_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/Priority_Task_Test.icc b/tests/Priority_Task_Test.icc deleted file mode 100644 index c2b446c877c..00000000000 --- a/tests/Priority_Task_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Priority_Task_Test.exe" - { - source type (cpp) "Priority_Task_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Process_Mutex_Test.bpr b/tests/Process_Mutex_Test.bpr new file mode 100644 index 00000000000..c5df004a995 --- /dev/null +++ b/tests/Process_Mutex_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Process_Mutex_Test.exe +OBJFILES = objs\Process_Mutex_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/Process_Mutex_Test.cpp b/tests/Process_Mutex_Test.cpp index 58f905b3d25..065c9f20ada 100644 --- a/tests/Process_Mutex_Test.cpp +++ b/tests/Process_Mutex_Test.cpp @@ -32,11 +32,6 @@ USELIB("..\ace\aced.lib"); static int release_mutex = 1; static int child_process = 0; static const char *mutex_name = ACE_DEFAULT_MUTEX_A; -#if defined (__Lynx__) - static const unsigned int processes = 4; -#else /* ! __Lynx__ */ - static const unsigned int processes = ACE_MAX_PROCESSES; -#endif /* ! __Lynx__ */ // Explain usage and exit. static void @@ -103,14 +98,14 @@ acquire_release (void) #endif /* ! ACE_LACKS_FORK */ int -main (int argc, ASYS_TCHAR *argv[]) +main (int argc, char *argv[]) { #if defined (ACE_LACKS_FORK) ACE_UNUSED_ARG (argc); ACE_UNUSED_ARG (argv); - ACE_START_TEST (ASYS_TEXT ("Process_Mutex_Test")); - ACE_ERROR ((LM_INFO, ASYS_TEXT ("fork is not supported on this platform\n"))); + ACE_START_TEST ("Process_Mutex_Test"); + ACE_ERROR ((LM_INFO, "fork is not supported on this platform\n")); ACE_END_TEST; #else /* ! ACE_LACKS_FORK */ @@ -125,7 +120,7 @@ main (int argc, ASYS_TCHAR *argv[]) } else { - ACE_START_TEST (ASYS_TEXT ("Process_Mutex_Test")); + ACE_START_TEST ("Process_Mutex_Test"); ACE_INIT_LOG ("Process_Mutex_Test-children"); ACE_Process_Options options; @@ -140,11 +135,12 @@ main (int argc, ASYS_TCHAR *argv[]) ACE_TEXT (" -c -n %s"), ACE_WIDE_STRING (mutex_name)); - // Spawn processes that will contend for the lock. - ACE_Process servers[processes]; + // Spawn ACE_MAX_PROCESSES processes that will contend for the + // lock. + ACE_Process servers[ACE_MAX_PROCESSES]; size_t i; - for (i = 0; i < processes; i++) + for (i = 0; i < ACE_MAX_PROCESSES; i++) { ACE_ASSERT (servers[i].spawn (options) != -1); ACE_DEBUG ((LM_DEBUG, @@ -152,7 +148,7 @@ main (int argc, ASYS_TCHAR *argv[]) servers[i].getpid ())); } - for (i = 0; i < processes; i++) + for (i = 0; i < ACE_MAX_PROCESSES; i++) { // Wait for the process we created to exit. ACE_ASSERT (servers[i].wait () != -1); diff --git a/tests/Process_Mutex_Test.dsp b/tests/Process_Mutex_Test.dsp index a3b97aef63d..990469f8d02 100644 --- a/tests/Process_Mutex_Test.dsp +++ b/tests/Process_Mutex_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Process_Mutex_Test - Win32 PharLap ETS Debug
+CFG=Process_Mutex_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,18 @@ CFG=Process_Mutex_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Process_Mutex_Test.mak" CFG="Process_Mutex_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "Process_Mutex_Test.mak"\
+ CFG="Process_Mutex_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Process_Mutex_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Process_Mutex_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "Process_Mutex_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Process_Mutex_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Process_Mutex_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +71,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Process_Mutex_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +84,12 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Process_Mutex_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Process_Mutex_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "Process_Mutex_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Process_Mutex_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Process_Mutex_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Process_Mutex_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "Process_Mutex_Test - Win32 Debug"
# Name "Process_Mutex_Test - Win32 Alpha Debug"
-# Name "Process_Mutex_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -160,6 +130,7 @@ DEP_CPP_PROCE=\ "..\ace\Process.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\SV_Semaphore_Complex.h"\
"..\ace\SV_Semaphore_Complex.i"\
"..\ace\SV_Semaphore_Simple.h"\
@@ -176,11 +147,6 @@ DEP_CPP_PROCE=\ "..\ace\ws2tcpip.h"\
".\test_config.h"\
-NODEP_CPP_PROCE=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "Process_Mutex_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/Process_Mutex_Test.icc b/tests/Process_Mutex_Test.icc deleted file mode 100644 index 33ae797b3bf..00000000000 --- a/tests/Process_Mutex_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Process_Mutex_Test.exe" - { - source type (cpp) "Process_Mutex_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Process_Strategy_Test.bpr b/tests/Process_Strategy_Test.bpr new file mode 100644 index 00000000000..f895e9baaa1 --- /dev/null +++ b/tests/Process_Strategy_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Process_Strategy_Test.exe +OBJFILES = objs\Process_Strategy_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/Process_Strategy_Test.cpp b/tests/Process_Strategy_Test.cpp index 6c7e52b43e8..c60e343395c 100644 --- a/tests/Process_Strategy_Test.cpp +++ b/tests/Process_Strategy_Test.cpp @@ -135,7 +135,7 @@ Options::concurrency_strategy (void) return this->concurrency_strategy_; } -const ASYS_TCHAR * +const char * Options::filename (void) { return this->filename_; @@ -161,32 +161,32 @@ Options::~Options (void) } int -Options::parse_args (int argc, ASYS_TCHAR *argv[]) +Options::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ASYS_TEXT ("p:c:f:")); + ACE_Get_Opt get_opt (argc, argv, "p:c:f:"); - this->filename_ = ASYS_TEXT (ACE_TEMP_FILE_NAME_A); + this->filename_ = ACE_TEMP_FILE_NAME_A; for (int c; (c = get_opt ()) != -1; ) switch (c) { case 'c': if (ACE_OS::strcmp (get_opt.optarg, - ASYS_TEXT ("REACTIVE")) == 0) + "REACTIVE") == 0) OPTIONS::instance ()->concurrency_type (Options::REACTIVE); #if !defined (ACE_LACKS_FORK) else if (ACE_OS::strcmp (get_opt.optarg, - ASYS_TEXT ("PROCESS")) == 0) + "PROCESS") == 0) OPTIONS::instance ()->concurrency_type (Options::PROCESS); #endif /* !ACE_LACKS_FORK */ #if defined (ACE_HAS_THREADS) else if (ACE_OS::strcmp (get_opt.optarg, - ASYS_TEXT ("THREAD")) == 0) + "THREAD") == 0) OPTIONS::instance ()->concurrency_type (Options::THREAD); #endif /* ACE_HAS_THREADS */ else ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("WARNING: concurrency strategy \"%s\" is not supported\n"), + "WARNING: concurrency strategy \"%s\" is not supported\n", get_opt.optarg)); break; case 'f': @@ -194,22 +194,22 @@ Options::parse_args (int argc, ASYS_TCHAR *argv[]) break; default: ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("usage: %n [-f (filename)] [-c (concurrency strategy)]\n%a"), 1)); + "usage: %n [-f (filename)] [-c (concurrency strategy)]\n%a", 1)); /* NOTREACHED */ } // Initialize the file lock. Note that this object lives beyond the // lifetime of the Acceptor. - if (this->file_lock_.open (ASYS_ONLY_WIDE_STRING (this->filename_), + if (this->file_lock_.open (ACE_WIDE_STRING (this->filename_), O_RDWR | O_CREAT, ACE_DEFAULT_FILE_PERMS) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("open")), + "%p\n", + "open"), -1); ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%P|%t) opening %s on handle %d.\n"), + "(%P|%t) opening %s on handle %d.\n", this->filename_, this->file_lock_.get_handle ())); @@ -220,8 +220,8 @@ Options::parse_args (int argc, ASYS_TCHAR *argv[]) (const void *) &count, sizeof count) != sizeof count) ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("(%P|%t) %p\n"), - ASYS_TEXT ("write"))); + "(%P|%t) %p\n", + "write")); // Initialize the Concurrency strategy. switch (this->concurrency_type_) @@ -283,7 +283,7 @@ Options::concurrency_type (Options::Concurrency_Type cs) Counting_Service::Counting_Service (ACE_Thread_Manager *) { ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%P|%t) creating the Counting_Service\n"))); + "(%P|%t) creating the Counting_Service\n")); } // Read the current value from the shared file and return it to the @@ -295,7 +295,7 @@ Counting_Service::read (void) ACE_READ_GUARD_RETURN (ACE_File_Lock, ace_mon, OPTIONS::instance ()->file_lock (), -1); ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%P|%t) reading on handle %d.\n"), + "(%P|%t) reading on handle %d.\n", OPTIONS::instance ()->file_lock ().get_handle ())); int count; @@ -304,8 +304,8 @@ Counting_Service::read (void) sizeof count, 0) != sizeof count) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("(%P|%t) %p\n"), - ASYS_TEXT ("read")), + "(%P|%t) %p\n", + "read"), -1); char buf[BUFSIZ]; @@ -313,13 +313,13 @@ Counting_Service::read (void) "count = %d\n", count); ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%P|%t) count = %d\n"), + "(%P|%t) count = %d\n", count)); if (this->peer ().send_n (buf, n) != n) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("(%P|%t) %p\n"), - ASYS_TEXT ("send_n")), + "(%P|%t) %p\n", + "send_n"), -1); return 0; } @@ -332,7 +332,7 @@ Counting_Service::inc (void) ACE_WRITE_GUARD_RETURN (ACE_File_Lock, ace_mon, OPTIONS::instance ()->file_lock (), -1); ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%P|%t) incrementing on handle %d.\n"), + "(%P|%t) incrementing on handle %d.\n", OPTIONS::instance ()->file_lock ().get_handle ())); int count; @@ -341,12 +341,12 @@ Counting_Service::inc (void) sizeof count, 0) != sizeof count) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("(%P|%t) %p\n"), - ASYS_TEXT ("read")), + "(%P|%t) %p\n", + "read"), -1); ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%P|%t) incrementing count from %d to %d\n"), + "(%P|%t) incrementing count from %d to %d\n", count, count + 1)); count++; @@ -356,8 +356,8 @@ Counting_Service::inc (void) sizeof count, 0) != sizeof count) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("(%P|%t) %p\n"), - ASYS_TEXT ("write")), + "(%P|%t) %p\n", + "write"), -1); return 0; } @@ -371,7 +371,7 @@ Counting_Service::handle_input (ACE_HANDLE) char buf[BUFSIZ]; ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%P|%t) reading from peer on %d\n"), + "(%P|%t) reading from peer on %d\n", this->peer ().get_handle ())); size_t len; @@ -389,7 +389,7 @@ Counting_Service::handle_input (ACE_HANDLE) else { ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%P|%t) %d bytes of input on %d is %*s\n"), + "(%P|%t) %d bytes of input on %d is %*s\n", bytes, this->peer ().get_handle (), bytes, @@ -405,7 +405,7 @@ Counting_Service::handle_input (ACE_HANDLE) return this->inc (); else ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%P|%t) no match...\n"))); + "(%P|%t) no match...\n")); return 0; } } @@ -414,7 +414,7 @@ int Counting_Service::svc (void) { ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%P|%t) handling thread\n"))); + "(%P|%t) handling thread\n")); while (this->handle_input () >= 0) continue; @@ -440,7 +440,7 @@ int Counting_Service::open (void *) { ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%P|%t) opening service\n"))); + "(%P|%t) opening service\n")); if (OPTIONS::instance ()->concurrency_type () == Options::PROCESS) { @@ -451,7 +451,7 @@ Counting_Service::open (void *) continue; ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%P|%t) About to exit from the child\n"))); + "(%P|%t) About to exit from the child\n")); // Exit the child. ACE_OS::exit (0); @@ -482,12 +482,12 @@ client (void *arg) for (i = 0; i < ACE_MAX_ITERATIONS; i++) { ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%P|%t) client iteration %d\n"), + "(%P|%t) client iteration %d\n", i)); if (connector.connect (stream, server_addr) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("open")), + "%p\n", + "open"), 0); command = "inc"; command_len = ACE_OS::strlen (command); @@ -496,8 +496,8 @@ client (void *arg) &command_len, sizeof command_len, command, command_len) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("send")), + "%p\n", + "send"), 0); command = "read"; command_len = ACE_OS::strlen (command); @@ -506,23 +506,23 @@ client (void *arg) &command_len, sizeof command_len, command, command_len) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("send")), + "%p\n", + "send"), 0); else if (stream.recv (buf, sizeof buf) <= 0) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("recv")), + "%p\n", + "recv"), 0); // ACE_DEBUG ((LM_DEBUG, - // ASYS_TEXT ("(%P|%t) client iteration %d, buf = %s\n"), + // "(%P|%t) client iteration %d, buf = %s\n", // i, buf)); if (stream.close () == -1) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("close")), + "%p\n", + "close"), 0); } @@ -532,20 +532,20 @@ client (void *arg) if (connector.connect (stream, server_addr) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("open")), + "%p\n", + "open"), 0); else if (stream.send (4, &command_len, sizeof command_len, command, command_len) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("send")), + "%p\n", + "send"), 0); else if ((bytes_read = stream.recv (buf, sizeof buf)) <= 0) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("recv")), + "%p\n", + "recv"), 0); else { @@ -556,7 +556,7 @@ client (void *arg) size_t count = ACE_OS::atoi (ACE_OS::strrchr (buf, ' ')); ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%P|%t) count = %d\n"), + "(%P|%t) count = %d\n", count)); // Make sure that the count is correct. ACE_ASSERT (count == ACE_MAX_ITERATIONS); @@ -564,8 +564,8 @@ client (void *arg) if (stream.close () == -1) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("close")), + "%p\n", + "close"), 0); // Remove the filename. @@ -590,14 +590,14 @@ server (void *) } int -main (int argc, ASYS_TCHAR *argv[]) +main (int argc, char *argv[]) { - ACE_START_TEST (ASYS_TEXT ("Process_Strategy_Test")); + ACE_START_TEST ("Process_Strategy_Test"); if (OPTIONS::instance ()->parse_args (argc, argv) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("parse_args")), + "%p\n", + "parse_args"), -1); ACCEPTOR acceptor; @@ -613,13 +613,13 @@ main (int argc, ASYS_TCHAR *argv[]) OPTIONS::instance ()->concurrency_strategy ()) == -1 || acceptor.acceptor ().get_local_addr (server_addr) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("open")), + "%p\n", + "open"), -1); else { ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%P|%t) starting server at port %d\n"), + "(%P|%t) starting server at port %d\n", server_addr.get_port_number ())); #if !defined (ACE_LACKS_FORK) @@ -631,8 +631,8 @@ main (int argc, ASYS_TCHAR *argv[]) { case -1: ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("(%P|%t) %p\n%a"), - ASYS_TEXT ("fork failed"))); + "(%P|%t) %p\n%a", + "fork failed")); exit (-1); /* NOTREACHED */ case 0: @@ -650,22 +650,22 @@ main (int argc, ASYS_TCHAR *argv[]) (void *) 0, THR_NEW_LWP | THR_DETACHED) == -1) ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("(%P|%t) %p\n%a"), - ASYS_TEXT ("thread create failed"))); + "(%P|%t) %p\n%a", + "thread create failed")); if (ACE_Thread_Manager::instance ()->spawn (ACE_THR_FUNC (client), (void *) &server_addr, THR_NEW_LWP | THR_DETACHED) == -1) ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("(%P|%t) %p\n%a"), - ASYS_TEXT ("thread create failed"))); + "(%P|%t) %p\n%a", + "thread create failed")); // Wait for the threads to exit. ACE_Thread_Manager::instance ()->wait (); #else ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("(%P|%t) only one thread may be run in a process on this platform\n%a"), + "(%P|%t) only one thread may be run in a process on this platform\n%a", 1)); #endif /* ACE_HAS_THREADS */ } diff --git a/tests/Process_Strategy_Test.dsp b/tests/Process_Strategy_Test.dsp index ee5311aa4ec..c0cb0f5a996 100644 --- a/tests/Process_Strategy_Test.dsp +++ b/tests/Process_Strategy_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Process_Strategy_Test - Win32 PharLap ETS Debug
+CFG=Process_Strategy_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,18 @@ CFG=Process_Strategy_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Process_Strategy_Test.mak" CFG="Process_Strategy_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "Process_Strategy_Test.mak"\
+ CFG="Process_Strategy_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Process_Strategy_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Process_Strategy_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "Process_Strategy_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Process_Strategy_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Process_Strategy_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +71,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Process_Strategy_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +84,12 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Process_Strategy_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Process_Strategy_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "Process_Strategy_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Process_Strategy_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Process_Strategy_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Process_Strategy_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "Process_Strategy_Test - Win32 Debug"
# Name "Process_Strategy_Test - Win32 Alpha Debug"
-# Name "Process_Strategy_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -223,6 +193,7 @@ DEP_CPP_PROCE=\ "..\ace\SOCK_Stream.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\Strategies.h"\
"..\ace\Strategies_T.cpp"\
"..\ace\Strategies_T.h"\
@@ -265,11 +236,6 @@ DEP_CPP_PROCE=\ ".\Process_Strategy_Test.h"\
".\test_config.h"\
-NODEP_CPP_PROCE=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "Process_Strategy_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/Process_Strategy_Test.h b/tests/Process_Strategy_Test.h index 48b3f29d3bf..7944355255b 100644 --- a/tests/Process_Strategy_Test.h +++ b/tests/Process_Strategy_Test.h @@ -100,7 +100,7 @@ public: ~Options (void); // Destructor. - int parse_args (int argc, ASYS_TCHAR *argv[]); + int parse_args (int argc, char *argv[]); // Read command-line arguments and initialize options. enum Concurrency_Type @@ -117,7 +117,7 @@ public: ACE_File_Lock &file_lock (void); // Returns the file lock. - const ASYS_TCHAR *filename (void); + const char *filename (void); // Returns the filename that we're using as the lock. ACE_Concurrency_Strategy <Counting_Service> *concurrency_strategy (void); @@ -134,7 +134,7 @@ private: // Activation strategy that either forks a new process or spawns a // new thread for each client connection. - const ASYS_TCHAR *filename_; + const char *filename_; // Name of the counting file. }; diff --git a/tests/Process_Strategy_Test.icc b/tests/Process_Strategy_Test.icc deleted file mode 100644 index 6d635f45967..00000000000 --- a/tests/Process_Strategy_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Process_Strategy_Test.exe" - { - source type (cpp) "Process_Strategy_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Purgable_Map_Manager_Test.icc b/tests/Purgable_Map_Manager_Test.icc deleted file mode 100644 index 0ffd1a6e76b..00000000000 --- a/tests/Purgable_Map_Manager_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Purgable_Map_Manager_Test.exe" - { - source type (cpp) "Purgable_Map_Manager_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/RB_Tree_Test.dsp b/tests/RB_Tree_Test.dsp index 597c7471a12..e5098eeed62 100644 --- a/tests/RB_Tree_Test.dsp +++ b/tests/RB_Tree_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=RB_Tree_Test - Win32 PharLap ETS Debug
+CFG=RB_Tree_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,17 @@ CFG=RB_Tree_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "RB_Tree_Test.mak" CFG="RB_Tree_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "RB_Tree_Test.mak" CFG="RB_Tree_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "RB_Tree_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "RB_Tree_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "RB_Tree_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "RB_Tree_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "RB_Tree_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +70,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +83,12 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "RB_Tree_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "RB_Tree_Test___Win32_PharLap_ETS_Debug"
-# PROP BASE Intermediate_Dir "RB_Tree_Test___Win32_PharLap_ETS_Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./RB_Tree_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "RB_Tree_Test - Win32 Debug"
# Name "RB_Tree_Test - Win32 Alpha Debug"
-# Name "RB_Tree_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter ".cpp"
@@ -131,7 +100,7 @@ SOURCE=.\RB_Tree_Test.cpp !ELSEIF "$(CFG)" == "RB_Tree_Test - Win32 Alpha Debug"
-DEP_CPP_RB_TR=\
+DEP_CPP_ATOMI=\
"..\ace\ACE.h"\
"..\ace\ACE.i"\
"..\ace\Atomic_Op.i"\
@@ -156,6 +125,7 @@ DEP_CPP_RB_TR=\ "..\ace\OS.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\SV_Semaphore_Complex.h"\
"..\ace\SV_Semaphore_Complex.i"\
"..\ace\SV_Semaphore_Simple.h"\
@@ -172,11 +142,6 @@ DEP_CPP_RB_TR=\ "..\ace\ws2tcpip.h"\
".\test_config.h"\
-NODEP_CPP_RB_TR=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "RB_Tree_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/RB_Tree_Test.icc b/tests/RB_Tree_Test.icc deleted file mode 100644 index 647fe72248e..00000000000 --- a/tests/RB_Tree_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "RB_Tree_Test.exe" - { - source type (cpp) "RB_Tree_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Reactor_Exceptions_Test.bpr b/tests/Reactor_Exceptions_Test.bpr new file mode 100644 index 00000000000..996473f56c4 --- /dev/null +++ b/tests/Reactor_Exceptions_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Reactor_Exceptions_Test.exe +OBJFILES = objs\Reactor_Exceptions_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/Reactor_Exceptions_Test.cpp b/tests/Reactor_Exceptions_Test.cpp index fa7f3797c4e..cc4905525fa 100644 --- a/tests/Reactor_Exceptions_Test.cpp +++ b/tests/Reactor_Exceptions_Test.cpp @@ -107,29 +107,9 @@ public: virtual int handle_events (ACE_Time_Value *max_wait_time) { int ret = 0; - try { -# if defined (__BORLANDC__) - // BCB does not catch structured exceptions with catch (...). - // Actually, the ANSI spec says that system exceptions are not - // supposed to be caught with catch. Borland may add this, and - // make it "switchable" in the future... - try - { -# endif /* defined (__BORLANDC__) */ - ret = ACE_Reactor::handle_events (max_wait_time); - -# if defined (__BORLANDC__) - } - __except (EXCEPTION_EXECUTE_HANDLER) - { - // Probably should handle the details of the exception - // and throw something that represents the structured exception - throw "Win32 Structured Exception"; - } -# endif /* defined (__BORLANDC__) */ } catch (...) { @@ -138,7 +118,6 @@ public: ret = -1; // do your thing, etc. } -//} return ret; } diff --git a/tests/Reactor_Exceptions_Test.dsp b/tests/Reactor_Exceptions_Test.dsp index 9488855d57d..390cf40a25c 100644 --- a/tests/Reactor_Exceptions_Test.dsp +++ b/tests/Reactor_Exceptions_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Reactor_Exceptions_Test - Win32 PharLap ETS Debug
+CFG=Reactor_Exceptions_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,18 @@ CFG=Reactor_Exceptions_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Reactor_Exceptions_Test.mak" CFG="Reactor_Exceptions_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "Reactor_Exceptions_Test.mak"\
+ CFG="Reactor_Exceptions_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Reactor_Exceptions_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reactor_Exceptions_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "Reactor_Exceptions_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Reactor_Exceptions_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Reactor_Exceptions_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +71,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Reactor_Exceptions_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +84,12 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Reactor_Exceptions_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Reactor_Exceptions_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "Reactor_Exceptions_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Reactor_Exceptions_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Reactor_Exceptions_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Reactor_Exceptions_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "Reactor_Exceptions_Test - Win32 Debug"
# Name "Reactor_Exceptions_Test - Win32 Alpha Debug"
-# Name "Reactor_Exceptions_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -188,6 +158,7 @@ DEP_CPP_REACT=\ "..\ace\SOCK_Dgram.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\SV_Semaphore_Complex.h"\
"..\ace\SV_Semaphore_Complex.i"\
"..\ace\SV_Semaphore_Simple.h"\
@@ -210,11 +181,6 @@ DEP_CPP_REACT=\ "..\ace\ws2tcpip.h"\
".\test_config.h"\
-NODEP_CPP_REACT=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "Reactor_Exceptions_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/Reactor_Exceptions_Test.icc b/tests/Reactor_Exceptions_Test.icc deleted file mode 100644 index be4e903690f..00000000000 --- a/tests/Reactor_Exceptions_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Reactor_Exceptions_Test.exe" - { - source type (cpp) "Reactor_Exceptions_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Reactor_Notify_Test.bpr b/tests/Reactor_Notify_Test.bpr new file mode 100644 index 00000000000..c92c8070ff5 --- /dev/null +++ b/tests/Reactor_Notify_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Reactor_Notify_Test.exe +OBJFILES = objs\Reactor_Notify_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/Reactor_Notify_Test.cpp b/tests/Reactor_Notify_Test.cpp index 5879c6e1bef..b00202452ac 100644 --- a/tests/Reactor_Notify_Test.cpp +++ b/tests/Reactor_Notify_Test.cpp @@ -217,7 +217,7 @@ run_test (int disable_notify_pipe) { // Create special reactors with the appropriate flags enabled. - ACE_Select_Reactor *reactor_impl = 0; + ACE_Select_Reactor *reactor_impl; if (disable_notify_pipe) ACE_NEW (reactor_impl, ACE_Select_Reactor (0, 0, 1)); diff --git a/tests/Reactor_Notify_Test.dsp b/tests/Reactor_Notify_Test.dsp index 65242b86f93..0cf81ae9d61 100644 --- a/tests/Reactor_Notify_Test.dsp +++ b/tests/Reactor_Notify_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Reactor_Notify_Test - Win32 PharLap ETS Debug
+CFG=Reactor_Notify_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,18 @@ CFG=Reactor_Notify_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Reactor_Notify_Test.mak" CFG="Reactor_Notify_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "Reactor_Notify_Test.mak"\
+ CFG="Reactor_Notify_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Reactor_Notify_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reactor_Notify_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "Reactor_Notify_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Reactor_Notify_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Reactor_Notify_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +71,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Reactor_Notify_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +84,12 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Reactor_Notify_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Reactor_Notify_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "Reactor_Notify_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Reactor_Notify_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Reactor_Notify_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Reactor_Notify_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "Reactor_Notify_Test - Win32 Debug"
# Name "Reactor_Notify_Test - Win32 Alpha Debug"
-# Name "Reactor_Notify_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -199,6 +169,7 @@ DEP_CPP_REACT=\ "..\ace\Signal.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\Strategies.h"\
"..\ace\Strategies_T.cpp"\
"..\ace\Strategies_T.h"\
@@ -236,11 +207,6 @@ DEP_CPP_REACT=\ "..\ace\ws2tcpip.h"\
".\test_config.h"\
-NODEP_CPP_REACT=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "Reactor_Notify_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/Reactor_Notify_Test.icc b/tests/Reactor_Notify_Test.icc deleted file mode 100644 index 60e80213aa5..00000000000 --- a/tests/Reactor_Notify_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Reactor_Notify_Test.exe" - { - source type (cpp) "Reactor_Notify_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Reactor_Performance_Test.bpr b/tests/Reactor_Performance_Test.bpr new file mode 100644 index 00000000000..a4c7e76c6b3 --- /dev/null +++ b/tests/Reactor_Performance_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Reactor_Performance_Test.exe +OBJFILES = objs\Reactor_Performance_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/Reactor_Performance_Test.cpp b/tests/Reactor_Performance_Test.cpp index 20db2146afc..bff9127cca0 100644 --- a/tests/Reactor_Performance_Test.cpp +++ b/tests/Reactor_Performance_Test.cpp @@ -111,8 +111,8 @@ Read_Handler::handle_input (ACE_HANDLE handle) return 0; else { - ACE_ERROR ((LM_ERROR, ASYS_TEXT ("handle_input: %p (errno: %d)\n"), - ASYS_TEXT ("recv"), errno)); + ACE_ERROR ((LM_ERROR, "handle_input: %p (errno: %d)\n", + "recv", errno)); // This will cause handle_close to get called. return -1; diff --git a/tests/Reactor_Performance_Test.dsp b/tests/Reactor_Performance_Test.dsp index 25a849ec724..14a7f5d8795 100644 --- a/tests/Reactor_Performance_Test.dsp +++ b/tests/Reactor_Performance_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Reactor_Performance_Test - Win32 PharLap ETS Debug
+CFG=Reactor_Performance_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,18 @@ CFG=Reactor_Performance_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Reactor_Performance_Test.mak" CFG="Reactor_Performance_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "Reactor_Performance_Test.mak"\
+ CFG="Reactor_Performance_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Reactor_Performance_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reactor_Performance_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "Reactor_Performance_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Reactor_Performance_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Reactor_Performance_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +71,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +84,12 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Reactor_Performance_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Reactor_Performance_Test___Win32_PharLap_ETS_Debug"
-# PROP BASE Intermediate_Dir "Reactor_Performance_Test___Win32_PharLap_ETS_Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Reactor_Performance_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "Reactor_Performance_Test - Win32 Debug"
# Name "Reactor_Performance_Test - Win32 Alpha Debug"
-# Name "Reactor_Performance_Test - Win32 PharLap ETS Debug"
# Begin Source File
SOURCE=.\Reactor_Performance_Test.cpp
@@ -280,8 +250,6 @@ NODEP_CPP_REACT=\ "..\ace\stdcpp.h"\
-!ELSEIF "$(CFG)" == "Reactor_Performance_Test - Win32 PharLap ETS Debug"
-
!ENDIF
# End Source File
diff --git a/tests/Reactor_Performance_Test.icc b/tests/Reactor_Performance_Test.icc deleted file mode 100644 index 1c8c6bf81bf..00000000000 --- a/tests/Reactor_Performance_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Reactor_Performance_Test.exe" - { - source type (cpp) "Reactor_Performance_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Reactor_Timer_Test.bpr b/tests/Reactor_Timer_Test.bpr new file mode 100644 index 00000000000..c93f847366b --- /dev/null +++ b/tests/Reactor_Timer_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Reactor_Timer_Test.exe +OBJFILES = objs\Reactor_Timer_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/Reactor_Timer_Test.dsp b/tests/Reactor_Timer_Test.dsp index 11b90d10433..d5ad3530091 100644 --- a/tests/Reactor_Timer_Test.dsp +++ b/tests/Reactor_Timer_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Reactor_Timer_Test - Win32 PharLap ETS Debug
+CFG=Reactor_Timer_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,18 @@ CFG=Reactor_Timer_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Reactor_Timer_Test.mak" CFG="Reactor_Timer_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "Reactor_Timer_Test.mak"\
+ CFG="Reactor_Timer_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Reactor_Timer_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reactor_Timer_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "Reactor_Timer_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Reactor_Timer_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Reactor_Timer_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +71,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Reactor_Timer_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +84,12 @@ LINK32=link.exe # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Reactor_Timer_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Reactor_Timer_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "Reactor_Timer_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Reactor_Timer_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Reactor_Timer_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Reactor_Timer_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "Reactor_Timer_Test - Win32 Debug"
# Name "Reactor_Timer_Test - Win32 Alpha Debug"
-# Name "Reactor_Timer_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -178,6 +148,7 @@ DEP_CPP_REACT=\ "..\ace\Signal.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\SV_Semaphore_Complex.h"\
"..\ace\SV_Semaphore_Complex.i"\
"..\ace\SV_Semaphore_Simple.h"\
@@ -198,11 +169,6 @@ DEP_CPP_REACT=\ "..\ace\ws2tcpip.h"\
".\test_config.h"\
-NODEP_CPP_REACT=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "Reactor_Timer_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/Reactor_Timer_Test.icc b/tests/Reactor_Timer_Test.icc deleted file mode 100644 index 7803cfb2fea..00000000000 --- a/tests/Reactor_Timer_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Reactor_Timer_Test.exe" - { - source type (cpp) "Reactor_Timer_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Reactors_Test.bpr b/tests/Reactors_Test.bpr new file mode 100644 index 00000000000..9a0ed9a81c2 --- /dev/null +++ b/tests/Reactors_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Reactors_Test.exe +OBJFILES = objs\Reactors_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/Reactors_Test.dsp b/tests/Reactors_Test.dsp index 639702d3425..3102b9c0bdb 100644 --- a/tests/Reactors_Test.dsp +++ b/tests/Reactors_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Reactors_Test - Win32 PharLap ETS Debug
+CFG=Reactors_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,17 @@ CFG=Reactors_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Reactors_Test.mak" CFG="Reactors_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "Reactors_Test.mak" CFG="Reactors_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Reactors_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reactors_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "Reactors_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Reactors_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Reactors_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +70,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Reactors_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +83,12 @@ LINK32=link.exe # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Reactors_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Reactors_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "Reactors_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Reactors_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Reactors_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Reactors_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "Reactors_Test - Win32 Debug"
# Name "Reactors_Test - Win32 Alpha Debug"
-# Name "Reactors_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -197,6 +166,7 @@ DEP_CPP_REACT=\ "..\ace\Signal.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\Strategies.h"\
"..\ace\Strategies_T.cpp"\
"..\ace\Strategies_T.h"\
@@ -234,11 +204,6 @@ DEP_CPP_REACT=\ "..\ace\ws2tcpip.h"\
".\test_config.h"\
-NODEP_CPP_REACT=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "Reactors_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/Reactors_Test.icc b/tests/Reactors_Test.icc deleted file mode 100644 index 08ee8110b58..00000000000 --- a/tests/Reactors_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Reactors_Test.exe" - { - source type (cpp) "Reactors_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Reader_Writer_Test.bpr b/tests/Reader_Writer_Test.bpr new file mode 100644 index 00000000000..b3fdb6e01f2 --- /dev/null +++ b/tests/Reader_Writer_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Reader_Writer_Test.exe +OBJFILES = objs\Reader_Writer_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/Reader_Writer_Test.dsp b/tests/Reader_Writer_Test.dsp index 094092618dd..f7e0f55fec8 100644 --- a/tests/Reader_Writer_Test.dsp +++ b/tests/Reader_Writer_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Reader_Writer_Test - Win32 PharLap ETS Debug
+CFG=Reader_Writer_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,18 @@ CFG=Reader_Writer_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Reader_Writer_Test.mak" CFG="Reader_Writer_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "Reader_Writer_Test.mak"\
+ CFG="Reader_Writer_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Reader_Writer_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reader_Writer_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "Reader_Writer_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Reader_Writer_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Reader_Writer_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +71,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Reader_Writer_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +84,12 @@ LINK32=link.exe # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Reader_Writer_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Reader_Writer_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "Reader_Writer_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Reader_Writer_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Reader_Writer_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Reader_Writer_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "Reader_Writer_Test - Win32 Debug"
# Name "Reader_Writer_Test - Win32 Alpha Debug"
-# Name "Reader_Writer_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -175,6 +145,7 @@ DEP_CPP_READE=\ "..\ace\Signal.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\SV_Semaphore_Complex.h"\
"..\ace\SV_Semaphore_Complex.i"\
"..\ace\SV_Semaphore_Simple.h"\
@@ -193,11 +164,6 @@ DEP_CPP_READE=\ "..\ace\ws2tcpip.h"\
".\test_config.h"\
-NODEP_CPP_READE=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "Reader_Writer_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/Reader_Writer_Test.icc b/tests/Reader_Writer_Test.icc deleted file mode 100644 index 1066d73ee30..00000000000 --- a/tests/Reader_Writer_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Reader_Writer_Test.exe" - { - source type (cpp) "Reader_Writer_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Recursive_Mutex_Test.bpr b/tests/Recursive_Mutex_Test.bpr new file mode 100644 index 00000000000..a474eb051e4 --- /dev/null +++ b/tests/Recursive_Mutex_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Recursive_Mutex_Test.exe +OBJFILES = objs\Recursive_Mutex_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/Recursive_Mutex_Test.cpp b/tests/Recursive_Mutex_Test.cpp index 999525d2b3e..07642ee03d4 100644 --- a/tests/Recursive_Mutex_Test.cpp +++ b/tests/Recursive_Mutex_Test.cpp @@ -36,8 +36,6 @@ USELIB("..\ace\aced.lib"); #if defined (CHORUS) // Chorus can't handle 100 iterations: // [amThrd.C:154]: Failed to allocate an AmActor - // NOTE: this was before we set the stack size, below. It - // might work with the default n_iterations now. static size_t n_iterations = 45; #else /* ! CHORUS */ static size_t n_iterations = 100; @@ -71,7 +69,7 @@ static void * worker (void *arg) { ACE_Recursive_Thread_Mutex *rm = - ACE_reinterpret_cast (ACE_Recursive_Thread_Mutex *, + ACE_reinterpret_cast (ACE_Recursive_Thread_Mutex *, arg); recursive_worker (0, rm); return 0; @@ -86,21 +84,9 @@ main (int, ASYS_TCHAR *[]) #if defined (ACE_HAS_THREADS) ACE_Recursive_Thread_Mutex rm; - - size_t stack_sizes [ACE_MAX_THREADS]; - for (unsigned int i = 0; i < ACE_MAX_THREADS; ++i) - stack_sizes[i] = 100000; - ACE_Thread_Manager::instance ()->spawn_n (n_threads, ACE_THR_FUNC (worker), - (void *) &rm, - THR_NEW_LWP | THR_JOINABLE, - ACE_DEFAULT_THREAD_PRIORITY, - -1, /* grp_id */ - 0, /* task base */ - 0, /* thread handles array */ - 0, /* stack array */ - stack_sizes); + (void *) &rm); ACE_Thread_Manager::instance ()->wait (); #else ACE_ERROR ((LM_ERROR, diff --git a/tests/Recursive_Mutex_Test.dsp b/tests/Recursive_Mutex_Test.dsp index 6117cce0dc0..6fafb0242bd 100644 --- a/tests/Recursive_Mutex_Test.dsp +++ b/tests/Recursive_Mutex_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Recursive_Mutex_Test - Win32 PharLap ETS Debug
+CFG=Recursive_Mutex_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,18 @@ CFG=Recursive_Mutex_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Recursive_Mutex_Test.mak" CFG="Recursive_Mutex_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "Recursive_Mutex_Test.mak"\
+ CFG="Recursive_Mutex_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Recursive_Mutex_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Recursive_Mutex_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "Recursive_Mutex_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Recursive_Mutex_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Recursive_Mutex_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +71,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Recursive_Mutex_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +84,12 @@ LINK32=link.exe # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Recursive_Mutex_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Recursive_Mutex_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "Recursive_Mutex_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Recursive_Mutex_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Recursive_Mutex_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Recursive_Mutex_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "Recursive_Mutex_Test - Win32 Debug"
# Name "Recursive_Mutex_Test - Win32 Alpha Debug"
-# Name "Recursive_Mutex_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -175,6 +145,7 @@ DEP_CPP_RECUR=\ "..\ace\Signal.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\SV_Semaphore_Complex.h"\
"..\ace\SV_Semaphore_Complex.i"\
"..\ace\SV_Semaphore_Simple.h"\
@@ -193,11 +164,6 @@ DEP_CPP_RECUR=\ "..\ace\ws2tcpip.h"\
".\test_config.h"\
-NODEP_CPP_RECUR=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "Recursive_Mutex_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/Recursive_Mutex_Test.icc b/tests/Recursive_Mutex_Test.icc deleted file mode 100644 index 765c7537b05..00000000000 --- a/tests/Recursive_Mutex_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Recursive_Mutex_Test.exe" - { - source type (cpp) "Recursive_Mutex_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Reverse_Lock_Test.dsp b/tests/Reverse_Lock_Test.dsp index 671cb750973..2d179e58411 100644 --- a/tests/Reverse_Lock_Test.dsp +++ b/tests/Reverse_Lock_Test.dsp @@ -4,32 +4,29 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Reverse_Lock_Test - Win32 PharLap ETS Debug
+CFG=Reverse_Lock_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "Reverse_Lock_Test.mak".
-!MESSAGE
+!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "Reverse_Lock_Test.mak" CFG="Reverse_Lock_Test - Win32 PharLap ETS Debug"
-!MESSAGE
+!MESSAGE
+!MESSAGE NMAKE /f "Reverse_Lock_Test.mak" CFG="Reverse_Lock_Test - Win32 Debug"
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "Reverse_Lock_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reverse_Lock_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
+!MESSAGE
+!MESSAGE "Reverse_Lock_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
CPP=cl.exe
RSC=rc.exe
-
-!IF "$(CFG)" == "Reverse_Lock_Test - Win32 Debug"
-
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Thread_M"
@@ -51,40 +48,9 @@ BSC32=bscmake.exe LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Reverse_Lock_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Reverse_Lock_Test___Win32_PharLap_ETS_Debug"
-# PROP BASE Intermediate_Dir "Reverse_Lock_Test___Win32_PharLap_ETS_Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Reverse_Lock_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF
-
# Begin Target
# Name "Reverse_Lock_Test - Win32 Debug"
-# Name "Reverse_Lock_Test - Win32 PharLap ETS Debug"
# Begin Source File
SOURCE=.\Reverse_Lock_Test.cpp
diff --git a/tests/SOCK_Connector_Test.bpr b/tests/SOCK_Connector_Test.bpr new file mode 100644 index 00000000000..181fcf94b39 --- /dev/null +++ b/tests/SOCK_Connector_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = SOCK_Connector_Test.exe +OBJFILES = objs\SOCK_Connector_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/SOCK_Connector_Test.cpp b/tests/SOCK_Connector_Test.cpp index 171ee42777c..9605321d521 100644 --- a/tests/SOCK_Connector_Test.cpp +++ b/tests/SOCK_Connector_Test.cpp @@ -172,8 +172,8 @@ fail_no_listener_nonblocking (void) else { ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("Test not executed fully; ") - ASYS_TEXT ("expected EWOULDBLOCK, %p (%d)\n"), + ASYS_TEXT ("Test not executed fully; " + "expected EWOULDBLOCK, %p (%d)\n"), ASYS_TEXT ("not"), errno)); status = -1; } diff --git a/tests/SOCK_Connector_Test.dsp b/tests/SOCK_Connector_Test.dsp index c8b21ce7018..05596e23a7c 100644 --- a/tests/SOCK_Connector_Test.dsp +++ b/tests/SOCK_Connector_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=SOCK_Connector_Test - Win32 PharLap ETS Debug
+CFG=SOCK_Connector_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,23 +13,20 @@ CFG=SOCK_Connector_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "SOCK_Connector_Test.mak" CFG="SOCK_Connector_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "SOCK_Connector_Test.mak"\
+ CFG="SOCK_Connector_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "SOCK_Connector_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "SOCK_Connector_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "SOCK_Connector_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
-
-!IF "$(CFG)" == "SOCK_Connector_Test - Win32 Debug"
-
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "SOCK_Connector_Test\Debug"
@@ -54,41 +51,9 @@ BSC32=bscmake.exe LINK32=link.exe
# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "SOCK_Connector_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "SOCK_Connector_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "SOCK_Connector_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "SOCK_Connector_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "SOCK_Connector_Test"
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./SOCK_Connector_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF
-
# Begin Target
# Name "SOCK_Connector_Test - Win32 Debug"
-# Name "SOCK_Connector_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
diff --git a/tests/SOCK_Connector_Test.icc b/tests/SOCK_Connector_Test.icc deleted file mode 100644 index 65474d09c4f..00000000000 --- a/tests/SOCK_Connector_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "SOCK_Connector_Test.exe" - { - source type (cpp) "SOCK_Connector_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/SOCK_Send_Recv_Test.cpp b/tests/SOCK_Send_Recv_Test.cpp index 30588d96484..b458f56528a 100644 --- a/tests/SOCK_Send_Recv_Test.cpp +++ b/tests/SOCK_Send_Recv_Test.cpp @@ -45,9 +45,9 @@ static int Test_Result = 0; // Change to non-zero if test fails static void * client (void *arg) { - ACE_INET_Addr * remote_addr = ACE_reinterpret_cast (ACE_INET_Addr *, arg); + ACE_INET_Addr * remote_addr = (ACE_INET_Addr *) arg; ACE_INET_Addr server_addr (remote_addr->get_port_number (), - ACE_LOCALHOST); + ASYS_TEXT ("localhost")); ACE_SOCK_Stream cli_stream; ACE_SOCK_Connector con; ACE_Time_Value timeout (ACE_DEFAULT_TIMEOUT); @@ -156,8 +156,6 @@ server (void *arg) // will be detected and read into a ACE-allocated buffer. Use a // 5 second timeout to give the client a chance to send it all. - ACE_OS::sleep (5); - iovec iov[3]; unsigned char buff[255]; ssize_t len; @@ -171,7 +169,7 @@ server (void *arg) iov[2].iov_base = ACE_reinterpret_cast (char *, &buff[175]); iov[2].iov_len = 80; - + len = sock_str.recvv_n (iov, 3); if (len == -1) { @@ -179,7 +177,6 @@ server (void *arg) ASYS_TEXT ("Test 1, recvv failed"))); Test_Result = 1; } - ACE_ASSERT (len == 255); for (i = 0; i < 255; i++) if (buff[i] != i) @@ -228,23 +225,19 @@ spawn (void) /* NOTREACHED */ case 0: client (&server_addr); - ACE_OS::exit (0); + exit (0); /* NOTREACHED */ default: - server (ACE_reinterpret_cast (void *, &peer_acceptor)); + server ((void *) &peer_acceptor); ACE_OS::wait (); } #elif defined (ACE_HAS_THREADS) if (ACE_Thread_Manager::instance ()->spawn - (ACE_THR_FUNC (server), - ACE_reinterpret_cast (void *, &peer_acceptor), - THR_NEW_LWP | THR_DETACHED) == -1) + (ACE_THR_FUNC (server), (void *) &peer_acceptor, THR_NEW_LWP | THR_DETACHED) == -1) ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n%a"), ASYS_TEXT ("thread create failed"))); if (ACE_Thread_Manager::instance ()->spawn - (ACE_THR_FUNC (client), - ACE_reinterpret_cast (void *, &server_addr), - THR_NEW_LWP | THR_DETACHED) == -1) + (ACE_THR_FUNC (client), (void *) &server_addr, THR_NEW_LWP | THR_DETACHED) == -1) ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P|%t) %p\n%a"), ASYS_TEXT ("thread create failed"))); // Wait for the threads to exit. diff --git a/tests/SOCK_Send_Recv_Test.dsp b/tests/SOCK_Send_Recv_Test.dsp index 69063cf3034..8a3b828651f 100644 --- a/tests/SOCK_Send_Recv_Test.dsp +++ b/tests/SOCK_Send_Recv_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=SOCK_Send_Recv_Test - Win32 PharLap ETS Debug
+CFG=SOCK_Send_Recv_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,23 +13,20 @@ CFG=SOCK_Send_Recv_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "SOCK_Send_Recv_Test.mak" CFG="SOCK_Send_Recv_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "SOCK_Send_Recv_Test.mak"\
+ CFG="SOCK_Send_Recv_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "SOCK_Send_Recv_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "SOCK_Send_Recv_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "SOCK_Send_Recv_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
-
-!IF "$(CFG)" == "SOCK_Send_Recv_Test - Win32 Debug"
-
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
@@ -52,41 +49,9 @@ BSC32=bscmake.exe LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./SOCK_Send_Recv_Test.exe" /pdbtype:sept /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "SOCK_Send_Recv_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "SOCK_Send_Recv_Test___Win32_PharLap_ETS_Debug"
-# PROP BASE Intermediate_Dir "SOCK_Send_Recv_Test___Win32_PharLap_ETS_Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./SOCK_Send_Recv_Test.exe" /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./SOCK_Send_Recv_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF
-
# Begin Target
# Name "SOCK_Send_Recv_Test - Win32 Debug"
-# Name "SOCK_Send_Recv_Test - Win32 PharLap ETS Debug"
# Begin Source File
SOURCE=.\SOCK_Send_Recv_Test.cpp
diff --git a/tests/SOCK_Test.bpr b/tests/SOCK_Test.bpr new file mode 100644 index 00000000000..8763a3c5110 --- /dev/null +++ b/tests/SOCK_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = SOCK_Test.exe +OBJFILES = objs\SOCK_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/SOCK_Test.cpp b/tests/SOCK_Test.cpp index 1b7756dfb38..c7073966e14 100644 --- a/tests/SOCK_Test.cpp +++ b/tests/SOCK_Test.cpp @@ -39,7 +39,7 @@ static void * client (void *arg) { ACE_INET_Addr *remote_addr = (ACE_INET_Addr *) arg; - ACE_INET_Addr server_addr (remote_addr->get_port_number (), ACE_LOCALHOST); + ACE_INET_Addr server_addr (remote_addr->get_port_number (), ASYS_TEXT ("localhost")); ACE_SOCK_Stream cli_stream; ACE_SOCK_Connector con; diff --git a/tests/SOCK_Test.dsp b/tests/SOCK_Test.dsp index ccfbba5b06e..50422ca9aa0 100644 --- a/tests/SOCK_Test.dsp +++ b/tests/SOCK_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=SOCK_Test - Win32 PharLap ETS Debug
+CFG=SOCK_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,16 @@ CFG=SOCK_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "SOCK_Test.mak" CFG="SOCK_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "SOCK_Test.mak" CFG="SOCK_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "SOCK_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "SOCK_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "SOCK_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "SOCK_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +69,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "SOCK_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +82,12 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "SOCK_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "SOCK_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "SOCK_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "SOCK_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "SOCK_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./SOCK_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "SOCK_Test - Win32 Debug"
# Name "SOCK_Test - Win32 Alpha Debug"
-# Name "SOCK_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -191,6 +159,7 @@ DEP_CPP_SOCK_=\ "..\ace\SOCK_Stream.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\SV_Semaphore_Complex.h"\
"..\ace\SV_Semaphore_Complex.i"\
"..\ace\SV_Semaphore_Simple.h"\
@@ -210,11 +179,6 @@ DEP_CPP_SOCK_=\ "..\ace\ws2tcpip.h"\
".\test_config.h"\
-NODEP_CPP_SOCK_=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "SOCK_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/SOCK_Test.icc b/tests/SOCK_Test.icc deleted file mode 100644 index bff3f281b73..00000000000 --- a/tests/SOCK_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "SOCK_Test.exe" - { - source type (cpp) "SOCK_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/SPIPE_Test.bpr b/tests/SPIPE_Test.bpr new file mode 100644 index 00000000000..29635091d4b --- /dev/null +++ b/tests/SPIPE_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = SPIPE_Test.exe +OBJFILES = objs\SPIPE_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/SPIPE_Test.cpp b/tests/SPIPE_Test.cpp index ca977366c58..0fdcb2c56d7 100644 --- a/tests/SPIPE_Test.cpp +++ b/tests/SPIPE_Test.cpp @@ -50,14 +50,14 @@ client (void *) ACE_OS::sleep (10); if (con.connect (cli_stream, ACE_SPIPE_Addr (ACE_WIDE_STRING (rendezvous))) == -1) - ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), rendezvous)); + ACE_ERROR ((LM_ERROR, "%p\n", rendezvous)); for (char *c = ACE_ALPHABET; *c != '\0'; c++) if (cli_stream.send (c, 1) == -1) - ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("send_n"))); + ACE_ERROR ((LM_ERROR, "%p\n", "send_n")); if (cli_stream.close () == -1) - ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("close"))); + ACE_ERROR ((LM_ERROR, "%p\n", "close")); #if !defined (ACE_WIN32) ACE_OS::exit (0); @@ -78,22 +78,22 @@ server (void *) // Initialize named pipe listener. if (acceptor.open (ACE_SPIPE_Addr (ACE_WIDE_STRING (rendezvous))) == -1) - ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("open"))); + ACE_ERROR ((LM_ERROR, "%p\n", "open")); - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("waiting for connection\n"))); + ACE_DEBUG ((LM_DEBUG, "waiting for connection\n")); // Accept a client connection if (acceptor.accept (new_stream, 0) == -1) - ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("accept"))); + ACE_ERROR ((LM_ERROR, "%p\n", "accept")); - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("Accepted connection\n"))); + ACE_DEBUG ((LM_DEBUG, "Accepted connection\n")); while (new_stream.recv (buf, 1) > 0) { ACE_ASSERT (*t == buf[0]); t++; } - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("End of connection. Closing handle\n"))); + ACE_DEBUG ((LM_DEBUG, "End of connection. Closing handle\n")); new_stream.close (); acceptor.close (); return 0; @@ -101,16 +101,16 @@ server (void *) #endif /* ACE_HAS_STREAM_PIPES || ACE_WIN32 */ int -main (int, ASYS_TCHAR *[]) +main (int, char *[]) { - ACE_START_TEST (ASYS_TEXT ("SPIPE_Test")); + ACE_START_TEST ("SPIPE_Test"); #if defined (ACE_HAS_STREAM_PIPES) || defined (ACE_WIN32) #if !defined (ACE_LACKS_FORK) switch (ACE_OS::fork ()) { case -1: - ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n%a"), ASYS_TEXT ("fork failed"))); + ACE_ERROR ((LM_ERROR, "%p\n%a", "fork failed")); exit (-1); case 0: client (0); @@ -121,18 +121,18 @@ main (int, ASYS_TCHAR *[]) if (ACE_Thread_Manager::instance ()->spawn (ACE_THR_FUNC (client), (void *) 0, THR_NEW_LWP | THR_DETACHED) == -1) - ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n%a"), ASYS_TEXT ("thread create failed"))); + ACE_ERROR ((LM_ERROR, "%p\n%a", "thread create failed")); if (ACE_Thread_Manager::instance ()->spawn (ACE_THR_FUNC (server), (void *) 0, THR_NEW_LWP | THR_DETACHED) == -1) - ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n%a"), ASYS_TEXT ("thread create failed"))); + ACE_ERROR ((LM_ERROR, "%p\n%a", "thread create failed")); ACE_Thread_Manager::instance ()->wait (); #endif /* !ACE_LACKS_EXEC */ #else ACE_DEBUG ((LM_INFO, - ASYS_TEXT ("SPIPE is not supported on this platform\n"))); + "SPIPE is not supported on this platform\n")); #endif /* ACE_HAS_STREAM_PIPES || ACE_WIN32 */ ACE_END_TEST; return 0; diff --git a/tests/SPIPE_Test.dsp b/tests/SPIPE_Test.dsp index ce5bae020e9..e39190bf411 100644 --- a/tests/SPIPE_Test.dsp +++ b/tests/SPIPE_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=SPIPE_Test - Win32 PharLap ETS Debug
+CFG=SPIPE_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,17 @@ CFG=SPIPE_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "SPIPE_Test.mak" CFG="SPIPE_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "SPIPE_Test.mak" CFG="SPIPE_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "SPIPE_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "SPIPE_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "SPIPE_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "SPIPE_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "SPIPE_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +70,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "SPIPE_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +83,12 @@ LINK32=link.exe # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "SPIPE_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "SPIPE_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "SPIPE_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "SPIPE_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "SPIPE_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./SPIPE_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "SPIPE_Test - Win32 Debug"
# Name "SPIPE_Test - Win32 Alpha Debug"
-# Name "SPIPE_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -186,6 +155,7 @@ DEP_CPP_SPIPE=\ "..\ace\SPIPE_Stream.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\SV_Semaphore_Complex.h"\
"..\ace\SV_Semaphore_Complex.i"\
"..\ace\SV_Semaphore_Simple.h"\
@@ -204,11 +174,6 @@ DEP_CPP_SPIPE=\ "..\ace\ws2tcpip.h"\
".\test_config.h"\
-NODEP_CPP_SPIPE=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "SPIPE_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/SPIPE_Test.icc b/tests/SPIPE_Test.icc deleted file mode 100644 index 06adf2cd6fd..00000000000 --- a/tests/SPIPE_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "SPIPE_Test.exe" - { - source type (cpp) "SPIPE_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/SString_Test.bpr b/tests/SString_Test.bpr new file mode 100644 index 00000000000..308fd5181a0 --- /dev/null +++ b/tests/SString_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = SString_Test.exe +OBJFILES = objs\SString_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/SString_Test.dsp b/tests/SString_Test.dsp index 67efd24cf45..0791ba47eec 100644 --- a/tests/SString_Test.dsp +++ b/tests/SString_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=SString_Test - Win32 PharLap ETS Debug
+CFG=SString_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,17 @@ CFG=SString_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "SString_Test.mak" CFG="SString_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "SString_Test.mak" CFG="SString_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "SString_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "SString_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "SString_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "SString_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "SString_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +70,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "SString_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +83,12 @@ LINK32=link.exe # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "SString_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "SString_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "SString_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "SString_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "SString_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./SString_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "SString_Test - Win32 Debug"
# Name "SString_Test - Win32 Alpha Debug"
-# Name "SString_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -162,8 +131,6 @@ NODEP_CPP_SSTRI=\ "..\ace\stdcpp.h"\
-!ELSEIF "$(CFG)" == "SString_Test - Win32 PharLap ETS Debug"
-
!ENDIF
# End Source File
diff --git a/tests/SString_Test.icc b/tests/SString_Test.icc deleted file mode 100644 index b78d81ee967..00000000000 --- a/tests/SString_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "SString_Test.exe" - { - source type (cpp) "SString_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/SV_Shared_Memory_Test.bpr b/tests/SV_Shared_Memory_Test.bpr new file mode 100644 index 00000000000..37ed9effcbb --- /dev/null +++ b/tests/SV_Shared_Memory_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = SV_Shared_Memory_Test.exe +OBJFILES = objs\SV_Shared_Memory_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/SV_Shared_Memory_Test.cpp b/tests/SV_Shared_Memory_Test.cpp index c612e868b6f..cbc5ee7a35a 100644 --- a/tests/SV_Shared_Memory_Test.cpp +++ b/tests/SV_Shared_Memory_Test.cpp @@ -68,16 +68,16 @@ parent (char *shm) shm[i] = SHMDATA[i]; if (mutex.release () == -1) - ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P) %p"), ASYS_TEXT ("parent mutex.release"))); + ACE_ERROR ((LM_ERROR, "(%P) %p", "parent mutex.release")); else if (synch.acquire () == -1) - ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P) %p"), ASYS_TEXT ("parent synch.acquire"))); + ACE_ERROR ((LM_ERROR, "(%P) %p", "parent synch.acquire")); if (myallocator ().remove () == -1) - ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P) %p\n"), ASYS_TEXT ("parent allocator.remove"))); + ACE_ERROR ((LM_ERROR, "(%P) %p\n", "parent allocator.remove")); if (mutex.remove () == -1) - ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P) %p\n"), ASYS_TEXT ("parent mutex.remove"))); + ACE_ERROR ((LM_ERROR, "(%P) %p\n", "parent mutex.remove")); if (synch.remove () == -1) - ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P) %p\n"), ASYS_TEXT ("parent synch.remove"))); + ACE_ERROR ((LM_ERROR, "(%P) %p\n", "parent synch.remove")); return 0; } @@ -102,15 +102,15 @@ child (char *shm) // semaphore wrappers. while (mutex.tryacquire () == -1) if (errno == EAGAIN) - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%P) spinning in child!\n"))); + ACE_DEBUG ((LM_DEBUG, "(%P) spinning in child!\n")); else - ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("(%P) child mutex.tryacquire")), 1); + ACE_ERROR_RETURN ((LM_ERROR, "(%P) child mutex.tryacquire"), 1); for (int i = 0; i < SHMSZ; i++) ACE_ASSERT (SHMDATA[i] == shm[i]); if (synch.release () == -1) - ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("(%P) child synch.release")), 1); + ACE_ERROR_RETURN ((LM_ERROR, "(%P) child synch.release"), 1); return 0; } @@ -127,9 +127,9 @@ template class ACE_Read_Guard<ACE_SV_Semaphore_Simple>; #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ #endif /* ACE_HAS_SYSV_IPC */ int -main (int, ASYS_TCHAR *[]) +main (int, char *[]) { - ACE_START_TEST (ASYS_TEXT ("SV_Shared_Memory_Test")); + ACE_START_TEST ("SV_Shared_Memory_Test"); #if defined (ACE_HAS_SYSV_IPC) && !defined (ACE_LACKS_FORK) && !defined(ACE_LACKS_SYSV_SHMEM) char *shm = (char *) myallocator ().malloc (27); @@ -137,7 +137,7 @@ main (int, ASYS_TCHAR *[]) switch (ACE_OS::fork ("SV_Shared_Memory_Test.cpp")) { case -1: - ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("(%P) fork failed\n")), -1); + ACE_ERROR_RETURN ((LM_ERROR, "(%P) fork failed\n"), -1); /* NOTREACHED */ case 0: child (shm); @@ -148,7 +148,7 @@ main (int, ASYS_TCHAR *[]) } #else ACE_ERROR ((LM_INFO, - ASYS_TEXT ("SYSV IPC, SYSV SHMEM, or fork are not supported on this platform\n"))); + "SYSV IPC, SYSV SHMEM, or fork are not supported on this platform\n")); #endif /* ACE_HAS_SYSV_IPC */ ACE_END_TEST; return 0; diff --git a/tests/SV_Shared_Memory_Test.dsp b/tests/SV_Shared_Memory_Test.dsp index c1878793d42..e20eaa1c43a 100644 --- a/tests/SV_Shared_Memory_Test.dsp +++ b/tests/SV_Shared_Memory_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=SV_Shared_Memory_Test - Win32 PharLap ETS Debug
+CFG=SV_Shared_Memory_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,18 @@ CFG=SV_Shared_Memory_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "SV_Shared_Memory_Test.mak" CFG="SV_Shared_Memory_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "SV_Shared_Memory_Test.mak"\
+ CFG="SV_Shared_Memory_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "SV_Shared_Memory_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "SV_Shared_Memory_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "SV_Shared_Memory_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "SV_Shared_Memory_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "SV_Shared_Memory_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +71,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "SV_Shared_Memory_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +84,12 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "SV_Shared_Memory_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "SV_Shared_Memory_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "SV_Shared_Memory_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "SV_Shared_Memory_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "SV_Shared_Memory_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./SV_Shared_Memory_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "SV_Shared_Memory_Test - Win32 Debug"
# Name "SV_Shared_Memory_Test - Win32 Alpha Debug"
-# Name "SV_Shared_Memory_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -173,6 +143,7 @@ DEP_CPP_SV_SH=\ "..\ace\Signal.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\SV_Semaphore_Complex.h"\
"..\ace\SV_Semaphore_Complex.i"\
"..\ace\SV_Semaphore_Simple.h"\
@@ -189,11 +160,6 @@ DEP_CPP_SV_SH=\ "..\ace\ws2tcpip.h"\
".\test_config.h"\
-NODEP_CPP_SV_SH=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "SV_Shared_Memory_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/SV_Shared_Memory_Test.icc b/tests/SV_Shared_Memory_Test.icc deleted file mode 100644 index b9523b7f01d..00000000000 --- a/tests/SV_Shared_Memory_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "SV_Shared_Memory_Test.exe" - { - source type (cpp) "SV_Shared_Memory_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Semaphore_Test.bpr b/tests/Semaphore_Test.bpr new file mode 100644 index 00000000000..829bdedb6e0 --- /dev/null +++ b/tests/Semaphore_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Semaphore_Test.exe +OBJFILES = objs\Semaphore_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/Semaphore_Test.dsp b/tests/Semaphore_Test.dsp index c4fe806b463..e2686bbdd0e 100644 --- a/tests/Semaphore_Test.dsp +++ b/tests/Semaphore_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Semaphore_Test - Win32 PharLap ETS Debug
+CFG=Semaphore_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,17 @@ CFG=Semaphore_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Semaphore_Test.mak" CFG="Semaphore_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "Semaphore_Test.mak" CFG="Semaphore_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Semaphore_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Semaphore_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "Semaphore_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Semaphore_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Semaphore_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +70,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +83,12 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Semaphore_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Semaphore_Test___Win32_PharLap_ETS_Debug"
-# PROP BASE Intermediate_Dir "Semaphore_Test___Win32_PharLap_ETS_Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Semaphore_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "Semaphore_Test - Win32 Debug"
# Name "Semaphore_Test - Win32 Alpha Debug"
-# Name "Semaphore_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp"
@@ -197,8 +166,6 @@ NODEP_CPP_SEMAP=\ "..\ace\stdcpp.h"\
-!ELSEIF "$(CFG)" == "Semaphore_Test - Win32 PharLap ETS Debug"
-
!ENDIF
# End Source File
diff --git a/tests/Semaphore_Test.icc b/tests/Semaphore_Test.icc deleted file mode 100644 index ddea71a4643..00000000000 --- a/tests/Semaphore_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Semaphore_Test.exe" - { - source type (cpp) "Semaphore_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Service_Config_Test.bpr b/tests/Service_Config_Test.bpr new file mode 100644 index 00000000000..11dc793ef39 --- /dev/null +++ b/tests/Service_Config_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Service_Config_Test.exe +OBJFILES = objs\Service_Config_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/Service_Config_Test.cpp b/tests/Service_Config_Test.cpp index 969df5f69c0..6f6e3b912a9 100644 --- a/tests/Service_Config_Test.cpp +++ b/tests/Service_Config_Test.cpp @@ -91,7 +91,7 @@ Test_Singleton::Test_Singleton (u_short variety) if (variety_ != current_++) { ACE_DEBUG ((LM_ERROR, - ASYS_TEXT ("ERROR: instance %u created out of order!\n"), + "ERROR: instance %u created out of order!\n", variety_)); ++error; } @@ -102,21 +102,21 @@ Test_Singleton::Test_Singleton (u_short variety) Test_Singleton::~Test_Singleton (void) { - /* ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("Test_Singleton %u dtor\n"), variety_)); */ + /* ACE_DEBUG ((LM_DEBUG, "Test_Singleton %u dtor\n", variety_)); */ if (variety_ != --current_) { ACE_OS::fprintf (stderr, - ASYS_TEXT ("ERROR: instance %u destroyed out of order!\n"), + "ERROR: instance %u destroyed out of order!\n", variety_); - /* ACE_DEBUG ((LM_ERROR, ASYS_TEXT ("ERROR: instance %u destroyed out of order!\n"), + /* ACE_DEBUG ((LM_ERROR, "ERROR: instance %u destroyed out of order!\n", variety_)); */ ++error; } } static void -run_test (int argc, ASYS_TCHAR *argv[]) +run_test (int argc, char *argv[]) { // We need this scope to make sure that the destructor for the // <ACE_Service_Config> gets called. @@ -124,15 +124,15 @@ run_test (int argc, ASYS_TCHAR *argv[]) ACE_ASSERT (daemon.open (argc, argv) != -1 || errno == ENOENT); - ACE_Time_Value tv (argc > 1 ? ACE_OS::atoi (argv[1]) : 2); + ACE_Time_Value tv (argc > 1 ? atoi (argv[1]) : 2); ACE_ASSERT (ACE_Reactor::run_event_loop (tv) == 0); } int -main (int argc, ASYS_TCHAR *argv[]) +main (int argc, char *argv[]) { - ACE_START_TEST (ASYS_TEXT ("Service_Config_Test")); + ACE_START_TEST ("Service_Config_Test"); for (u_int i = 0; i < VARIETIES; ++i) { @@ -140,7 +140,7 @@ main (int argc, ASYS_TCHAR *argv[]) if (s == 0) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("instance () allocate failed!\n")), + "instance () allocate failed!\n"), 1); } diff --git a/tests/Service_Config_Test.dsp b/tests/Service_Config_Test.dsp index e727f4a99c2..7f804785939 100644 --- a/tests/Service_Config_Test.dsp +++ b/tests/Service_Config_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Service_Config_Test - Win32 PharLap ETS Debug
+CFG=Service_Config_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,18 @@ CFG=Service_Config_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Service_Config_Test.mak" CFG="Service_Config_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "Service_Config_Test.mak"\
+ CFG="Service_Config_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Service_Config_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Service_Config_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "Service_Config_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Service_Config_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Service_Config_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +71,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Service_Config_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +84,12 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Service_Config_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Service_Config_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "Service_Config_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Service_Config_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Service_Config_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Service_Config_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "Service_Config_Test - Win32 Debug"
# Name "Service_Config_Test - Win32 Alpha Debug"
-# Name "Service_Config_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -184,6 +154,7 @@ DEP_CPP_SERVI=\ "..\ace\Signal.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\SV_Semaphore_Complex.h"\
"..\ace\SV_Semaphore_Complex.i"\
"..\ace\SV_Semaphore_Simple.h"\
@@ -205,11 +176,6 @@ DEP_CPP_SERVI=\ "..\ace\ws2tcpip.h"\
".\test_config.h"\
-NODEP_CPP_SERVI=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "Service_Config_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/Service_Config_Test.icc b/tests/Service_Config_Test.icc deleted file mode 100644 index ad6a2672a33..00000000000 --- a/tests/Service_Config_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Service_Config_Test.exe" - { - source type (cpp) "Service_Config_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Shared_Memory_SV_Test.cpp b/tests/Shared_Memory_SV_Test.cpp deleted file mode 100644 index a3654a7745b..00000000000 --- a/tests/Shared_Memory_SV_Test.cpp +++ /dev/null @@ -1,83 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// tests -// -// = FILENAME -// Shared_Memory_SV_Test.cpp -// -// = DESCRIPTION -// This is a simple test of ACE_Shared_Memory_SV -// -// = AUTHOR -// Prashant Jain and Doug Schmidt -// -// ============================================================================ - - -#include "ace/Shared_Memory_SV.h" -#include "test_config.h" - -const int SHMSZ = 27; -const int SHM_KEY = 5678; - -static void -client (void) -{ - char t = 'a'; - ACE_Shared_Memory_SV shm_client (SHM_KEY, SHMSZ, - ACE_Shared_Memory_SV::ACE_CREATE); - char *shm = (char *) shm_client.malloc (); - - for (char *s = shm; *s != '\0'; s++) - { - ACE_ASSERT (t == s[0]); - t++; - } - *shm = '*'; - ACE_OS::exit (0); -} - -static void -server (void) -{ - ACE_Shared_Memory_SV shm_server (SHM_KEY, SHMSZ, - ACE_Shared_Memory_SV::ACE_CREATE); - char *shm = (char *) shm_server.malloc (); - char *s = shm; - - for (char c = 'a'; c <= 'z'; c++) - *s++ = c; - - *s = '\0'; - - while (*shm != '*') - ACE_OS::sleep (1); - - if (shm_server.remove () < 0) - ACE_ERROR ((LM_ERROR, "%p\n", "remove")); -} - -int -main (int, char *argv []) -{ - ACE_START_TEST ("Shared_Memory_SV_Test.cpp"); - - switch (ACE_OS::fork ()) - { - case -1: - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "fork"), 1); - case 0: - client (); - break; - default: - server (); - break; - } - - ACE_END_TEST; - return 0; -} - diff --git a/tests/Sigset_Ops_Test.bpr b/tests/Sigset_Ops_Test.bpr new file mode 100644 index 00000000000..3d31cf4fb60 --- /dev/null +++ b/tests/Sigset_Ops_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Sigset_Ops_Test.exe +OBJFILES = objs\Sigset_Ops_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/Sigset_Ops_Test.dsp b/tests/Sigset_Ops_Test.dsp index 42194db0df1..fd237041cd9 100644 --- a/tests/Sigset_Ops_Test.dsp +++ b/tests/Sigset_Ops_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Sigset_Ops_Test - Win32 PharLap ETS Debug
+CFG=Sigset_Ops_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,17 @@ CFG=Sigset_Ops_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Sigset_Ops_Test.mak" CFG="Sigset_Ops_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "Sigset_Ops_Test.mak" CFG="Sigset_Ops_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Sigset_Ops_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Sigset_Ops_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "Sigset_Ops_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Sigset_Ops_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Sigset_Ops_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +70,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Sigset_Ops_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +83,12 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Sigset_Ops_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Sigset_Ops_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "Sigset_Ops_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Sigset_Ops_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Sigset_Ops_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Sigset_Ops_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "Sigset_Ops_Test - Win32 Debug"
# Name "Sigset_Ops_Test - Win32 Alpha Debug"
-# Name "Sigset_Ops_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -153,16 +122,12 @@ DEP_CPP_SIGSE=\ "..\ace\OS.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\Trace.h"\
"..\ace\Version.h"\
"..\ace\ws2tcpip.h"\
".\test_config.h"\
-NODEP_CPP_SIGSE=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "Sigset_Ops_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/Sigset_Ops_Test.icc b/tests/Sigset_Ops_Test.icc deleted file mode 100644 index 402f4a58cc5..00000000000 --- a/tests/Sigset_Ops_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Sigset_Ops_Test.exe" - { - source type (cpp) "Sigset_Ops_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Simple_Message_Block_Test.bpr b/tests/Simple_Message_Block_Test.bpr new file mode 100644 index 00000000000..12e9d75fc12 --- /dev/null +++ b/tests/Simple_Message_Block_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Simple_Message_Block_Test.exe +OBJFILES = objs\Simple_Message_Block_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/Simple_Message_Block_Test.dsp b/tests/Simple_Message_Block_Test.dsp index a5a155e5ce5..bc56373c538 100644 --- a/tests/Simple_Message_Block_Test.dsp +++ b/tests/Simple_Message_Block_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Simple_Message_Block_Test - Win32 PharLap ETS Debug
+CFG=Simple_Message_Block_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,18 @@ CFG=Simple_Message_Block_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Simple_Message_Block_Test.mak" CFG="Simple_Message_Block_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "Simple_Message_Block_Test.mak"\
+ CFG="Simple_Message_Block_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Simple_Message_Block_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Simple_Message_Block_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "Simple_Message_Block_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Simple_Message_Block_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Simple_Message_Block_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +71,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Simple_Message_Block_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +84,12 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Simple_Message_Block_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Simple_Message_Block_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "Simple_Message_Block_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Simple_Message_Block_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Simple_Message_Block_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Simple_Message_Block_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "Simple_Message_Block_Test - Win32 Debug"
# Name "Simple_Message_Block_Test - Win32 Alpha Debug"
-# Name "Simple_Message_Block_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -175,6 +145,7 @@ DEP_CPP_SIMPL=\ "..\ace\Signal.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\SV_Semaphore_Complex.h"\
"..\ace\SV_Semaphore_Complex.i"\
"..\ace\SV_Semaphore_Simple.h"\
@@ -191,11 +162,6 @@ DEP_CPP_SIMPL=\ "..\ace\ws2tcpip.h"\
".\test_config.h"\
-NODEP_CPP_SIMPL=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "Simple_Message_Block_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/Simple_Message_Block_Test.icc b/tests/Simple_Message_Block_Test.icc deleted file mode 100644 index 491d98b82ab..00000000000 --- a/tests/Simple_Message_Block_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Simple_Message_Block_Test.exe" - { - source type (cpp) "Simple_Message_Block_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Svc_Handler_Test.dsp b/tests/Svc_Handler_Test.dsp index 74749471720..2425d913f88 100644 --- a/tests/Svc_Handler_Test.dsp +++ b/tests/Svc_Handler_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Svc_Handler_Test - Win32 PharLap ETS Debug
+CFG=Svc_Handler_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,16 @@ CFG=Svc_Handler_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Svc_Handler_Test.mak" CFG="Svc_Handler_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "Svc_Handler_Test.mak" CFG="Svc_Handler_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "Svc_Handler_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Svc_Handler_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "Svc_Handler_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Svc_Handler_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +69,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Svc_Handler_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +82,12 @@ LINK32=link.exe # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Svc_Handler_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Svc_Handler_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "Svc_Handler_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Svc_Handler_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Svc_Handler_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Svc_Handler_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "Svc_Handler_Test - Win32 Debug"
# Name "Svc_Handler_Test - Win32 Alpha Debug"
-# Name "Svc_Handler_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -131,7 +99,7 @@ SOURCE=.\Svc_Handler_Test.cpp !ELSEIF "$(CFG)" == "Svc_Handler_Test - Win32 Alpha Debug"
-DEP_CPP_SVC_H=\
+DEP_CPP_TASK_=\
"..\ace\ACE.h"\
"..\ace\ACE.i"\
"..\ace\Atomic_Op.i"\
@@ -197,6 +165,7 @@ DEP_CPP_SVC_H=\ "..\ace\Signal.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\Strategies.h"\
"..\ace\Strategies_T.cpp"\
"..\ace\Strategies_T.h"\
@@ -234,11 +203,6 @@ DEP_CPP_SVC_H=\ "..\ace\ws2tcpip.h"\
".\test_config.h"\
-NODEP_CPP_SVC_H=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "Svc_Handler_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/TSS_Test.bpr b/tests/TSS_Test.bpr new file mode 100644 index 00000000000..e811d8a650c --- /dev/null +++ b/tests/TSS_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = TSS_Test.exe +OBJFILES = objs\TSS_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/TSS_Test.dsp b/tests/TSS_Test.dsp index 88a5b9297cf..72f95171f62 100644 --- a/tests/TSS_Test.dsp +++ b/tests/TSS_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=TSS_Test - Win32 PharLap ETS Debug
+CFG=TSS_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,16 @@ CFG=TSS_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "TSS_Test.mak" CFG="TSS_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "TSS_Test.mak" CFG="TSS_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "TSS_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "TSS_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "TSS_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "TSS_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +69,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "TSS_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +82,12 @@ LINK32=link.exe # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "TSS_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "TSS_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "TSS_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "TSS_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "TSS_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./TSS_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "TSS_Test - Win32 Debug"
# Name "TSS_Test - Win32 Alpha Debug"
-# Name "TSS_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -173,6 +141,7 @@ DEP_CPP_TSS_T=\ "..\ace\Signal.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\SV_Semaphore_Complex.h"\
"..\ace\SV_Semaphore_Complex.i"\
"..\ace\SV_Semaphore_Simple.h"\
@@ -192,11 +161,6 @@ DEP_CPP_TSS_T=\ ".\test_config.h"\
".\TSS_Test_Errno.h"\
-NODEP_CPP_TSS_T=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "TSS_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/TSS_Test.icc b/tests/TSS_Test.icc deleted file mode 100644 index aa297680546..00000000000 --- a/tests/TSS_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "TSS_Test.exe" - { - source type (cpp) "TSS_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Task_Test.bpr b/tests/Task_Test.bpr new file mode 100644 index 00000000000..57d0a4ba97a --- /dev/null +++ b/tests/Task_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Task_Test.exe +OBJFILES = objs\Task_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/Task_Test.dsp b/tests/Task_Test.dsp index bd504437729..49c872e9e54 100644 --- a/tests/Task_Test.dsp +++ b/tests/Task_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Task_Test - Win32 PharLap ETS Debug
+CFG=Task_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,16 @@ CFG=Task_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Task_Test.mak" CFG="Task_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "Task_Test.mak" CFG="Task_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "Task_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Task_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "Task_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Task_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +69,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Task_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +82,12 @@ LINK32=link.exe # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Task_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Task_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "Task_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Task_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Task_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Task_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "Task_Test - Win32 Debug"
# Name "Task_Test - Win32 Alpha Debug"
-# Name "Task_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -197,6 +165,7 @@ DEP_CPP_TASK_=\ "..\ace\Signal.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\Strategies.h"\
"..\ace\Strategies_T.cpp"\
"..\ace\Strategies_T.h"\
@@ -234,11 +203,6 @@ DEP_CPP_TASK_=\ "..\ace\ws2tcpip.h"\
".\test_config.h"\
-NODEP_CPP_TASK_=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "Task_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/Task_Test.icc b/tests/Task_Test.icc deleted file mode 100644 index b8ca8f285eb..00000000000 --- a/tests/Task_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Task_Test.exe" - { - source type (cpp) "Task_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Thread_Manager_Test.bpr b/tests/Thread_Manager_Test.bpr new file mode 100644 index 00000000000..d01c42d3247 --- /dev/null +++ b/tests/Thread_Manager_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Thread_Manager_Test.exe +OBJFILES = objs\Thread_Manager_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/Thread_Manager_Test.cpp b/tests/Thread_Manager_Test.cpp index da7aaec3e3c..8d1711e9f10 100644 --- a/tests/Thread_Manager_Test.cpp +++ b/tests/Thread_Manager_Test.cpp @@ -214,7 +214,7 @@ main (int, ASYS_TCHAR *[]) n_threads, (ACE_THR_FUNC) worker, (void *) n_iterations, - THR_BOUND + THR_BOUND | THR_DETACHED #if defined (VXWORKS) , ACE_DEFAULT_THREAD_PRIORITY , -1 @@ -235,8 +235,7 @@ main (int, ASYS_TCHAR *[]) // so it's allowed to ENOTSUP; anything else is a hard fail. ACE_ASSERT (errno == ENOTSUP); ACE_DEBUG((LM_DEBUG, - ASYS_TEXT (" OK: suspend_grp isn't supported with ") - ASYS_TEXT ("Pthreads\n"))); + ASYS_TEXT (" OK: suspend_grp isn't supported with Pthreads\n"))); } // Wait for 1 more second and then resume every thread in the @@ -250,8 +249,7 @@ main (int, ASYS_TCHAR *[]) { ACE_ASSERT (errno == ENOTSUP); ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT (" OK: resume_grp isn't supported with ") - ASYS_TEXT ("Pthreads\n"))); + ASYS_TEXT (" OK: resume_grp isn't supported with Pthreads\n"))); } // Wait for 1 more second and then send a SIGINT to every thread in @@ -264,6 +262,10 @@ main (int, ASYS_TCHAR *[]) #if defined (ACE_HAS_WTHREADS) thr_mgr->kill_grp (grp_id, SIGINT); +#elif defined (sun) + // thr_self () can't be used safely on Solaris within a signal + // handler. It's not documented as being Async-Signal-Safe. + // So, don't signal them in this test on Solaris. #elif !defined (ACE_HAS_PTHREADS_DRAFT4) ACE_ASSERT (thr_mgr->kill_grp (grp_id, SIGINT) != -1); @@ -283,7 +285,7 @@ main (int, ASYS_TCHAR *[]) // Perform a barrier wait until all the threads have shut down. // But, wait for a limited time, just in case. - const ACE_Time_Value max_wait (600); + const ACE_Time_Value max_wait (60); const ACE_Time_Value wait_time (ACE_OS::gettimeofday () + max_wait); if (thr_mgr->wait (&wait_time) == -1) { @@ -293,7 +295,7 @@ main (int, ASYS_TCHAR *[]) max_wait.msec ())); else ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("%p\n"), ASYS_TEXT ("wait"))); + "%p\n", "wait")); status = -1; } diff --git a/tests/Thread_Manager_Test.dsp b/tests/Thread_Manager_Test.dsp index c471c079905..ca62f5abe6e 100644 --- a/tests/Thread_Manager_Test.dsp +++ b/tests/Thread_Manager_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Thread_Manager_Test - Win32 PharLap ETS Debug
+CFG=Thread_Manager_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,18 @@ CFG=Thread_Manager_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Thread_Manager_Test.mak" CFG="Thread_Manager_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "Thread_Manager_Test.mak"\
+ CFG="Thread_Manager_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Thread_Manager_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Thread_Manager_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "Thread_Manager_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Thread_Manager_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Thread_Manager_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +71,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Thread_Manager_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +84,12 @@ LINK32=link.exe # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Thread_Manager_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Thread_Manager_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "Thread_Manager_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Thread_Manager_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Thread_Manager_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Thread_Manager_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "Thread_Manager_Test - Win32 Debug"
# Name "Thread_Manager_Test - Win32 Alpha Debug"
-# Name "Thread_Manager_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -173,6 +143,7 @@ DEP_CPP_THREA=\ "..\ace\Signal.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\SV_Semaphore_Complex.h"\
"..\ace\SV_Semaphore_Complex.i"\
"..\ace\SV_Semaphore_Simple.h"\
@@ -191,11 +162,6 @@ DEP_CPP_THREA=\ "..\ace\ws2tcpip.h"\
".\test_config.h"\
-NODEP_CPP_THREA=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "Thread_Manager_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/Thread_Manager_Test.icc b/tests/Thread_Manager_Test.icc deleted file mode 100644 index dded477b8fd..00000000000 --- a/tests/Thread_Manager_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Thread_Manager_Test.exe" - { - source type (cpp) "Thread_Manager_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Thread_Mutex_Test.bpr b/tests/Thread_Mutex_Test.bpr new file mode 100644 index 00000000000..467da61d732 --- /dev/null +++ b/tests/Thread_Mutex_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Thread_Mutex_Test.exe +OBJFILES = objs\Thread_Mutex_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/Thread_Mutex_Test.dsp b/tests/Thread_Mutex_Test.dsp index 4e3631aca14..113314f484a 100644 --- a/tests/Thread_Mutex_Test.dsp +++ b/tests/Thread_Mutex_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Thread_Mutex_Test - Win32 PharLap ETS Debug
+CFG=Thread_Mutex_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,23 +13,20 @@ CFG=Thread_Mutex_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Thread_Mutex_Test.mak" CFG="Thread_Mutex_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "Thread_Mutex_Test.mak" CFG="Thread_Mutex_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Thread_Mutex_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Thread_Mutex_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Thread_Mutex_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
CPP=cl.exe
RSC=rc.exe
-
-!IF "$(CFG)" == "Thread_Mutex_Test - Win32 Debug"
-
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Thread_M"
@@ -51,40 +48,9 @@ BSC32=bscmake.exe LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Thread_Mutex_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Thread_Mutex_Test___Win32_PharLap_ETS_Debug"
-# PROP BASE Intermediate_Dir "Thread_Mutex_Test___Win32_PharLap_ETS_Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Thread_Mutex_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF
-
# Begin Target
# Name "Thread_Mutex_Test - Win32 Debug"
-# Name "Thread_Mutex_Test - Win32 PharLap ETS Debug"
# Begin Source File
SOURCE=.\Thread_Mutex_Test.cpp
diff --git a/tests/Thread_Mutex_Test.icc b/tests/Thread_Mutex_Test.icc deleted file mode 100644 index 7faf8bd52fd..00000000000 --- a/tests/Thread_Mutex_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Thread_Mutex_Test.exe" - { - source type (cpp) "Thread_Mutex_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Thread_Pool_Reactor_Test.cpp b/tests/Thread_Pool_Reactor_Test.cpp index 66ff5199632..9d5489e2777 100644 --- a/tests/Thread_Pool_Reactor_Test.cpp +++ b/tests/Thread_Pool_Reactor_Test.cpp @@ -61,7 +61,7 @@ typedef ACE_Strategy_Acceptor <Request_Handler, ACE_SOCK_ACCEPTOR> ACCEPTOR; // Accepting end point. This is actually "localhost:10010", but some // platform couldn't resolve the name so we use the IP address // directly here. -static const ASYS_TCHAR *rendezvous = ASYS_TEXT ("127.0.0.1:10010"); +static LPCTSTR rendezvous = ASYS_TEXT ("127.0.0.1:10010"); // Total number of server threads. static size_t svr_thrno = ACE_MAX_THREADS; @@ -247,7 +247,7 @@ static void * worker (void *) { ACE_OS::sleep (3); - const ASYS_TCHAR *msg = ASYS_TEXT ("Message from Connection worker"); + LPCTSTR msg = ASYS_TEXT ("Message from Connection worker"); ASYS_TCHAR buf [BUFSIZ]; buf[0] = (ACE_OS::strlen (msg) + 1) * sizeof (ASYS_TCHAR); ACE_OS::strcpy (&buf[1], msg); diff --git a/tests/Thread_Pool_Reactor_Test.dsp b/tests/Thread_Pool_Reactor_Test.dsp index b254a4c8a85..5003602b975 100644 --- a/tests/Thread_Pool_Reactor_Test.dsp +++ b/tests/Thread_Pool_Reactor_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Thread_Pool_Reactor_Test - Win32 PharLap ETS Debug
+CFG=Thread_Pool_Reactor_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,17 @@ CFG=Thread_Pool_Reactor_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Thread_Pool_Reactor_Test.mak" CFG="Thread_Pool_Reactor_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "Thread_Pool_Reactor_Test.mak" CFG="Thread_Pool_Reactor_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Thread_Pool_Reactor_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Thread_Pool_Reactor_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "Thread_Pool_Reactor_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Thread_Pool_Reactor_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Thread_Pool_Reactor_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +70,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +83,12 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Thread_Pool_Reactor_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Thread_Pool_Reactor_Test___Win32_PharLap_ETS_Debug"
-# PROP BASE Intermediate_Dir "Thread_Pool_Reactor_Test___Win32_PharLap_ETS_Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Thread_Pool_Reactor_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "Thread_Pool_Reactor_Test - Win32 Debug"
# Name "Thread_Pool_Reactor_Test - Win32 Alpha Debug"
-# Name "Thread_Pool_Reactor_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter ".cpp"
@@ -131,7 +100,7 @@ SOURCE=.\Thread_Pool_Reactor_Test.cpp !ELSEIF "$(CFG)" == "Thread_Pool_Reactor_Test - Win32 Alpha Debug"
-DEP_CPP_THREA=\
+DEP_CPP_ATOMI=\
"..\ace\ACE.h"\
"..\ace\ACE.i"\
"..\ace\Atomic_Op.i"\
@@ -156,6 +125,7 @@ DEP_CPP_THREA=\ "..\ace\OS.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\SV_Semaphore_Complex.h"\
"..\ace\SV_Semaphore_Complex.i"\
"..\ace\SV_Semaphore_Simple.h"\
@@ -172,11 +142,6 @@ DEP_CPP_THREA=\ "..\ace\ws2tcpip.h"\
".\test_config.h"\
-NODEP_CPP_THREA=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "Thread_Pool_Reactor_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/Thread_Pool_Reactor_Test.icc b/tests/Thread_Pool_Reactor_Test.icc deleted file mode 100644 index fc15a6ae3cf..00000000000 --- a/tests/Thread_Pool_Reactor_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Thread_Pool_Reactor_Test.exe" - { - source type (cpp) "Thread_Pool_Reactor_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Thread_Pool_Test.bpr b/tests/Thread_Pool_Test.bpr new file mode 100644 index 00000000000..2d4160ff267 --- /dev/null +++ b/tests/Thread_Pool_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Thread_Pool_Test.exe +OBJFILES = objs\Thread_Pool_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/Thread_Pool_Test.cpp b/tests/Thread_Pool_Test.cpp index b840cbe28bd..14bc973287d 100644 --- a/tests/Thread_Pool_Test.cpp +++ b/tests/Thread_Pool_Test.cpp @@ -203,9 +203,7 @@ Thread_Pool::open (void *) &this->lock_adapter_), -1); - int i; // We need to define 'i' here to keep EGCS from complaining... - - for (i = this->thr_count (); i > 0; i--) + for (int i = this->thr_count (); i > 0; i--) { ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) EOF, enqueueing NULL block for thread = %d\n"), diff --git a/tests/Thread_Pool_Test.dsp b/tests/Thread_Pool_Test.dsp index a525b25d1a2..97b2b5fba34 100644 --- a/tests/Thread_Pool_Test.dsp +++ b/tests/Thread_Pool_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Thread_Pool_Test - Win32 PharLap ETS Debug
+CFG=Thread_Pool_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,17 @@ CFG=Thread_Pool_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Thread_Pool_Test.mak" CFG="Thread_Pool_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "Thread_Pool_Test.mak" CFG="Thread_Pool_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Thread_Pool_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Thread_Pool_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "Thread_Pool_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Thread_Pool_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Thread_Pool_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +70,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Thread_Pool_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +83,12 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Thread_Pool_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Thread_Pool_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "Thread_Pool_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Thread_Pool_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Thread_Pool_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Thread_Pool_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "Thread_Pool_Test - Win32 Debug"
# Name "Thread_Pool_Test - Win32 Alpha Debug"
-# Name "Thread_Pool_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -197,6 +166,7 @@ DEP_CPP_THREA=\ "..\ace\Signal.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\Strategies.h"\
"..\ace\Strategies_T.cpp"\
"..\ace\Strategies_T.h"\
@@ -234,11 +204,6 @@ DEP_CPP_THREA=\ "..\ace\ws2tcpip.h"\
".\test_config.h"\
-NODEP_CPP_THREA=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "Thread_Pool_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/Thread_Pool_Test.icc b/tests/Thread_Pool_Test.icc deleted file mode 100644 index 4b90a1380a8..00000000000 --- a/tests/Thread_Pool_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Thread_Pool_Test.exe" - { - source type (cpp) "Thread_Pool_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Time_Service_Test.bpr b/tests/Time_Service_Test.bpr new file mode 100644 index 00000000000..d7a283344df --- /dev/null +++ b/tests/Time_Service_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Time_Service_Test.exe +OBJFILES = objs\Time_Service_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/Time_Service_Test.cpp b/tests/Time_Service_Test.cpp index acea9415223..ecb5436bb28 100644 --- a/tests/Time_Service_Test.cpp +++ b/tests/Time_Service_Test.cpp @@ -39,9 +39,9 @@ ACE_TEXT ("main") ACE_PLATFORM_EXE_SUFFIX \ ACE_TEXT (" -f ") ACE_PLATFORM int -main (int, ASYS_TCHAR *[]) +main (int, char *[]) { - ACE_START_TEST (ASYS_TEXT ("Time_Service_Test")); + ACE_START_TEST ("Time_Service_Test"); // Make sure that the backing store is not there. We need to make // sure because this test kills the Time Clerk and on some platforms @@ -56,10 +56,10 @@ main (int, ASYS_TCHAR *[]) ACE_Process server; if (server.spawn (server_options) == -1) - ACE_ERROR_RETURN ((LM_DEBUG, ASYS_TEXT ("%n; %p (%s).\n"), - ASYS_TEXT ("Server fork failed"), server_cl), -1); + ACE_ERROR_RETURN ((LM_DEBUG, "%n; %p (%s).\n", + "Server fork failed", server_cl), -1); else - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("Server forked with pid = %d.\n"), server.getpid ())); + ACE_DEBUG ((LM_DEBUG, "Server forked with pid = %d.\n", server.getpid ())); ACE_OS::sleep (3); @@ -69,19 +69,19 @@ main (int, ASYS_TCHAR *[]) ACE_Process clerk; if (clerk.spawn (clerk_options) == -1) - ACE_ERROR_RETURN ((LM_DEBUG, ASYS_TEXT ("%n; %p: (%s).\n"), - ASYS_TEXT ("Clerk fork failed"), clerk_cl), -1); + ACE_ERROR_RETURN ((LM_DEBUG, "%n; %p: (%s).\n", + "Clerk fork failed", clerk_cl), -1); else - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("Clerk forked with pid = %d.\n"), clerk.getpid ())); + ACE_DEBUG ((LM_DEBUG, "Clerk forked with pid = %d.\n", clerk.getpid ())); - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("Sleeping...\n"))); + ACE_DEBUG ((LM_DEBUG, "Sleeping...\n")); ACE_OS::sleep (10); if (clerk.terminate () == -1) - ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("Terminate failed for clerk.\n")), -1); + ACE_ERROR_RETURN ((LM_ERROR, "Terminate failed for clerk.\n"), -1); if (server.terminate () == -1) - ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("Terminate failed for server.\n")), -1); + ACE_ERROR_RETURN ((LM_ERROR, "Terminate failed for server.\n"), -1); // Since we kill the clerk process, on Win32 it may not do a // graceful shutdown and the backing store file is left behind. diff --git a/tests/Time_Service_Test.dsp b/tests/Time_Service_Test.dsp index eecdd2c504a..77456a2b9b2 100644 --- a/tests/Time_Service_Test.dsp +++ b/tests/Time_Service_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Time_Service_Test - Win32 PharLap ETS Debug
+CFG=Time_Service_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,17 @@ CFG=Time_Service_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Time_Service_Test.mak" CFG="Time_Service_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "Time_Service_Test.mak" CFG="Time_Service_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Time_Service_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Time_Service_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "Time_Service_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Time_Service_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Time_Service_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +70,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Time_Service_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +83,12 @@ LINK32=link.exe # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Time_Service_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Time_Service_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "Time_Service_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Time_Service_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Time_Service_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Time_Service_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "Time_Service_Test - Win32 Debug"
# Name "Time_Service_Test - Win32 Alpha Debug"
-# Name "Time_Service_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -155,16 +124,12 @@ DEP_CPP_TIME_=\ "..\ace\Process.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\Trace.h"\
"..\ace\Version.h"\
"..\ace\ws2tcpip.h"\
".\test_config.h"\
-NODEP_CPP_TIME_=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "Time_Service_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/Time_Service_Test.icc b/tests/Time_Service_Test.icc deleted file mode 100644 index 563240411b2..00000000000 --- a/tests/Time_Service_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Time_Service_Test.exe" - { - source type (cpp) "Time_Service_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Time_Value_Test.bpr b/tests/Time_Value_Test.bpr new file mode 100644 index 00000000000..1832f6af3f9 --- /dev/null +++ b/tests/Time_Value_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Time_Value_Test.exe +OBJFILES = objs\Time_Value_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/Time_Value_Test.dsp b/tests/Time_Value_Test.dsp index 540632e9ce4..737673e2586 100644 --- a/tests/Time_Value_Test.dsp +++ b/tests/Time_Value_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Time_Value_Test - Win32 PharLap ETS Debug
+CFG=Time_Value_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,17 @@ CFG=Time_Value_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Time_Value_Test.mak" CFG="Time_Value_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "Time_Value_Test.mak" CFG="Time_Value_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Time_Value_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Time_Value_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "Time_Value_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Time_Value_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Time_Value_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +70,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Time_Value_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +83,12 @@ LINK32=link.exe # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Time_Value_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Time_Value_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "Time_Value_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Time_Value_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Time_Value_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Time_Value_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "Time_Value_Test - Win32 Debug"
# Name "Time_Value_Test - Win32 Alpha Debug"
-# Name "Time_Value_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -153,16 +122,12 @@ DEP_CPP_TIME_=\ "..\ace\OS.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\Trace.h"\
"..\ace\Version.h"\
"..\ace\ws2tcpip.h"\
".\test_config.h"\
-NODEP_CPP_TIME_=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "Time_Value_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/Time_Value_Test.icc b/tests/Time_Value_Test.icc deleted file mode 100644 index f88e9c66963..00000000000 --- a/tests/Time_Value_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Time_Value_Test.exe" - { - source type (cpp) "Time_Value_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Timeprobe_Test.bpr b/tests/Timeprobe_Test.bpr new file mode 100644 index 00000000000..f47d0b9e6f7 --- /dev/null +++ b/tests/Timeprobe_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Timeprobe_Test.exe +OBJFILES = objs\Timeprobe_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/Timeprobe_Test.dsp b/tests/Timeprobe_Test.dsp index 0371ce07940..b5e5c697652 100644 --- a/tests/Timeprobe_Test.dsp +++ b/tests/Timeprobe_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Timeprobe_Test - Win32 PharLap ETS Debug
+CFG=Timeprobe_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,23 +13,19 @@ CFG=Timeprobe_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Timeprobe_Test.mak" CFG="Timeprobe_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "Timeprobe_Test.mak" CFG="Timeprobe_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Timeprobe_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Timeprobe_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Timeprobe_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
-
-!IF "$(CFG)" == "Timeprobe_Test - Win32 Debug"
-
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
@@ -52,41 +48,9 @@ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF "$(CFG)" == "Timeprobe_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Timeprobe_Test___Win32_PharLap_ETS_Debug"
-# PROP BASE Intermediate_Dir "Timeprobe_Test___Win32_PharLap_ETS_Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Timeprobe_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF
-
# Begin Target
# Name "Timeprobe_Test - Win32 Debug"
-# Name "Timeprobe_Test - Win32 PharLap ETS Debug"
# Begin Source File
SOURCE=.\Timeprobe_Test.cpp
diff --git a/tests/Timeprobe_Test.icc b/tests/Timeprobe_Test.icc deleted file mode 100644 index c1d9dc3a194..00000000000 --- a/tests/Timeprobe_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Timeprobe_Test.exe" - { - source type (cpp) "Timeprobe_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Timer_Queue_Test.bpr b/tests/Timer_Queue_Test.bpr new file mode 100644 index 00000000000..9470aefc357 --- /dev/null +++ b/tests/Timer_Queue_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Timer_Queue_Test.exe +OBJFILES = objs\Timer_Queue_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/Timer_Queue_Test.cpp b/tests/Timer_Queue_Test.cpp index aff963cec17..c985f5c762e 100644 --- a/tests/Timer_Queue_Test.cpp +++ b/tests/Timer_Queue_Test.cpp @@ -10,16 +10,13 @@ // // = DESCRIPTION // This is a simple test of <ACE_Timer_Queue> and four of its -// subclasses (<ACE_Timer_List>, <ACE_Timer_Heap>, -// <ACE_Timer_Wheel>, and <ACE_Timer_Hash>). The test sets up a -// bunch of timers and then adds them to a timer queue. The -// functionality of the timer queue is then tested. No command -// line arguments are needed to run the test. +// subclasses (<ACE_Timer_List>, <ACE_Timer_Heap>, <ACE_Timer_Wheel>, and +// <ACE_Timer_Hash>). The test sets up a bunch of timers and then adds +// them to a timer queue. The functionality of the timer queue is then +// tested. No command line arguments are needed to run the test. // // = AUTHORS -// Douglas C. Schmidt <schmidt@cs.wustl.edu>, -// Prashant Jain <pjain@cs.wustl.edu>, and -// Darrell Brunsch <brunsch@cs.wustl.edu> +// Douglas C. Schmidt, Prashant Jain, and Darrell Brunsch // // ============================================================================ @@ -55,9 +52,9 @@ randomize_array (T array[], size_t size) } } -// Number of iterations for the performance tests. Some platforms -// have a very high ACE_DEFAULT_TIMERS (HP-UX is 400), so limit this -// to a reasonable run time. +// Number of iterations for the performance tests. Some platforms have a very +// high ACE_DEFAULT_TIMERS (HP-UX is 400), so limit this to a reasonable run +// time. #if (ACE_DEFAULT_TIMERS > 20) static int max_iterations = 2000; #else @@ -83,8 +80,7 @@ public: const void *arg) { ACE_ASSERT (arg == (const void *) 42 || arg == (const void *)007); - - if (arg != (const void *) 42) + if (arg != (const void *)42) return -1; else return 0; @@ -103,17 +99,16 @@ test_functionality (ACE_Timer_Queue *tq) ACE_ASSERT (ACE_Time_Value::zero == ACE_Time_Value (0)); long timer_id, timer_id2; - // Do a test on earliest_time. + // Do a test on earliest_time + ACE_Time_Value earliest_time = tq->gettimeofday (); - timer_id = tq->schedule (&eh, - (const void *) 1, + timer_id = tq->schedule (&eh, (const void *) 1, earliest_time); ACE_OS::sleep (ACE_Time_Value (0, 10)); - timer_id2 = tq->schedule (&eh, - (const void *) 1, + timer_id2 = tq->schedule (&eh, (const void *) 1, tq->gettimeofday ()); ACE_ASSERT (tq->earliest_time () == earliest_time); @@ -121,51 +116,42 @@ test_functionality (ACE_Timer_Queue *tq) tq->cancel (timer_id); tq->cancel (timer_id2); - timer_id = tq->schedule (&eh, - (const void *) 1, + timer_id = tq->schedule (&eh, (const void *) 1, tq->gettimeofday ()); ACE_ASSERT (timer_id != -1); ACE_ASSERT (tq->is_empty () == 0); //== - ACE_ASSERT (tq->schedule (&eh, - (const void *) 42, - tq->gettimeofday ()) != -1); + ACE_ASSERT (tq->schedule (&eh, (const void *) 42, + tq->gettimeofday ()) != -1); ACE_ASSERT (tq->is_empty () == 0); //== - ACE_ASSERT (tq->schedule (&eh, - (const void *) 42, - tq->gettimeofday ()) != -1); + ACE_ASSERT (tq->schedule (&eh, (const void *) 42, + tq->gettimeofday ()) != -1); ACE_ASSERT (tq->is_empty () == 0); //== - // The following method will trigger a call to <handle_close>. ACE_ASSERT (tq->cancel (timer_id, 0, 0) == 1); ACE_ASSERT (tq->is_empty () == 0); ACE_ASSERT (tq->expire () == 2); - ACE_ASSERT (tq->schedule (&eh, - (const void *) 007, + ACE_ASSERT (tq->schedule (&eh, (const void *) 007, tq->gettimeofday ()) != -1); - ACE_ASSERT (tq->schedule (&eh, - (const void *) 42, + ACE_ASSERT (tq->schedule (&eh, (const void *) 42, tq->gettimeofday () + ACE_Time_Value (100)) != -1); - ACE_ASSERT (tq->schedule (&eh, - (const void *) 42, - tq->gettimeofday () + ACE_Time_Value (100)) != -1); - - // The following will trigger a call to <handle_close> when it - // cancels the second timer. This happens because the first timer - // has an <act> of 007, which causes eh.handle_timeout () to return - // -1. Since -1 is returned, all timers that use <eh> will be - // cancelled (and <handle_close> will only be called on the first - // timer that is cancelled). + ACE_ASSERT (tq->schedule (&eh, (const void *) 42, + tq->gettimeofday () + ACE_Time_Value (100)) != -1); + + // The following will trigger a call to <handle_close> when + // it cancels the second timer. This happens because the first + // timer has an <act> of 007, which causes eh.handle_timeout () to + // return -1. Since -1 is returned, all timers that use <eh> will + // be cancelled (and <handle_close> will only be called on the first + // timer that is cancelled). ACE_ASSERT (tq->expire () == 1); ACE_ASSERT (tq->is_empty () != 0); - ACE_ASSERT (tq->schedule (&eh, - (const void *) 4, + ACE_ASSERT (tq->schedule (&eh, (const void *) 4, tq->gettimeofday ()) != -1); - ACE_ASSERT (tq->schedule (&eh, - (const void *) 5, + ACE_ASSERT (tq->schedule (&eh, (const void *) 5, tq->gettimeofday ()) != -1); // The following method will trigger a call to <handle_close>. @@ -175,17 +161,14 @@ test_functionality (ACE_Timer_Queue *tq) // This tests to make sure that <handle_close> is called when there // is only one timer of the type in the queue - ACE_ASSERT (tq->schedule (&eh, - (const void *) 007, + ACE_ASSERT (tq->schedule (&eh, (const void *) 007, tq->gettimeofday ()) != -1); ACE_ASSERT (tq->expire () == 1); - timer_id = tq->schedule (&eh, - (const void *) 6, + timer_id = tq->schedule (&eh, (const void *) 6, tq->gettimeofday ()); ACE_ASSERT (timer_id != -1); - ACE_ASSERT (tq->schedule (&eh, - (const void *) 7, + ACE_ASSERT (tq->schedule (&eh, (const void *) 7, tq->gettimeofday ()) != -1); // The following method will *not* trigger a call to <handle_close>. @@ -237,7 +220,7 @@ test_performance (ACE_Timer_Queue *tq, max_iterations, test_name)); ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("real time = %f secs, user time = %f secs, system time = %f secs\n"), - et.real_time, et.user_time, et.system_time)); + et.real_time, et.user_time, et.system_time)); ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("time per call = %f usecs\n"), (et.user_time / ACE_timer_t (max_iterations)) * 1000000)); @@ -260,7 +243,7 @@ test_performance (ACE_Timer_Queue *tq, max_iterations, test_name)); ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("real time = %f secs, user time = %f secs, system time = %f secs\n"), - et.real_time, et.user_time, et.system_time)); + et.real_time, et.user_time, et.system_time)); ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("time per call = %f usecs\n"), (et.user_time / ACE_timer_t (max_iterations)) * 1000000)); @@ -283,10 +266,10 @@ test_performance (ACE_Timer_Queue *tq, timer.stop (); if (!tq->is_empty ()) - { - ACE_OS::sleep (ACE_Time_Value (1)); - tq->expire (); - } + { + ACE_OS::sleep (ACE_Time_Value (1)); + tq->expire (); + } ACE_ASSERT (tq->is_empty ()); @@ -321,10 +304,10 @@ test_performance (ACE_Timer_Queue *tq, tq->cancel (timer_ids[i]); if (!tq->is_empty ()) - { - ACE_OS::sleep (ACE_Time_Value (1)); - tq->expire (); - } + { + ACE_OS::sleep (ACE_Time_Value (1)); + tq->expire (); + } ACE_ASSERT (tq->is_empty ()); @@ -333,17 +316,14 @@ test_performance (ACE_Timer_Queue *tq, timer.elapsed_time (et); ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("time to randomly cancel %d timers for %s\n"), - max_iterations, - test_name)); + ASYS_TEXT ("time to randomly cancel %d timers for %s\n"), + max_iterations, test_name)); ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("real time = %f secs, user time = %f secs, system time = %f secs\n"), - et.real_time, - et.user_time, - et.system_time)); + ASYS_TEXT ("real time = %f secs, user time = %f secs, system time = %f secs\n"), + et.real_time, et.user_time, et.system_time)); ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("time per call = %f usecs\n"), - (et.user_time / ACE_timer_t (max_iterations)) * 1000000)); + ASYS_TEXT ("time per call = %f usecs\n"), + (et.user_time / ACE_timer_t (max_iterations)) * 1000000)); // Test the amount of time required to randomly schedule all the timers. @@ -373,9 +353,7 @@ test_performance (ACE_Timer_Queue *tq, max_iterations, test_name)); ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("real time = %f secs, user time = %f secs, system time = %f secs\n"), - et.real_time, - et.user_time, - et.system_time)); + et.real_time, et.user_time, et.system_time)); ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("time per call = %f usecs\n"), (et.user_time / ACE_timer_t (max_iterations)) * 1000000)); @@ -387,10 +365,10 @@ test_performance (ACE_Timer_Queue *tq, tq->expire (); if (!tq->is_empty ()) - { - ACE_OS::sleep (ACE_Time_Value (1)); - tq->expire (); - } + { + ACE_OS::sleep (ACE_Time_Value (1)); + tq->expire (); + } ACE_ASSERT (tq->is_empty ()); @@ -403,7 +381,7 @@ test_performance (ACE_Timer_Queue *tq, max_iterations, test_name)); ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("real time = %f secs, user time = %f secs, system time = %f secs\n"), - et.real_time, et.user_time, et.system_time)); + et.real_time, et.user_time, et.system_time)); ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("time per call = %f usecs\n"), (et.user_time / ACE_timer_t (max_iterations)) * 1000000)); @@ -411,23 +389,13 @@ test_performance (ACE_Timer_Queue *tq, delete [] times; } -class Timer_Queue_Stack +struct Timer_Queue_List { - // = TITLE - // Keeps track of the <Timer_Queue>s that we're going to test. - // - // = DESCRIPTION - // This data structure is organized as a stack to make it easy to implement. -public: - // = Initialization method - Timer_Queue_Stack (ACE_Timer_Queue *queue, - const ASYS_TCHAR *name, - Timer_Queue_Stack *next = NULL) + Timer_Queue_List (ACE_Timer_Queue *queue, const ASYS_TCHAR *name, Timer_Queue_List *next = NULL) : queue_ (queue), name_ (name), next_ (next) {} - // "Push" a new <queue> on the stack of <queue>s. ACE_Timer_Queue *queue_; // Pointer to the subclass of <ACE_Timer_Queue> that we're testing. @@ -435,8 +403,8 @@ public: const ASYS_TCHAR *name_; // Name of the Queue that we're testing. - Timer_Queue_Stack *next_; - // Pointer to the next <Timer_Queue>. + Timer_Queue_List *next_; + // Pointer to the next <Timer_Queues> structure }; int @@ -451,78 +419,88 @@ main (int argc, ASYS_TCHAR *argv[]) // = Perform initializations. - Timer_Queue_Stack *tq_stack = NULL; + Timer_Queue_List *tq_list = NULL; - // Add new Timer_Queue implementations here. Note that these will - // be executed in "reverse order" since we treat + // Add new Timer_Queue implementations here. + // Timer_Hash (Heap) - ACE_NEW_RETURN (tq_stack, - Timer_Queue_Stack (new ACE_Timer_Hash_Heap, - ASYS_TEXT ("ACE_Timer_Hash (Heap)"), - tq_stack), + + ACE_NEW_RETURN (tq_list, + Timer_Queue_List (new ACE_Timer_Hash_Heap, + ASYS_TEXT ("ACE_Timer_Hash (Heap)"), + tq_list), -1); // Timer_Hash - ACE_NEW_RETURN (tq_stack, - Timer_Queue_Stack (new ACE_Timer_Hash, - ASYS_TEXT ("ACE_Timer_Hash"), - tq_stack), + + ACE_NEW_RETURN (tq_list, + Timer_Queue_List (new ACE_Timer_Hash, + ASYS_TEXT ("ACE_Timer_Hash"), + tq_list), -1); - // Timer_stack - ACE_NEW_RETURN (tq_stack, - Timer_Queue_Stack (new ACE_Timer_List, - ASYS_TEXT ("ACE_Timer_List"), - tq_stack), + // Timer_List + + ACE_NEW_RETURN (tq_list, + Timer_Queue_List (new ACE_Timer_List, + ASYS_TEXT ("ACE_Timer_List"), + tq_list), -1); // Timer_Wheel without preallocated memory - ACE_NEW_RETURN (tq_stack, - Timer_Queue_Stack (new ACE_Timer_Wheel, - ASYS_TEXT ("ACE_Timer_Wheel (non-preallocated)"), - tq_stack), + + ACE_NEW_RETURN (tq_list, + Timer_Queue_List (new ACE_Timer_Wheel, + ASYS_TEXT ("ACE_Timer_Wheel (non-preallocated)"), + tq_list), -1); // Timer_Wheel with preallocated memory. - ACE_NEW_RETURN (tq_stack, - Timer_Queue_Stack (new ACE_Timer_Wheel (ACE_DEFAULT_TIMER_WHEEL_SIZE, + + ACE_NEW_RETURN (tq_list, + Timer_Queue_List (new ACE_Timer_Wheel (ACE_DEFAULT_TIMER_WHEEL_SIZE, ACE_DEFAULT_TIMER_WHEEL_RESOLUTION, max_iterations), - ASYS_TEXT ("ACE_Timer_Wheel (preallocated)"), - tq_stack), + ASYS_TEXT ("ACE_Timer_Wheel (preallocated)"), + tq_list), -1); + + + // Timer_Heap without preallocated memory. - ACE_NEW_RETURN (tq_stack, - Timer_Queue_Stack (new ACE_Timer_Heap, - ASYS_TEXT ("ACE_Timer_Heap (non-preallocated)"), - tq_stack), + + ACE_NEW_RETURN (tq_list, + Timer_Queue_List (new ACE_Timer_Heap, + ASYS_TEXT ("ACE_Timer_Heap (non-preallocated)"), + tq_list), -1); // Timer_Heap with preallocate memory. - ACE_NEW_RETURN (tq_stack, - Timer_Queue_Stack (new ACE_Timer_Heap (max_iterations, 1), - ASYS_TEXT ("ACE_Timer_Heap (preallocated)"), - tq_stack), + + ACE_NEW_RETURN (tq_list, + Timer_Queue_List (new ACE_Timer_Heap (max_iterations, 1), + ASYS_TEXT ("ACE_Timer_Heap (preallocated)"), + tq_list), -1); // Create the Timer ID array + ACE_NEW_RETURN (timer_ids, long[max_iterations], -1); - Timer_Queue_Stack *tq_ptr = tq_stack; + Timer_Queue_List *tq_ptr = tq_list; while (tq_ptr != NULL) { - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("**** starting test of %s\n"), + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("**** starting test of %s\n"), tq_ptr->name_)); test_functionality (tq_ptr->queue_); test_performance (tq_ptr->queue_, tq_ptr->name_); delete tq_ptr->queue_; - Timer_Queue_Stack *temp = tq_ptr; + Timer_Queue_List *temp = tq_ptr; tq_ptr = tq_ptr->next_; delete temp; } diff --git a/tests/Timer_Queue_Test.dsp b/tests/Timer_Queue_Test.dsp index 892ae5afdcf..e78360f5dff 100644 --- a/tests/Timer_Queue_Test.dsp +++ b/tests/Timer_Queue_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Timer_Queue_Test - Win32 PharLap ETS Debug
+CFG=Timer_Queue_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,17 @@ CFG=Timer_Queue_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Timer_Queue_Test.mak" CFG="Timer_Queue_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "Timer_Queue_Test.mak" CFG="Timer_Queue_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Timer_Queue_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Timer_Queue_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "Timer_Queue_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Timer_Queue_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Timer_Queue_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +70,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Timer_Queue_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +83,12 @@ LINK32=link.exe # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Timer_Queue_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Timer_Queue_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "Timer_Queue_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Timer_Queue_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Timer_Queue_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Timer_Queue_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "Timer_Queue_Test - Win32 Debug"
# Name "Timer_Queue_Test - Win32 Alpha Debug"
-# Name "Timer_Queue_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -177,6 +146,7 @@ DEP_CPP_TIMER=\ "..\ace\Signal.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\SV_Semaphore_Complex.h"\
"..\ace\SV_Semaphore_Complex.i"\
"..\ace\SV_Semaphore_Simple.h"\
@@ -210,11 +180,6 @@ DEP_CPP_TIMER=\ "..\ace\ws2tcpip.h"\
".\test_config.h"\
-NODEP_CPP_TIMER=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "Timer_Queue_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/Timer_Queue_Test.icc b/tests/Timer_Queue_Test.icc deleted file mode 100644 index 37276b4070f..00000000000 --- a/tests/Timer_Queue_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Timer_Queue_Test.exe" - { - source type (cpp) "Timer_Queue_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Tokens_Test.bpr b/tests/Tokens_Test.bpr new file mode 100644 index 00000000000..c2ea1b68935 --- /dev/null +++ b/tests/Tokens_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Tokens_Test.exe +OBJFILES = objs\Tokens_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/Tokens_Test.cpp b/tests/Tokens_Test.cpp index d6678b9a168..b4b75cb6c7d 100644 --- a/tests/Tokens_Test.cpp +++ b/tests/Tokens_Test.cpp @@ -45,7 +45,7 @@ USELIB("..\ace\aced.lib"); typedef ACE_Token_Invariant_Manager TOKEN_INVARIANTS; -static const ASYS_TCHAR *server_host = ACE_DEFAULT_SERVER_HOST; +static const char *server_host = ACE_DEFAULT_SERVER_HOST; static const int server_port = 23456; // Synchronize starts of threads, so that they all start before one @@ -59,7 +59,7 @@ struct Test_Params public: ACE_Token_Proxy *token1_; ACE_Token_Proxy *token2_; - const ASYS_TCHAR *collection_name_; + const char *collection_name_; }; static void * @@ -70,7 +70,7 @@ run_thread (void *vp) collection.insert (*(tp->token1_)); collection.insert (*(tp->token2_)); - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) new thread.\n"))); + ACE_DEBUG ((LM_DEBUG, "(%t) new thread.\n")); thread_start->wait (); int count = 50; @@ -80,19 +80,17 @@ run_thread (void *vp) { if (ACE_OS::last_error () == EDEADLK) { - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("deadlock detected in acquire"))); + ACE_DEBUG ((LM_DEBUG, "deadlock detected in acquire")); continue; } - ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("(%t) %p acquire failed\n"), - ASYS_TEXT ("run_thread"))); + ACE_ERROR ((LM_ERROR, "(%t) %p acquire failed\n","run_thread")); return (void *) -1; } ACE_ASSERT ((TOKEN_INVARIANTS::instance ()->acquired (tp->token1_) == 1) || (TOKEN_INVARIANTS::instance ()->acquired (tp->token2_) == 1)); - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) %s acquired.\n"), collection.name ())); + ACE_DEBUG ((LM_DEBUG, "(%t) %s acquired.\n", collection.name ())); TOKEN_INVARIANTS::instance ()->releasing (tp->token1_); TOKEN_INVARIANTS::instance ()->releasing (tp->token2_); @@ -101,18 +99,17 @@ run_thread (void *vp) { if (ACE_OS::last_error () == EDEADLK) { - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("deadlock detected"))); + ACE_DEBUG ((LM_DEBUG, "deadlock detected")); goto deadlock; } - ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%t) %p renew failed\n"), - ASYS_TEXT ("run_thread"))); + ACE_ERROR ((LM_ERROR, "(%t) %p renew failed\n","run_thread")); return (void *) -1; } ACE_ASSERT (TOKEN_INVARIANTS::instance ()->acquired (tp->token1_) == 1 || TOKEN_INVARIANTS::instance ()->acquired (tp->token2_) == 1); - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) %s renewed.\n"), collection.name ())); + ACE_DEBUG ((LM_DEBUG, "(%t) %s renewed.\n", collection.name ())); deadlock: @@ -121,15 +118,15 @@ run_thread (void *vp) if (collection.release () == -1) { - ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%t) %p release failed\n"),ASYS_TEXT ("run_thread"))); + ACE_ERROR ((LM_ERROR, "(%t) %p release failed\n","run_thread")); return (void *) -1; } - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) %s released.\n"), collection.name ())); + ACE_DEBUG ((LM_DEBUG, "(%t) %s released.\n", collection.name ())); } - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) thread finished.\n"))); + ACE_DEBUG ((LM_DEBUG, "(%t) thread finished.\n")); return 0; } @@ -145,15 +142,15 @@ run_test (ACE_Token_Proxy *A, // tp1 and tp2 can run concurrently. Neither tp1 or tp3 can run // when tp2 is running. - tp1.collection_name_ = ASYS_TEXT ("A and Reader"); + tp1.collection_name_ = "A and Reader"; tp1.token1_ = A; tp1.token2_ = R; - tp2.collection_name_ = ASYS_TEXT ("A and Writer"); + tp2.collection_name_ = "A and Writer"; tp2.token1_ = A; tp2.token2_ = W; - tp3.collection_name_ = ASYS_TEXT ("B and Reader"); + tp3.collection_name_ = "B and Reader"; tp3.token1_ = B; tp3.token2_ = R; @@ -162,35 +159,35 @@ run_test (ACE_Token_Proxy *A, if (mgr->spawn (ACE_THR_FUNC (run_thread), (void *) &tp1, THR_BOUND) == -1) - ACE_ERROR_RETURN ((LM_DEBUG, ASYS_TEXT ("%p\n"), ASYS_TEXT ("spawn 1 failed")), -1); + ACE_ERROR_RETURN ((LM_DEBUG, "%p\n", "spawn 1 failed"), -1); if (mgr->spawn (ACE_THR_FUNC (run_thread), (void *) &tp2, THR_BOUND) == -1) - ACE_ERROR_RETURN ((LM_DEBUG, ASYS_TEXT ("%p\n"), ASYS_TEXT ("spawn 2 failed")), -1); + ACE_ERROR_RETURN ((LM_DEBUG, "%p\n", "spawn 2 failed"), -1); if (mgr->spawn (ACE_THR_FUNC (run_thread), (void *) &tp3, THR_BOUND) == -1) - ACE_ERROR_RETURN ((LM_DEBUG, ASYS_TEXT ("%p\n"), ASYS_TEXT ("spawn 3 failed")), -1); + ACE_ERROR_RETURN ((LM_DEBUG, "%p\n", "spawn 3 failed"), -1); // Wait for all threads to exit. mgr->wait (); - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("Test finished.\n"))); + ACE_DEBUG ((LM_DEBUG, "Test finished.\n")); return 0; } #endif /* ACE_HAS_THREADS */ int -main (int, ASYS_TCHAR *[]) +main (int, char *[]) { - ACE_START_TEST (ASYS_TEXT ("Tokens_Test")); + ACE_START_TEST ("Tokens_Test"); #if defined (ACE_HAS_THREADS) ACE_Token_Proxy *A = 0, *B = 0, *R = 0, *W = 0; - ACE_NEW_RETURN (A, ACE_Local_Mutex (ASYS_TEXT ("L Mutex A"), 0, 0), -1); - ACE_NEW_RETURN (B, ACE_Local_Mutex (ASYS_TEXT ("L Mutex B"), 0, 0), -1); - ACE_NEW_RETURN (R, ACE_Local_RLock (ASYS_TEXT ("L Reader Lock"), 0, 0), -1); - ACE_NEW_RETURN (W, ACE_Local_WLock (ASYS_TEXT ("L Writer Lock"), 0, 0), -1); + ACE_NEW_RETURN (A, ACE_Local_Mutex ("L Mutex A", 0, 0), -1); + ACE_NEW_RETURN (B, ACE_Local_Mutex ("L Mutex B", 0, 0), -1); + ACE_NEW_RETURN (R, ACE_Local_RLock ("L Reader Lock", 0, 0), -1); + ACE_NEW_RETURN (W, ACE_Local_WLock ("L Writer Lock", 0, 0), -1); ACE_NEW_RETURN (thread_start, ACE_Barrier (3), -1); run_test (A, B, R, W); @@ -206,23 +203,23 @@ main (int, ASYS_TCHAR *[]) ACE_Process_Options options; options.command_line (cl); - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("Forking Token Service.\n"))); + ACE_DEBUG ((LM_DEBUG, "Forking Token Service.\n")); // Start up the token server for the remote test. ACE_Process new_process; if (new_process.spawn (options) == -1) - ACE_ERROR ((LM_DEBUG, ASYS_TEXT ("%n; %p (%s), will not run remote test.\n"), - ASYS_TEXT ("Server fork failed"), cl)); + ACE_ERROR ((LM_DEBUG, "%n; %p (%s), will not run remote test.\n", + "Server fork failed", cl)); else { - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("Server forked with pid = %d.\n"), + ACE_DEBUG ((LM_DEBUG, "Server forked with pid = %d.\n", new_process.getpid ())); // Wait for the server to start. ACE_OS::sleep (3); ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("Using Token Server on %s at port %d.\n"), + "Using Token Server on %s at port %d.\n", server_host, server_port)); ACE_Remote_Mutex::set_server_address (ACE_INET_Addr (server_port, server_host)); @@ -232,10 +229,10 @@ main (int, ASYS_TCHAR *[]) delete R; delete W; - ACE_NEW_RETURN (A, ACE_Remote_Mutex (ASYS_TEXT ("R Mutex A"), 0, 1), -1); - ACE_NEW_RETURN (B, ACE_Remote_Mutex (ASYS_TEXT ("R Mutex B"), 0, 1), -1); - ACE_NEW_RETURN (R, ACE_Remote_RLock (ASYS_TEXT ("R Reader Lock"), 0, 1), -1); - ACE_NEW_RETURN (W, ACE_Remote_WLock (ASYS_TEXT ("R Writer Lock"), 0, 1), -1); + ACE_NEW_RETURN (A, ACE_Remote_Mutex ("R Mutex A", 0, 1), -1); + ACE_NEW_RETURN (B, ACE_Remote_Mutex ("R Mutex B", 0, 1), -1); + ACE_NEW_RETURN (R, ACE_Remote_RLock ("R Reader Lock", 0, 1), -1); + ACE_NEW_RETURN (W, ACE_Remote_WLock ("R Writer Lock", 0, 1), -1); run_test (A, B, R, W); @@ -244,7 +241,7 @@ main (int, ASYS_TCHAR *[]) // Kill the token server. if (new_process.terminate () == -1) - ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("Kill failed.\n")), -1); + ACE_ERROR_RETURN ((LM_ERROR, "Kill failed.\n"), -1); } delete thread_start; @@ -254,10 +251,10 @@ main (int, ASYS_TCHAR *[]) delete R; delete W; - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) main thread exiting.\n"))); + ACE_DEBUG ((LM_DEBUG, "(%t) main thread exiting.\n")); #else ACE_ERROR ((LM_INFO, - ASYS_TEXT ("threads not supported on this platform\n"))); + "threads not supported on this platform\n")); #endif /* ACE_HAS_THREADS */ ACE_END_TEST; return 0; diff --git a/tests/Tokens_Test.dsp b/tests/Tokens_Test.dsp index d407a8937d9..2501564ea85 100644 --- a/tests/Tokens_Test.dsp +++ b/tests/Tokens_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Tokens_Test - Win32 PharLap ETS Debug
+CFG=Tokens_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,17 @@ CFG=Tokens_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Tokens_Test.mak" CFG="Tokens_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "Tokens_Test.mak" CFG="Tokens_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Tokens_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Tokens_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "Tokens_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Tokens_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Tokens_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +70,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "Tokens_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +83,12 @@ LINK32=link.exe # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Tokens_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Tokens_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "Tokens_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Tokens_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Tokens_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Tokens_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "Tokens_Test - Win32 Debug"
# Name "Tokens_Test - Win32 Alpha Debug"
-# Name "Tokens_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -209,6 +178,7 @@ DEP_CPP_TOKEN=\ "..\ace\SOCK_Stream.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\SV_Semaphore_Complex.h"\
"..\ace\SV_Semaphore_Complex.i"\
"..\ace\SV_Semaphore_Simple.h"\
@@ -240,11 +210,6 @@ DEP_CPP_TOKEN=\ "..\ace\ws2tcpip.h"\
".\test_config.h"\
-NODEP_CPP_TOKEN=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "Tokens_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/Tokens_Test.icc b/tests/Tokens_Test.icc deleted file mode 100644 index 3381ea44ca5..00000000000 --- a/tests/Tokens_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Tokens_Test.exe" - { - source type (cpp) "Tokens_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/UPIPE_SAP_Test.bpr b/tests/UPIPE_SAP_Test.bpr new file mode 100644 index 00000000000..b8668f7d04f --- /dev/null +++ b/tests/UPIPE_SAP_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = UPIPE_SAP_Test.exe +OBJFILES = objs\UPIPE_SAP_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/UPIPE_SAP_Test.cpp b/tests/UPIPE_SAP_Test.cpp index 4401fc202d8..04fcd624c91 100644 --- a/tests/UPIPE_SAP_Test.cpp +++ b/tests/UPIPE_SAP_Test.cpp @@ -45,11 +45,11 @@ connector (void *) ACE_OS::sleep (5); - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) connector starting connect\n"))); + ACE_DEBUG ((LM_DEBUG, "(%t) connector starting connect\n")); ACE_UPIPE_Connector con; if (con.connect (c_stream, addr) == -1) - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) connector ACE_UPIPE_Connector failed\n"))); + ACE_DEBUG ((LM_DEBUG, "(%t) connector ACE_UPIPE_Connector failed\n")); ACE_Message_Block *mb; @@ -58,10 +58,10 @@ connector (void *) mb->copy ("hello"); if (c_stream.send (mb) == -1) - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) error connector send\n"))); + ACE_DEBUG ((LM_DEBUG, "(%t) error connector send\n")); if (c_stream.recv (mb) == -1) - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) error connector recv\n"))); + ACE_DEBUG ((LM_DEBUG, "(%t) error connector recv\n")); ACE_ASSERT (ACE_OS::strcmp (mb->rd_ptr (), "thanks") == 0); @@ -71,10 +71,10 @@ connector (void *) // Now try the send()/recv() interface. char mytext[] = "This string is sent by connector as a buffer"; - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) connector sending text\n"))); + ACE_DEBUG ((LM_DEBUG, "(%t) connector sending text\n")); if (c_stream.send (mytext, sizeof (mytext)) == -1) ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%t) buffer send from connector failed\n"))); + "(%t) buffer send from connector failed\n")); char conbuf[BUFSIZ]; // Buffer to receive response. @@ -84,17 +84,17 @@ connector (void *) { if (c_stream.recv (&c, 1) == -1) ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%t) buffer recv from connector failed\n"))); + "(%t) buffer recv from connector failed\n")); else conbuf[i] = c; } conbuf[i] = '\0'; - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) conbuf = %s\n"), conbuf)); + ACE_DEBUG ((LM_DEBUG, "(%t) conbuf = %s\n", conbuf)); ACE_ASSERT (ACE_OS::strcmp (conbuf, "this is the acceptor response!") == 0); c_stream.close (); - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) exiting thread\n"))); + ACE_DEBUG ((LM_DEBUG, "(%t) exiting thread\n")); return 0; } @@ -106,12 +106,12 @@ acceptor (void *args) if (acceptor->accept (s_stream) == -1) ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%t) ACE_UPIPE_Acceptor.accept failed\n"))); + "(%t) ACE_UPIPE_Acceptor.accept failed\n")); ACE_Message_Block *mb = 0; if (s_stream.recv (mb) == -1) - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) acceptor recv failed\n"))); + ACE_DEBUG ((LM_DEBUG, "(%t) acceptor recv failed\n")); ACE_ASSERT (ACE_OS::strcmp (mb->rd_ptr (), "hello") == 0); @@ -119,13 +119,13 @@ acceptor (void *args) mb->copy ("thanks"); if (s_stream.send (mb) == -1) - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) acceptor send failed\n"))); + ACE_DEBUG ((LM_DEBUG, "(%t) acceptor send failed\n")); char s_buf[BUFSIZ]; - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) acceptor sleeping on recv\n"))); + ACE_DEBUG ((LM_DEBUG, "(%t) acceptor sleeping on recv\n")); if (s_stream.recv (s_buf, sizeof (s_buf)) == -1) - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) acceptor recv failed\n"))); + ACE_DEBUG ((LM_DEBUG, "(%t) acceptor recv failed\n")); else ACE_ASSERT (ACE_OS::strcmp (s_buf, "This string is sent by connector as a buffer") == 0); @@ -134,18 +134,18 @@ acceptor (void *args) ACE_OS::strcpy (s_buf, svr_response); if (s_stream.send (s_buf, sizeof (svr_response)) == -1) - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) acceptor send failed\n"))); + ACE_DEBUG ((LM_DEBUG, "(%t) acceptor send failed\n")); s_stream.close (); - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) exiting thread\n"))); + ACE_DEBUG ((LM_DEBUG, "(%t) exiting thread\n")); return 0; } #endif /* ACE_HAS_THREADS && defined ACE_HAS_STREAM_PIPES || (ACE_WIN32&&NT4)*/ int -main (int, ASYS_TCHAR *[]) +main (int, char *[]) { - ACE_START_TEST (ASYS_TEXT ("UPIPE_SAP_Test")); + ACE_START_TEST ("UPIPE_SAP_Test"); #if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_STREAM_PIPES) || \ (defined (ACE_WIN32) && \ @@ -158,17 +158,17 @@ main (int, ASYS_TCHAR *[]) (void *) &acc, THR_NEW_LWP, 0) == -1) - ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("spawn")), 1); + ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "spawn"), 1); // Spawn a connector thread. if (ACE_Thread_Manager::instance ()->spawn (ACE_THR_FUNC (connector), (void *) 0, THR_NEW_LWP, 0) == -1) - ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("spawn")), 1); + ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "spawn"), 1); ACE_Thread_Manager::instance ()->wait (); - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) joined with acceptor thread\n"))); + ACE_DEBUG ((LM_DEBUG, "(%t) joined with acceptor thread\n")); // Close the acceptor acc.close (); @@ -176,9 +176,9 @@ main (int, ASYS_TCHAR *[]) #else #if !defined (ACE_HAS_THREADS) - ACE_ERROR ((LM_INFO, ASYS_TEXT ("threads not supported on this platform\n"))); + ACE_ERROR ((LM_INFO, "threads not supported on this platform\n")); #else - ACE_ERROR ((LM_INFO, ASYS_TEXT ("UPIPE is not supported on this platform\n"))); + ACE_ERROR ((LM_INFO, "UPIPE is not supported on this platform\n")); #endif /* !defined (ACE_HAS_THREADS) */ #endif /* defined (ACE_HAS_THREADS) && (defined (ACE_HAS_STREAM_PIPES) || defined (ACE_WIN32) && NT4) */ diff --git a/tests/UPIPE_SAP_Test.dsp b/tests/UPIPE_SAP_Test.dsp index 192c018820b..3a72501c0cc 100644 --- a/tests/UPIPE_SAP_Test.dsp +++ b/tests/UPIPE_SAP_Test.dsp @@ -5,7 +5,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=UPIPE_SAP_Test - Win32 PharLap ETS Debug
+CFG=UPIPE_SAP_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,17 +14,17 @@ CFG=UPIPE_SAP_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "UPIPE_SAP_Test.mak" CFG="UPIPE_SAP_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "UPIPE_SAP_Test.mak" CFG="UPIPE_SAP_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "UPIPE_SAP_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "UPIPE_SAP_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "UPIPE_SAP_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "UPIPE_SAP_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "UPIPE_SAP_Test - Win32 Alpha Debug" (based on\
+ "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -70,8 +70,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "UPIPE_SAP_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -83,43 +83,12 @@ LINK32=link.exe # ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "UPIPE_SAP_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "UPIPE_SAP_Test\PharLap ETS Debug"
-# PROP BASE Intermediate_Dir "UPIPE_SAP_Test\PharLap ETS Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "UPIPE_SAP_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "UPIPE_SAP_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./UPIPE_SAP_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "UPIPE_SAP_Test - Win32 Debug"
# Name "UPIPE_SAP_Test - Win32 Alpha Debug"
-# Name "UPIPE_SAP_Test - Win32 PharLap ETS Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -208,6 +177,7 @@ DEP_CPP_UPIPE=\ "..\ace\SPIPE_Stream.i"\
"..\ace\SString.h"\
"..\ace\SString.i"\
+ "..\ace\stdcpp.h"\
"..\ace\Strategies.h"\
"..\ace\Strategies_T.cpp"\
"..\ace\Strategies_T.h"\
@@ -256,11 +226,6 @@ DEP_CPP_UPIPE=\ "..\ace\ws2tcpip.h"\
".\test_config.h"\
-NODEP_CPP_UPIPE=\
- "..\ace\stdcpp.h"\
-
-
-!ELSEIF "$(CFG)" == "UPIPE_SAP_Test - Win32 PharLap ETS Debug"
!ENDIF
diff --git a/tests/UPIPE_SAP_Test.icc b/tests/UPIPE_SAP_Test.icc deleted file mode 100644 index 785888c0180..00000000000 --- a/tests/UPIPE_SAP_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "UPIPE_SAP_Test.exe" - { - source type (cpp) "UPIPE_SAP_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/Upgradable_RW_Test.bpr b/tests/Upgradable_RW_Test.bpr new file mode 100644 index 00000000000..8bbc99e6898 --- /dev/null +++ b/tests/Upgradable_RW_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Upgradable_RW_Test.exe +OBJFILES = objs\Upgradable_RW_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/Upgradable_RW_Test.cpp b/tests/Upgradable_RW_Test.cpp index 791b6d89d1b..90e76e41331 100644 --- a/tests/Upgradable_RW_Test.cpp +++ b/tests/Upgradable_RW_Test.cpp @@ -110,9 +110,9 @@ static void print_usage_and_die (void) { ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("usage: %n [-r n_readers] [-w n_writers]\n") - ASYS_TEXT (" [-e max_entries] [-u try update] ") - ASYS_TEXT ("[-n iteration_count] [-f for FIFO threads]\n"))); + ASYS_TEXT ("usage: %n [-r n_readers] [-w n_writers]\n" + " [-e max_entries] [-u try update] " + "[-n iteration_count] [-f for FIFO threads]\n"))); ACE_OS::exit (1); } @@ -295,11 +295,11 @@ Time_Calculation ::print_stats (void) double tmp = 1000 / elapsed_time.real_time; ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("\n") - ASYS_TEXT ("\treal_time\t = %0.06f ms, \n") - ASYS_TEXT ("\tuser_time\t = %0.06f ms, \n") - ASYS_TEXT ("\tsystem_time\t = %0.06f ms, \n") - ASYS_TEXT ("\t%0.00f calls/second\n"), + ASYS_TEXT ("\n" + "\treal_time\t = %0.06f ms, \n" + "\tuser_time\t = %0.06f ms, \n" + "\tsystem_time\t = %0.06f ms, \n" + "\t%0.00f calls/second\n"), elapsed_time.real_time < 0.0 ? 0.0 : elapsed_time.real_time, elapsed_time.user_time < 0.0 ? 0.0 : elapsed_time.user_time, elapsed_time.system_time < 0.0 ? 0.0 : elapsed_time.system_time, @@ -311,7 +311,7 @@ Time_Calculation ::print_stats (void) } else ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("\tNo time stats printed. Zero iterations or error ocurred.\n"))); + "\tNo time stats printed. Zero iterations or error ocurred.\n")); } static int diff --git a/tests/Upgradable_RW_Test.dsp b/tests/Upgradable_RW_Test.dsp index a993d5e5519..37933f6d07c 100644 --- a/tests/Upgradable_RW_Test.dsp +++ b/tests/Upgradable_RW_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Upgradable_RW_Test - Win32 PharLap ETS Debug
+CFG=Upgradable_RW_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,23 +13,21 @@ CFG=Upgradable_RW_Test - Win32 PharLap ETS Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Upgradable_RW_Test.mak" CFG="Upgradable_RW_Test - Win32 PharLap ETS Debug"
+!MESSAGE NMAKE /f "Upgradable_RW_Test.mak"\
+ CFG="Upgradable_RW_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Upgradable_RW_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Upgradable_RW_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Upgradable_RW_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
-# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
CPP=cl.exe
RSC=rc.exe
-
-!IF "$(CFG)" == "Upgradable_RW_Test - Win32 Debug"
-
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
@@ -51,40 +49,9 @@ BSC32=bscmake.exe LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Upgradable_RW_Test - Win32 PharLap ETS Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Upgradable_RW_Test___Win32_PharLap_ETS_Debug"
-# PROP BASE Intermediate_Dir "Upgradable_RW_Test___Win32_PharLap_ETS_Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\ETS_LIB\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Upgradable_RW_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF
-
# Begin Target
# Name "Upgradable_RW_Test - Win32 Debug"
-# Name "Upgradable_RW_Test - Win32 PharLap ETS Debug"
# Begin Group "Source files"
# PROP Default_Filter "*.cpp"
diff --git a/tests/Upgradable_RW_Test.icc b/tests/Upgradable_RW_Test.icc deleted file mode 100644 index 117be19b9f2..00000000000 --- a/tests/Upgradable_RW_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "Upgradable_RW_Test.exe" - { - source type (cpp) "Upgradable_RW_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/XtReactor_Test.bpr b/tests/XtReactor_Test.bpr new file mode 100644 index 00000000000..7ac903df2f9 --- /dev/null +++ b/tests/XtReactor_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = XtReactor_Test.exe +OBJFILES = objs\XtReactor_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/XtReactor_Test.icc b/tests/XtReactor_Test.icc deleted file mode 100644 index c37c4d06afb..00000000000 --- a/tests/XtReactor_Test.icc +++ /dev/null @@ -1,22 +0,0 @@ -option - define ("ACE_HAS_WINSOCK2","1"), - define ("__ACE_INLINE__","0"), - define ("WIN32","1"), - define ("_WINDOWS","1"), - define("ACE_HAS_DLL","0"), - link(libSearchPath,'H:\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - { - target "XtReactor_Test.exe" - { - source type (cpp) "XtReactor_Test.cpp" - - source type (lib) "aced.lib" - source type (lib) "advapi32.lib" - source type (lib) "user32.lib" - source type (lib) "ws2_32.lib" - source type (lib) "wsock32.lib" - source type (lib) "mswsock.lib" - } - } diff --git a/tests/icc.bat b/tests/icc.bat deleted file mode 100644 index a54461b85ea..00000000000 --- a/tests/icc.bat +++ /dev/null @@ -1,223 +0,0 @@ -vacbld -SEV=E Aio_Platform_Test.icc -vacbld -SEV=E Atomic_Op_Test.icc -vacbld -SEV=E Barrier_Test.icc -vacbld -SEV=E Basic_Types_Test.icc -vacbld -SEV=E Buffer_Stream_Test.icc -vacbld -SEV=E CDR_Test.icc -vacbld -SEV=E Collection_Test.icc -vacbld -SEV=E Conn_Test.icc -vacbld -SEV=E DLL_Test.icc -vacbld -SEV=E DLList_Test.icc -vacbld -SEV=E Dynamic_Priority_Test.icc -vacbld -SEV=E Enum_Interfaces_Test.icc -vacbld -SEV=E Env_Value_Test.icc -vacbld -SEV=E Future_Test.icc -vacbld -SEV=E Future_Set_Test.icc -vacbld -SEV=E Handle_Set_Test.icc -vacbld -SEV=E Hash_Map_Manager_Test.icc -vacbld -SEV=E High_Res_Timer_Test.icc -vacbld -SEV=E IOStream_Test.icc -vacbld -SEV=E MM_Shared_Memory_Test.icc -vacbld -SEV=E MT_Reactor_Timer_Test.icc -vacbld -SEV=E MT_SOCK_Test.icc -vacbld -SEV=E Map_Manager_Test.icc -vacbld -SEV=E Map_Test.icc -vacbld -SEV=E Mem_Map_Test.icc -vacbld -SEV=E Message_Block_Test.icc -vacbld -SEV=E Message_Queue_Notifications_Test.icc -vacbld -SEV=E Message_Queue_Test.icc -vacbld -SEV=E Naming_Test.icc -vacbld -SEV=E Notify_Performance_Test.icc -vacbld -SEV=E OrdMultiSet_Test.icc -vacbld -SEV=E Pipe_Test.icc -vacbld -SEV=E Priority_Buffer_Test.icc -vacbld -SEV=E Priority_Reactor_Test.icc -vacbld -SEV=E Priority_Task_Test.icc -vacbld -SEV=E Process_Mutex_Test.icc -vacbld -SEV=E Process_Strategy_Test.icc -vacbld -SEV=E Purgable_Map_Manager_Test.icc -vacbld -SEV=E RB_Tree_Test.icc -vacbld -SEV=E Reactor_Exceptions_Test.icc -vacbld -SEV=E Reactor_Notify_Test.icc -vacbld -SEV=E Reactor_Performance_Test.icc -vacbld -SEV=E Reactor_Timer_Test.icc -vacbld -SEV=E Reactors_Test.icc -vacbld -SEV=E Reader_Writer_Test.icc -vacbld -SEV=E Recursive_Mutex_Test.icc -vacbld -SEV=E SOCK_Connector_Test.icc -vacbld -SEV=E SOCK_Test.icc -vacbld -SEV=E SPIPE_Test.icc -vacbld -SEV=E SString_Test.icc -vacbld -SEV=E SV_Shared_Memory_Test.icc -vacbld -SEV=E Semaphore_Test.icc -vacbld -SEV=E Service_Config_Test.icc -vacbld -SEV=E Sigset_Ops_Test.icc -vacbld -SEV=E Simple_Message_Block_Test.icc -vacbld -SEV=E TSS_Test.icc -vacbld -SEV=E Task_Test.icc -vacbld -SEV=E Thread_Manager_Test.icc -vacbld -SEV=E Thread_Mutex_Test.icc -vacbld -SEV=E Thread_Pool_Reactor_Test.icc -vacbld -SEV=E Thread_Pool_Test.icc -vacbld -SEV=E Time_Service_Test.icc -vacbld -SEV=E Time_Value_Test.icc -vacbld -SEV=E Timeprobe_Test.icc -vacbld -SEV=E Timer_Queue_Test.icc -vacbld -SEV=E Tokens_Test.icc -vacbld -SEV=E UPIPE_SAP_Test.icc -vacbld -SEV=E Upgradable_RW_Test.icc -vacbld -SEV=E XtReactor_Test.icc -vacbld -SEV=E Aio_Platform_Test.icc -vacbld -SEV=E Atomic_Op_Test.icc -vacbld -SEV=E Barrier_Test.icc -vacbld -SEV=E Basic_Types_Test.icc -vacbld -SEV=E Buffer_Stream_Test.icc -vacbld -SEV=E CDR_Test.icc -vacbld -SEV=E CLASSIX_Addr_Test.icc -vacbld -SEV=E CLASSIX_CLD_Connector_Test.icc -vacbld -SEV=E CLASSIX_Con_Acc_Test.icc -vacbld -SEV=E CLASSIX_Group_Test.icc -vacbld -SEV=E CLASSIX_Notify_Test.icc -vacbld -SEV=E CLASSIX_OS_Test.icc -vacbld -SEV=E CLASSIX_Reactor_Test.icc -vacbld -SEV=E CLASSIX_Select_Reactor_Test.icc -vacbld -SEV=E CLASSIX_Stream_Test.icc -vacbld -SEV=E Collection_Test.icc -vacbld -SEV=E Conn_Test.icc -vacbld -SEV=E DLL_Test.icc -vacbld -SEV=E DLList_Test.icc -vacbld -SEV=E Dynamic_Priority_Test.icc -vacbld -SEV=E Enum_Interfaces_Test.icc -vacbld -SEV=E Env_Value_Test.icc -vacbld -SEV=E Future_Test.icc -vacbld -SEV=E Handle_Set_Test.icc -vacbld -SEV=E Hash_Map_Manager_Test.icc -vacbld -SEV=E High_Res_Timer_Test.icc -vacbld -SEV=E IOStream_Test.icc -vacbld -SEV=E MM_Shared_Memory_Test.icc -vacbld -SEV=E MT_Reactor_Timer_Test.icc -vacbld -SEV=E MT_SOCK_Test.icc -vacbld -SEV=E Map_Manager_Test.icc -vacbld -SEV=E Map_Test.icc -vacbld -SEV=E Mem_Map_Test.icc -vacbld -SEV=E Message_Block_Test.icc -vacbld -SEV=E Message_Queue_Notifications_Test.icc -vacbld -SEV=E Message_Queue_Test.icc -vacbld -SEV=E Naming_Test.icc -vacbld -SEV=E Notify_Performance_Test.icc -vacbld -SEV=E OrdMultiSet_Test.icc -vacbld -SEV=E Pipe_Test.icc -vacbld -SEV=E Priority_Buffer_Test.icc -vacbld -SEV=E Priority_Reactor_Test.icc -vacbld -SEV=E Priority_Task_Test.icc -vacbld -SEV=E Process_Mutex_Test.icc -vacbld -SEV=E Process_Strategy_Test.icc -vacbld -SEV=E Purgable_Map_Manager_Test.icc -vacbld -SEV=E RB_Tree_Test.icc -vacbld -SEV=E Reactor_Exceptions_Test.icc -vacbld -SEV=E Reactor_Notify_Test.icc -vacbld -SEV=E Reactor_Performance_Test.icc -vacbld -SEV=E Reactor_Timer_Test.icc -vacbld -SEV=E Reactors_Test.icc -vacbld -SEV=E Reader_Writer_Test.icc -vacbld -SEV=E Recursive_Mutex_Test.icc -vacbld -SEV=E SOCK_Connector_Test.icc -vacbld -SEV=E SOCK_Test.icc -vacbld -SEV=E SPIPE_Test.icc -vacbld -SEV=E SString_Test.icc -vacbld -SEV=E SV_Shared_Memory_Test.icc -vacbld -SEV=E Semaphore_Test.icc -vacbld -SEV=E Service_Config_Test.icc -vacbld -SEV=E Sigset_Ops_Test.icc -vacbld -SEV=E Simple_Message_Block_Test.icc -vacbld -SEV=E TSS_Test.icc -vacbld -SEV=E Task_Test.icc -vacbld -SEV=E Thread_Manager_Test.icc -vacbld -SEV=E Thread_Mutex_Test.icc -vacbld -SEV=E Thread_Pool_Reactor_Test.icc -vacbld -SEV=E Thread_Pool_Test.icc -vacbld -SEV=E Time_Service_Test.icc -vacbld -SEV=E Time_Value_Test.icc -vacbld -SEV=E Timeprobe_Test.icc -vacbld -SEV=E Timer_Queue_Test.icc -vacbld -SEV=E Tokens_Test.icc -vacbld -SEV=E UPIPE_SAP_Test.icc -vacbld -SEV=E Upgradable_RW_Test.icc -vacbld -SEV=E XtReactor_Test.icc -vacbld -SEV=E Aio_Platform_Test.icc -vacbld -SEV=E Atomic_Op_Test.icc -vacbld -SEV=E Barrier_Test.icc -vacbld -SEV=E Basic_Types_Test.icc -vacbld -SEV=E Buffer_Stream_Test.icc -vacbld -SEV=E CDR_Test.icc -vacbld -SEV=E CLASSIX_Addr_Test.icc -vacbld -SEV=E CLASSIX_CLD_Connector_Test.icc -vacbld -SEV=E CLASSIX_Con_Acc_Test.icc -vacbld -SEV=E CLASSIX_Group_Test.icc -vacbld -SEV=E CLASSIX_Notify_Test.icc -vacbld -SEV=E CLASSIX_OS_Test.icc -vacbld -SEV=E CLASSIX_Reactor_Test.icc -vacbld -SEV=E CLASSIX_Select_Reactor_Test.icc -vacbld -SEV=E CLASSIX_Stream_Test.icc -vacbld -SEV=E Collection_Test.icc -vacbld -SEV=E Conn_Test.icc -vacbld -SEV=E DLL_Test.icc -vacbld -SEV=E DLList_Test.icc -vacbld -SEV=E Dynamic_Priority_Test.icc -vacbld -SEV=E Enum_Interfaces_Test.icc -vacbld -SEV=E Env_Value_Test.icc -vacbld -SEV=E Future_Test.icc -vacbld -SEV=E Handle_Set_Test.icc -vacbld -SEV=E Hash_Map_Manager_Test.icc -vacbld -SEV=E High_Res_Timer_Test.icc -vacbld -SEV=E IOStream_Test.icc -vacbld -SEV=E MM_Shared_Memory_Test.icc -vacbld -SEV=E MT_Reactor_Timer_Test.icc -vacbld -SEV=E MT_SOCK_Test.icc -vacbld -SEV=E Map_Manager_Test.icc -vacbld -SEV=E Map_Test.icc -vacbld -SEV=E Mem_Map_Test.icc -vacbld -SEV=E Message_Block_Test.icc -vacbld -SEV=E Message_Queue_Notifications_Test.icc -vacbld -SEV=E Message_Queue_Test.icc -vacbld -SEV=E Naming_Test.icc -vacbld -SEV=E Notify_Performance_Test.icc -vacbld -SEV=E OrdMultiSet_Test.icc -vacbld -SEV=E Pipe_Test.icc -vacbld -SEV=E Priority_Buffer_Test.icc -vacbld -SEV=E Priority_Reactor_Test.icc -vacbld -SEV=E Priority_Task_Test.icc -vacbld -SEV=E Process_Mutex_Test.icc -vacbld -SEV=E Process_Strategy_Test.icc -vacbld -SEV=E Purgable_Map_Manager_Test.icc -vacbld -SEV=E RB_Tree_Test.icc -vacbld -SEV=E Reactor_Exceptions_Test.icc -vacbld -SEV=E Reactor_Notify_Test.icc -vacbld -SEV=E Reactor_Performance_Test.icc -vacbld -SEV=E Reactor_Timer_Test.icc -vacbld -SEV=E Reactors_Test.icc -vacbld -SEV=E Reader_Writer_Test.icc -vacbld -SEV=E Recursive_Mutex_Test.icc -vacbld -SEV=E SOCK_Connector_Test.icc -vacbld -SEV=E SOCK_Test.icc -vacbld -SEV=E SPIPE_Test.icc -vacbld -SEV=E SString_Test.icc -vacbld -SEV=E SV_Shared_Memory_Test.icc -vacbld -SEV=E Semaphore_Test.icc -vacbld -SEV=E Service_Config_Test.icc -vacbld -SEV=E Sigset_Ops_Test.icc -vacbld -SEV=E Simple_Message_Block_Test.icc -vacbld -SEV=E TSS_Test.icc -vacbld -SEV=E Task_Test.icc -vacbld -SEV=E Thread_Manager_Test.icc -vacbld -SEV=E Thread_Mutex_Test.icc -vacbld -SEV=E Thread_Pool_Reactor_Test.icc -vacbld -SEV=E Thread_Pool_Test.icc -vacbld -SEV=E Time_Service_Test.icc -vacbld -SEV=E Time_Value_Test.icc -vacbld -SEV=E Timeprobe_Test.icc -vacbld -SEV=E Timer_Queue_Test.icc -vacbld -SEV=E Tokens_Test.icc -vacbld -SEV=E UPIPE_SAP_Test.icc -vacbld -SEV=E Upgradable_RW_Test.icc -vacbld -SEV=E XtReactor_Test.icc diff --git a/tests/makeicc.pl b/tests/makeicc.pl deleted file mode 100755 index d810dbc1d02..00000000000 --- a/tests/makeicc.pl +++ /dev/null @@ -1,44 +0,0 @@ -# $Id$ - -@ls = `ls -1 *.cpp`; -$allicc = "icc.bat"; - -foreach $tmp (@ls) -{ - ($a1, $a2) = split("cpp",$tmp); - $tmp2 = "$a1\icc"; - -open(T,"> $a1\icc"); - print T "option\n"; - print T " define (\"ACE_HAS_WINSOCK2\",\"1\"),\n"; - print T " define (\"__ACE_INLINE__\",\"0\"),\n"; - print T " define (\"WIN32\",\"1\"),\n"; - print T " define (\"_WINDOWS\",\"1\"),\n"; - print T " define(\"ACE_HAS_DLL\",\"0\"),\n"; - - print T " link(libSearchPath,'H:\\ACE_wrappers\\ace'),\n"; - print T " incl(searchPath,'H:\\ACE_wrappers'),\n"; - print T " link(linkWithMultiThreadLib,yes)\n"; - print T " {\n"; - chop($a1); - print T " target \"$a1\.exe\"\n"; - print T " {\n"; - - - print T " source type (cpp) \"$a1\.cpp\"\n\n"; - print T " source type (lib) \"aced.lib\"\n"; - print T " source type (lib) \"advapi32.lib\"\n"; - print T " source type (lib) \"user32.lib\"\n"; - print T " source type (lib) \"ws2_32.lib\"\n"; - print T " source type (lib) \"wsock32.lib\"\n"; - print T " source type (lib) \"mswsock.lib\"\n"; - print T " }\n"; - print T " }\n"; -close T; - -open(ALLICC,">> $allicc"); - print ALLICC "vacbld -SEV=E $a1\.icc\n"; -close ALLICC; - print "$a1\n"; -} - diff --git a/tests/run_pharlap_tests.bat b/tests/run_pharlap_tests.bat deleted file mode 100755 index 8b34bfcf42c..00000000000 --- a/tests/run_pharlap_tests.bat +++ /dev/null @@ -1,125 +0,0 @@ -@echo off -rem $Id$ - -rem This file runs all the tests on PharLap ETS. -rem To use this either give it no arguments to run all the tests or -rem pass it the test name (without the extention) to run only one -rem test - -setlocal - -set arg=%1 - -if not "%1" == "" goto runtest - -:runall - -rem call %0 ACE_Init_Test -call %0 Atomic_Op_Test -call %0 Barrier_Test -call %0 Basic_Types_Test -call %0 Buffer_Stream_Test -call %0 CDR_Test -call %0 Collection_Test -call %0 Conn_Test -call %0 DLL_Test -call %0 DLList_Test -call %0 Enum_Interfaces_Test -call %0 Env_Value_Test -call %0 Future_Test -call %0 Handle_Set_Test -call %0 Hash_Map_Manager_Test -call %0 High_Res_Timer_Test -call %0 IOStream_Test -call %0 Map_Manager_Test -call %0 Cache_Map_Manager_Test -call %0 Map_Test -rem call %0 Mem_Map_Test not supported -call %0 Message_Block_Test -call %0 Message_Queue_Notifications_Test -call %0 Message_Queue_Test -call %0 MT_Reactor_Timer_Test -rem call %0 MM_Shared_Memory_Test not supported -call %0 MT_SOCK_Test -call %0 Naming_Test -call %0 New_Fail_Test -call %0 Notify_Performance_Test -call %0 OrdMultiSet_Test -call %0 Pipe_Test -call %0 Priority_Buffer_Test -call %0 Dynamic_Priority_Test -call %0 Priority_Reactor_Test -call %0 Priority_Task_Test -call %0 Process_Mutex_Test -call %0 Process_Strategy_Test -call %0 RB_Tree_Test -call %0 Reactors_Test -call %0 Reactor_Exceptions_Test -call %0 Reactor_Notify_Test -call %0 Reactor_Performance_Test -call %0 Reactor_Timer_Test -call %0 Reader_Writer_Test -call %0 Thread_Pool_Reactor_Test -call %0 Recursive_Mutex_Test -call %0 Reverse_Lock_Test -call %0 Semaphore_Test -call %0 Service_Config_Test -call %0 Sigset_Ops_Test -call %0 Simple_Message_Block_Test -call %0 Svc_Handler_Test -call %0 SOCK_Test -call %0 SOCK_Connector_Test -call %0 SOCK_Send_Recv_Test -rem call %0 SPIPE_Test not supported -call %0 SString_Test -call %0 SV_Shared_Memory_Test -call %0 Task_Test -call %0 Thread_Manager_Test -call %0 Thread_Mutex_Test -call %0 Thread_Pool_Test -call %0 Timer_Queue_Test -call %0 Timeprobe_Test -if exist ..\netsvcs\servers\main.exe call %0 Time_Service_Test -call %0 Time_Value_Test -call %0 Tokens_Test -call %0 TSS_Test -call %0 UPIPE_SAP_Test -call %0 Upgradable_RW_Test -goto done - -:runtest - -echo Running %arg% -if not exist %arg%_ETS.exe goto nofile - -RUNEMB -LOGHOST -NODIALOG %arg%_ETS.exe > log\%arg%.log -if errorlevel 0 goto fine -echo. -echo %arg% has FAILED!!! -echo. -type log\%arg%.log | find /I "Abnormal program termination" -type log/%arg%.log | find /I "target halted" -type log/%arg%.log | find /I "Fatal error" -type log\%arg%.log | find /I "assertion failed" -type log\%arg%.log | find /I "not supported" -type log\%arg%.log | find /I "no such file or directory" -type log\%arg%.log | find /I "invalid argument" -type log\%arg%.log | find /I "timeout" -type log\%arg%.log | find /I "bad file number" -type log\%arg%.log | find /I "Win32 structured exception" -echo. - -goto done - -:nofile -echo %arg%.exe not found -goto done - -:fine - -rem We should check the log files here to make sure the test ended correctly -rem type log\%arg%.log | find "Ending" - -:done - -endlocal diff --git a/tests/run_tests.bat b/tests/run_tests.bat index f0625695664..33816c48eba 100644 --- a/tests/run_tests.bat +++ b/tests/run_tests.bat @@ -1,59 +1,20 @@ @echo off rem $Id$ -rem To run this script, the first argument must be either bor -rem or msc. This will determine if the borland tests are run, or -rem msvc tests are run. -rem You can provide an optional second parameter, the name of -rem the test to be run. -rem An optional first argument of "purify" can be provided as well. +rem To use this either give it no arguments to run all the tests or +rem pass it the test name (without the extention) to run only one +rem test setlocal -set arg= -set deco= -set exedir= -set dopure= - -set run_cmd=%0 - -if "%1" == "help" goto usage -if "%1" == "?" goto usage -if "%1" == "/?" goto usage if "%1" == "purify" goto setuppurify -if "%1" == "bor" goto setupbor_arg -if "%1" == "msc" goto setupmsc_arg -goto setupmsc - -:setuppurify -shift -set dopure=purify -if "%1" == "bor" goto setupbor_arg -if "%1" == "msc" goto setupmsc_arg -goto setupmsc - -:setupbor_arg -shift -:setupbor -set arg=%1 -set exedir=.\bor\bin\ -rem Set deco to whatever decoration you have for the executables -set deco= -set platform=bor -goto endsetup - -:setupmsc_arg -shift -:setupmsc +set dopure= set arg=%1 -set exedir= -set deco= -set platform= goto endsetup -:usage -echo "usage: run_tests [purify] bor|msc [program-name]" -goto done +:setuppurify +set dopure=purify +set arg=%2 :endsetup @@ -61,78 +22,76 @@ if not "%arg%" == "" goto runtest :runall -call %run_cmd% %dopure% %platform% ACE_Init_Test -call %run_cmd% %dopure% %platform% Atomic_Op_Test -call %run_cmd% %dopure% %platform% Barrier_Test -call %run_cmd% %dopure% %platform% Basic_Types_Test -call %run_cmd% %dopure% %platform% Buffer_Stream_Test -call %run_cmd% %dopure% %platform% CDR_Test -call %run_cmd% %dopure% %platform% Collection_Test -call %run_cmd% %dopure% %platform% Conn_Test -call %run_cmd% %dopure% %platform% DLL_Test -call %run_cmd% %dopure% %platform% DLList_Test -call %run_cmd% %dopure% %platform% Enum_Interfaces_Test -call %run_cmd% %dopure% %platform% Env_Value_Test -call %run_cmd% %dopure% %platform% Future_Test -call %run_cmd% %dopure% %platform% Future_Set_Test -call %run_cmd% %dopure% %platform% Handle_Set_Test -call %run_cmd% %dopure% %platform% Hash_Map_Manager_Test -call %run_cmd% %dopure% %platform% High_Res_Timer_Test -call %run_cmd% %dopure% %platform% IOStream_Test -call %run_cmd% %dopure% %platform% Map_Manager_Test -call %run_cmd% %dopure% %platform% Cache_Map_Manager_Test -call %run_cmd% %dopure% %platform% Map_Test -call %run_cmd% %dopure% %platform% Mem_Map_Test -call %run_cmd% %dopure% %platform% Message_Block_Test -call %run_cmd% %dopure% %platform% Message_Queue_Notifications_Test -call %run_cmd% %dopure% %platform% Message_Queue_Test -call %run_cmd% %dopure% %platform% MT_Reactor_Timer_Test -call %run_cmd% %dopure% %platform% MM_Shared_Memory_Test -call %run_cmd% %dopure% %platform% MT_SOCK_Test -call %run_cmd% %dopure% %platform% Naming_Test -rem call %run_cmd% %dopure% %platform% New_Fail_Test -call %run_cmd% %dopure% %platform% Notify_Performance_Test -call %run_cmd% %dopure% %platform% OrdMultiSet_Test -call %run_cmd% %dopure% %platform% Pipe_Test -call %run_cmd% %dopure% %platform% Priority_Buffer_Test -call %run_cmd% %dopure% %platform% Dynamic_Priority_Test -call %run_cmd% %dopure% %platform% Priority_Reactor_Test -call %run_cmd% %dopure% %platform% Priority_Task_Test -call %run_cmd% %dopure% %platform% Process_Mutex_Test -call %run_cmd% %dopure% %platform% Process_Strategy_Test -call %run_cmd% %dopure% %platform% RB_Tree_Test -call %run_cmd% %dopure% %platform% Reactors_Test -call %run_cmd% %dopure% %platform% Reactor_Exceptions_Test -call %run_cmd% %dopure% %platform% Reactor_Notify_Test -call %run_cmd% %dopure% %platform% Reactor_Performance_Test -call %run_cmd% %dopure% %platform% Reactor_Timer_Test -call %run_cmd% %dopure% %platform% Reader_Writer_Test -call %run_cmd% %dopure% %platform% Thread_Pool_Reactor_Test -call %run_cmd% %dopure% %platform% Recursive_Mutex_Test -call %run_cmd% %dopure% %platform% Reverse_Lock_Test -call %run_cmd% %dopure% %platform% Semaphore_Test -call %run_cmd% %dopure% %platform% Service_Config_Test -call %run_cmd% %dopure% %platform% Sigset_Ops_Test -call %run_cmd% %dopure% %platform% Simple_Message_Block_Test -call %run_cmd% %dopure% %platform% Svc_Handler_Test -call %run_cmd% %dopure% %platform% SOCK_Test -call %run_cmd% %dopure% %platform% SOCK_Connector_Test -call %run_cmd% %dopure% %platform% SOCK_Send_Recv_Test -call %run_cmd% %dopure% %platform% SPIPE_Test -call %run_cmd% %dopure% %platform% SString_Test -call %run_cmd% %dopure% %platform% SV_Shared_Memory_Test -call %run_cmd% %dopure% %platform% Task_Test -call %run_cmd% %dopure% %platform% Thread_Manager_Test -call %run_cmd% %dopure% %platform% Thread_Mutex_Test -call %run_cmd% %dopure% %platform% Thread_Pool_Test -call %run_cmd% %dopure% %platform% Timer_Queue_Test -call %run_cmd% %dopure% %platform% Timeprobe_Test -if exist ..\netsvcs\servers\main.exe call %run_cmd% %dopure% %platform% Time_Service_Test -call %run_cmd% %dopure% %platform% Time_Value_Test -call %run_cmd% %dopure% %platform% Tokens_Test -call %run_cmd% %dopure% %platform% TSS_Test -call %run_cmd% %dopure% %platform% UPIPE_SAP_Test -call %run_cmd% %dopure% %platform% Upgradable_RW_Test +call %0 %dopure% ACE_Init_Test +call %0 %dopure% Atomic_Op_Test +call %0 %dopure% Barrier_Test +call %0 %dopure% Basic_Types_Test +call %0 %dopure% Buffer_Stream_Test +call %0 %dopure% CDR_Test +call %0 %dopure% Collection_Test +call %0 %dopure% Conn_Test +call %0 %dopure% DLL_Test +call %0 %dopure% DLList_Test +call %0 %dopure% Enum_Interfaces_Test +call %0 %dopure% Env_Value_Test +call %0 %dopure% Future_Test +call %0 %dopure% Handle_Set_Test +call %0 %dopure% Hash_Map_Manager_Test +call %0 %dopure% High_Res_Timer_Test +call %0 %dopure% IOStream_Test +call %0 %dopure% Map_Manager_Test +call %0 %dopure% Map_Test +call %0 %dopure% Mem_Map_Test +call %0 %dopure% Message_Block_Test +call %0 %dopure% Message_Queue_Notifications_Test +call %0 %dopure% Message_Queue_Test +call %0 %dopure% MT_Reactor_Timer_Test +call %0 %dopure% MM_Shared_Memory_Test +call %0 %dopure% MT_SOCK_Test +call %0 %dopure% Naming_Test +call %0 %dopure% New_Fail_Test +call %0 %dopure% Notify_Performance_Test +call %0 %dopure% OrdMultiSet_Test +call %0 %dopure% Pipe_Test +call %0 %dopure% Priority_Buffer_Test +call %0 %dopure% Dynamic_Priority_Test +call %0 %dopure% Priority_Reactor_Test +call %0 %dopure% Priority_Task_Test +call %0 %dopure% Process_Mutex_Test +call %0 %dopure% Process_Strategy_Test +call %0 %dopure% RB_Tree_Test +call %0 %dopure% Reactors_Test +call %0 %dopure% Reactor_Exceptions_Test +call %0 %dopure% Reactor_Notify_Test +call %0 %dopure% Reactor_Performance_Test +call %0 %dopure% Reactor_Timer_Test +call %0 %dopure% Reader_Writer_Test +call %0 %dopure% Thread_Pool_Reactor_Test +call %0 %dopure% Recursive_Mutex_Test +call %0 %dopure% Reverse_Lock_Test +call %0 %dopure% Semaphore_Test +call %0 %dopure% Service_Config_Test +call %0 %dopure% Sigset_Ops_Test +call %0 %dopure% Simple_Message_Block_Test +call %0 %dopure% Svc_Handler_Test +call %0 %dopure% SOCK_Test +call %0 %dopure% SOCK_Connector_Test +call %0 %dopure% SOCK_Send_Recv_Test +call %0 %dopure% SPIPE_Test +call %0 %dopure% SString_Test +call %0 %dopure% SV_Shared_Memory_Test +call %0 %dopure% Task_Test +call %0 %dopure% Thread_Manager_Test +call %0 %dopure% Thread_Mutex_Test +call %0 %dopure% Thread_Pool_Test +call %0 %dopure% Timer_Queue_Test +call %0 %dopure% Timeprobe_Test +if exist ..\netsvcs\servers\main.exe call %0 %dopure% Time_Service_Test +call %0 %dopure% Time_Value_Test +call %0 %dopure% Tokens_Test +call %0 %dopure% TSS_Test +call %0 %dopure% UPIPE_SAP_Test +call %0 %dopure% Upgradable_RW_Test goto done @@ -149,14 +108,13 @@ goto done :justrun -set exefile=%exedir%%arg%%deco% -echo Running %exefile% -if not exist %exefile%.exe goto nofile +echo Running %arg% +if not exist %arg%.exe goto nofile -%exefile%.exe +%arg%.exe if errorlevel 0 goto fine echo. -echo %exefile% has FAILED!!! +echo %arg% has FAILED!!! echo. type %temp%\log\%arg%.log | find /I "assertion failed" type %temp%\log\%arg%.log | find /I "not supported" @@ -170,7 +128,7 @@ echo. goto done :nofile -echo %exefile%.exe not found +echo %arg%.exe not found goto done :fine diff --git a/tests/run_tests.ksh b/tests/run_tests.ksh deleted file mode 100755 index a4d7f0d8b17..00000000000 --- a/tests/run_tests.ksh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/ksh -f - -. ./run_tests.sh - -# EOF - diff --git a/tests/run_tests.psosim b/tests/run_tests.psosim index 0d810f84ede..9d1a7846302 100755 --- a/tests/run_tests.psosim +++ b/tests/run_tests.psosim @@ -81,9 +81,6 @@ run SOCK_Connector_Test # uses SOCK_Connector #Future_Test: threads not supported on this platform #run Future_Test # uses Thread_Manager, Task -#Future_Set_Test: threads not supported on this platform -#run Future_Set_Test # uses Thread_Manager, Task - #Reactors_Test: threads not supported on this platform #run Reactors_Test # uses Task, Mutex, Reactor diff --git a/tests/run_tests.sh b/tests/run_tests.sh index 9ef06a9bf17..7b933d8e37f 100755 --- a/tests/run_tests.sh +++ b/tests/run_tests.sh @@ -153,8 +153,7 @@ run Task_Test # tests ACE_Thread_Manager, ACE_Task # Thread_Manager_Test: UNICOS fails due to no pthread_kill nor pthread_cancel test $Unicos || run Thread_Manager_Test # tests ACE_Thread_Manager, ACE_Task run Thread_Pool_Test # tests ACE_Thread_Manager, ACE_Task -run Future_Test # tests ACE_Thread_Manager, ACE_Task, ACE_Future -# run Future_Set_Test # tests ACE_Thread_Manager, ACE_Task, ACE_Future_Set +run Future_Test # tests ACE_Thread_Manager, ACE_Task run RB_Tree_Test # tests ACE_RB_Tree, ACE_RB_Tree_Iterator run Reactors_Test # tests ACE_Task, ACE_Mutex, ACE_Reactor run Reactor_Exceptions_Test # tests ACE_Reactor and C++ exceptions @@ -187,8 +186,7 @@ fi # Tokens_Test: UNICOS fails dlopen() - no shared libs on UNICOS test $TOKEN && (test $chorus || test $Unicos || run Tokens_Test) # tests ACE_Token -run Cache_Map_Manager_Test # tests ACE_Cache_Map_Manager and ACE_Hash_Cache_Manager and caching features. -run Map_Manager_Test # tests ACE_Map Manager and ACE_Hash_Map_Manager + Forward and Reverse Map Iterators. +#### run Map_Manager_Test # tests ACE_Map Manager and ACE_Hash_Map_Manager + Forward and Reverse Map Iterators. run Map_Test # tests ACE_Map + Forward and Reverse Map Iterators. run Message_Queue_Notifications_Test # tests ACE_Message_Queue + ACE_Reactor test $chorus || run Message_Queue_Test # tests ACE_Message_Queue + Forward and Reverse Message Queue Iterators. diff --git a/tests/run_tests.vxworks b/tests/run_tests.vxworks index 4b7d45e8f5d..8d0257cdabf 100644 --- a/tests/run_tests.vxworks +++ b/tests/run_tests.vxworks @@ -135,10 +135,6 @@ ld < Future_Test write 2, "Future_Test ", 12 ace_main; unld "Future_Test" -#### ld < Future_Set_Test -#### write 2, "Future_Set_Test ", 12 -#### ace_main; unld "Future_Set_Test" - ld < Reactors_Test write 2, "Reactors_Test ", 14 ace_main; unld "Reactors_Test" diff --git a/tests/t.icc b/tests/t.icc deleted file mode 100644 index bdd9992b852..00000000000 --- a/tests/t.icc +++ /dev/null @@ -1,277 +0,0 @@ -option - link(libSearchPath,'H:\ACE+TAO\ACE_wrappers\ace'), - incl(searchPath,'H:\ACE+TAO\ACE_wrappers'), - link(linkWithMultiThreadLib,yes) - - target "Reactor_Timer_Test.exe" - { - source type(cpp) "Aio_Platform_Test.cpp" - } - target "Atomic_Op_Test.exe" - { - source type(cpp) "Atomic_Op_Test.cpp" - } - target "Barrier_Test.exe" - { - source type(cpp) "Barrier_Test.cpp" - } - target "Basic_Types_Test.exe" - { - source type(cpp) "Basic_Types_Test.cpp" - } - target "Buffer_Stream_Test.exe" - { - source type(cpp) "Buffer_Stream_Test.cpp" - } - target "CDR_Test.exe" - { - source type(cpp) "CDR_Test.cpp" - } - target "Collection_Test.exe" - { - source type(cpp) "Collection_Test.cpp" - } - target "Conn_Test.exe" - { - source type(cpp) "Conn_Test.cpp" - } - target "DLL_Test.cpp" - { - source type(cpp) "DLL_Test.cpp" - } - target "DLList_Test.exe" - { - source type(cpp) "DLList_Test.cpp" - } - target "Dynamic_Priority_Test.exe" - { - source type(cpp) "Dynamic_Priority_Test.cpp" - } - target "Enum_Interfaces_Test.exe" - { - source type(cpp) "Enum_Interfaces_Test.cpp" - } - target "Env_Value_Test.exe" - { - source type(cpp) "Env_Value_Test.cpp" - } - target "Future_Test.exe" - { - source type(cpp) "Future_Test.cpp" - } - target "Handle_Set_Test.exe" - { - source type(cpp) "Handle_Set_Test.cpp" - } - target "Hash_Map_Manager_Test.exe" - { - source type(cpp) "Hash_Map_Manager_Test.cpp" - } - target "High_Res_Timer_Test.exe" - { - source type(cpp) "High_Res_Timer_Test.cpp" - } - target "IOStream_Test.exe" - { - source type(cpp) "IOStream_Test.cpp" - } - target "MM_Shared_Memory_Test.exe" - { - source type(cpp) "MM_Shared_Memory_Test.cpp" - } - target "MT_Reactor_Timer_Test.cpp" - { - source type(cpp) "MT_Reactor_Timer_Test.cpp" - } - target "MT_SOCK_Test.exe" - { - source type(cpp) "MT_SOCK_Test.cpp" - } - target "Map_Manager_Test.exe" - { - source type(cpp) "Map_Manager_Test.cpp" - } - target "Map_Test.exe" - { - source type(cpp) "Map_Test.cpp" - } - target "Mem_Map_Test.exe" - { - source type(cpp) "Mem_Map_Test.cpp" - } - target "Message_Block_Test.cpp" - { - source type(cpp) "Message_Block_Test.cpp" - } - target "Message_Queue_Notifications_Test.exe" - { - source type(cpp) "Message_Queue_Notifications_Test.cpp" - } - target "Message_Queue_Test.exe" - { - source type(cpp) "Message_Queue_Test.cpp" - } - target "Naming_Test.exe" - { - source type(cpp) "Naming_Test.cpp" - } - target "Notify_Performance_Test.exe" - { - source type(cpp) "Notify_Performance_Test.cpp" - } - target "OrdMultiSet_Test.exe" - { - source type(cpp) "OrdMultiSet_Test.cpp" - } - target "Pipe_Test.exe" - { - source type(cpp) "Pipe_Test.cpp" - } - target "Priority_Buffer_Test.exe" - { - source type(cpp) "Priority_Buffer_Test.cpp" - } - target "Priority_Reactor_Test.exe" - { - source type(cpp) "Priority_Reactor_Test.cpp" - } - target "Priority_Task_Test.exe" - { - source type(cpp) "Priority_Task_Test.cpp" - } - target "Process_Mutex_Test.exe" - { - source type(cpp) "Process_Mutex_Test.cpp" - } - target "Process_Strategy_Test.exe" - { - source type(cpp) "Process_Strategy_Test.cpp" - } - target "Purgable_Map_Manager_Test.exe" - { - source type(cpp) "Purgable_Map_Manager_Test.cpp" - } - target "RB_Tree_Test.exe" - { - source type(cpp) "RB_Tree_Test.cpp" - } - target "Reactor_Exceptions_Test.exe" - { - source type(cpp) "Reactor_Exceptions_Test.cpp" - } - target "Reactor_Notify_Test.exe" - { - source type(cpp) "Reactor_Notify_Test.cpp" - } - target "Reactor_Performance_Test.exe" - { - source type(cpp) "Reactor_Performance_Test.cpp" - } - target "Reactor_Timer_Test.exe" - { - source type(cpp) "Reactor_Timer_Test.cpp" - } - target "Reactors_Test.exe" - { - source type(cpp) "Reactors_Test.cpp" - } - target "Reader_Writer_Test.exe" - { - source type(cpp) "Reader_Writer_Test.cpp" - } - target "Recursive_Mutex_Test.exe" - { - source type(cpp) "Recursive_Mutex_Test.cpp" - } - target "SOCK_Connector_Test.exe" - { - source type(cpp) "SOCK_Connector_Test.cpp" - } - target "SOCK_Test.exe" - { - source type(cpp) "SOCK_Test.cpp" - } - target "SPIPE_Test.exe" - { - source type(cpp) "SPIPE_Test.cpp" - } - target "SString_Test.exe" - { - source type(cpp) "SString_Test.cpp" - } - target "SV_Shared_Memory_Test.exe" - { - source type(cpp) "SV_Shared_Memory_Test.cpp" - } - target "Semaphore_Test.exe" - { - source type(cpp) "Semaphore_Test.cpp" - } - target "Service_Config_Test.exe" - { - source type(cpp) "Service_Config_Test.cpp" - } - target "Sigset_Ops_Test.exe" - { - source type(cpp) "Sigset_Ops_Test.cpp" - } - target "Simple_Message_Block_Test.exe" - { - source type(cpp) "Simple_Message_Block_Test.cpp" - } - target "TSS_Test.exe" - { - source type(cpp) "TSS_Test.cpp" - } - target "Task_Test.exe" - { - source type(cpp) "Task_Test.cpp" - } - target "Thread_Manager_Test.exe" - { - source type(cpp) "Thread_Manager_Test.cpp" - } - target "Thread_Mutex_Test.exe" - { - source type(cpp) "Thread_Mutex_Test.cpp" - } - target "Thread_Pool_Reactor_Test.exe" - { - source type(cpp) "Thread_Pool_Reactor_Test.cpp" - } - target "Thread_Pool_Test.exe" - { - source type(cpp) "Thread_Pool_Test.cpp" - } - target "Time_Service_Test.exe" - { - source type(cpp) "Time_Service_Test.cpp" - } - target "Time_Value_Test.exe" - { - source type(cpp) "Time_Value_Test.cpp" - } - target "Timeprobe_Test.exe" - { - source type(cpp) "Timeprobe_Test.cpp" - } - target "Timer_Queue_Test.exe" - { - source type(cpp) "Timer_Queue_Test.cpp" - } - target "Tokens_Test.exe" - { - source type(cpp) "Tokens_Test.cpp" - } - target "UPIPE_SAP_Test.exe" - { - source type(cpp) "UPIPE_SAP_Test.cpp" - } - target "Upgradable_RW_Test.exe" - { - source type(cpp) "Upgradable_RW_Test.cpp" - } - target "XtReactor_Test.exe" - { - source type(cpp) "XtReactor_Test.cpp" - } diff --git a/tests/test_config.h b/tests/test_config.h index 218d41bbe2e..cd825452cc7 100644 --- a/tests/test_config.h +++ b/tests/test_config.h @@ -6,15 +6,9 @@ // = FILENAME // test_config.h // -// = DESCRIPTION -// -// This file factors out common macros and other utilities used by the -// ACE automated regression tests. -// // = AUTHOR -// Prashant Jain <pjain@cs.wustl.edu>, -// Tim Harrison <harrison@cs.wustl.edu>, -// and David Levine <levine@cs.wustl.edu> +// Prashant Jain <pjain@cs.wustl.edu>, Tim Harrison +// <harrison@cs.wustl.edu>, and David Levine <levine@cs.wustl.edu> // // ============================================================================ @@ -114,7 +108,7 @@ #define MAKE_PIPE_NAME MAKE_PIPE_NAME_A #endif /* UNICODE */ -#if defined (ACE_HAS_WINCE) || defined (ACE_HAS_PHARLAP) +#if defined (ACE_HAS_WINCE) const size_t ACE_MAX_CLIENTS = 4; #else const size_t ACE_MAX_CLIENTS = 30; @@ -126,8 +120,13 @@ const size_t ACE_MAX_TIMERS = 4; const size_t ACE_MAX_DELAY = 10; const size_t ACE_MAX_INTERVAL = 0; const size_t ACE_MAX_ITERATIONS = 10; -const size_t ACE_MAX_PROCESSES = 10; -const size_t ACE_MAX_THREADS = 4; +#if defined (__Lynx__) + const size_t ACE_MAX_PROCESSES = 4; + const size_t ACE_MAX_THREADS = 2; +#else /* ! __Lynx__ */ + const size_t ACE_MAX_PROCESSES = 10; + const size_t ACE_MAX_THREADS = 4; +#endif /* ! __Lynx__ */ char ACE_ALPHABET[] = "abcdefghijklmnopqrstuvwxyz"; @@ -168,12 +167,12 @@ char ACE_ALPHABET[] = "abcdefghijklmnopqrstuvwxyz"; // This is the only way I could figure out to avoid an error // about attempting to unlink a non-existant file. #define ACE_INIT_LOG(NAME) \ - ASYS_TCHAR temp[MAXPATHLEN]; \ - ACE_OS::sprintf (temp, ASYS_TEXT ("%s%s%s"), \ - ASYS_TEXT (ACE_LOG_DIRECTORY_A), \ - ACE::basename (NAME, ASYS_TEXT (ACE_DIRECTORY_SEPARATOR_CHAR_A)), \ - ASYS_TEXT (ACE_LOG_FILE_EXT_NAME_A)); \ - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%P|%t) Deleting old log file %s (if any)\n\n"), temp)); \ + char temp[MAXPATHLEN]; \ + ACE_OS::sprintf (temp, "%s%s%s", \ + ACE_LOG_DIRECTORY_A, \ + ACE::basename (NAME, ACE_DIRECTORY_SEPARATOR_CHAR_A), \ + ACE_LOG_FILE_EXT_NAME_A); \ + ACE_DEBUG ((LM_DEBUG, "(%P|%t) Deleting old log file %s (if any)\n\n", temp)); \ int fd_init_log; \ if ((fd_init_log = ACE_OS::open (temp, \ O_WRONLY | O_CREAT, 0x644)) != ERROR) \ @@ -189,12 +188,12 @@ char ACE_ALPHABET[] = "abcdefghijklmnopqrstuvwxyz"; #endif /* ghs */ #else /* ! VXWORKS */ #define ACE_INIT_LOG(NAME) \ - ASYS_TCHAR temp[MAXPATHLEN]; \ - ACE_OS::sprintf (temp, ASYS_TEXT ("%s%s%s"), \ - ASYS_TEXT (ACE_LOG_DIRECTORY_A), \ - ACE::basename (NAME, ASYS_TEXT (ACE_DIRECTORY_SEPARATOR_CHAR_A)), \ - ASYS_TEXT (ACE_LOG_FILE_EXT_NAME_A)); \ - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%P|%t) Deleting old log file %s (if any)\n\n"), temp)); \ + char temp[MAXPATHLEN]; \ + ACE_OS::sprintf (temp, "%s%s%s", \ + ACE_LOG_DIRECTORY_A, \ + ACE::basename (NAME, ACE_DIRECTORY_SEPARATOR_CHAR_A), \ + ACE_LOG_FILE_EXT_NAME_A); \ + ACE_DEBUG ((LM_DEBUG, "(%P|%t) Deleting old log file %s (if any)\n\n", temp)); \ ACE_OS::unlink (temp); #endif /* ! VXWORKS */ @@ -236,7 +235,7 @@ ACE_Test_Output::~ACE_Test_Output (void) ACE_LOG_MSG->clr_flags (ACE_Log_Msg::OSTREAM); ACE_LOG_MSG->set_flags (ACE_Log_Msg::STDERR); -#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) && !defined (ACE_HAS_PHARLAP) +#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) delete this->output_file_; #endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */ } @@ -244,23 +243,16 @@ ACE_Test_Output::~ACE_Test_Output (void) int ACE_Test_Output::set_output (const ASYS_TCHAR *filename, int append) { -#if defined (ACE_HAS_PHARLAP) - // For PharLap, just send it all to the host console for now - redirect - // to a file there for saving/analysis. - EtsSelectConsole(ETS_CO_HOST); - ACE_LOG_MSG->msg_ostream (&cout); - -#else ASYS_TCHAR temp[MAXPATHLEN]; // Ignore the error value since the directory may already exist. LPCTSTR test_dir; #if !defined (ACE_HAS_WINCE) - test_dir = ACE_OS::getenv (ACE_TEXT ("ACE_TEST_DIR")); + test_dir = ACE_OS::getenv ("ACE_TEST_DIR"); if (test_dir == 0) #endif /* ACE_HAS_WINCE */ - test_dir = ACE_TEXT (""); + test_dir = ASYS_TEXT (""); ACE_OS::sprintf (temp, ASYS_TEXT ("%s%s%s%s"), @@ -270,35 +262,36 @@ ACE_Test_Output::set_output (const ASYS_TCHAR *filename, int append) ACE_LOG_FILE_EXT_NAME_A); #if defined (VXWORKS) - // This is the only way I could figure out to avoid a console - // warning about opening an existing file (w/o O_CREAT), or - // attempting to unlink a non-existant one. - ACE_HANDLE fd = ACE_OS::open (temp, O_WRONLY | O_CREAT, 0x644); + // This is the only way I could figure out to avoid a console warning + // about opening an existing file (w/o O_CREAT), or attempting to unlink + // a non-existant one. + int fd = ACE_OS::open (temp, O_WRONLY | O_CREAT, 0x644); if (fd != ERROR) { ACE_OS::close (fd); ACE_OS::unlink (temp); } -# else /* ! VXWORKS */ +#else /* ! VXWORKS */ // This doesn't seem to work on VxWorks if the directory doesn't - // exist: it creates a plain file instead of a directory. If the + // exist: it creates a plain file instead of a directory. If the // directory does exist, it causes a wierd console error message // about "cat: input error on standard input: Is a directory". So, // VxWorks users must create the directory manually. - ACE_OS::mkdir (ASYS_TEXT (ACE_LOG_DIRECTORY_A)); -# endif /* ! VXWORKS */ + ACE_OS::mkdir (ACE_LOG_DIRECTORY_A); +#endif /* ! VXWORKS */ -# if !defined (ACE_LACKS_IOSTREAM_TOTALLY) +#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) int flags = ios::out; if (append) flags |= ios::app; else flags |= ios::trunc; - this->output_file_->open (ASYS_ONLY_MULTIBYTE_STRING (temp), - flags); + this->output_file_->open (temp, flags); if (this->output_file_->bad ()) - return -1; + { + return -1; + } #else /* when ACE_LACKS_IOSTREAM_TOTALLY */ ASYS_TCHAR *fmode = 0; if (append) @@ -306,11 +299,9 @@ ACE_Test_Output::set_output (const ASYS_TCHAR *filename, int append) else fmode = ASYS_TEXT ("w"); this->output_file_ = ACE_OS::fopen (temp, fmode); -# endif /* ACE_LACKS_IOSTREAM_TOTALLY */ +#endif /* ACE_LACKS_IOSTREAM_TOTALLY */ ACE_LOG_MSG->msg_ostream (this->output_file ()); -#endif /* ACE_HAS_PHARLAP */ - ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER ); ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM); diff --git a/tests/tests.bpg b/tests/tests.bpg new file mode 100644 index 00000000000..548dc0c9501 --- /dev/null +++ b/tests/tests.bpg @@ -0,0 +1,202 @@ +#------------------------------------------------------------------------------ +VERSION = BWS.01 +#------------------------------------------------------------------------------ +!ifndef ROOT +ROOT = $(MAKEDIR)\.. +!endif +#------------------------------------------------------------------------------ +MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$** +DCC = $(ROOT)\bin\dcc32.exe $** +BRCC = $(ROOT)\bin\brcc32.exe $** +#------------------------------------------------------------------------------ +PROJECTS = Aio_Platform_Test Atomic_Op_Test Barrier_Test Basic_Types_Test \ + Buffer_Stream_Test Conn_Test Dynamic_Priority_Test Enum_Interfaces_Test Env_Value_Test Future_Test \ + Handle_Set_Test Hash_Map_Manager_Test Map_Manager_Test MM_Shared_Memory_Test \ + MT_Reactor_Timer_Test MT_SOCK_Test Mem_Map_Test Message_Block_Test \ + Message_Queue_Notifications_Test.cpp Message_Queue_Test Naming_Test \ + Notify_Performance_Test OrdMultiSet_Test Pipe_Test Priority_Buffer_Test \ + Priority_Reactor_Test Priority_Task_Test Process_Mutex_Test \ + Process_Strategy_Test Reactor_Exceptions_Test Reactor_Notify_Test \ + Reactor_Performance_Test Reactor_Timer_Test Reactors_Test Reader_Writer_Test \ + Recursive_Mutex_Test SOCK_Connector_Test SOCK_Test SPIPE_Test SString_Test \ + SV_Shared_Memory_Test Semaphore_Test Service_Config_Test Sigset_Ops_Test \ + Simple_Message_Block_Test TSS_Test Task_Test Thread_Manager_Test \ + Thread_Mutex_Test Thread_Pool_Test Timeprobe_Test Time_Service_Test Time_Value_Test \ + Timer_Queue_Test Tokens_Test Upgradable_RW_Test UPIPE_SAP_Test XtReactor_Test +#------------------------------------------------------------------------------ +default: $(PROJECTS) +#------------------------------------------------------------------------------ + +Aio_Platform_Test: Aio_Platform_Test.bpr + $(MAKE) + +Atomic_Op_Test: Atomic_Op_Test.bpr + $(MAKE) + +Barrier_Test: Barrier_Test.bpr + $(MAKE) + +Basic_Types_Test: Basic_Types_Test.bpr + $(MAKE) + +Buffer_Stream_Test: Buffer_Stream_Test.bpr + $(MAKE) + +Conn_Test: Conn_Test.bpr + $(MAKE) + +Dynamic_Priority_Test: Dynamic_Priority_Test.bpr + $(MAKE) + +Enum_Interfaces_Test: Enum_Interfaces_Test.bpr + $(MAKE) + +Env_Value_Test: Env_Value_Test.bpr + $(MAKE) + +Future_Test: Future_Test.bpr + $(MAKE) + +Handle_Set_Test: Handle_Set_Test.bpr + $(MAKE) + +Hash_Map_Manager_Test: Hash_Map_Manager_Test.bpr + $(MAKE) + +Map_Manager_Test: Map_Manager_Test.bpr + $(MAKE) + +MM_Shared_Memory_Test: MM_Shared_Memory_Test.bpr + $(MAKE) + +MT_Reactor_Timer_Test: MT_Reactor_Timer_Test.bpr + $(MAKE) + +MT_SOCK_Test: MT_SOCK_Test.bpr + $(MAKE) + +Mem_Map_Test: Mem_Map_Test.bpr + $(MAKE) + +Message_Block_Test: Message_Block_Test.bpr + $(MAKE) + +Message_Queue_Notifications_Test.cpp: Message_Queue_Notifications_Test.cpp.bpr + $(MAKE) + +Message_Queue_Test: Message_Queue_Test.bpr + $(MAKE) + +Naming_Test: Naming_Test.bpr + $(MAKE) + +Notify_Performance_Test: Notify_Performance_Test.bpr + $(MAKE) + +OrdMultiSet_Test: OrdMultiSet_Test.bpr + $(MAKE) + +Pipe_Test: Pipe_Test.bpr + $(MAKE) + +Priority_Buffer_Test: Priority_Buffer_Test.bpr + $(MAKE) + +Priority_Reactor_Test: Priority_Reactor_Test.bpr + $(MAKE) + +Priority_Task_Test: Priority_Task_Test.bpr + $(MAKE) + +Process_Mutex_Test: Process_Mutex_Test.bpr + $(MAKE) + +Process_Strategy_Test: Process_Strategy_Test.bpr + $(MAKE) + +Reactor_Exceptions_Test: Reactor_Exceptions_Test.bpr + $(MAKE) + +Reactor_Notify_Test: Reactor_Notify_Test.bpr + $(MAKE) + +Reactor_Performance_Test: Reactor_Performance_Test.bpr + $(MAKE) + +Reactor_Timer_Test: Reactor_Timer_Test.bpr + $(MAKE) + +Reactors_Test: Reactors_Test.bpr + $(MAKE) + +Reader_Writer_Test: Reader_Writer_Test.bpr + $(MAKE) + +Recursive_Mutex_Test: Recursive_Mutex_Test.bpr + $(MAKE) + +SOCK_Connector_Test: SOCK_Connector_Test.bpr + $(MAKE) + +SOCK_Test: SOCK_Test.bpr + $(MAKE) + +SPIPE_Test: SPIPE_Test.bpr + $(MAKE) + +SString_Test: SString_Test.bpr + $(MAKE) + +SV_Shared_Memory_Test: SV_Shared_Memory_Test.bpr + $(MAKE) + +Semaphore_Test: Semaphore_Test.bpr + $(MAKE) + +Service_Config_Test: Service_Config_Test.bpr + $(MAKE) + +Sigset_Ops_Test: Sigset_Ops_Test.bpr + $(MAKE) + +Simple_Message_Block_Test: Simple_Message_Block_Test.bpr + $(MAKE) + +TSS_Test: TSS_Test.bpr + $(MAKE) + +Task_Test: Task_Test.bpr + $(MAKE) + +Thread_Manager_Test: Thread_Manager_Test.bpr + $(MAKE) + +Thread_Mutex_Test: Thread_Mutex_Test.bpr + $(MAKE) + +Thread_Pool_Test: Thread_Pool_Test.bpr + $(MAKE) + +Timeprobe_Test: Timeprobe_Test.bpr + $(MAKE) + +Time_Service_Test: Time_Service_Test.bpr + $(MAKE) + +Time_Value_Test: Time_Value_Test.bpr + $(MAKE) + +Timer_Queue_Test: Timer_Queue_Test.bpr + $(MAKE) + +Tokens_Test: Tokens_Test.bpr + $(MAKE) + +Upgradable_RW_Test: Upgradable_RW_Test.bpr + $(MAKE) + +UPIPE_SAP_Test: UPIPE_SAP_Test.bpr + $(MAKE) + +XtReactor_Test: XtReactor_Test.bpr + $(MAKE) diff --git a/tests/tests.dsw b/tests/tests.dsw index 4bf8393e600..48f082785e8 100644 --- a/tests/tests.dsw +++ b/tests/tests.dsw @@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 ###############################################################################
-Project: "ACE_Init_Test"=.\ACE_Init_Test.dsp - Package Owner=<4>
+Project: "ACE_Init_Test"=".\ACE_Init_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -15,7 +15,7 @@ Package=<4> ###############################################################################
-Project: "Atomic_Op_Test"=.\Atomic_Op_Test.dsp - Package Owner=<4>
+Project: "Atomic_Op_Test"=".\Atomic_Op_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -27,7 +27,7 @@ Package=<4> ###############################################################################
-Project: "Barrier_Test"=.\Barrier_Test.dsp - Package Owner=<4>
+Project: "Barrier_Test"=".\Barrier_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -39,7 +39,7 @@ Package=<4> ###############################################################################
-Project: "Basic_Types_Test"=.\Basic_Types_Test.dsp - Package Owner=<4>
+Project: "Basic_Types_Test"=".\Basic_Types_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -51,7 +51,7 @@ Package=<4> ###############################################################################
-Project: "Buffer_Stream_Test"=.\Buffer_Stream_Test.dsp - Package Owner=<4>
+Project: "Buffer_Stream_Test"=".\Buffer_Stream_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -63,7 +63,7 @@ Package=<4> ###############################################################################
-Project: "CDR_Test"=.\CDR_Test.dsp - Package Owner=<4>
+Project: "CDR_Test"=".\CDR_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -75,7 +75,7 @@ Package=<4> ###############################################################################
-Project: "Cache_Map_Manager_Test"=.\Cache_Map_Manager_Test.dsp - Package Owner=<4>
+Project: "Collection_Test"=".\Collection_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -87,7 +87,7 @@ Package=<4> ###############################################################################
-Project: "Collection_Test"=.\Collection_Test.dsp - Package Owner=<4>
+Project: "Conn_Test"=".\Conn_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -99,7 +99,7 @@ Package=<4> ###############################################################################
-Project: "Conn_Test"=.\Conn_Test.dsp - Package Owner=<4>
+Project: "DLL_Test"=".\DLL_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -111,7 +111,7 @@ Package=<4> ###############################################################################
-Project: "DLL_Test"=.\DLL_Test.dsp - Package Owner=<4>
+Project: "DLList_Test"=".\DLList_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -123,7 +123,7 @@ Package=<4> ###############################################################################
-Project: "DLList_Test"=.\DLList_Test.dsp - Package Owner=<4>
+Project: "Dynamic_Priority_Test"=".\Dynamic_Priority_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -135,7 +135,7 @@ Package=<4> ###############################################################################
-Project: "Dynamic_Priority_Test"=.\Dynamic_Priority_Test.dsp - Package Owner=<4>
+Project: "Enum_Interfaces_Test"=".\Enum_Interfaces_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -147,7 +147,7 @@ Package=<4> ###############################################################################
-Project: "Enum_Interfaces_Test"=.\Enum_Interfaces_Test.dsp - Package Owner=<4>
+Project: "Env_Value_Test"=".\Env_Value_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -159,7 +159,7 @@ Package=<4> ###############################################################################
-Project: "Env_Value_Test"=.\Env_Value_Test.dsp - Package Owner=<4>
+Project: "Future_Test"=".\Future_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -171,7 +171,7 @@ Package=<4> ###############################################################################
-Project: "Future_Set_Test"=.\Future_Set_Test.dsp - Package Owner=<4>
+Project: "Handle_Set_Test"=".\Handle_Set_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -183,7 +183,7 @@ Package=<4> ###############################################################################
-Project: "Future_Test"=.\Future_Test.dsp - Package Owner=<4>
+Project: "Hash_Map_Manager_Test"=".\Hash_Map_Manager_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -195,7 +195,7 @@ Package=<4> ###############################################################################
-Project: "Handle_Set_Test"=.\Handle_Set_Test.dsp - Package Owner=<4>
+Project: "High_Res_Timer_Test"=".\High_Res_Timer_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -207,7 +207,7 @@ Package=<4> ###############################################################################
-Project: "Hash_Map_Manager_Test"=.\Hash_Map_Manager_Test.dsp - Package Owner=<4>
+Project: "IOStream_Test"=".\IOStream_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -219,7 +219,7 @@ Package=<4> ###############################################################################
-Project: "High_Res_Timer_Test"=.\High_Res_Timer_Test.dsp - Package Owner=<4>
+Project: "MM_Shared_Memory_Test"=".\MM_Shared_Memory_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -231,7 +231,7 @@ Package=<4> ###############################################################################
-Project: "IOStream_Test"=.\IOStream_Test.dsp - Package Owner=<4>
+Project: "MT_Reactor_Timer_Test"=".\MT_Reactor_Timer_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -243,7 +243,7 @@ Package=<4> ###############################################################################
-Project: "MM_Shared_Memory_Test"=.\MM_Shared_Memory_Test.dsp - Package Owner=<4>
+Project: "MT_SOCK_Test"=".\MT_SOCK_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -255,7 +255,7 @@ Package=<4> ###############################################################################
-Project: "MT_Reactor_Timer_Test"=.\MT_Reactor_Timer_Test.dsp - Package Owner=<4>
+Project: "Map_Manager_Test"=".\Map_Manager_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -267,7 +267,7 @@ Package=<4> ###############################################################################
-Project: "MT_SOCK_Test"=.\MT_SOCK_Test.dsp - Package Owner=<4>
+Project: "Map_Test"=".\Map_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -279,7 +279,7 @@ Package=<4> ###############################################################################
-Project: "Map_Manager_Test"=.\Map_Manager_Test.dsp - Package Owner=<4>
+Project: "Mem_Map_Test"=".\Mem_Map_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -291,7 +291,7 @@ Package=<4> ###############################################################################
-Project: "Map_Test"=.\Map_Test.dsp - Package Owner=<4>
+Project: "Message_Block_Test"=".\Message_Block_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -303,7 +303,7 @@ Package=<4> ###############################################################################
-Project: "Mem_Map_Test"=.\Mem_Map_Test.dsp - Package Owner=<4>
+Project: "Message_Queue_Notifications_Test"=".\Message_Queue_Notifications_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -315,7 +315,7 @@ Package=<4> ###############################################################################
-Project: "Message_Block_Test"=.\Message_Block_Test.dsp - Package Owner=<4>
+Project: "Message_Queue_Test"=".\Message_Queue_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -327,7 +327,7 @@ Package=<4> ###############################################################################
-Project: "Message_Queue_Notifications_Test"=.\Message_Queue_Notifications_Test.dsp - Package Owner=<4>
+Project: "Naming_Test"=".\Naming_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -339,7 +339,7 @@ Package=<4> ###############################################################################
-Project: "Message_Queue_Test"=.\Message_Queue_Test.dsp - Package Owner=<4>
+Project: "New_Fail_Test"=".\New_Fail_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -351,7 +351,7 @@ Package=<4> ###############################################################################
-Project: "Naming_Test"=.\Naming_Test.dsp - Package Owner=<4>
+Project: "Notify_Performance_Test"=".\Notify_Performance_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -363,7 +363,7 @@ Package=<4> ###############################################################################
-Project: "New_Fail_Test"=.\New_Fail_Test.dsp - Package Owner=<4>
+Project: "OrdMultiSet_Test"=".\OrdMultiSet_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -375,7 +375,7 @@ Package=<4> ###############################################################################
-Project: "Notify_Performance_Test"=.\Notify_Performance_Test.dsp - Package Owner=<4>
+Project: "Pipe_Test"=".\Pipe_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -387,7 +387,7 @@ Package=<4> ###############################################################################
-Project: "OrdMultiSet_Test"=.\OrdMultiSet_Test.dsp - Package Owner=<4>
+Project: "Priority_Buffer_Test"=".\Priority_Buffer_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -399,7 +399,7 @@ Package=<4> ###############################################################################
-Project: "Pipe_Test"=.\Pipe_Test.dsp - Package Owner=<4>
+Project: "Priority_Reactor_Test"=".\Priority_Reactor_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -411,7 +411,7 @@ Package=<4> ###############################################################################
-Project: "Priority_Buffer_Test"=.\Priority_Buffer_Test.dsp - Package Owner=<4>
+Project: "Priority_Task_Test"=".\Priority_Task_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -423,7 +423,7 @@ Package=<4> ###############################################################################
-Project: "Priority_Reactor_Test"=.\Priority_Reactor_Test.dsp - Package Owner=<4>
+Project: "Process_Mutex_Test"=".\Process_Mutex_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -435,7 +435,7 @@ Package=<4> ###############################################################################
-Project: "Priority_Task_Test"=.\Priority_Task_Test.dsp - Package Owner=<4>
+Project: "Process_Strategy_Test"=".\Process_Strategy_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -447,7 +447,7 @@ Package=<4> ###############################################################################
-Project: "Process_Mutex_Test"=.\Process_Mutex_Test.dsp - Package Owner=<4>
+Project: "RB_Tree_Test"=".\RB_Tree_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -459,7 +459,7 @@ Package=<4> ###############################################################################
-Project: "Process_Strategy_Test"=.\Process_Strategy_Test.dsp - Package Owner=<4>
+Project: "Reactor_Exceptions_Test"=".\Reactor_Exceptions_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -471,7 +471,7 @@ Package=<4> ###############################################################################
-Project: "RB_Tree_Test"=.\RB_Tree_Test.dsp - Package Owner=<4>
+Project: "Reactor_Notify_Test"=".\Reactor_Notify_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -483,7 +483,7 @@ Package=<4> ###############################################################################
-Project: "Reactor_Exceptions_Test"=.\Reactor_Exceptions_Test.dsp - Package Owner=<4>
+Project: "Reactor_Performance_Test"=".\Reactor_Performance_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -495,7 +495,7 @@ Package=<4> ###############################################################################
-Project: "Reactor_Notify_Test"=.\Reactor_Notify_Test.dsp - Package Owner=<4>
+Project: "Reactor_Timer_Test"=".\Reactor_Timer_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -507,7 +507,7 @@ Package=<4> ###############################################################################
-Project: "Reactor_Performance_Test"=.\Reactor_Performance_Test.dsp - Package Owner=<4>
+Project: "Reactors_Test"=".\Reactors_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -519,7 +519,7 @@ Package=<4> ###############################################################################
-Project: "Reactor_Timer_Test"=.\Reactor_Timer_Test.dsp - Package Owner=<4>
+Project: "Reader_Writer_Test"=".\Reader_Writer_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -531,7 +531,7 @@ Package=<4> ###############################################################################
-Project: "Reactors_Test"=.\Reactors_Test.dsp - Package Owner=<4>
+Project: "Recursive_Mutex_Test"=".\Recursive_Mutex_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -543,7 +543,7 @@ Package=<4> ###############################################################################
-Project: "Reader_Writer_Test"=.\Reader_Writer_Test.dsp - Package Owner=<4>
+Project: "Reverse_Lock_Test"=".\Reverse_Lock_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -555,7 +555,7 @@ Package=<4> ###############################################################################
-Project: "Recursive_Mutex_Test"=.\Recursive_Mutex_Test.dsp - Package Owner=<4>
+Project: "SOCK_Connector_Test"=".\SOCK_Connector_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -567,7 +567,7 @@ Package=<4> ###############################################################################
-Project: "Reverse_Lock_Test"=.\Reverse_Lock_Test.dsp - Package Owner=<4>
+Project: "SOCK_Send_Recv_Test"=".\SOCK_Send_Recv_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -579,7 +579,7 @@ Package=<4> ###############################################################################
-Project: "SOCK_Connector_Test"=.\SOCK_Connector_Test.dsp - Package Owner=<4>
+Project: "SOCK_Test"=".\SOCK_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -591,7 +591,7 @@ Package=<4> ###############################################################################
-Project: "SOCK_Send_Recv_Test"=.\SOCK_Send_Recv_Test.dsp - Package Owner=<4>
+Project: "SPIPE_Test"=".\SPIPE_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -603,7 +603,7 @@ Package=<4> ###############################################################################
-Project: "SOCK_Test"=.\SOCK_Test.dsp - Package Owner=<4>
+Project: "SString_Test"=".\SString_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -615,7 +615,7 @@ Package=<4> ###############################################################################
-Project: "SPIPE_Test"=.\SPIPE_Test.dsp - Package Owner=<4>
+Project: "SV_Shared_Memory_Test"=".\SV_Shared_Memory_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -627,7 +627,7 @@ Package=<4> ###############################################################################
-Project: "SString_Test"=.\SString_Test.dsp - Package Owner=<4>
+Project: "Semaphore_Test"=".\Semaphore_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -639,7 +639,7 @@ Package=<4> ###############################################################################
-Project: "SV_Shared_Memory_Test"=.\SV_Shared_Memory_Test.dsp - Package Owner=<4>
+Project: "Service_Config_Test"=".\Service_Config_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -651,7 +651,7 @@ Package=<4> ###############################################################################
-Project: "Semaphore_Test"=.\Semaphore_Test.dsp - Package Owner=<4>
+Project: "Sigset_Ops_Test"=".\Sigset_Ops_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -663,7 +663,7 @@ Package=<4> ###############################################################################
-Project: "Service_Config_Test"=.\Service_Config_Test.dsp - Package Owner=<4>
+Project: "Simple_Message_Block_Test"=".\Simple_Message_Block_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -675,7 +675,7 @@ Package=<4> ###############################################################################
-Project: "Sigset_Ops_Test"=.\Sigset_Ops_Test.dsp - Package Owner=<4>
+Project: "Svc_Handler_Test"=".\Svc_Handler_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -687,7 +687,7 @@ Package=<4> ###############################################################################
-Project: "Simple_Message_Block_Test"=.\Simple_Message_Block_Test.dsp - Package Owner=<4>
+Project: "TSS_Test"=".\TSS_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -699,7 +699,7 @@ Package=<4> ###############################################################################
-Project: "Svc_Handler_Test"=.\Svc_Handler_Test.dsp - Package Owner=<4>
+Project: "Task_Test"=".\Task_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -711,7 +711,7 @@ Package=<4> ###############################################################################
-Project: "TSS_Test"=.\TSS_Test.dsp - Package Owner=<4>
+Project: "Thread_Manager_Test"=".\Thread_Manager_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -723,7 +723,7 @@ Package=<4> ###############################################################################
-Project: "Task_Test"=.\Task_Test.dsp - Package Owner=<4>
+Project: "Thread_Mutex_Test"=".\Thread_Mutex_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -735,7 +735,7 @@ Package=<4> ###############################################################################
-Project: "Thread_Manager_Test"=.\Thread_Manager_Test.dsp - Package Owner=<4>
+Project: "Thread_Pool_Reactor_Test"=".\Thread_Pool_Reactor_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -747,7 +747,7 @@ Package=<4> ###############################################################################
-Project: "Thread_Mutex_Test"=.\Thread_Mutex_Test.dsp - Package Owner=<4>
+Project: "Thread_Pool_Test"=".\Thread_Pool_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -759,7 +759,7 @@ Package=<4> ###############################################################################
-Project: "Thread_Pool_Reactor_Test"=.\Thread_Pool_Reactor_Test.dsp - Package Owner=<4>
+Project: "Time_Service_Test"=".\Time_Service_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -771,7 +771,7 @@ Package=<4> ###############################################################################
-Project: "Thread_Pool_Test"=.\Thread_Pool_Test.dsp - Package Owner=<4>
+Project: "Time_Value_Test"=".\Time_Value_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -783,7 +783,7 @@ Package=<4> ###############################################################################
-Project: "Time_Service_Test"=.\Time_Service_Test.dsp - Package Owner=<4>
+Project: "Timeprobe_Test"=".\Timeprobe_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -795,7 +795,7 @@ Package=<4> ###############################################################################
-Project: "Time_Value_Test"=.\Time_Value_Test.dsp - Package Owner=<4>
+Project: "Timer_Queue_Test"=".\Timer_Queue_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -807,7 +807,7 @@ Package=<4> ###############################################################################
-Project: "Timeprobe_Test"=.\Timeprobe_Test.dsp - Package Owner=<4>
+Project: "Tokens_Test"=".\Tokens_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -819,7 +819,7 @@ Package=<4> ###############################################################################
-Project: "Timer_Queue_Test"=.\Timer_Queue_Test.dsp - Package Owner=<4>
+Project: "UPIPE_SAP_Test"=".\UPIPE_SAP_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -831,31 +831,7 @@ Package=<4> ###############################################################################
-Project: "Tokens_Test"=.\Tokens_Test.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "UPIPE_SAP_Test"=.\UPIPE_SAP_Test.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "Upgradable_RW_Test"=.\Upgradable_RW_Test.dsp - Package Owner=<4>
+Project: "Upgradable_RW_Test"=".\Upgradable_RW_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
diff --git a/tests/tests_bcc.ide b/tests/tests_bcc.ide Binary files differnew file mode 100644 index 00000000000..ad4a71ea784 --- /dev/null +++ b/tests/tests_bcc.ide diff --git a/tests/tests_pharlap_msvc.lnk b/tests/tests_pharlap_msvc.lnk deleted file mode 100644 index 39af043e409..00000000000 --- a/tests/tests_pharlap_msvc.lnk +++ /dev/null @@ -1,72 +0,0 @@ -! $Id$ -! Application linker command file for ACE tests. - -! Visual C++ Compiler with PC-Compatible Target -@vc.emb - -! PC-Compatible Screen Driver -!@pcat_sc.emb - -! PC-Compatible Keyboard Driver -!@pcat_kb.emb - -! Multithread Support, Debug version -@vcmtd.emb - -! Structured Exception Handling -@strucexc.emb - -! Floating Point Emulator -!@fpem.emb - -! MS-DOS Compatible File System -!@lfs.emb - -! DLL Loader -!@ldr.emb - -! TCP/IP Support -@winsock.emb - -! TCP/IP Driver -!@eth-smc.emb ! SMC 8003/8216/8416 -!@eth-smc9.emb ! SMC 91C92/91C94 -@eth-3com.emb ! 3Com 3C509 -!@eth-ne2k.emb ! NE2000 -!@eth-dec.emb ! Digital 2114x -!@ppp16550.emb ! PPP 8250/16450/16550 -!@slp16550.emb ! SLIP/CSLIP 8250/16450/16550 - -! MicroWeb Server -!@microweb.emb - -! FTP Server -!@ftpserve.emb - -! Event Logging -!@log.emb - -! PC Card Support -!@pccard.emb - -! PC Card Enablers -!@cs-ser.emb ! Serial Ports -!@cs-ide.emb ! ATA Disk Drives -!@cs-3com.emb ! 3Com Ethernet -!@cs-ne2k.emb ! NE2000 Ethernet - -! M-Systems Flash Support -!@pcfd.emb ! PC-FD -!@dochip2.emb ! DiskOnChip 2000 - -! The section below contains the user-specified switches from the -! Extra Application Link File Switches section of the Extra Linker Switches -! property sheet. -! - -! 32K stack works well. The 8K default is way too small --stack 32767 - -! Many of the ACE tests are too large to load in the default space without -! running over the ROM area at some point, so go up. --offset 10_0000h diff --git a/tests/version_tests/Cache_Map_Manager_Test.dsp b/tests/version_tests/Cache_Map_Manager_Test.dsp deleted file mode 100644 index 0b346f34c23..00000000000 --- a/tests/version_tests/Cache_Map_Manager_Test.dsp +++ /dev/null @@ -1,270 +0,0 @@ -# Microsoft Developer Studio Project File - Name="Cache_Map_Manager_Test" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=Cache_Map_Manager_Test - Win32 DLL Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "atomic_op_test.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "atomic_op_test.mak" CFG="Cache_Map_Manager_Test - Win32 DLL Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "Cache_Map_Manager_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Cache_Map_Manager_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Cache_Map_Manager_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Cache_Map_Manager_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Cache_Map_Manager_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Cache_Map_Manager_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Cache_Map_Manager_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Cache_Map_Manager_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "Cache_Map_Manager_Test - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Cache_Map_Manager_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Cache_Map_Manager_Test\DLL Debug"
-# PROP BASE Target_Dir ".\Cache_Map_Manager_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Cache_Map_Manager_Test"
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Cache_Map_Manager_Test - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Cache_Map_Manager_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Cache_Map_Manager_Test\DLL Release"
-# PROP BASE Target_Dir ".\Cache_Map_Manager_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Cache_Map_Manager_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Cache_Map_Manager_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Cache_Map_Manager_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Cache_Map_Manager_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Cache_Map_Manager_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Unicode Debug"
-# PROP Intermediate_Dir ".\DLL Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Cache_Map_Manager_Test"
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
-# ADD LINK32 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Cache_Map_Manager_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Cache_Map_Manager_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Cache_Map_Manager_Test\static Debug"
-# PROP BASE Target_Dir ".\Cache_Map_Manager_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Debug"
-# PROP Intermediate_Dir ".\static Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Cache_Map_Manager_Test"
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Cache_Map_Manager_Test - Win32 static Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Cache_Map_Manager_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Cache_Map_Manager_Test\static Release"
-# PROP BASE Target_Dir ".\Cache_Map_Manager_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Cache_Map_Manager_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 aces.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Cache_Map_Manager_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Cache_Map_Manager_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Cache_Map_Manager_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Cache_Map_Manager_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Cache_Map_Manager_Test"
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
-# ADD LINK32 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Cache_Map_Manager_Test - Win32 static Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Cache_Map_Manager_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Cache_Map_Manager_Test\static Unicode Release"
-# PROP BASE Target_Dir ".\Cache_Map_Manager_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Cache_Map_Manager_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Cache_Map_Manager_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Cache_Map_Manager_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Cache_Map_Manager_Test\DLL Unicode Release"
-# PROP BASE Target_Dir ".\Cache_Map_Manager_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Cache_Map_Manager_Test"
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ENDIF
-
-# Begin Target
-
-# Name "Cache_Map_Manager_Test - Win32 DLL Debug"
-# Name "Cache_Map_Manager_Test - Win32 DLL Release"
-# Name "Cache_Map_Manager_Test - Win32 DLL Unicode Debug"
-# Name "Cache_Map_Manager_Test - Win32 static Debug"
-# Name "Cache_Map_Manager_Test - Win32 static Release"
-# Name "Cache_Map_Manager_Test - Win32 static Unicode Debug"
-# Name "Cache_Map_Manager_Test - Win32 static Unicode Release"
-# Name "Cache_Map_Manager_Test - Win32 DLL Unicode Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
-# Begin Source File
-
-SOURCE=..\Cache_Map_Manager_Test.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# Begin Source File
-
-SOURCE=..\test_config.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/tests/version_tests/Future_Set_Test.dsp b/tests/version_tests/Future_Set_Test.dsp deleted file mode 100644 index 00bd74156ef..00000000000 --- a/tests/version_tests/Future_Set_Test.dsp +++ /dev/null @@ -1,270 +0,0 @@ -# Microsoft Developer Studio Project File - Name="Future_Set_Test" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=Future_Set_Test - Win32 DLL Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "atomic_op_test.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "atomic_op_test.mak" CFG="Future_Set_Test - Win32 DLL Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "Future_Set_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Future_Set_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Future_Set_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Future_Set_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Future_Set_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Future_Set_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Future_Set_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Future_Set_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "Future_Set_Test - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Future_Set_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Future_Set_Test\DLL Debug"
-# PROP BASE Target_Dir ".\Future_Set_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Future_Set_Test"
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Future_Set_Test - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Future_Set_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Future_Set_Test\DLL Release"
-# PROP BASE Target_Dir ".\Future_Set_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Future_Set_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Future_Set_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Future_Set_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Future_Set_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Future_Set_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Unicode Debug"
-# PROP Intermediate_Dir ".\DLL Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Future_Set_Test"
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
-# ADD LINK32 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Future_Set_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Future_Set_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Future_Set_Test\static Debug"
-# PROP BASE Target_Dir ".\Future_Set_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Debug"
-# PROP Intermediate_Dir ".\static Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Future_Set_Test"
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Future_Set_Test - Win32 static Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Future_Set_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Future_Set_Test\static Release"
-# PROP BASE Target_Dir ".\Future_Set_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Future_Set_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 aces.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Future_Set_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Future_Set_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Future_Set_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Future_Set_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Future_Set_Test"
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
-# ADD LINK32 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Future_Set_Test - Win32 static Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Future_Set_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Future_Set_Test\static Unicode Release"
-# PROP BASE Target_Dir ".\Future_Set_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Future_Set_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Future_Set_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Future_Set_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Future_Set_Test\DLL Unicode Release"
-# PROP BASE Target_Dir ".\Future_Set_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Future_Set_Test"
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ENDIF
-
-# Begin Target
-
-# Name "Future_Set_Test - Win32 DLL Debug"
-# Name "Future_Set_Test - Win32 DLL Release"
-# Name "Future_Set_Test - Win32 DLL Unicode Debug"
-# Name "Future_Set_Test - Win32 static Debug"
-# Name "Future_Set_Test - Win32 static Release"
-# Name "Future_Set_Test - Win32 static Unicode Debug"
-# Name "Future_Set_Test - Win32 static Unicode Release"
-# Name "Future_Set_Test - Win32 DLL Unicode Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
-# Begin Source File
-
-SOURCE=..\Future_Set_Test.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# Begin Source File
-
-SOURCE=..\test_config.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/tests/version_tests/version_tests.dsw b/tests/version_tests/version_tests.dsw index 46a393ec13d..87a67aa721d 100644 --- a/tests/version_tests/version_tests.dsw +++ b/tests/version_tests/version_tests.dsw @@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 ###############################################################################
-Project: "Ace_Init_Test"=.\ACE_Init_Test.dsp - Package Owner=<4>
+Project: "Ace_Init_Test"=".\ACE_Init_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -15,7 +15,7 @@ Package=<4> ###############################################################################
-Project: "Atomic_Op_Test"=.\Atomic_Op_Test.dsp - Package Owner=<4>
+Project: "Atomic_Op_Test"=".\Atomic_Op_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -27,7 +27,7 @@ Package=<4> ###############################################################################
-Project: "Barrier_Test"=.\Barrier_Test.dsp - Package Owner=<4>
+Project: "Barrier_Test"=".\Barrier_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -39,7 +39,7 @@ Package=<4> ###############################################################################
-Project: "Basic_Types_Test"=.\Basic_Types_Test.dsp - Package Owner=<4>
+Project: "Basic_Types_Test"=".\Basic_Types_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -51,7 +51,7 @@ Package=<4> ###############################################################################
-Project: "Buffer_Stream_Test"=.\Buffer_Stream_Test.dsp - Package Owner=<4>
+Project: "Buffer_Stream_Test"=".\Buffer_Stream_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -63,7 +63,7 @@ Package=<4> ###############################################################################
-Project: "CDR_Test"=.\CDR_Test.dsp - Package Owner=<4>
+Project: "CDR_Test"=".\CDR_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -75,7 +75,7 @@ Package=<4> ###############################################################################
-Project: "Cache_Map_Manager_Test"=.\Cache_Map_Manager_Test.dsp - Package Owner=<4>
+Project: "Collection_Test"=".\Collection_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -87,7 +87,7 @@ Package=<4> ###############################################################################
-Project: "Collection_Test"=.\Collection_Test.dsp - Package Owner=<4>
+Project: "Conn_Test"=".\Conn_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -99,7 +99,7 @@ Package=<4> ###############################################################################
-Project: "Conn_Test"=.\Conn_Test.dsp - Package Owner=<4>
+Project: "DLL_Test"=".\DLL_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -111,7 +111,7 @@ Package=<4> ###############################################################################
-Project: "DLL_Test"=.\DLL_Test.dsp - Package Owner=<4>
+Project: "DLList_Test"=".\DLList_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -123,7 +123,7 @@ Package=<4> ###############################################################################
-Project: "DLList_Test"=.\DLList_Test.dsp - Package Owner=<4>
+Project: "Dynamic_Priority_Test"=".\Dynamic_Priority_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -135,7 +135,7 @@ Package=<4> ###############################################################################
-Project: "Dynamic_Priority_Test"=.\Dynamic_Priority_Test.dsp - Package Owner=<4>
+Project: "Enum_Interfaces_Test"=".\Enum_Interfaces_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -147,7 +147,7 @@ Package=<4> ###############################################################################
-Project: "Enum_Interfaces_Test"=.\Enum_Interfaces_Test.dsp - Package Owner=<4>
+Project: "Env_Value_Test"=".\Env_Value_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -159,7 +159,7 @@ Package=<4> ###############################################################################
-Project: "Env_Value_Test"=.\Env_Value_Test.dsp - Package Owner=<4>
+Project: "Future_Test"=".\Future_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -171,7 +171,7 @@ Package=<4> ###############################################################################
-Project: "Future_Set_Test"=.\Future_Set_Test.dsp - Package Owner=<4>
+Project: "Handle_Set_Test"=".\Handle_Set_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -183,7 +183,7 @@ Package=<4> ###############################################################################
-Project: "Future_Test"=.\Future_Test.dsp - Package Owner=<4>
+Project: "Hash_Map_Manager_Test"=".\Hash_Map_Manager_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -195,7 +195,7 @@ Package=<4> ###############################################################################
-Project: "Handle_Set_Test"=.\Handle_Set_Test.dsp - Package Owner=<4>
+Project: "High_Res_Timer_Test"=".\High_Res_Timer_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -207,7 +207,7 @@ Package=<4> ###############################################################################
-Project: "Hash_Map_Manager_Test"=.\Hash_Map_Manager_Test.dsp - Package Owner=<4>
+Project: "IOStream_Test"=".\IOStream_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -219,7 +219,7 @@ Package=<4> ###############################################################################
-Project: "High_Res_Timer_Test"=.\High_Res_Timer_Test.dsp - Package Owner=<4>
+Project: "MM_Shared_Memory_Test"=".\MM_Shared_Memory_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -231,7 +231,7 @@ Package=<4> ###############################################################################
-Project: "IOStream_Test"=.\IOStream_Test.dsp - Package Owner=<4>
+Project: "MT_SOCK_Test"=".\MT_SOCK_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -243,7 +243,7 @@ Package=<4> ###############################################################################
-Project: "MM_Shared_Memory_Test"=.\MM_Shared_Memory_Test.dsp - Package Owner=<4>
+Project: "Map_Manager_Test"=".\Map_Manager_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -255,7 +255,7 @@ Package=<4> ###############################################################################
-Project: "MT_SOCK_Test"=.\MT_SOCK_Test.dsp - Package Owner=<4>
+Project: "Map_Test"=".\Map_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -267,7 +267,7 @@ Package=<4> ###############################################################################
-Project: "Map_Manager_Test"=.\Map_Manager_Test.dsp - Package Owner=<4>
+Project: "Mem_Map_Test"=".\Mem_Map_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -279,7 +279,7 @@ Package=<4> ###############################################################################
-Project: "Map_Test"=.\Map_Test.dsp - Package Owner=<4>
+Project: "Message_Block_Test"=".\Message_Block_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -291,7 +291,7 @@ Package=<4> ###############################################################################
-Project: "Mem_Map_Test"=.\Mem_Map_Test.dsp - Package Owner=<4>
+Project: "Message_Queue_Notifications_Test"=".\Message_Queue_Notifications_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -303,7 +303,7 @@ Package=<4> ###############################################################################
-Project: "Message_Block_Test"=.\Message_Block_Test.dsp - Package Owner=<4>
+Project: "Message_Queue_Test"=".\Message_Queue_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -315,7 +315,7 @@ Package=<4> ###############################################################################
-Project: "Message_Queue_Notifications_Test"=.\Message_Queue_Notifications_Test.dsp - Package Owner=<4>
+Project: "Mt_Reactor_Timer_Test"=".\MT_Reactor_Timer_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -327,7 +327,7 @@ Package=<4> ###############################################################################
-Project: "Message_Queue_Test"=.\Message_Queue_Test.dsp - Package Owner=<4>
+Project: "Naming_Test"=".\Naming_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -339,7 +339,7 @@ Package=<4> ###############################################################################
-Project: "Mt_Reactor_Timer_Test"=.\MT_Reactor_Timer_Test.dsp - Package Owner=<4>
+Project: "New_Fail_Test"=".\New_Fail_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -351,7 +351,7 @@ Package=<4> ###############################################################################
-Project: "Naming_Test"=.\Naming_Test.dsp - Package Owner=<4>
+Project: "Notify_Performance_Test"=".\Notify_Performance_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -363,7 +363,7 @@ Package=<4> ###############################################################################
-Project: "New_Fail_Test"=.\New_Fail_Test.dsp - Package Owner=<4>
+Project: "OrdMultiSet_Test"=".\OrdMultiSet_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -375,7 +375,7 @@ Package=<4> ###############################################################################
-Project: "Notify_Performance_Test"=.\Notify_Performance_Test.dsp - Package Owner=<4>
+Project: "Pipe_Test"=".\Pipe_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -387,7 +387,7 @@ Package=<4> ###############################################################################
-Project: "OrdMultiSet_Test"=.\OrdMultiSet_Test.dsp - Package Owner=<4>
+Project: "Priority_Buffer_Test"=".\Priority_Buffer_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -399,7 +399,7 @@ Package=<4> ###############################################################################
-Project: "Pipe_Test"=.\Pipe_Test.dsp - Package Owner=<4>
+Project: "Priority_Reactor_Test"=".\Priority_Reactor_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -411,7 +411,7 @@ Package=<4> ###############################################################################
-Project: "Priority_Buffer_Test"=.\Priority_Buffer_Test.dsp - Package Owner=<4>
+Project: "Priority_Task_Test"=".\Priority_Task_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -423,7 +423,7 @@ Package=<4> ###############################################################################
-Project: "Priority_Reactor_Test"=.\Priority_Reactor_Test.dsp - Package Owner=<4>
+Project: "Process_Mutex_Test"=".\Process_Mutex_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -435,7 +435,7 @@ Package=<4> ###############################################################################
-Project: "Priority_Task_Test"=.\Priority_Task_Test.dsp - Package Owner=<4>
+Project: "Process_Strategy_Test"=".\Process_Strategy_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -447,7 +447,7 @@ Package=<4> ###############################################################################
-Project: "Process_Mutex_Test"=.\Process_Mutex_Test.dsp - Package Owner=<4>
+Project: "RB_Tree_Test"=".\RB_Tree_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -459,7 +459,7 @@ Package=<4> ###############################################################################
-Project: "Process_Strategy_Test"=.\Process_Strategy_Test.dsp - Package Owner=<4>
+Project: "Reactor_Exception_Test"=".\Reactor_Exception_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -471,7 +471,7 @@ Package=<4> ###############################################################################
-Project: "RB_Tree_Test"=.\RB_Tree_Test.dsp - Package Owner=<4>
+Project: "Reactor_Notify_Test"=".\Reactor_Notify_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -483,7 +483,7 @@ Package=<4> ###############################################################################
-Project: "Reactor_Exception_Test"=.\Reactor_Exception_Test.dsp - Package Owner=<4>
+Project: "Reactor_Performance_Test"=".\Reactor_Performance_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -495,7 +495,7 @@ Package=<4> ###############################################################################
-Project: "Reactor_Notify_Test"=.\Reactor_Notify_Test.dsp - Package Owner=<4>
+Project: "Reactor_Timer_Test"=".\Reactor_Timer_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -507,7 +507,7 @@ Package=<4> ###############################################################################
-Project: "Reactor_Performance_Test"=.\Reactor_Performance_Test.dsp - Package Owner=<4>
+Project: "Reactors_Test"=".\Reactors_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -519,7 +519,7 @@ Package=<4> ###############################################################################
-Project: "Reactor_Timer_Test"=.\Reactor_Timer_Test.dsp - Package Owner=<4>
+Project: "Reader_Writer_Test"=".\Reader_Writer_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -531,7 +531,7 @@ Package=<4> ###############################################################################
-Project: "Reactors_Test"=.\Reactors_Test.dsp - Package Owner=<4>
+Project: "Recursive_Mutex_Test"=".\Recursive_Mutex_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -543,7 +543,7 @@ Package=<4> ###############################################################################
-Project: "Reader_Writer_Test"=.\Reader_Writer_Test.dsp - Package Owner=<4>
+Project: "Reverse_Lock_Test"=".\Reverse_Lock_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -555,7 +555,7 @@ Package=<4> ###############################################################################
-Project: "Recursive_Mutex_Test"=.\Recursive_Mutex_Test.dsp - Package Owner=<4>
+Project: "SOCK_Connector_Test"=".\SOCK_Connector_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -567,7 +567,7 @@ Package=<4> ###############################################################################
-Project: "Reverse_Lock_Test"=.\Reverse_Lock_Test.dsp - Package Owner=<4>
+Project: "SOCK_Send_Recv_Test"=".\SOCK_Send_Recv_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -579,7 +579,7 @@ Package=<4> ###############################################################################
-Project: "SOCK_Connector_Test"=.\SOCK_Connector_Test.dsp - Package Owner=<4>
+Project: "SOCK_Test"=".\SOCK_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -591,7 +591,7 @@ Package=<4> ###############################################################################
-Project: "SOCK_Send_Recv_Test"=.\SOCK_Send_Recv_Test.dsp - Package Owner=<4>
+Project: "SPIPE_Test"=".\SPIPE_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -603,7 +603,7 @@ Package=<4> ###############################################################################
-Project: "SOCK_Test"=.\SOCK_Test.dsp - Package Owner=<4>
+Project: "SString_Test"=".\SString_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -615,7 +615,7 @@ Package=<4> ###############################################################################
-Project: "SPIPE_Test"=.\SPIPE_Test.dsp - Package Owner=<4>
+Project: "SV_Shared_Memory_Test"=".\SV_Shared_Memory_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -627,7 +627,7 @@ Package=<4> ###############################################################################
-Project: "SString_Test"=.\SString_Test.dsp - Package Owner=<4>
+Project: "Semaphore_Test"=".\Semaphore_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -639,7 +639,7 @@ Package=<4> ###############################################################################
-Project: "SV_Shared_Memory_Test"=.\SV_Shared_Memory_Test.dsp - Package Owner=<4>
+Project: "Service_Config_Test"=".\Service_Config_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -651,7 +651,7 @@ Package=<4> ###############################################################################
-Project: "Semaphore_Test"=.\Semaphore_Test.dsp - Package Owner=<4>
+Project: "Sigset_Op_Test"=".\Sigset_Op_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -663,7 +663,7 @@ Package=<4> ###############################################################################
-Project: "Service_Config_Test"=.\Service_Config_Test.dsp - Package Owner=<4>
+Project: "Simple_Message_Block_Test"=".\Simple_Message_Block_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -675,7 +675,7 @@ Package=<4> ###############################################################################
-Project: "Sigset_Op_Test"=.\Sigset_Op_Test.dsp - Package Owner=<4>
+Project: "Svc_Handler_Test"=".\Svc_Handler_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -687,7 +687,7 @@ Package=<4> ###############################################################################
-Project: "Simple_Message_Block_Test"=.\Simple_Message_Block_Test.dsp - Package Owner=<4>
+Project: "TSS_Test"=".\TSS_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -699,7 +699,7 @@ Package=<4> ###############################################################################
-Project: "Svc_Handler_Test"=.\Svc_Handler_Test.dsp - Package Owner=<4>
+Project: "Task_Test"=".\Task_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -711,7 +711,7 @@ Package=<4> ###############################################################################
-Project: "TSS_Test"=.\TSS_Test.dsp - Package Owner=<4>
+Project: "Thread_Manager_Test"=".\Thread_Manager_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -723,7 +723,7 @@ Package=<4> ###############################################################################
-Project: "Task_Test"=.\Task_Test.dsp - Package Owner=<4>
+Project: "Thread_Mutex_Test"=".\Thread_Mutex_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -735,7 +735,7 @@ Package=<4> ###############################################################################
-Project: "Thread_Manager_Test"=.\Thread_Manager_Test.dsp - Package Owner=<4>
+Project: "Thread_Pool_Reactor_Test"=".\Thread_Pool_Reactor_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -747,7 +747,7 @@ Package=<4> ###############################################################################
-Project: "Thread_Mutex_Test"=.\Thread_Mutex_Test.dsp - Package Owner=<4>
+Project: "Thread_Pool_Test"=".\Thread_Pool_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -759,7 +759,7 @@ Package=<4> ###############################################################################
-Project: "Thread_Pool_Reactor_Test"=.\Thread_Pool_Reactor_Test.dsp - Package Owner=<4>
+Project: "Time_Service_Test"=".\Time_Service_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -771,7 +771,7 @@ Package=<4> ###############################################################################
-Project: "Thread_Pool_Test"=.\Thread_Pool_Test.dsp - Package Owner=<4>
+Project: "Time_Value_Test"=".\Time_Value_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -783,7 +783,7 @@ Package=<4> ###############################################################################
-Project: "Time_Service_Test"=.\Time_Service_Test.dsp - Package Owner=<4>
+Project: "Timeprobe_Test"=".\Timeprobe_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -795,7 +795,7 @@ Package=<4> ###############################################################################
-Project: "Time_Value_Test"=.\Time_Value_Test.dsp - Package Owner=<4>
+Project: "Timer_Queue_Test"=".\Timer_Queue_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -807,7 +807,7 @@ Package=<4> ###############################################################################
-Project: "Timeprobe_Test"=.\Timeprobe_Test.dsp - Package Owner=<4>
+Project: "Tokens_Test"=".\Tokens_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -819,7 +819,7 @@ Package=<4> ###############################################################################
-Project: "Timer_Queue_Test"=.\Timer_Queue_Test.dsp - Package Owner=<4>
+Project: "UPIPE_SAP_Test"=".\UPIPE_SAP_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -831,31 +831,7 @@ Package=<4> ###############################################################################
-Project: "Tokens_Test"=.\Tokens_Test.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "UPIPE_SAP_Test"=.\UPIPE_SAP_Test.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "Upgradable_RW_Test"=.\Upgradable_RW_Test.dsp - Package Owner=<4>
+Project: "Upgradable_RW_Test"=".\Upgradable_RW_Test.dsp" - Package Owner=<4>
Package=<5>
{{{
|