From commits-return-8795-apmail-apr-commits-archive=apr.apache.org@apr.apache.org Fri Oct 12 21:56:45 2007 Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 32180 invoked from network); 12 Oct 2007 21:56:45 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 12 Oct 2007 21:56:45 -0000 Received: (qmail 45412 invoked by uid 500); 12 Oct 2007 21:56:32 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 45368 invoked by uid 500); 12 Oct 2007 21:56:32 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 45357 invoked by uid 99); 12 Oct 2007 21:56:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Oct 2007 14:56:32 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Oct 2007 21:56:43 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C79701A9838; Fri, 12 Oct 2007 14:55:52 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r584285 - in /apr/apr/branches/1.2.x/test: Makefile.win internal/Makefile.win testdll.dsp testlib.dsp Date: Fri, 12 Oct 2007 21:55:51 -0000 To: commits@apr.apache.org From: wrowe@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071012215552.C79701A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: wrowe Date: Fri Oct 12 14:55:50 2007 New Revision: 584285 URL: http://svn.apache.org/viewvc?rev=584285&view=rev Log: Refactor the build to know x64 (on Visual Studios which support it). Also invoke the make test/ check from either the testdll or testlib targets of test/testall.dsw (this both builds and runs the test suite inside the studio). Refactor Makefile.win to permit many parallel sorts of builds (e.g. testing x86 and x64, regular nt vs. 9x inclusive builds, debug vs. release and libs vs. dll's). Migrate 'testapp', the simple stub example, in order to test every flavor of apr_app.lib and libapr_app.lib. (Before you ask, this is the stub that allows apr apps to accept unicode command input, and represent it all as utf-8 to our true-char flavor libraries.) [The WINNT preference is not moved backwards for x86 default Release and Debug builds, we keep a seperate ReleaseNT or DebugNT target for those, till the end of the 1.2.x cycle.] Backports: 582603 582604 583035 583036 583246 583709 583864 Added: apr/apr/branches/1.2.x/test/internal/Makefile.win (with props) Modified: apr/apr/branches/1.2.x/test/Makefile.win apr/apr/branches/1.2.x/test/testdll.dsp apr/apr/branches/1.2.x/test/testlib.dsp Modified: apr/apr/branches/1.2.x/test/Makefile.win URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/test/Makefile.win?rev=584285&r1=584284&r2=584285&view=diff ============================================================================== --- apr/apr/branches/1.2.x/test/Makefile.win (original) +++ apr/apr/branches/1.2.x/test/Makefile.win Fri Oct 12 14:55:50 2007 @@ -7,16 +7,87 @@ # programs such as sendfile, that have to be invoked in a special sequence # or with special parameters +!IFNDEF MODEL +MODEL=dynamic +!ENDIF + +INCDIR=../include + +!IFNDEF OUTDIR +!IF "$(MODEL)" == "static" +OUTDIR=LibR +!ELSE +OUTDIR=Release +!ENDIF + +!IF [$(COMSPEC) /c cl /nologo /? | find "x64" >NUL ] == 0 +OUTDIR=x64\$(OUTDIR) +!ENDIF +!ENDIF + +!IF !EXIST("$(OUTDIR)\.") +!IF ([$(COMSPEC) /C mkdir $(OUTDIR)] == 0) +!ENDIF +!ENDIF + +!IFNDEF INTDIR +INTDIR=$(OUTDIR) +!ELSE +!IF !EXIST("$(INTDIR)\.") +!IF ([$(COMSPEC) /C mkdir $(INTDIR)] == 0) +!ENDIF +!ENDIF +!ENDIF + +!MESSAGE Building tests into $(OUTDIR) for $(MODEL) + STDTEST_PORTABLE = \ - testlockperf.exe \ - testshmproducer.exe \ - testshmconsumer.exe \ - testmutexscope.exe \ - testall.exe + $(OUTDIR)\testapp.exe \ + $(OUTDIR)\testall.exe \ + $(OUTDIR)\testlockperf.exe \ + $(OUTDIR)\testmutexscope.exe + +OTHER_PROGRAMS = \ + $(OUTDIR)\sendfile.exe + +TESTALL_COMPONENTS = \ + $(OUTDIR)\mod_test.dll \ + $(OUTDIR)\occhild.exe \ + $(OUTDIR)\readchild.exe \ + $(OUTDIR)\proc_child.exe \ + $(OUTDIR)\tryread.exe \ + $(OUTDIR)\sockchild.exe \ + $(OUTDIR)\testshmproducer.exe \ + $(OUTDIR)\testshmconsumer.exe \ + $(OUTDIR)\globalmutexchild.exe + +ALL_TESTS = $(INTDIR)\testutil.obj $(INTDIR)\testtime.obj $(INTDIR)\teststr.obj \ + $(INTDIR)\testvsn.obj $(INTDIR)\testipsub.obj $(INTDIR)\testmmap.obj \ + $(INTDIR)\testud.obj $(INTDIR)\testtable.obj $(INTDIR)\testsleep.obj \ + $(INTDIR)\testpools.obj $(INTDIR)\testfmt.obj $(INTDIR)\testfile.obj \ + $(INTDIR)\testdir.obj $(INTDIR)\testfileinfo.obj $(INTDIR)\testrand.obj \ + $(INTDIR)\testdso.obj $(INTDIR)\testoc.obj $(INTDIR)\testdup.obj \ + $(INTDIR)\testsockets.obj $(INTDIR)\testproc.obj $(INTDIR)\testpoll.obj \ + $(INTDIR)\testlock.obj $(INTDIR)\testsockopt.obj $(INTDIR)\testpipe.obj \ + $(INTDIR)\testthread.obj $(INTDIR)\testhash.obj $(INTDIR)\testargs.obj \ + $(INTDIR)\testnames.obj $(INTDIR)\testuser.obj $(INTDIR)\testpath.obj \ + $(INTDIR)\testenv.obj $(INTDIR)\testprocmutex.obj $(INTDIR)\testfnmatch.obj \ + $(INTDIR)\testatomic.obj $(INTDIR)\testflock.obj $(INTDIR)\testshm.obj \ + $(INTDIR)\testsock.obj $(INTDIR)\testglobalmutex.obj $(INTDIR)\teststrnatcmp.obj \ + $(INTDIR)\testfilecopy.obj $(INTDIR)\testtemp.obj $(INTDIR)\testlfs.obj \ + $(INTDIR)\testcond.obj + +CLEAN_DATA = testfile.tmp lfstests\large.bin \ + data\testputs.txt data\testbigfprintf.dat \ + data\testwritev.txt data\testwritev_full.txt \ + data\testflush.dat data\testxthread.dat \ + data\apr.testshm.shm + +CLEAN_BUILDDIRS = Debug Release LibD LibR 9x x64 -OTHER_PROGRAMS = sendfile.exe +TEST_SUBDIRS = internal -PROGRAMS = $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE) $(OTHER_PROGRAMS) +PROGRAMS = $(TESTALL_COMPONENTS) $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE) $(OTHER_PROGRAMS) TARGETS = $(PROGRAMS) @@ -24,95 +95,131 @@ ALL: $(TARGETS) CL = cl.exe +LD = link.exe -CFLAGS = /nologo /c /MDd /W3 /Gm /EHsc /Zi /Od /D _DEBUG /D WIN32 /D APR_DECLARE_STATIC /FD +!IF "$(MODEL)" == "static" +LOCAL_LIB= ..\$(OUTDIR)\apr-1.lib +APP_LIB= ..\build\$(OUTDIR)\apr_app-1.lib +STATIC_CFLAGS = /D APR_DECLARE_STATIC +!ELSE +LOCAL_LIB= ..\$(OUTDIR)\libapr-1.lib +APP_LIB= ..\build\$(OUTDIR)\libapr_app-1.lib +STATIC_CFLAGS = +!ENDIF + +!IFDEF _DEBUG +DEBUG_CFLAGS = /MDd +!ELSE +DEBUG_CFLAGS = /MD +!ENDIF -.c.obj:: - $(CL) -c $< $(CFLAGS) $(INCLUDES) - -LOCAL_LIBS= ../LibD/apr-1.lib -ALL_LIBS= kernel32.lib user32.lib advapi32.lib Rpcrt4.lib ws2_32.lib wsock32.lib ole32.lib - - -CLEAN_TARGETS = testfile.tmp mod_test.dll proc_child.exe occhild.exe \ - readchild.exe tryread.exe sockchild.exe \ - globalmutexchild.exe lfstests/large.bin \ - data/testputs.txt data/testbigfprintf.dat data/testwritev.txt \ - data/testwritev_full.txt -CLEAN_SUBDIRS = internal - -INCDIR=../include INCLUDES=/I "$(INCDIR)" -# link programs using -no-install to get real executables not -# libtool wrapper scripts which link an executable when first run. -LINK_PROG = link.exe /nologo /debug /subsystem:console /incremental:no -LINK_LIB = link.exe /nologo /dll /debug /subsystem:windows /incremental:no - -check: $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE) - for prog in $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE); do \ - ./$$prog; \ - if test $$? = 255; then \ - echo "$$prog failed"; \ - break; \ - fi; \ - done - -occhild.exe: occhild.obj $(LOCAL_LIBS) - $(LINK_PROG) occhild.obj $(LOCAL_LIBS) $(ALL_LIBS) - -sockchild.exe: sockchild.obj $(LOCAL_LIBS) - $(LINK_PROG) sockchild.obj $(LOCAL_LIBS) $(ALL_LIBS) - -readchild.exe: readchild.obj $(LOCAL_LIBS) - $(LINK_PROG) readchild.obj $(LOCAL_LIBS) $(ALL_LIBS) - -globalmutexchild.exe: globalmutexchild.obj $(LOCAL_LIBS) - $(LINK_PROG) globalmutexchild.obj $(LOCAL_LIBS) $(ALL_LIBS) - -tryread.exe: tryread.obj $(LOCAL_LIBS) - $(LINK_PROG) tryread.obj $(LOCAL_LIBS) $(ALL_LIBS) - -proc_child.exe: proc_child.obj $(LOCAL_LIBS) - $(LINK_PROG) proc_child.obj $(LOCAL_LIBS) $(ALL_LIBS) - -# FIXME: -prefer-pic is only supported with libtool-1.4+ -mod_test.dll: mod_test.obj - $(LINK_LIB) mod_test.obj /export:print_hello /export:count_reps $(LOCAL_LIBS) $(ALL_LIBS) - -testlockperf.exe: testlockperf.obj $(LOCAL_LIBS) - $(LINK_PROG) testlockperf.obj $(LOCAL_LIBS) $(ALL_LIBS) - -sendfile.exe: sendfile.obj $(LOCAL_LIBS) - $(LINK_PROG) sendfile.obj $(LOCAL_LIBS) $(ALL_LIBS) - -testshmproducer.exe: testshmproducer.obj $(LOCAL_LIBS) - $(LINK_PROG) testshmproducer.obj $(LOCAL_LIBS) $(ALL_LIBS) - -testshmconsumer.exe: testshmconsumer.obj $(LOCAL_LIBS) - $(LINK_PROG) testshmconsumer.obj $(LOCAL_LIBS) $(ALL_LIBS) - -testprocmutex.exe: testprocmutex.obj $(LOCAL_LIBS) - $(LINK_PROG) testprocmutex.obj $(LOCAL_LIBS) $(ALL_LIBS) - -testmutexscope.exe: testmutexscope.obj $(LOCAL_LIBS) - $(LINK_PROG) testmutexscope.obj $(LOCAL_LIBS) $(ALL_LIBS) - -TESTS = testutil.obj testtime.obj teststr.obj testvsn.obj testipsub.obj \ - testmmap.obj testud.obj testtable.obj testsleep.obj testpools.obj \ - testfmt.obj testfile.obj testdir.obj testfileinfo.obj testrand.obj \ - testdso.obj testoc.obj testdup.obj testsockets.obj testproc.obj \ - testpoll.obj testlock.obj testsockopt.obj testpipe.obj testthread.obj \ - testhash.obj testargs.obj testnames.obj testuser.obj testpath.obj \ - testenv.obj testprocmutex.obj testrand2.obj testfnmatch.obj \ - testatomic.obj testflock.obj testshm.obj testsock.obj testglobalmutex.obj \ - teststrnatcmp.obj testfilecopy.obj testtemp.obj testlfs.obj - -testall.exe: $(TESTS) mod_test.dll occhild.exe \ - readchild.exe abts.obj proc_child.exe \ - tryread.exe sockchild.exe globalmutexchild.exe \ - $(LOCAL_LIBS) - $(LINK_PROG) /out:testall.exe $(TESTS) abts.obj $(LOCAL_LIBS) $(ALL_LIBS) - +CFLAGS = /nologo /c /W3 /Gm /EHsc /Zi /Od $(INCLUDES) \ + $(STATIC_CFLAGS) $(DEBUG_CFLAGS) /D "BINPATH=$(OUTDIR:\=/)" \ + /D _DEBUG /D WIN32 /Fo"$(INTDIR)/" /FD + +LD_LIBS = kernel32.lib advapi32.lib ws2_32.lib wsock32.lib \ + ole32.lib shell32.lib rpcrt4.lib + +LDFLAGS = /nologo /debug /subsystem:console /incremental:no +SHLDFLAGS = /nologo /dll /debug /subsystem:windows /incremental:no + +.c{$(INTDIR)}.obj:: + $(CL) $(CFLAGS) -c $< -Fd$(INTDIR)\ $(INCLUDES) + +$(OUTDIR)\testall.exe: $(ALL_TESTS) $(INTDIR)\abts.obj $(LOCAL_LIB) + $(LD) $(LDFLAGS) /out:"$@" $** $(LD_LIBS) + @if exist "$@.manifest" \ + mt.exe -manifest "$@.manifest" -outputresource:$@;1 + +$(OUTDIR)\testapp.exe: $(INTDIR)/testapp.obj $(LOCAL_LIB) $(APP_LIB) + $(LD) $(LDFLAGS) /entry:wmainCRTStartup /out:"$@" $** $(LD_LIBS) + @if exist "$@.manifest" \ + mt.exe -manifest "$@.manifest" -outputresource:$@;2 + +$(OUTDIR)\testlockperf.exe: $(INTDIR)\testlockperf.obj $(LOCAL_LIB) + $(LD) $(LDFLAGS) /out:"$@" $** $(LD_LIBS) + @if exist "$@.manifest" \ + mt.exe -manifest "$@.manifest" -outputresource:$@;1 + +$(OUTDIR)\testmutexscope.exe: $(INTDIR)\testmutexscope.obj $(LOCAL_LIB) + $(LD) $(LDFLAGS) /out:"$@" $** $(LD_LIBS) + @if exist "$@.manifest" \ + mt.exe -manifest "$@.manifest" -outputresource:$@;1 + +$(OUTDIR)\globalmutexchild.exe: $(INTDIR)\globalmutexchild.obj $(LOCAL_LIB) + $(LD) $(LDFLAGS) /out:"$@" $** $(LD_LIBS) + @if exist "$@.manifest" \ + mt.exe -manifest "$@.manifest" -outputresource:$@;1 + +$(OUTDIR)\mod_test.dll: $(INTDIR)/mod_test.obj $(LOCAL_LIB) + $(LD) $(SHLDFLAGS) /out:"$@" $** \ + /export:print_hello /export:count_reps $(LD_LIBS) + @if exist "$@.manifest" \ + mt.exe -manifest "$@.manifest" -outputresource:$@;2 + +$(OUTDIR)\occhild.exe: $(INTDIR)\occhild.obj $(LOCAL_LIB) + $(LD) $(LDFLAGS) /out:"$@" $** $(LD_LIBS) + @if exist "$@.manifest" \ + mt.exe -manifest "$@.manifest" -outputresource:$@;1 + +$(OUTDIR)\proc_child.exe: $(INTDIR)\proc_child.obj $(LOCAL_LIB) + $(LD) $(LDFLAGS) /out:"$@" $** $(LD_LIBS) + @if exist "$@.manifest" \ + mt.exe -manifest "$@.manifest" -outputresource:$@;1 + +$(OUTDIR)\readchild.exe: $(INTDIR)\readchild.obj $(LOCAL_LIB) + $(LD) $(LDFLAGS) /out:"$@" $** $(LD_LIBS) + @if exist "$@.manifest" \ + mt.exe -manifest "$@.manifest" -outputresource:$@;1 + +$(OUTDIR)\sockchild.exe: $(INTDIR)\sockchild.obj $(LOCAL_LIB) + $(LD) $(LDFLAGS) /out:"$@" $** $(LD_LIBS) + @if exist "$@.manifest" \ + mt.exe -manifest "$@.manifest" -outputresource:$@;1 + +$(OUTDIR)\testshmconsumer.exe: $(INTDIR)\testshmconsumer.obj $(LOCAL_LIB) + $(LD) $(LDFLAGS) /out:"$@" $** $(LD_LIBS) + @if exist "$@.manifest" \ + mt.exe -manifest "$@.manifest" -outputresource:$@;1 + +$(OUTDIR)\testshmproducer.exe: $(INTDIR)\testshmproducer.obj $(LOCAL_LIB) + $(LD) $(LDFLAGS) /out:"$@" $** $(LD_LIBS) + @if exist "$@.manifest" \ + mt.exe -manifest "$@.manifest" -outputresource:$@;1 + +$(OUTDIR)\tryread.exe: $(INTDIR)\tryread.obj $(LOCAL_LIB) + $(LD) $(LDFLAGS) /out:"$@" $** $(LD_LIBS) + @if exist "$@.manifest" \ + mt.exe -manifest "$@.manifest" -outputresource:$@;1 + + +cleandata: + @for %f in ($(CLEAN_DATA)) do @if EXIST %f del /f %f + +clean: cleandata + @if EXIST $(INTDIR)\. rmdir /s /q $(INTDIR) + @if EXIST $(OUTDIR)\. rmdir /s /q $(OUTDIR) + @for %d in ($(TEST_SUBDIRS)) do \ + %COMSPEC% /c "cd %%d && $(MAKE) -f Makefile.win clean" \ + +cleanall: + @for %d in ($(CLEAN_BUILDDIRS) $(INTDIR) $(OUTDIR)) do \ + @if EXIST %d\. rmdir /s /q %d + @for %d in ($(TEST_SUBDIRS)) do \ + %COMSPEC% /c "cd %%d & $(MAKE) -f Makefile.win cleanall" \ + + +PATH=$(OUTDIR);..\$(OUTDIR);$(PATH) + +check: $(TESTALL_COMPONENTS) $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE) + @for %p in ($(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE)) do @( \ + echo Testing %p && %p || echo %p failed \ + ) + +checkall: check + @for %d in ($(TEST_SUBDIRS)) do \ + %COMSPEC% /c "cd %%d && $(MAKE) -f Makefile.win check" \ # DO NOT REMOVE Added: apr/apr/branches/1.2.x/test/internal/Makefile.win URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/test/internal/Makefile.win?rev=584285&view=auto ============================================================================== --- apr/apr/branches/1.2.x/test/internal/Makefile.win (added) +++ apr/apr/branches/1.2.x/test/internal/Makefile.win Fri Oct 12 14:55:50 2007 @@ -0,0 +1,109 @@ +# PROGRAMS includes all test programs built on this platform. +# STDTEST_PORTABLE +# test programs invoked via standard user interface, run on all platforms +# STDTEST_NONPORTABLE +# test programs invoked via standard user interface, not portable +# OTHER_PROGRAMS +# programs such as sendfile, that have to be invoked in a special sequence +# or with special parameters + +!IFNDEF MODEL +MODEL=dynamic +!ENDIF + +INCDIR=../../include + +!IFNDEF OUTDIR +!IF "$(MODEL)" == "static" +OUTDIR=LibR +!ELSE +OUTDIR=Release +!ENDIF + +!IF [$(COMSPEC) /c cl /nologo /? | find "x64" >NUL ] == 0 +OUTDIR=x64\$(OUTDIR) +!ENDIF +!ENDIF + +!IF !EXIST("$(OUTDIR)\.") +!IF ([$(COMSPEC) /C mkdir $(OUTDIR)] == 0) +!ENDIF +!ENDIF + +!IFNDEF INTDIR +INTDIR=$(OUTDIR) +!ELSE +!IF !EXIST("$(INTDIR)\.") +!IF ([$(COMSPEC) /C mkdir $(INTDIR)] == 0) +!ENDIF +!ENDIF +!ENDIF + +!MESSAGE Building tests into $(OUTDIR) for $(MODEL) + +NONPORTABLE = \ + $(OUTDIR)\testucs.exe + +CLEAN_BUILDDIRS = Release Debug NT x64 + +PROGRAMS = + +TARGETS = $(PROGRAMS) $(NONPORTABLE) + +# bring in rules.mk for standard functionality +ALL: $(TARGETS) + +CL = cl.exe +LD = link.exe + +!IF "$(MODEL)" == "static" +LOCAL_LIB= ..\..\$(OUTDIR)\apr-1.lib +STATIC_CFLAGS = /D APR_DECLARE_STATIC +!ELSE +LOCAL_LIB= ..\..\$(OUTDIR)\libapr-1.lib +STATIC_CFLAGS = +!ENDIF + +!IFDEF _DEBUG +DEBUG_CFLAGS = /MDd +!ELSE +DEBUG_CFLAGS = /MD +!ENDIF + +INCLUDES=/I "$(INCDIR)" + +CFLAGS = /nologo /c /W3 /Gm /EHsc /Zi /Od $(INCLUDES) \ + $(STATIC_CFLAGS) $(DEBUG_CFLAGS) /D "BINPATH=$(OUTDIR:\=/)" \ + /D _DEBUG /D WIN32 /Fo"$(INTDIR)/" /FD + +LD_LIBS = kernel32.lib advapi32.lib ws2_32.lib wsock32.lib \ + ole32.lib shell32.lib rpcrt4.lib + +LDFLAGS = /nologo /debug /subsystem:console /incremental:no +SHLDFLAGS = /nologo /dll /debug /subsystem:windows /incremental:no + +.c{$(INTDIR)}.obj: + $(CL) $(CFLAGS) -c $< -Fd$(INTDIR)\ $(INCLUDES) + +$(OUTDIR)\testucs.exe: $(INTDIR)\testucs.obj $(LOCAL_LIB) + $(LD) $(LDFLAGS) /out:"$@" $** $(LD_LIBS) + @if exist "$@.manifest" \ + mt.exe -manifest "$@.manifest" -outputresource:$@;1 + + +clean: + @if EXIST $(INTDIR)\. rmdir /s /q $(INTDIR) + @if EXIST $(OUTDIR)\. rmdir /s /q $(OUTDIR) + +cleanall: + @for %d in ($(CLEAN_BUILDDIRS)) do @if EXIST %d\. rmdir /s /q %d + + +PATH=$(OUTDIR);..\..\$(OUTDIR);$(PATH) + +check: $(NONPORTABLE) + @for %p in ($(NONPORTABLE)) do @( \ + echo Testing %p && %p || echo %p failed \ + ) + +# DO NOT REMOVE Propchange: apr/apr/branches/1.2.x/test/internal/Makefile.win ------------------------------------------------------------------------------ svn:eol-style = native Modified: apr/apr/branches/1.2.x/test/testdll.dsp URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/test/testdll.dsp?rev=584285&r1=584284&r2=584285&view=diff ============================================================================== --- apr/apr/branches/1.2.x/test/testdll.dsp (original) +++ apr/apr/branches/1.2.x/test/testdll.dsp Fri Oct 12 14:55:50 2007 @@ -1,24 +1,28 @@ -# Microsoft Developer Studio Project File - Name="testall" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="testdll" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) External Target" 0x0106 -CFG=testall - Win32 Debug +CFG=testdll - Win32 Release !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 "testall.mak". +!MESSAGE NMAKE /f "testdll.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 "testall.mak" CFG="testall - Win32 Debug" +!MESSAGE NMAKE /f "testdll.mak" CFG="testdll - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "testall - Win32 Release" (based on "Win32 (x86) External Target") -!MESSAGE "testall - Win32 Debug" (based on "Win32 (x86) External Target") +!MESSAGE "testdll - Win32 Release" (based on "Win32 (x86) External Target") +!MESSAGE "testdll - Win32 Debug" (based on "Win32 (x86) External Target") +!MESSAGE "testdll - Win32 ReleaseNT" (based on "Win32 (x86) External Target") +!MESSAGE "testdll - Win32 DebugNT" (based on "Win32 (x86) External Target") +!MESSAGE "testdll - x64 Release" (based on "Win32 (x86) External Target") +!MESSAGE "testdll - x64 Debug" (based on "Win32 (x86) External Target") !MESSAGE # Begin Project @@ -26,100 +30,156 @@ # PROP Scc_ProjName "" # PROP Scc_LocalPath "" -!IF "$(CFG)" == "testall - Win32 Release" +!IF "$(CFG)" == "testdll - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "" # PROP BASE Intermediate_Dir "" -# PROP BASE Cmd_Line "NMAKE /f Makefile.win all" +# PROP BASE Cmd_Line "NMAKE /f Makefile.win INTDIR=Release OUTDIR=Release MODEL=dynamic check" # PROP BASE Rebuild_Opt "/a" -# PROP BASE Target_File "testall.exe" -# PROP BASE Bsc_Name "testall.bsc" +# PROP BASE Target_File "Release\testall.exe" +# PROP BASE Bsc_Name "" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "" # PROP Intermediate_Dir "" -# PROP Cmd_Line "NMAKE /f Makefile.win all" +# PROP Cmd_Line "NMAKE /f Makefile.win INTDIR=Release OUTDIR=Release MODEL=dynamic check" # PROP Rebuild_Opt "/a" -# PROP Target_File "testall.exe" +# PROP Target_File "Release\testall.exe" # PROP Bsc_Name "" # PROP Target_Dir "" -!ELSEIF "$(CFG)" == "testall - Win32 Debug" +!ELSEIF "$(CFG)" == "testdll - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "" # PROP BASE Intermediate_Dir "" -# PROP BASE Cmd_Line "NMAKE /f Makefile.win all" +# PROP BASE Cmd_Line "NMAKE /f Makefile.win INTDIR=Debug OUTDIR=Debug MODEL=dynamic _DEBUG=1 check" # PROP BASE Rebuild_Opt "/a" -# PROP BASE Target_File "testall.exe" -# PROP BASE Bsc_Name "testall.bsc" +# PROP BASE Target_File "Debug\testall.exe" +# PROP BASE Bsc_Name "" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "" # PROP Intermediate_Dir "" -# PROP Cmd_Line "NMAKE /f Makefile.win all" +# PROP Cmd_Line "NMAKE /f Makefile.win INTDIR=Debug OUTDIR=Debug MODEL=dynamic _DEBUG=1 check" # PROP Rebuild_Opt "/a" -# PROP Target_File "testall.exe" +# PROP Target_File "Debug\testall.exe" # PROP Bsc_Name "" # PROP Target_Dir "" -!ENDIF - -# Begin Target +!IF "$(CFG)" == "testdll - Win32 ReleaseNT" -# Name "testall - Win32 Release" -# Name "testall - Win32 Debug" - -!IF "$(CFG)" == "testall - Win32 Release" +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "" +# PROP BASE Intermediate_Dir "" +# PROP BASE Cmd_Line "NMAKE /f Makefile.win INTDIR=NT\Release OUTDIR=NT\Release MODEL=dynamic check" +# PROP BASE Rebuild_Opt "/a" +# PROP BASE Target_File "NT\Release\testall.exe" +# PROP BASE Bsc_Name "" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "" +# PROP Intermediate_Dir "" +# PROP Cmd_Line "NMAKE /f Makefile.win INTDIR=NT\Release OUTDIR=NT\Release MODEL=dynamic check" +# PROP Rebuild_Opt "/a" +# PROP Target_File "NT\Release\testall.exe" +# PROP Bsc_Name "" +# PROP Target_Dir "" -!ELSEIF "$(CFG)" == "testall - Win32 Debug" +!ELSEIF "$(CFG)" == "testdll - Win32 DebugNT" -!ENDIF +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "" +# PROP BASE Intermediate_Dir "" +# PROP BASE Cmd_Line "NMAKE /f Makefile.win INTDIR=NT\Debug OUTDIR=NT\Debug MODEL=dynamic _DEBUG=1 check" +# PROP BASE Rebuild_Opt "/a" +# PROP BASE Target_File "NT\Debug\testall.exe" +# PROP BASE Bsc_Name "" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "" +# PROP Intermediate_Dir "" +# PROP Cmd_Line "NMAKE /f Makefile.win INTDIR=NT\Debug OUTDIR=NT\Debug MODEL=dynamic _DEBUG=1 check" +# PROP Rebuild_Opt "/a" +# PROP Target_File "NT\Debug\testall.exe" +# PROP Bsc_Name "" +# PROP Target_Dir "" -# Begin Source File +!IF "$(CFG)" == "testdll - x64 Release" -SOURCE=.\abts.c -# End Source File -# Begin Source File +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "" +# PROP BASE Intermediate_Dir "" +# PROP BASE Cmd_Line "NMAKE /f Makefile.win INTDIR=x64\Release OUTDIR=x64\Release MODEL=dynamic check" +# PROP BASE Rebuild_Opt "/a" +# PROP BASE Target_File "x64\Release\testall.exe" +# PROP BASE Bsc_Name "" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "" +# PROP Intermediate_Dir "" +# PROP Cmd_Line "NMAKE /f Makefile.win INTDIR=x64\Release OUTDIR=x64\Release MODEL=dynamic check" +# PROP Rebuild_Opt "/a" +# PROP Target_File "x64\Release\testall.exe" +# PROP Bsc_Name "" +# PROP Target_Dir "" -SOURCE=.\globalmutexchild.c -# End Source File -# Begin Source File +!ELSEIF "$(CFG)" == "testdll - x64 Debug" -SOURCE=.\Makefile.win -# End Source File -# Begin Source File +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "" +# PROP BASE Intermediate_Dir "" +# PROP BASE Cmd_Line "NMAKE /f Makefile.win INTDIR=x64\Debug OUTDIR=x64\Debug MODEL=dynamic _DEBUG=1 check" +# PROP BASE Rebuild_Opt "/a" +# PROP BASE Target_File "x64\Debug\testall.exe" +# PROP BASE Bsc_Name "" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "" +# PROP Intermediate_Dir "" +# PROP Cmd_Line "NMAKE /f Makefile.win INTDIR=x64\Debug OUTDIR=x64\Debug MODEL=dynamic _DEBUG=1 check" +# PROP Rebuild_Opt "/a" +# PROP Target_File "x64\Debug\testall.exe" +# PROP Bsc_Name "" +# PROP Target_Dir "" -SOURCE=.\mod_test.c -# End Source File -# Begin Source File +!ENDIF -SOURCE=.\nw_misc.c -# End Source File -# Begin Source File +# Begin Target -SOURCE=.\occhild.c -# End Source File -# Begin Source File +# Name "testdll - Win32 Release" +# Name "testdll - Win32 Debug" +# Name "testdll - Win32 ReleaseNT" +# Name "testdll - Win32 DebugNT" +# Name "testdll - x64 Release" +# Name "testdll - x64 Debug" +# Begin Group "testall Source Files" -SOURCE=.\proc_child.c -# End Source File +# PROP Default_Filter ".c" # Begin Source File -SOURCE=.\readchild.c +SOURCE=.\abts.c # End Source File # Begin Source File -SOURCE=.\sendfile.c +SOURCE=.\abts.h # End Source File # Begin Source File -SOURCE=.\sockchild.c +SOURCE=.\abts_tests.h # End Source File # Begin Source File @@ -167,6 +227,10 @@ # End Source File # Begin Source File +SOURCE=.\testflock.h +# End Source File +# Begin Source File + SOURCE=.\testfmt.c # End Source File # Begin Source File @@ -179,6 +243,10 @@ # End Source File # Begin Source File +SOURCE=.\testglobalmutex.h +# End Source File +# Begin Source File + SOURCE=.\testhash.c # End Source File # Begin Source File @@ -195,18 +263,10 @@ # End Source File # Begin Source File -SOURCE=.\testlockperf.c -# End Source File -# Begin Source File - SOURCE=.\testmmap.c # End Source File # Begin Source File -SOURCE=.\testmutexscope.c -# End Source File -# Begin Source File - SOURCE=.\testnames.c # End Source File # Begin Source File @@ -235,10 +295,6 @@ # End Source File # Begin Source File -SOURCE=.\testprocmutex.c -# End Source File -# Begin Source File - SOURCE=.\testrand.c # End Source File # Begin Source File @@ -251,19 +307,19 @@ # End Source File # Begin Source File -SOURCE=.\testshmconsumer.c +SOURCE=.\testshm.h # End Source File # Begin Source File -SOURCE=.\testshmproducer.c +SOURCE=.\testsleep.c # End Source File # Begin Source File -SOURCE=.\testsleep.c +SOURCE=.\testsock.c # End Source File # Begin Source File -SOURCE=.\testsock.c +SOURCE=.\testsock.h # End Source File # Begin Source File @@ -311,11 +367,76 @@ # End Source File # Begin Source File +SOURCE=.\testutil.h +# End Source File +# Begin Source File + SOURCE=.\testvsn.c # End Source File +# End Group +# Begin Group "Other Source Files" + +# PROP Default_Filter ".c" +# Begin Source File + +SOURCE=.\globalmutexchild.c +# End Source File +# Begin Source File + +SOURCE=.\mod_test.c +# End Source File +# Begin Source File + +SOURCE=.\nw_misc.c +# End Source File +# Begin Source File + +SOURCE=.\occhild.c +# End Source File +# Begin Source File + +SOURCE=.\proc_child.c +# End Source File +# Begin Source File + +SOURCE=.\readchild.c +# End Source File +# Begin Source File + +SOURCE=.\sendfile.c +# End Source File +# Begin Source File + +SOURCE=.\sockchild.c +# End Source File +# Begin Source File + +SOURCE=.\testlockperf.c +# End Source File +# Begin Source File + +SOURCE=.\testmutexscope.c +# End Source File +# Begin Source File + +SOURCE=.\testprocmutex.c +# End Source File +# Begin Source File + +SOURCE=.\testshmconsumer.c +# End Source File +# Begin Source File + +SOURCE=.\testshmproducer.c +# End Source File # Begin Source File SOURCE=.\tryread.c +# End Source File +# End Group +# Begin Source File + +SOURCE=.\Makefile.win # End Source File # End Target # End Project Modified: apr/apr/branches/1.2.x/test/testlib.dsp URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/test/testlib.dsp?rev=584285&r1=584284&r2=584285&view=diff ============================================================================== --- apr/apr/branches/1.2.x/test/testlib.dsp (original) +++ apr/apr/branches/1.2.x/test/testlib.dsp Fri Oct 12 14:55:50 2007 @@ -1,24 +1,28 @@ -# Microsoft Developer Studio Project File - Name="testall" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="testlib" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) External Target" 0x0106 -CFG=testall - Win32 Debug +CFG=testlib - Win32 Release !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 "testall.mak". +!MESSAGE NMAKE /f "testlib.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 "testall.mak" CFG="testall - Win32 Debug" +!MESSAGE NMAKE /f "testlib.mak" CFG="testlib - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "testall - Win32 Release" (based on "Win32 (x86) External Target") -!MESSAGE "testall - Win32 Debug" (based on "Win32 (x86) External Target") +!MESSAGE "testlib - Win32 Release" (based on "Win32 (x86) External Target") +!MESSAGE "testlib - Win32 Debug" (based on "Win32 (x86) External Target") +!MESSAGE "testlib - Win32 ReleaseNT" (based on "Win32 (x86) External Target") +!MESSAGE "testlib - Win32 DebugNT" (based on "Win32 (x86) External Target") +!MESSAGE "testlib - x64 Release" (based on "Win32 (x86) External Target") +!MESSAGE "testlib - x64 Debug" (based on "Win32 (x86) External Target") !MESSAGE # Begin Project @@ -26,100 +30,156 @@ # PROP Scc_ProjName "" # PROP Scc_LocalPath "" -!IF "$(CFG)" == "testall - Win32 Release" +!IF "$(CFG)" == "testlib - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "" # PROP BASE Intermediate_Dir "" -# PROP BASE Cmd_Line "NMAKE /f Makefile.win all" +# PROP BASE Cmd_Line "NMAKE /f Makefile.win INTDIR=LibR OUTDIR=LibR MODEL=static check" # PROP BASE Rebuild_Opt "/a" -# PROP BASE Target_File "testall.exe" -# PROP BASE Bsc_Name "testall.bsc" +# PROP BASE Target_File "LibR\testall.exe" +# PROP BASE Bsc_Name "" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "" # PROP Intermediate_Dir "" -# PROP Cmd_Line "NMAKE /f Makefile.win all" +# PROP Cmd_Line "NMAKE /f Makefile.win INTDIR=LibR OUTDIR=LibR MODEL=static check" # PROP Rebuild_Opt "/a" -# PROP Target_File "testall.exe" +# PROP Target_File "LibR\testall.exe" # PROP Bsc_Name "" # PROP Target_Dir "" -!ELSEIF "$(CFG)" == "testall - Win32 Debug" +!ELSEIF "$(CFG)" == "testlib - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "" # PROP BASE Intermediate_Dir "" -# PROP BASE Cmd_Line "NMAKE /f Makefile.win all" +# PROP BASE Cmd_Line "NMAKE /f Makefile.win INTDIR=LibD OUTDIR=LibD MODEL=static _DEBUG=1 check" # PROP BASE Rebuild_Opt "/a" -# PROP BASE Target_File "testall.exe" -# PROP BASE Bsc_Name "testall.bsc" +# PROP BASE Target_File "LibD\testall.exe" +# PROP BASE Bsc_Name "" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "" # PROP Intermediate_Dir "" -# PROP Cmd_Line "NMAKE /f Makefile.win all" +# PROP Cmd_Line "NMAKE /f Makefile.win INTDIR=LibD OUTDIR=LibD MODEL=static _DEBUG=1 check" # PROP Rebuild_Opt "/a" -# PROP Target_File "testall.exe" +# PROP Target_File "LibD\testall.exe" # PROP Bsc_Name "" # PROP Target_Dir "" -!ENDIF - -# Begin Target +!IF "$(CFG)" == "testlib - Win32 ReleaseNT" -# Name "testall - Win32 Release" -# Name "testall - Win32 Debug" - -!IF "$(CFG)" == "testall - Win32 Release" +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "" +# PROP BASE Intermediate_Dir "" +# PROP BASE Cmd_Line "NMAKE /f Makefile.win INTDIR=NT\LibR OUTDIR=NT\LibR MODEL=static check" +# PROP BASE Rebuild_Opt "/a" +# PROP BASE Target_File "NT\LibR\testall.exe" +# PROP BASE Bsc_Name "" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "" +# PROP Intermediate_Dir "" +# PROP Cmd_Line "NMAKE /f Makefile.win INTDIR=NT\LibR OUTDIR=NT\LibR MODEL=static check" +# PROP Rebuild_Opt "/a" +# PROP Target_File "NT\LibR\testall.exe" +# PROP Bsc_Name "" +# PROP Target_Dir "" -!ELSEIF "$(CFG)" == "testall - Win32 Debug" +!ELSEIF "$(CFG)" == "testlib - Win32 DebugNT" -!ENDIF +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "" +# PROP BASE Intermediate_Dir "" +# PROP BASE Cmd_Line "NMAKE /f Makefile.win INTDIR=NT\LibD OUTDIR=NT\LibD MODEL=static _DEBUG=1 check" +# PROP BASE Rebuild_Opt "/a" +# PROP BASE Target_File "NT\LibD\testall.exe" +# PROP BASE Bsc_Name "" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "" +# PROP Intermediate_Dir "" +# PROP Cmd_Line "NMAKE /f Makefile.win INTDIR=NT\LibD OUTDIR=NT\LibD MODEL=static _DEBUG=1 check" +# PROP Rebuild_Opt "/a" +# PROP Target_File "NT\LibD\testall.exe" +# PROP Bsc_Name "" +# PROP Target_Dir "" -# Begin Source File +!IF "$(CFG)" == "testlib - x64 Release" -SOURCE=.\abts.c -# End Source File -# Begin Source File +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "" +# PROP BASE Intermediate_Dir "" +# PROP BASE Cmd_Line "NMAKE /f Makefile.win INTDIR=x64\LibR OUTDIR=x64\LibR MODEL=static check" +# PROP BASE Rebuild_Opt "/a" +# PROP BASE Target_File "x64\LibR\testall.exe" +# PROP BASE Bsc_Name "" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "" +# PROP Intermediate_Dir "" +# PROP Cmd_Line "NMAKE /f Makefile.win INTDIR=x64\LibR OUTDIR=x64\LibR MODEL=static check" +# PROP Rebuild_Opt "/a" +# PROP Target_File "x64\LibR\testall.exe" +# PROP Bsc_Name "" +# PROP Target_Dir "" -SOURCE=.\globalmutexchild.c -# End Source File -# Begin Source File +!ELSEIF "$(CFG)" == "testlib - x64 Debug" -SOURCE=.\Makefile.win -# End Source File -# Begin Source File +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "" +# PROP BASE Intermediate_Dir "" +# PROP BASE Cmd_Line "NMAKE /f Makefile.win INTDIR=x64\LibD OUTDIR=x64\LibD MODEL=static _DEBUG=1 check" +# PROP BASE Rebuild_Opt "/a" +# PROP BASE Target_File "x64\LibD\testall.exe" +# PROP BASE Bsc_Name "" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "" +# PROP Intermediate_Dir "" +# PROP Cmd_Line "NMAKE /f Makefile.win INTDIR=x64\LibD OUTDIR=x64\LibD MODEL=static _DEBUG=1 check" +# PROP Rebuild_Opt "/a" +# PROP Target_File "x64\LibD\testall.exe" +# PROP Bsc_Name "" +# PROP Target_Dir "" -SOURCE=.\mod_test.c -# End Source File -# Begin Source File +!ENDIF -SOURCE=.\nw_misc.c -# End Source File -# Begin Source File +# Begin Target -SOURCE=.\occhild.c -# End Source File -# Begin Source File +# Name "testlib - Win32 Release" +# Name "testlib - Win32 Debug" +# Name "testlib - Win32 ReleaseNT" +# Name "testlib - Win32 DebugNT" +# Name "testlib - x64 Release" +# Name "testlib - x64 Debug" +# Begin Group "testall Source Files" -SOURCE=.\proc_child.c -# End Source File +# PROP Default_Filter ".c" # Begin Source File -SOURCE=.\readchild.c +SOURCE=.\abts.c # End Source File # Begin Source File -SOURCE=.\sendfile.c +SOURCE=.\abts.h # End Source File # Begin Source File -SOURCE=.\sockchild.c +SOURCE=.\abts_tests.h # End Source File # Begin Source File @@ -167,6 +227,10 @@ # End Source File # Begin Source File +SOURCE=.\testflock.h +# End Source File +# Begin Source File + SOURCE=.\testfmt.c # End Source File # Begin Source File @@ -179,6 +243,10 @@ # End Source File # Begin Source File +SOURCE=.\testglobalmutex.h +# End Source File +# Begin Source File + SOURCE=.\testhash.c # End Source File # Begin Source File @@ -195,18 +263,10 @@ # End Source File # Begin Source File -SOURCE=.\testlockperf.c -# End Source File -# Begin Source File - SOURCE=.\testmmap.c # End Source File # Begin Source File -SOURCE=.\testmutexscope.c -# End Source File -# Begin Source File - SOURCE=.\testnames.c # End Source File # Begin Source File @@ -235,10 +295,6 @@ # End Source File # Begin Source File -SOURCE=.\testprocmutex.c -# End Source File -# Begin Source File - SOURCE=.\testrand.c # End Source File # Begin Source File @@ -251,19 +307,19 @@ # End Source File # Begin Source File -SOURCE=.\testshmconsumer.c +SOURCE=.\testshm.h # End Source File # Begin Source File -SOURCE=.\testshmproducer.c +SOURCE=.\testsleep.c # End Source File # Begin Source File -SOURCE=.\testsleep.c +SOURCE=.\testsock.c # End Source File # Begin Source File -SOURCE=.\testsock.c +SOURCE=.\testsock.h # End Source File # Begin Source File @@ -311,11 +367,76 @@ # End Source File # Begin Source File +SOURCE=.\testutil.h +# End Source File +# Begin Source File + SOURCE=.\testvsn.c # End Source File +# End Group +# Begin Group "Other Source Files" + +# PROP Default_Filter ".c" +# Begin Source File + +SOURCE=.\globalmutexchild.c +# End Source File +# Begin Source File + +SOURCE=.\mod_test.c +# End Source File +# Begin Source File + +SOURCE=.\nw_misc.c +# End Source File +# Begin Source File + +SOURCE=.\occhild.c +# End Source File +# Begin Source File + +SOURCE=.\proc_child.c +# End Source File +# Begin Source File + +SOURCE=.\readchild.c +# End Source File +# Begin Source File + +SOURCE=.\sendfile.c +# End Source File +# Begin Source File + +SOURCE=.\sockchild.c +# End Source File +# Begin Source File + +SOURCE=.\testlockperf.c +# End Source File +# Begin Source File + +SOURCE=.\testmutexscope.c +# End Source File +# Begin Source File + +SOURCE=.\testprocmutex.c +# End Source File +# Begin Source File + +SOURCE=.\testshmconsumer.c +# End Source File +# Begin Source File + +SOURCE=.\testshmproducer.c +# End Source File # Begin Source File SOURCE=.\tryread.c +# End Source File +# End Group +# Begin Source File + +SOURCE=.\Makefile.win # End Source File # End Target # End Project