Refactor the build to know x64 (on Visual Studios which

support it) - intended for backport, and make -DWINNT 
the default (not intended for backport) with new 9x
compatible flavor targets.

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).


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@582604 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 188 insertions, 71 deletions

diff --git a/test/testdll.dsp b/test/testdll.dsp
index 47709f486..aadf88211 100644
--- a/test/testdll.dsp
+++ b/test/testdll.dsp
@@ -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 Release9x" (based on "Win32 (x86) External Target")
+!MESSAGE "testdll - Win32 Debug9x" (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,104 +30,156 @@ CFG=testall - Win32 Debug
 # 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 Release9x"
 
-# Name "testall - Win32 Release"
-# Name "testall - Win32 Debug"
-
-!IF  "$(CFG)" == "testall - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testall - Win32 Debug"
+# 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=9x\Release OUTDIR=9x\Release MODEL=dynamic check"
+# PROP BASE Rebuild_Opt "/a"
+# PROP BASE Target_File "9x\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=9x\Release OUTDIR=9x\Release MODEL=dynamic check"
+# PROP Rebuild_Opt "/a"
+# PROP Target_File "9x\Release\testall.exe"
+# PROP Bsc_Name ""
+# PROP Target_Dir ""
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "testdll - Win32 Debug9x"
 
-# 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=9x\Debug OUTDIR=9x\Debug MODEL=dynamic _DEBUG=1 check"
+# PROP BASE Rebuild_Opt "/a"
+# PROP BASE Target_File "9x\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=9x\Debug OUTDIR=9x\Debug MODEL=dynamic _DEBUG=1 check"
+# PROP Rebuild_Opt "/a"
+# PROP Target_File "9x\Debug\testall.exe"
+# PROP Bsc_Name ""
+# PROP Target_Dir ""
 
-SOURCE=.\abts.c
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "testdll - x64 Release"
 
-SOURCE=.\abts.h
-# 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 Release9x"
+# Name "testdll - Win32 Debug9x"
+# 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
 
@@ -175,6 +231,10 @@ SOURCE=.\testflock.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\testflock.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\testfmt.c
 # End Source File
 # Begin Source File
@@ -187,6 +247,10 @@ SOURCE=.\testglobalmutex.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\testglobalmutex.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\testhash.c
 # End Source File
 # Begin Source File
@@ -203,18 +267,10 @@ SOURCE=.\testlock.c
 # 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
@@ -243,10 +299,6 @@ SOURCE=.\testproc.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\testprocmutex.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\testrand.c
 # End Source File
 # Begin Source File
@@ -255,19 +307,19 @@ SOURCE=.\testshm.c
 # 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
 
@@ -315,11 +367,76 @@ SOURCE=.\testutil.c
 # 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