5 files changed, 62 insertions, 29 deletions
diff --git a/cpp/all.dsw b/cpp/all.dsw
index e32ea2cbe37..b55c4cc189f 100644
--- a/cpp/all.dsw
+++ b/cpp/all.dsw
@@ -639,6 +639,42 @@ Package=<4>
 
 ###############################################################################
 
+Project: "bindingC"=.\test\Ice\binding\bindingC.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name ice
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name iceutil
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "bindingS"=.\test\Ice\binding\bindingS.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name ice
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name iceutil
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "callbackC"=.\demo\ice\callback\callbackC.dsp - Package Owner=<4>
 
 Package=<5>
diff --git a/cpp/allTests.py b/cpp/allTests.py
index da5e66202d8..d57d10dc358 100755
--- a/cpp/allTests.py
+++ b/cpp/allTests.py
@@ -62,6 +62,7 @@ tests = [ \
     "Ice/inheritance", \
     "Ice/facets", \
     "Ice/objects", \
+    "Ice/binding", \
     "Ice/faultTolerance", \
     "Ice/location", \
     "Ice/adapterDeactivation", \
diff --git a/cpp/test/Ice/binding/bindingC.dsp b/cpp/test/Ice/binding/bindingC.dsp
index 1929f30717e..afab2b22ef6 100644
--- a/cpp/test/Ice/binding/bindingC.dsp
+++ b/cpp/test/Ice/binding/bindingC.dsp
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="locationC" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="bindingC" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Console Application" 0x0103
 
-CFG=locationC - Win32 Debug
+CFG=bindingC - 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 NMAKE /f "locationC.mak".
+!MESSAGE NMAKE /f "bindingC.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 "locationC.mak" CFG="locationC - Win32 Debug"
+!MESSAGE NMAKE /f "bindingC.mak" CFG="bindingC - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "locationC - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "locationC - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "bindingC - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "bindingC - Win32 Debug" (based on "Win32 (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -28,7 +28,7 @@ CFG=locationC - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "locationC - Win32 Release"
+!IF  "$(CFG)" == "bindingC - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -54,7 +54,7 @@ LINK32=link.exe
 # ADD LINK32 /nologo /subsystem:console /pdb:none /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no
 # SUBTRACT LINK32 /debug /nodefaultlib
 
-!ELSEIF  "$(CFG)" == "locationC - Win32 Debug"
+!ELSEIF  "$(CFG)" == "bindingC - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -84,8 +84,8 @@ LINK32=link.exe
 
 # Begin Target
 
-# Name "locationC - Win32 Release"
-# Name "locationC - Win32 Debug"
+# Name "bindingC - Win32 Release"
+# Name "bindingC - Win32 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -117,7 +117,7 @@ SOURCE=.\Test.h
 
 SOURCE=.\Test.ice
 
-!IF  "$(CFG)" == "locationC - Win32 Release"
+!IF  "$(CFG)" == "bindingC - Win32 Release"
 
 USERDEP__TEST_="..\..\..\bin\slice2cpp.exe"	"..\..\..\lib\slice.lib"	
 # Begin Custom Build
@@ -133,7 +133,7 @@ BuildCmds= \
    $(BuildCmds)
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "locationC - Win32 Debug"
+!ELSEIF  "$(CFG)" == "bindingC - Win32 Debug"
 
 USERDEP__TEST_="..\..\..\bin\slice2cpp.exe"	"..\..\..\lib\sliced.lib"	
 # Begin Custom Build
diff --git a/cpp/test/Ice/binding/bindingS.dsp b/cpp/test/Ice/binding/bindingS.dsp
index 0791bee636f..4d7887b0611 100644
--- a/cpp/test/Ice/binding/bindingS.dsp
+++ b/cpp/test/Ice/binding/bindingS.dsp
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="locationS" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="bindingS" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Console Application" 0x0103
 
-CFG=locationS - Win32 Debug
+CFG=bindingS - 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 NMAKE /f "locationS.mak".
+!MESSAGE NMAKE /f "bindingS.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 "locationS.mak" CFG="locationS - Win32 Debug"
+!MESSAGE NMAKE /f "bindingS.mak" CFG="bindingS - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "locationS - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "locationS - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "bindingS - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "bindingS - Win32 Debug" (based on "Win32 (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -28,7 +28,7 @@ CFG=locationS - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "locationS - Win32 Release"
+!IF  "$(CFG)" == "bindingS - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -54,7 +54,7 @@ LINK32=link.exe
 # ADD LINK32 /nologo /subsystem:console /pdb:none /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no
 # SUBTRACT LINK32 /debug /nodefaultlib
 
-!ELSEIF  "$(CFG)" == "locationS - Win32 Debug"
+!ELSEIF  "$(CFG)" == "bindingS - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -84,8 +84,8 @@ LINK32=link.exe
 
 # Begin Target
 
-# Name "locationS - Win32 Release"
-# Name "locationS - Win32 Debug"
+# Name "bindingS - Win32 Release"
+# Name "bindingS - Win32 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -95,10 +95,6 @@ SOURCE=.\Server.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\ServerLocator.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\Test.cpp
 # End Source File
 # Begin Source File
@@ -125,7 +121,7 @@ SOURCE=.\TestI.h
 
 SOURCE=.\Test.ice
 
-!IF  "$(CFG)" == "locationS - Win32 Release"
+!IF  "$(CFG)" == "bindingS - Win32 Release"
 
 USERDEP__TEST_="..\..\..\bin\slice2cpp.exe"	"..\..\..\lib\slice.lib"	
 # Begin Custom Build
@@ -141,7 +137,7 @@ BuildCmds= \
    $(BuildCmds)
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "locationS - Win32 Debug"
+!ELSEIF  "$(CFG)" == "bindingS - Win32 Debug"
 
 USERDEP__TEST_="..\..\..\bin\slice2cpp.exe"	"..\..\..\lib\sliced.lib"	
 # Begin Custom Build
diff --git a/cpp/test/Ice/location/run.py b/cpp/test/Ice/location/run.py
index deb5bae7f7b..b2d86a0f65e 100755
--- a/cpp/test/Ice/location/run.py
+++ b/cpp/test/Ice/location/run.py
@@ -22,5 +22,5 @@ import TestUtil
 
 name = os.path.join("Ice", "location")
 
-TestUtil.clientServerTest(name)
+TestUtil.mixedClientServerTest(name)
 sys.exit(0)