3 files changed, 9 insertions, 13 deletions
diff --git a/cpp/test/Ice/gc/Client.cpp b/cpp/test/Ice/gc/Client.cpp
index 339298496c0..6e03a5920d7 100644
--- a/cpp/test/Ice/gc/Client.cpp
+++ b/cpp/test/Ice/gc/Client.cpp
@@ -470,6 +470,10 @@ MyApplication::run(int argc, char* argv[])
     Ice::collectGarbage();
     test(num == 0);
     cout << "ok" << endl;
+    
+#if defined(_AIX)
+    cout << "The following test may take a long time (like one full minute); please be patient." << endl;
+#endif   
 
     cout << "testing for race conditions... " << flush;
     ::IceUtil::Time t = ::IceUtil::Time::now();
diff --git a/cpp/test/IcePack/deployer/Makefile b/cpp/test/IcePack/deployer/Makefile
index 61f5b97e486..71578564a1b 100644
--- a/cpp/test/IcePack/deployer/Makefile
+++ b/cpp/test/IcePack/deployer/Makefile
@@ -12,12 +12,10 @@ top_srcdir	= ../../..
 CLIENT		= client
 SERVER		= server
 
-SVCFILENAME     = $(call mklibfilename,TestService,$(VERSION))
-SVCSONAME	= $(call mksoname,TestService,$(SOVERSION)) 
-SVCLIBNAME	= $(call mklibname,TestService) 
+SVCFILENAME     = $(call mklibfilename,TestService)
+SVCSONAME	= $(call mksoname,TestService) 
 
-TARGETS		= $(CLIENT) $(SERVER) \
-                  $(SVCFILENAME) $(SVCSONAME) $(SVCLIBNAME)
+TARGETS		= $(CLIENT) $(SERVER) $(SVCFILENAME) 
 
 OBJS		= Test.o
 
@@ -54,14 +52,6 @@ $(SVCFILENAME): $(OBJS) $(SERVICE_OBJS)
 	rm -f $@
 	$(call mkshlib,$@,$(SVCSONAME),$(OBJS) $(SERVICE_OBJS),$(LINKWITH))
 
-$(SVCSONAME): $(SVCFILENAME)
-	rm -f $@
-	ln -s $(SVCFILENAME) $@
-
-$(SVCLIBNAME): $(SVCSONAME)
-	rm -f $@
-	ln -s $(SVCSONAME) $@
-
 clean::
 	rm -f db/node/db/servers db/node/db/serveradapters db/node/db/log.*
 	rm -f db/registry/*
diff --git a/cpp/test/IcePack/deployer/run.py b/cpp/test/IcePack/deployer/run.py
index 45a41cc2c07..c8bed4755d1 100755
--- a/cpp/test/IcePack/deployer/run.py
+++ b/cpp/test/IcePack/deployer/run.py
@@ -26,6 +26,8 @@ testdir = os.path.join(toplevel, "test", name)
 
 if TestUtil.isWin32():
     os.environ["PATH"] = testdir + ";" + os.getenv("PATH", "")
+elif TestUtil.isAIX():
+    os.environ["LIBPATH"] = testdir + ":" + os.getenv("LIBPATH", "")
 else:
     os.environ["LD_LIBRARY_PATH"] = testdir + ":" + os.getenv("LD_LIBRARY_PATH", "")
     os.environ["LD_LIBRARY_PATH_64"] = testdir + ":" + os.getenv("LD_LIBRARY_PATH_64", "")